Fix dependencies for gtk3 use flag. Thanks to Daniel M. Weeks in bug 404579.

Package-Manager: portage-2.2.0_alpha87/cvs/Linux x86_64

4 files changed, 28 insertions, 16 deletions

diff --git a/net-misc/remmina/ChangeLog b/net-misc/remmina/ChangeLog
index 2e47b444125f..c1e63d955775 100644
--- a/net-misc/remmina/ChangeLog
+++ b/net-misc/remmina/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/remmina
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/ChangeLog,v 1.26 2012/02/20 23:59:45 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/ChangeLog,v 1.27 2012/02/21 15:59:04 floppym Exp $
+
+  21 Feb 2012; Mike Gilbert <floppym@gentoo.org> remmina-1.0.0-r1.ebuild,
+  remmina-9999.ebuild:
+  Fix dependencies for gtk3 use flag. Thanks to Daniel M. Weeks in bug 404579.
 
   20 Feb 2012; Mike Gilbert <floppym@gentoo.org> remmina-1.0.0-r1.ebuild,
   remmina-9999.ebuild:
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 6d07d29f0a91..a79bdb36d1da 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -9,15 +9,15 @@ DIST remmina-0.7.5.tar.gz 633137 RMD160 7dc6c58c3aa027cf3cb9f804e460e721f16c0b53
 DIST remmina-0.9.3.tar.gz 389744 RMD160 312aefd5781db1223ebe7d14e67fc5055a0784a9 SHA1 51585eb24d297f23bb51a23e3a4a767f9dd00083 SHA256 ea10eba6f60676f7ebfebd285884e41fbb081f3809064588564f53624a3cee82
 EBUILD remmina-0.7.5.ebuild 1395 RMD160 a3d60d4c87654e70f2a6efed4b4e2a38ab615ca0 SHA1 96e68a1bb7ed504ede5b0f974bb8ee709087575f SHA256 a5eb65dabb006949cfcc35570af01fa697ba1973589ef18623edc570de50cf7f
 EBUILD remmina-0.9.3.ebuild 1507 RMD160 07ef041486cfa2cfd248f78ffbd769a5f82731c2 SHA1 603b0eaccbd855c0fc7cf6ee7426671f69d76471 SHA256 0622c90818c093d69307bc4c7bf2181251babf6c9323998782310e50e0abdd5b
-EBUILD remmina-1.0.0-r1.ebuild 2056 RMD160 e1c1d5dcfa424e251fb11cd270d9740720e375be SHA1 b1ea3857fdb893a25625718e985f1574d9a97b6f SHA256 1b7400d953b4669962c49dccc345b89099f2bcadb72c590f5bb7e8fd13c16d5e
-EBUILD remmina-9999.ebuild 1678 RMD160 8be7ddc1466ac0c094116782a2f968653a883f94 SHA1 da8e740b9b6f2b553289aa7c1d88cb46e44be653 SHA256 fca6de49d093d790fa357818726556cccde3c0d17827e0e5baf09d99bed068fa
-MISC ChangeLog 4021 RMD160 f9413e09a97d05d4ffe1e05380e781563d7d2134 SHA1 6563faec3274e1f24647205b561a2d009f299a13 SHA256 3a2cec0cab544c27b292901e92e025ae681dae05aaae14c45aaab62fe36f4a91
+EBUILD remmina-1.0.0-r1.ebuild 2118 RMD160 13b617313e804707f2f02b3f328080edd5b22b7f SHA1 3c22e209dffb27073051abb9e44cbe6d3e327edb SHA256 1251989510b558d993dc80829ee1d5286f1186f4a3a59069410c03cf332a8b90
+EBUILD remmina-9999.ebuild 1740 RMD160 5e16895849e0323e34739989924e573373ead0fe SHA1 05166a054a9f0873239ba82257b099e2196a0ecb SHA256 45992ceff0ea3d2f9cf3dc49e28ab560f7adff0215f2b198908281126ff7b398
+MISC ChangeLog 4198 RMD160 8162b69709ab7edc9ef9df94e2b2f1b9c13b80dc SHA1 a92d7917caed9d2ab3780fe505f93be9a15ef2d2 SHA256 6d7990a7b381cd3d5dacf07432b388203d093e5dd630501bed2c3c953bb9b4e5
 MISC metadata.xml 891 RMD160 f2d1ee00903b3b6544a54c2a2461795ed00dda73 SHA1 0c2770a9ee3e633f267b4883528a801488fac0e0 SHA256 8f5a4e99ec403771abd902e7f237dcb8a7e3020bbcc59df33ffd5149545f1495
-MISC remmina-1.0.0-r1.ebuild.orig 2054 RMD160 a7ba3fc214798a846146fbc0485bf80c30336f73 SHA1 86ae829203f22f09cbf72980d792f2f6bdd77730 SHA256 a58eeb20d1e3024c9dee4f3d2c3bf369ab34b11b74057491fb2d5c16d288ad95
+MISC remmina-1.0.0-r1.ebuild.orig 2056 RMD160 e1c1d5dcfa424e251fb11cd270d9740720e375be SHA1 b1ea3857fdb893a25625718e985f1574d9a97b6f SHA256 1b7400d953b4669962c49dccc345b89099f2bcadb72c590f5bb7e8fd13c16d5e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk9C3ncACgkQC77qH+pIQ6TO3AEAsn9njUH6eE5Ss+0KMpCxYtYV
-zQol/z4aJJ5c8+oFCtYA/RDQysBHX/QbCstWcM6nPnvx0rGkhmKkRvqUlQ5baPY5
-=DZem
+iF4EAREIAAYFAk9Dv1YACgkQC77qH+pIQ6SLNgD9Ewm4NhGrjBXy3aVd3HZnre7j
+jabXNzQuKPsVs/nFyPIBAKIw4oSKB0k/BKjMg9rD8HpIubq6LJStLHTZdNVR1PYS
+=2SWq
 -----END PGP SIGNATURE-----
diff --git a/net-misc/remmina/remmina-1.0.0-r1.ebuild b/net-misc/remmina/remmina-1.0.0-r1.ebuild
index 57def8df2d02..c8c4d38d7c97 100644
--- a/net-misc/remmina/remmina-1.0.0-r1.ebuild
+++ b/net-misc/remmina/remmina-1.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/remmina-1.0.0-r1.ebuild,v 1.5 2012/02/20 23:59:45 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/remmina-1.0.0-r1.ebuild,v 1.6 2012/02/21 15:59:04 floppym Exp $
 
 EAPI="4"
 
@@ -19,17 +19,21 @@ IUSE="ayatana avahi crypt debug freerdp gnome-keyring +gtk3 nls ssh telepathy vt
 RDEPEND="
 	x11-libs/libxkbfile
 	gnome-keyring? ( gnome-base/libgnome-keyring )
-	avahi? ( net-dns/avahi[gtk3] )
 	crypt? ( dev-libs/libgcrypt )
 	freerdp? ( >=net-misc/freerdp-1.0 )
 	gtk3? ( x11-libs/gtk+:3
+		avahi? ( net-dns/avahi[gtk3] )
 		ayatana? ( dev-libs/libappindicator )
+		vte? ( x11-libs/vte:2.90 )
+	)
+	!gtk3? ( x11-libs/gtk+:2
+		avahi? ( net-dns/avahi[gtk] )
+		vte? ( x11-libs/vte:0 )
 	)
-	!gtk3? ( x11-libs/gtk+:2 )
 	ssh? ( net-libs/libssh[sftp] )
 	telepathy? ( net-libs/telepathy-glib )
 	!net-misc/remmina-plugins
-	vte? ( x11-libs/vte:2.90 )"
+"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	dev-util/pkgconfig
diff --git a/net-misc/remmina/remmina-9999.ebuild b/net-misc/remmina/remmina-9999.ebuild
index c51bf2e4f14b..20871dfac12d 100644
--- a/net-misc/remmina/remmina-9999.ebuild
+++ b/net-misc/remmina/remmina-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/remmina-9999.ebuild,v 1.15 2012/02/20 23:59:45 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/remmina-9999.ebuild,v 1.16 2012/02/21 15:59:04 floppym Exp $
 
 EAPI="4"
 EGIT_REPO_URI="git://github.com/FreeRDP/Remmina.git"
@@ -19,17 +19,21 @@ RDEPEND="
 	net-libs/libvncserver
 	x11-libs/libxkbfile
 	gnome-keyring? ( gnome-base/libgnome-keyring )
-	avahi? ( net-dns/avahi[gtk3] )
 	crypt? ( dev-libs/libgcrypt )
 	freerdp? ( >=net-misc/freerdp-1.0 )
 	gtk3? ( x11-libs/gtk+:3
+		avahi? ( net-dns/avahi[gtk3] )
 		ayatana? ( dev-libs/libappindicator )
+		vte? ( x11-libs/vte:2.90 )
+	)
+	!gtk3? ( x11-libs/gtk+:2
+		avahi? ( net-dns/avahi[gtk] )
+		vte? ( x11-libs/vte:0 )
 	)
-	!gtk3? ( x11-libs/gtk+:2 )
 	ssh? ( net-libs/libssh[sftp] )
 	telepathy? ( net-libs/telepathy-glib )
 	!net-misc/remmina-plugins
-	vte? ( x11-libs/vte:2.90 )"
+"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	dev-util/pkgconfig