diff --git a/app-backup/deja-dup/deja-dup-29.1.ebuild b/app-backup/deja-dup/deja-dup-29.1.ebuild
index c30d1695a2cc..f34dd61b75b2 100644
--- a/app-backup/deja-dup/deja-dup-29.1.ebuild
+++ b/app-backup/deja-dup/deja-dup-29.1.ebuild
@@ -1,12 +1,13 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/deja-dup/deja-dup-29.1.ebuild,v 1.1 2013/11/17 11:19:50 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/deja-dup/deja-dup-29.1.ebuild,v 1.2 2013/11/19 07:37:49 jlec Exp $
EAPI=5
GNOME2_LA_PUNT="yes"
VALA_MIN_API_VERSION="0.16"
+VALA_MAX_API_VERSION="0.20"
inherit cmake-utils eutils gnome2 vala
diff --git a/app-shells/rssh/Manifest b/app-shells/rssh/Manifest
index bff4650cbccd..70a1bb8ad2ee 100644
--- a/app-shells/rssh/Manifest
+++ b/app-shells/rssh/Manifest
@@ -1,2 +1,2 @@
-DIST rssh-2.3.3.tar.gz 119510 SHA256 1940912c2485f8531e4461de06bd2aebc607d2a89805debb7ac81002fa6fd07f SHA512 a5aeeca30217224830ca96acbf257a59c0da602ed541120d7a69695a352dfe6617b9fd8df7340f3363f4f807b47d1db20b60c10dcc8ef3a208968e3f9cb1c3ee WHIRLPOOL 2db29c430880bf37b7daceece8510fef54662cc3d10e75b693c425231d00b55c4d39c75cd539a088c8547d6caf10ff7c3b994c3ff2eb7e606bb3dcecd3362f05
DIST rssh-2.3.4.tar.gz 113315 SHA256 f30c6a760918a0ed39cf9e49a49a76cb309d7ef1c25a66e77a41e2b1d0b40cd9 SHA512 c1a77abdf4abe5f936fb1c9c008fc81fabf7b624d69ed31fe2ae5619dfa4a79f1d4a4f2daa5291a36d40353fa2168e74e5ba61294230d702fcdc88ae0d520487 WHIRLPOOL a2fa86922780bdc5f34536aa5840a76902841024b0bc35220098e9d40e087c28578c37417c92ffca5035898c47f50d5de5d18609a3087ceb25eb532bd6b26092
+DIST rssh_2.3.4-3.debian.tar.xz 27364 SHA256 077b304c423349f2771207b0da20b0aef4a8e5baa9c51dcacd37fe2134bee70b SHA512 963d51c0a806090f8008b1f83ca3a0bc271f789e1388c4f4de993e61d705458be4163ba74ebb4fccea454b6ab08239b0a7c2b067bfe7ab222033b9785cb79a90 WHIRLPOOL 127f922d7595c3f3dc68be7b87f2b4043fa433c1e115232b6bac35cc924b280f161c976ab59cca92da846653ea4b5d5c3e33592e4f72593ec8dd07bd6c891c34
diff --git a/app-shells/rssh/files/rssh-2.3.3-envvars.patch b/app-shells/rssh/files/rssh-2.3.3-envvars.patch
deleted file mode 100644
index e9193c7bd2e0..000000000000
--- a/app-shells/rssh/files/rssh-2.3.3-envvars.patch
+++ /dev/null
@@ -1,228 +0,0 @@
---- rssh-2.3.3/main.c.in 2010-08-01 15:43:30.000000000 -0400
-+++ rssh-2.3.3/main.c.in 2012-05-11 16:44:39.000000000 -0400
-@@ -184,7 +184,7 @@
- * determine if the command in cmdline is acceptable to run, and store
- * name of program to exec in cmd
- */
-- if ( !(*cmd = check_command_line(cmdline, opts)) ) return NULL;
-+ if ( !(*cmd = get_command(cmdline, opts)) ) return NULL;
-
- /* if we need to do chroot processing, do it */
- if ( opts->shell_flags & RSSH_USE_CHROOT ){
-@@ -252,7 +252,9 @@
- }
-
- /* return vector of pointers to command line arguments */
-- return build_arg_vector(cmdline, 0);
-+ argvec = build_arg_vector(cmdline, 0);
-+ if (check_command_line(argvec, opts)) return argvec;
-+ else return NULL;
- }
-
- void vers_info( void )
---- rssh-2.3.3/util.c 2010-08-01 09:07:00.000000000 -0400
-+++ rssh-2.3.3/util.c 2012-05-11 16:43:10.000000000 -0400
-@@ -106,7 +106,7 @@
- /* print error message to user and log attempt */
- fprintf(stderr, "\nThis account is restricted by rssh.\n"
- "%s\n\nIf you believe this is in error, please contact "
-- "your system administrator.\n\n", cmd);
-+ "your system administrator.\n\n", cmd);
- if ( argc < 3 )
- log_msg("user %s attempted to log in with a shell",
- username);
-@@ -132,31 +132,35 @@
- */
- bool opt_exist(char *cl, char opt)
- {
-- int i = 0;
-+ int i = 1;
- int len;
-- char *token;
-- bool optstring = FALSE;
--
-
- len = strlen(cl);
-
- /* process command line character by character */
-- while ( i < (len - 2) ){
-- if ( cl[i] == ' ' || cl[i] == '\t' ){
-- if ( cl[i+1] == '-' ){
-- optstring = TRUE;
-- i+=2;
-- }
-- }
-- if ( cl[i] == opt && optstring ) return TRUE;
-- if ( cl[i] == ' ' || cl[i] == '\t' || cl[i] == '-' )
-- optstring = FALSE;
-+ if (!(cl[0] == '-')) return FALSE;
-+ while ( i < (len) ){
-+ if ( cl[i] == opt ) return TRUE;
- i++;
- }
- return FALSE;
- }
-
-
-+bool opt_filter(char **vec, const char opt)
-+{
-+ while (vec && *vec){
-+ if (opt_exist(*vec, opt)){
-+ fprintf(stderr, "\nillegal insecure %c option", opt);
-+ log_msg("insecure %c option in scp command line!", opt);
-+ return TRUE;
-+ }
-+ vec++;
-+ }
-+ return FALSE;
-+}
-+
-+
- bool check_command( char *cl, ShellOptions_t *opts, char *cmd, int cmdflag )
- {
- int cl_len; /* length of command line */
-@@ -186,69 +190,78 @@
- return FALSE;
- }
-
-+
- /*
- * check_command_line() - take the command line passed to rssh, and verify
-- * that the specified command is one the user is
-- * allowed to run. Return the path of the command
-- * which will be run if it is ok, or return NULL if it
-- * is not.
-+ * that the specified command is one the user is
-+ * allowed to run and validate the arguments. Return the
-+ * path of the command which will be run if it is ok, or
-+ * return NULL if it is not.
- */
--char *check_command_line( char *cl, ShellOptions_t *opts )
-+char *check_command_line( char **cl, ShellOptions_t *opts )
- {
-
-- if ( check_command(cl, opts, PATH_SFTP_SERVER, RSSH_ALLOW_SFTP) )
-+ if ( check_command(*cl, opts, PATH_SFTP_SERVER, RSSH_ALLOW_SFTP) )
- return PATH_SFTP_SERVER;
-
-- if ( check_command(cl, opts, PATH_SCP, RSSH_ALLOW_SCP) ){
-+ if ( check_command(*cl, opts, PATH_SCP, RSSH_ALLOW_SCP) ){
- /* filter -S option */
-- if ( opt_exist(cl, 'S') ){
-- fprintf(stderr, "\ninsecure -S option not allowed.");
-- log_msg("insecure -S option in scp command line!");
-- return NULL;
-- }
-+ if ( opt_filter(cl, 'S') ) return NULL;
- return PATH_SCP;
- }
-
-- if ( check_command(cl, opts, PATH_CVS, RSSH_ALLOW_CVS) ){
-- if ( opt_exist(cl, 'e') ){
-- fprintf(stderr, "\ninsecure -e option not allowed.");
-- log_msg("insecure -e option in cvs command line!");
-- return NULL;
-- }
-+ if ( check_command(*cl, opts, PATH_CVS, RSSH_ALLOW_CVS) ){
-+ if ( opt_filter(cl, 'e') ) return NULL;
- return PATH_CVS;
- }
-
-- if ( check_command(cl, opts, PATH_RDIST, RSSH_ALLOW_RDIST) ){
-+ if ( check_command(*cl, opts, PATH_RDIST, RSSH_ALLOW_RDIST) ){
- /* filter -P option */
-- if ( opt_exist(cl, 'P') ){
-- fprintf(stderr, "\ninsecure -P option not allowed.");
-- log_msg("insecure -P option in rdist command line!");
-- return NULL;
-- }
-+ if ( opt_filter(cl, 'P') ) return NULL;
- return PATH_RDIST;
- }
-
-- if ( check_command(cl, opts, PATH_RSYNC, RSSH_ALLOW_RSYNC) ){
-+ if ( check_command(*cl, opts, PATH_RSYNC, RSSH_ALLOW_RSYNC) ){
- /* filter -e option */
-- if ( opt_exist(cl, 'e') ){
-- fprintf(stderr, "\ninsecure -e option not allowed.");
-- log_msg("insecure -e option in rdist command line!");
-- return NULL;
-- }
--
-- if ( strstr(cl, "--rsh=" ) ){
-- fprintf(stderr, "\ninsecure --rsh= not allowed.");
-- log_msg("insecure --rsh option in rsync command line!");
-- return NULL;
-+ if ( opt_filter(cl, 'e') ) return NULL;
-+ while (cl && *cl){
-+ if ( strstr(*cl, "--rsh=" ) ){
-+ fprintf(stderr, "\ninsecure --rsh= not allowed.");
-+ log_msg("insecure --rsh option in rsync command line!");
-+ return NULL;
-+ }
- }
--
- return PATH_RSYNC;
- }
-+ /* No match, return NULL */
-+ return NULL;
-+}
-+
-+
-+/*
-+ * get_command() - take the command line passed to rssh, and verify
-+ * that the specified command is one the user is allowed to run.
-+ * Return the path of the command which will be run if it is ok,
-+ * or return NULL if it is not.
-+ */
-+char *get_command( char *cl, ShellOptions_t *opts )
-+{
-
-+ if ( check_command(cl, opts, PATH_SFTP_SERVER, RSSH_ALLOW_SFTP) )
-+ return PATH_SFTP_SERVER;
-+ if ( check_command(cl, opts, PATH_SCP, RSSH_ALLOW_SCP) )
-+ return PATH_SCP;
-+ if ( check_command(cl, opts, PATH_CVS, RSSH_ALLOW_CVS) )
-+ return PATH_CVS;
-+ if ( check_command(cl, opts, PATH_RDIST, RSSH_ALLOW_RDIST) )
-+ return PATH_RDIST;
-+ if ( check_command(cl, opts, PATH_RSYNC, RSSH_ALLOW_RSYNC) )
-+ return PATH_RSYNC;
- return NULL;
- }
-
-
-+
- /*
- * extract_root() - takes a root directory and the full path to some other
- * directory, and returns a pointer to a string which
-@@ -264,7 +277,7 @@
- len = strlen(root);
- /* get rid of a trailing / from the root path */
- if ( root[len - 1] == '/' ){
-- root[len - 1] = '\0';
-+ root[len - 1] = '\0';
- len--;
- }
- if ( (strncmp(root, path, len)) ) return NULL;
-@@ -309,7 +322,7 @@
- * same name, and returns FALSE if the bits are not valid
- */
- int validate_access( const char *temp, bool *allow_sftp, bool *allow_scp,
-- bool *allow_cvs, bool *allow_rdist, bool *allow_rsync )
-+ bool *allow_cvs, bool *allow_rdist, bool *allow_rsync )
- {
- int i;
-
---- rssh-2.3.3/util.h 2006-12-21 17:22:38.000000000 -0500
-+++ rssh-2.3.3/util.h 2012-05-11 16:21:12.000000000 -0400
-@@ -33,7 +33,8 @@
- #include "rsshconf.h"
-
- void fail( int flags, int argc, char **argv );
--char *check_command_line( char *cl, ShellOptions_t *opts );
-+char *check_command_line( char **cl, ShellOptions_t *opts );
-+char *get_command( char *cl, ShellOptions_t *opts);
- char *extract_root( char *root, char *path );
- int validate_umask( const char *temp, int *mask );
- int validate_access( const char *temp, bool *allow_sftp, bool *allow_scp,
diff --git a/app-shells/rssh/files/rssh-2.3.4_p3-autotools.patch b/app-shells/rssh/files/rssh-2.3.4_p3-autotools.patch
new file mode 100644
index 000000000000..8030eda525f3
--- /dev/null
+++ b/app-shells/rssh/files/rssh-2.3.4_p3-autotools.patch
@@ -0,0 +1,33 @@
+diff -Naur rssh-2.3.4.orig/configure.ac rssh-2.3.4/configure.ac
+--- rssh-2.3.4.orig/configure.ac 2013-11-15 16:11:21.301056547 -0700
++++ rssh-2.3.4/configure.ac 2013-11-15 16:11:51.471424233 -0700
+@@ -13,12 +13,6 @@
+ AC_PROG_MAKE_SET
+ AC_CHECK_TOOL([STRIP],[strip])
+
+-if test yes = "$GCC" ; then
+- defcflags="-O2 -Wall -Wshadow"
+-else
+- echo "Using default flags"
+-fi
+-
+ # Checks for libraries.
+
+ # Checks for header files.
+diff -Naur rssh-2.3.4.orig/Makefile.am rssh-2.3.4/Makefile.am
+--- rssh-2.3.4.orig/Makefile.am 2013-11-15 16:11:21.301056547 -0700
++++ rssh-2.3.4/Makefile.am 2013-11-15 16:12:28.581876494 -0700
+@@ -15,7 +15,7 @@
+ base=`echo @PACKAGE_STRING@|tr " " "-"`
+
+ install-exec-hook:
+- chmod u+s $(libexecdir)/rssh_chroot_helper
++ chmod u+s $(DESTDIR)/$(libexecdir)/rssh_chroot_helper
+
+ rpm: dist
+ rpmbuild -ta --sign $(base).tar.gz
+@@ -24,3 +24,4 @@
+ gpg -ba --default-key ddm@pizzashack.org $(base).tar.gz
+ mv $(base).tar.gz.asc $(base).tar.gz.sig
+
++AM_CPPFLAGS += -I. -I$(srcdir)
diff --git a/app-shells/rssh/metadata.xml b/app-shells/rssh/metadata.xml
index 6f229cf9eedf..75b1c5a42744 100644
--- a/app-shells/rssh/metadata.xml
+++ b/app-shells/rssh/metadata.xml
@@ -1,9 +1,12 @@
-proxy-maintainers
-
- opensource@andmarios.com
- Marios Andreopoulos
-
+
+ opensource@andmarios.com
+ Marios Andreopoulos
+
+
+ ottxor@gentoo.org
+ Christoph Junghans
+
diff --git a/app-shells/rssh/rssh-2.3.3-r2.ebuild b/app-shells/rssh/rssh-2.3.3-r2.ebuild
deleted file mode 100644
index 1812928e8e50..000000000000
--- a/app-shells/rssh/rssh-2.3.3-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/rssh/rssh-2.3.3-r2.ebuild,v 1.5 2013/05/10 07:51:42 patrick Exp $
-
-EAPI=4
-inherit eutils multilib
-
-DESCRIPTION="Restricted shell for SSHd"
-HOMEPAGE="http://rssh.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rssh/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="static"
-
-RDEPEND="virtual/ssh"
-
-src_prepare() {
- sed -i 's:chmod u+s $(:chmod u+s $(DESTDIR)$(:' Makefile.in || die
- epatch "${FILESDIR}"/rssh-2.3.3-envvars.patch
-}
-
-src_configure() {
- econf \
- --libexecdir="/usr/$(get_libdir)/misc" \
- --with-scp=/usr/bin/scp \
- --with-sftp-server="/usr/$(get_libdir)/misc/sftp-server" \
- $(use_enable static)
-}
-
-src_install() {
- emake install DESTDIR="${D}"
- dodoc AUTHORS ChangeLog CHROOT INSTALL README TODO
-}
diff --git a/app-shells/rssh/rssh-2.3.4_p3.ebuild b/app-shells/rssh/rssh-2.3.4_p3.ebuild
new file mode 100644
index 000000000000..9249a3797ddd
--- /dev/null
+++ b/app-shells/rssh/rssh-2.3.4_p3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/rssh/rssh-2.3.4_p3.ebuild,v 1.1 2013/11/19 05:00:42 ottxor Exp $
+
+EAPI=5
+inherit autotools-utils multilib
+
+DESCRIPTION="Restricted shell for SSHd"
+HOMEPAGE="http://rssh.sourceforge.net/"
+MY_P="${P/%_p*}"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
+ mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p/-}.debian.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="static subversion"
+
+RDEPEND="virtual/ssh"
+
+S="${WORKDIR}/${MY_P}"
+DOCS=( AUTHORS ChangeLog CHROOT INSTALL README TODO )
+
+src_prepare() {
+ epatch "${WORKDIR}"/debian/patches/fixes/*.diff "${FILESDIR}/${P}"-autotools.patch
+ use subversion && epatch "${WORKDIR}"/debian/patches/features/subversion.diff
+ AUTOTOOLS_AUTORECONF=1 autotools-utils_src_prepare #due to debian patches
+}
+
+src_configure() {
+ local myeconfargs=(
+ --libexecdir="/usr/$(get_libdir)/misc"
+ --with-scp=/usr/bin/scp
+ --with-sftp-server="/usr/$(get_libdir)/misc/sftp-server"
+ $(use_enable static)
+ )
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install
+ if use subversion && [[ -f "${EROOT}"/etc/rssh.conf ]]; then
+ awk -f conf_convert "${EROOT}"/etc/rssh.conf > "${T}/rssh.conf" || die
+ insinto /etc
+ doins "${T}/rssh.conf"
+ fi
+}
diff --git a/dev-lang/opendylan/opendylan-2013.1.ebuild b/dev-lang/opendylan/opendylan-2013.1-r1.ebuild
similarity index 97%
rename from dev-lang/opendylan/opendylan-2013.1.ebuild
rename to dev-lang/opendylan/opendylan-2013.1-r1.ebuild
index e9c46e805237..e1f668bd3926 100644
--- a/dev-lang/opendylan/opendylan-2013.1.ebuild
+++ b/dev-lang/opendylan/opendylan-2013.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/opendylan/opendylan-2013.1.ebuild,v 1.1 2013/07/12 03:47:54 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/opendylan/opendylan-2013.1-r1.ebuild,v 1.1 2013/11/19 06:11:58 patrick Exp $
EAPI=4
inherit autotools
@@ -23,7 +23,7 @@ IUSE=""
# the boehm-gc check is "wrong" and reported upstream
# but for now static-libs useflag is needed
DEPEND="app-arch/unzip
- dev-libs/boehm-gc[static-libs]
+ dev-libs/boehm-gc
dev-lang/perl
dev-perl/XML-Parser
|| ( dev-lang/opendylan-bin dev-lang/opendylan )
diff --git a/dev-python/py-bcrypt/Manifest b/dev-python/py-bcrypt/Manifest
index 25c023be9195..1142d2779c6b 100644
--- a/dev-python/py-bcrypt/Manifest
+++ b/dev-python/py-bcrypt/Manifest
@@ -1,2 +1 @@
-DIST py-bcrypt-0.2.tar.gz 16804 SHA256 86a798053e41620e64c41b9d6cfd820ac4a564ed4030a5fb177b9daef6bbacba SHA512 d01f263ebb309b4018e457714f8a2cfad6b3a4c33c8b151e2c66de3a658a8495e50704ce10122f0cb551f7669fa9a8f9fdc8d2c5af22e39352c22feb45eaf777 WHIRLPOOL 4f4735505c1e744c516159f0d4a04231e1d21a1fd5e37bc6e85a59c76f92155f1558ab69511c9427346308934d946662ebb653c668d189dff45e6d043529ac98
DIST py-bcrypt-0.4.tar.gz 27399 SHA256 5fa13bce551468350d66c4883694850570f3da28d6866bb638ba44fe5eabda78 SHA512 0e43212c9928dc842f93b18a19805d7e0a12dad1032ee6949efba4afee95922bb4046d052c817c09c09fcdc6bcc3b92512fad8d6571bb8983a4ae94e287bb49e WHIRLPOOL 72d584bbab08c802ef37898d2258efba6f7fedaa4774c29cf71410812382c6bf43413dc20c0fd34b6dad18c88616906d947529781126364946a8703192071475
diff --git a/dev-python/py-bcrypt/py-bcrypt-0.2.ebuild b/dev-python/py-bcrypt/py-bcrypt-0.2.ebuild
deleted file mode 100644
index dc341738c050..000000000000
--- a/dev-python/py-bcrypt/py-bcrypt-0.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2011-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py-bcrypt/py-bcrypt-0.2.ebuild,v 1.1 2013/09/10 06:29:40 patrick Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="py-bcrypt is an implementation of the OpenBSD Blowfish password hashing algorithm"
-HOMEPAGE="http://www.mindrot.org/projects/py-bcrypt
-https://code.google.com/p/py-bcrypt/"
-SRC_URI="http://www.mindrot.org/files/${PN}/${P}.tar.gz
-http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DOCS=( ChangeLog LICENSE README TODO )
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index fedf1cfbd875..9fe37112bc20 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,2 +1,3 @@
DIST graphviz-2.26.3.tar.gz 17092429 SHA256 f410996e69b1095237c2128deae5fc7b6ce99055b095271abb14447bc2f37fa1 SHA512 6225141752318af0b50714d70d31dd1ef1bc414d134d22f066f159843991194215bb9bc4e8df38a194e1de67ebbf137d371e875948fa6a6eebfca9df1a414a6d WHIRLPOOL ca35d0ed9cb3751ae968e1c6d425efe42e8b681685eb66f975c0ff1b73e245fc3db6418ec69300331c94275fe3bfcdcd168b931b880c280f3dd63f1f03c4d4db
DIST graphviz-2.28.0.tar.gz 19620087 SHA256 d3aa7973c578cae4cc26d9d6498c57ed06680cab9a4e940d0357a3c6527afc76 SHA512 d6dbcd99487e382f9ca83ef63a3ff3fbe9208f6d3969cf03d15b8944dfb58c7fefe1bf96939e3e69019ae9a562619c6d64ad24e390c408b7271caade443233e0 WHIRLPOOL f0274567661f16993a107f45685f0716e64ea493e064efd2e72a4680120cbee8989fb0eab6429d432d18106d42bfc37d4113816efb14e7888d00014b83dea72a
+DIST graphviz-2.34.0.tar.gz 23921350 SHA256 d94abca5745aa4c5808ab56cd3d0ec9ed14fb76a5a88d39e1f234fa84d22d764 SHA512 73dc8c25bc5747fda717d6d2162a8b37bf883544a13b487354a6000d528816a69a021f33cbeec0f6e718a7e9905ab2a04ee63f787ca7f79226055b2da21f4832 WHIRLPOOL 0fe3bf7420eccef9de51789ae9a8d8cab55b6fae7382e557604fb974e04eaa1e0610392dc7f6d5fa85a0b83a3cc955a4ff08d594bf8805c7f06625c7d9ac9007
diff --git a/media-gfx/graphviz/files/graphviz-2.34.0-Xaw-configure.patch b/media-gfx/graphviz/files/graphviz-2.34.0-Xaw-configure.patch
new file mode 100644
index 000000000000..ac91d4bd4d46
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.34.0-Xaw-configure.patch
@@ -0,0 +1,81 @@
+--- configure.ac 2011-05-07 05:25:24.000000000 +0200
++++ configure.ac 2011-06-24 13:24:49.000000000 +0200
+@@ -560,8 +560,8 @@
+ use_xlib="Yes"
+ #no x11.pc on centos4
+ # PKG_CHECK_MODULES(X11, [x11])
+- PKG_CHECK_MODULES(XRENDER, [xrender],HAVE_XRENDER="yes" ,HAVE_XRENDER="no")
+ fi
++PKG_CHECK_MODULES(XRENDER, [xrender],HAVE_XRENDER="yes" ,HAVE_XRENDER="no")
+ AM_CONDITIONAL(WITH_X, [test "x$use_xlib" = "xYes"])
+ AM_CONDITIONAL(WITH_XRENDER, [test "x$,HAVE_XRENDER" = "xyes"])
+
+@@ -1924,6 +1924,10 @@
+ # so we set HAVE_LIBXPMFORLEFTY instead of the usual HAVE_LIBXPM
+ #
+
++AC_ARG_WITH(lefty,
++ [AS_HELP_STRING([--with-lefty=yes],[build lefty])],
++ [],[with_xaw=yes])
++
+ AC_ARG_WITH(Xpmincludedir,
+ [AS_HELP_STRING([--with-Xpmincludedir=DIR],[use Xpm includes from DIR])],
+ [XPM_INCLUDES="-I$withval"])
+@@ -1931,6 +1935,17 @@
+ [AS_HELP_STRING([--with-Xpmlibdir=DIR],[use Xpm libraries from DIR])],
+ [XPM_LIBS="-L$withval"])
+
++AC_ARG_WITH(Xawincludedir,
++ [AS_HELP_STRING([--with-Xawincludedir=DIR],[use Xaw includes from DIR])],
++ [XAW_INCLUDES="-I$withval"])
++AC_ARG_WITH(Xawlibdir,
++ [AS_HELP_STRING([--with-Xawlibdir=DIR],[use Xaw libraries from DIR])],
++ [XAW_LIBS="-L$withval"])
++
++if test "x$with_xaw" != "xyes"; then
++ use_lefty="No (disabled)"
++else
++
+ save_CPPFLAGS=$CPPFLAGS
+ save_LDFLAGS=$LDFLAGS
+ CPPFLAGS="$CPPFLAGS $XPM_INCLUDES $X_CFLAGS"
+@@ -1941,18 +1956,10 @@
+ AC_MSG_WARN(Optional Xpm library not available), [-lXmu -lXt -lX11 -lXext $SOCKET_LIBS])
+ LDFLAGS=$save_LDFLAGS
+ CPPFLAGS=$save_CPPFLAGS
+-AC_SUBST([XPM_INCLUDES])
+-AC_SUBST([XPM_LIBS])
+
+ dnl -----------------------------------
+ dnl INCLUDES and LIBS for XAW
+
+-AC_ARG_WITH(Xawincludedir,
+- [AS_HELP_STRING([--with-Xawincludedir=DIR],[use Xaw includes from DIR])],
+- [XAW_INCLUDES="-I$withval"])
+-AC_ARG_WITH(Xawlibdir,
+- [AS_HELP_STRING([--with-Xawlibdir=DIR],[use Xaw libraries from DIR])],
+- [XAW_LIBS="-L$withval"])
+ save_CPPFLAGS=$CPPFLAGS
+ save_LDFLAGS=$LDFLAGS
+ CPPFLAGS="$CPPFLAGS $XAW_INCLUDES $X_CFLAGS"
+@@ -1978,12 +1985,17 @@
+ fi
+ LDFLAGS=$save_LDFLAGS
+ CPPFLAGS=$save_CPPFLAGS
++
++fi
++
++AC_SUBST([XPM_INCLUDES])
++AC_SUBST([XPM_LIBS])
+ AC_SUBST([XAW_INCLUDES])
+ AC_SUBST([XAW_LIBS])
+-AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" != "xno"])
+-if test "x$with_xaw" = "xno"; then
++AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" = "xyes"])
++if test "x$with_xaw" != "xyes"; then
+ if test "x$no_x" != "xyes"; then
+- AC_MSG_WARN(Lefty cannot be built)
++ AC_MSG_WARN(Lefty will not be built)
+ fi
+ fi
+
diff --git a/media-gfx/graphviz/files/graphviz-2.34.0-dot-pangocairo-link.patch b/media-gfx/graphviz/files/graphviz-2.34.0-dot-pangocairo-link.patch
new file mode 100644
index 000000000000..143beabe5058
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.34.0-dot-pangocairo-link.patch
@@ -0,0 +1,17 @@
+--- cmd/dot/Makefile.am 2013-01-14 04:11:21.000000000 +0100
++++ cmd/dot/Makefile.am 2013-02-01 17:19:30.893949329 +0100
+@@ -115,12 +115,8 @@
+ dot_static_LDADD += $(top_builddir)/plugin/webp/.libs/libgvplugin_webp_C.a $(WEBP_LIBS)
+ dot_builtins_LDADD += $(top_builddir)/plugin/webp/libgvplugin_webp.la $(WEBP_LIBS)
+ endif
+-dot_static_LDADD += $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS)
+-dot_builtins_LDADD += $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS)
+-if WITH_WEBP
+-dot_static_LDADD += $(top_builddir)/plugin/webp/.libs/libgvplugin_webp_C.a $(WEBP_LIBS)
+-dot_builtins_LDADD += $(top_builddir)/plugin/webp/libgvplugin_webp.la $(WEBP_LIBS)
+-endif
++dot_static_LDADD += $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS)
++dot_builtins_LDADD += $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS)
+ endif
+
+ if WITH_LASI
diff --git a/media-gfx/graphviz/graphviz-2.34.0.ebuild b/media-gfx/graphviz/graphviz-2.34.0.ebuild
new file mode 100644
index 000000000000..e68d09c3140d
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-2.34.0.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.34.0.ebuild,v 1.1 2013/11/19 07:06:35 nerdboy Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1
+
+DESCRIPTION="Open Source Graph Visualization Software"
+HOMEPAGE="http://www.graphviz.org/"
+SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+#original KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt4 ruby svg static-libs tcl X elibc_FreeBSD"
+
+# Requires ksh
+RESTRICT="test"
+
+RDEPEND="
+ sys-libs/zlib
+ >=dev-libs/expat-2
+ >=dev-libs/glib-2.11.1
+ >=media-libs/fontconfig-2.3.95
+ >=media-libs/freetype-2.1.10
+ >=media-libs/gd-2.0.34[fontconfig,jpeg,png,truetype,zlib]
+ >=media-libs/libpng-1.2:0
+ !<=sci-chemistry/cluster-1.3.081231
+ virtual/jpeg
+ virtual/libiconv
+ X? (
+ x11-libs/libXaw
+ x11-libs/libX11
+ x11-libs/libXmu
+ x11-libs/libXpm
+ x11-libs/libXt
+ )
+ cairo? (
+ >=x11-libs/pango-1.12
+ >=x11-libs/cairo-1.1.10[svg]
+ )
+ devil? ( media-libs/devil[png,jpeg] )
+ postscript? ( app-text/ghostscript-gpl )
+ gtk? ( x11-libs/gtk+:2 )
+ gts? ( sci-libs/gts )
+ lasi? ( media-libs/lasi )
+ pdf? ( app-text/poppler )
+ python? ( ${PYTHON_DEPS} )
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ )
+ ruby? ( dev-lang/ruby )
+ svg? ( gnome-base/librsvg )
+ tcl? ( >=dev-lang/tcl-8.3 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/flex
+ guile? ( dev-scheme/guile dev-lang/swig )
+ java? ( >=virtual/jdk-1.5 dev-lang/swig )
+ nls? ( >=sys-devel/gettext-0.14.5 )
+ perl? ( dev-lang/swig )
+ python? (
+ dev-lang/swig
+ ${PYTHON_DEPS}
+ )
+ ruby? ( dev-lang/swig )
+ tcl? ( dev-lang/swig )"
+REQUIRED_USE="
+ !cairo? ( !X !gtk !postscript !lasi )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Dependency description / Maintainer-Info:
+
+# Rendering is done via the following plugins (/plugins):
+# - core, dot_layout, neato_layout, gd , dot
+# the ones which are always compiled in, depend on zlib, gd
+# - gtk
+# Directly depends on gtk-2.
+# needs 'pangocairo' enabled in graphviz configuration
+# gtk-2 depends on pango, cairo and libX11 directly.
+# - gdk-pixbuf
+# Disabled, GTK-1 junk.
+# - glitz
+# Disabled, no particular reason
+# needs 'pangocairo' enabled in graphviz configuration
+# - ming
+# flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
+# incomplete.
+# - cairo/pango:
+# Needs pango for text layout, uses cairo methods to draw stuff
+# - xlib:
+# needs cairo+pango,
+# can make use of gnomeui and inotify support (??? unsure),
+# needs libXaw for UI
+# UI also links directly against libX11, libXmu, and libXt
+# and uses libXpm if available so we make sure it always is
+
+# There can be swig-generated bindings for the following languages (/tclpkg/gv):
+# - c-sharp (disabled)
+# - scheme (enabled via guile) ... no longer broken on ~x86
+# - io (disabled)
+# - java (enabled via java) *2
+# - lua (enabled via lua)
+# - ocaml (enabled via ocaml)
+# - perl (enabled via perl) *1
+# - php (enabled via php) *2
+# - python (enabled via python) *1
+# - ruby (enabled via ruby) *1
+# - tcl (enabled via tcl)
+# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
+# *2 = Those bindings don't build because the paths for the headers/libs aren't
+# detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
+
+# There are several other tools in /tclpkg:
+# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
+# tkspline, tkstubs ; enabled with: --with-tk
+
+# And the commands (/cmd):
+# - dot, dotty, gvedit, gvpr, lefty, lneato, smyrna, tools/* :)
+# sci-libs/gts can be used for some of these
+# - lefty:
+# needs Xaw and X to build
+# - gvedit (via 'qt4'):
+# based on ./configure it needs qt-core and qt-gui only
+# - smyrna : experimental opengl front-end (via 'smyrna')
+# currently disabled -- it segfaults a lot
+# needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
+# sci-libs/gts, x11-libs/gtk. Also needs 'gtk','glade','glut','gts' and 'png'
+# with flags enabled at configure time
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-Xaw-configure.patch \
+ "${FILESDIR}"/${P}-dot-pangocairo-link.patch
+
+ # ToDo: Do the same thing for examples and/or
+ # write a patch for a configuration-option
+ # and send it to upstream
+ # note - the longer sed expression removes multi-line assignments that are extended via '\'
+ if ! use doc ; then
+ find . -iname Makefile.am \
+ | xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \
+ -e '/^\(html\|pdf\)_DATA/d' || die
+ fi
+
+ # This is an old version of libtool
+ # use the ./configure option to exclude its use, and
+ # delete the dir since we don't need to eautoreconf it
+ rm -rf libltdl
+
+ # no nls, no gettext, no iconv macro, so disable it
+ use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; }
+
+ # Nuke the dead symlinks for the bindings
+ sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die
+
+ # replace the whitespace with tabs
+ sed -i -e 's: :\t:g' doc/info/Makefile.am || die
+
+ # workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
+ use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
+
+ use java && append-cppflags $(java-pkg_get-jni-cflags)
+
+ eautoreconf
+}
+
+src_configure() {
+ # libtool file collision, bug 276609
+ local myconf="--without-included-ltdl --disable-ltdl-install"
+
+ myconf="${myconf}
+ $(use_with cairo pangocairo)
+ $(use_with devil)
+ $(use_with gtk)
+ $(use_with gts)
+ $(use_with qt4)
+ $(use_with lasi)
+ $(use_with svg rsvg)
+ $(use_with X x)
+ $(use_with X xaw)
+ $(use_with X lefty)
+ --with-digcola
+ --with-fontconfig
+ --with-freetype2
+ --with-ipsepcola
+ --with-libgd
+ --with-sfdp
+ $(use_enable gdk-pixbuf)
+ --without-ming"
+
+ # new/experimental features, to be tested, disable for now
+ myconf="${myconf}
+ --with-cgraph
+ --without-glitz
+ --without-ipsepcola
+ --without-smyrna
+ --without-visio"
+
+ # Bindings:
+ myconf="${myconf}
+ $(use_enable guile)
+ --disable-io
+ $(use_enable java)
+ --disable-lua
+ --disable-ocaml
+ $(use_enable perl)
+ --disable-php
+ $(use_enable python)
+ --disable-r
+ $(use_enable ruby)
+ --disable-sharp
+ $(use_enable tcl)"
+
+ econf \
+ --enable-ltdl \
+ --disable-silent-rules \
+ $(use_enable static-libs static) \
+ ${myconf}
+}
+
+src_install() {
+ sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
+
+ emake DESTDIR="${D}" \
+ txtdir="${EPREFIX}"/usr/share/doc/${PF} \
+ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
+ pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
+ pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
+ install
+
+ use examples || rm -rf "${ED}"/usr/share/graphviz/demo
+
+ use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
+
+ dodoc AUTHORS ChangeLog NEWS README
+
+ use python && python_optimize \
+ "${D}$(python_get_sitedir)" \
+ "${D}/usr/$(get_libdir)/graphviz/python"
+}
+
+pkg_postinst() {
+ # This actually works if --enable-ltdl is passed
+ # to configure
+ dot -c
+}
diff --git a/media-gfx/graphviz/metadata.xml b/media-gfx/graphviz/metadata.xml
index b7ac441985d6..4772c3130252 100644
--- a/media-gfx/graphviz/metadata.xml
+++ b/media-gfx/graphviz/metadata.xml
@@ -30,6 +30,7 @@ a database of telephone calls or e-mail messages