Add gtk3 use flag, bug 404579. Live ebuild is currently broken with USE=-gtk3.

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

5 files changed, 25 insertions, 14 deletions

diff --git a/net-misc/remmina/ChangeLog b/net-misc/remmina/ChangeLog
index 87c3540dad81..0cebb6f8e585 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.24 2012/02/20 20:45:32 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/ChangeLog,v 1.25 2012/02/20 22:30:39 floppym Exp $
+
+  20 Feb 2012; Mike Gilbert <floppym@gentoo.org> metadata.xml,
+  remmina-1.0.0-r1.ebuild, remmina-9999.ebuild:
+  Add gtk3 use flag, bug 404579. Live ebuild is currently broken with USE=-gtk3.
 
   20 Feb 2012; Mike Gilbert <floppym@gentoo.org> -remmina-1.0.0.ebuild,
   remmina-1.0.0-r1.ebuild, remmina-9999.ebuild:
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 70f3cab54a9c..661bf2c0e681 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -9,14 +9,14 @@ 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 1960 RMD160 9cf513af91f97c9cc59687cb9f7cd8bb8d94b862 SHA1 8785206481f91cdc78b0cb7a5496225a6b399d0b SHA256 0d79c627c671a3ad6d17888ddce8f6ac1c1a0ca46cc14e54bf77f6cfe29f35cc
-EBUILD remmina-9999.ebuild 1582 RMD160 3134e4679f8decc1e7252adb5fa853d52f45408e SHA1 8fff7a009afc43caac17031e4ac7949fab53fec4 SHA256 50b849f320663693b3c0e85883c904b4420ec5ebd175496de1a7b1a8f399570c
-MISC ChangeLog 3674 RMD160 0ea286aecce491cd3e65ac38fb8869f0b6af9c74 SHA1 a3d58d9158b1c781b3f0c7b3946f32ae53929eae SHA256 75af2bc59b62b64edf384b74e693dcff4a1b8c18a1867dbc5336a8a18d252680
-MISC metadata.xml 823 RMD160 17e0e2684161cfb4c0d904074a7546f8fa614049 SHA1 78cad87bf6207c61b649956c1be605b186d89aad SHA256 06e1fb198e548427bf49de7a16ee94b550837f5cdc26c11334ec846cbb555d8d
+EBUILD remmina-1.0.0-r1.ebuild 2054 RMD160 a7ba3fc214798a846146fbc0485bf80c30336f73 SHA1 86ae829203f22f09cbf72980d792f2f6bdd77730 SHA256 a58eeb20d1e3024c9dee4f3d2c3bf369ab34b11b74057491fb2d5c16d288ad95
+EBUILD remmina-9999.ebuild 1676 RMD160 064a79d75d1a310436b1e84c35ae0557890c0eec SHA1 1dd0e37c9eb09f9019842b83c6f42183eb1c00a1 SHA256 3ede5f2bf4ca027a84f61e70415e019861161c02be04c63560d35fbf21c7d549
+MISC ChangeLog 3867 RMD160 15414de7b0ccdca623c419a18b5bb335178d74cb SHA1 79db66957181263adb7f2ea9d617c906be7e85bb SHA256 b5a57fc51850222da2a899ad0021e674f99e6f4ba013272f8fd40a85f25c4a04
+MISC metadata.xml 891 RMD160 f2d1ee00903b3b6544a54c2a2461795ed00dda73 SHA1 0c2770a9ee3e633f267b4883528a801488fac0e0 SHA256 8f5a4e99ec403771abd902e7f237dcb8a7e3020bbcc59df33ffd5149545f1495
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk9CsPMACgkQC77qH+pIQ6R1qgD+PvoLAO5c0JqyNFrY1Uv88GFW
-jG4/GGaFY0b/phaWNcEBAJwOSEzCiUvfLeKzw4IgZBHr58Dciq0u4VD8cdffOA+C
-=dfop
+iF4EAREIAAYFAk9CyZUACgkQC77qH+pIQ6SpwAD/SyV+QgPfE1wWDBVMGnZAvQvY
+91sHKuSSLbTQ9sQoLAEA/jD1I4/minrLfeHBcl1pUfFNUjS86l5hu9W8A0cqffCZ
+=8Y2G
 -----END PGP SIGNATURE-----
diff --git a/net-misc/remmina/metadata.xml b/net-misc/remmina/metadata.xml
index 8b003105a34d..94180e3fa2c1 100644
--- a/net-misc/remmina/metadata.xml
+++ b/net-misc/remmina/metadata.xml
@@ -11,6 +11,7 @@
 	</maintainer>
 	<use>
 		<flag name="freerdp">Add support for the net-misc/freerdp application</flag>
+		<flag name="gtk3">Build against <pkg>x11-libs/gtk+:3</pkg></flag>
 		<flag name="ssh">Enable support for SSH/SFTP using <pkg>net-libs/libssh</pkg></flag>
 		<flag name="telepathy">Enable telepathy support</flag>
 		<flag name="unique">Enable single instance support using <pkg>dev-libs/libunique</pkg></flag>
diff --git a/net-misc/remmina/remmina-1.0.0-r1.ebuild b/net-misc/remmina/remmina-1.0.0-r1.ebuild
index 49cdbeca9220..265507ae6ff9 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.3 2012/02/20 20:45:32 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/remmina-1.0.0-r1.ebuild,v 1.4 2012/02/20 22:30:39 floppym Exp $
 
 EAPI="4"
 
@@ -13,16 +13,18 @@ SRC_URI="https://github.com/downloads/FreeRDP/Remmina/Remmina-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ayatana avahi crypt debug freerdp gnome-keyring nls ssh telepathy vte"
+IUSE="ayatana avahi crypt debug freerdp gnome-keyring +gtk3 nls ssh telepathy vte"
 
 # net-libs/libvncserver is bundled; add dep for next release
-RDEPEND="x11-libs/gtk+:3
+RDEPEND="
 	x11-libs/libxkbfile
 	gnome-keyring? ( gnome-base/libgnome-keyring )
 	ayatana? ( dev-libs/libappindicator )
 	avahi? ( net-dns/avahi[gtk3] )
 	crypt? ( dev-libs/libgcrypt )
 	freerdp? ( >=net-misc/freerdp-1.0 )
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( x11-libs/gtk+:2 )
 	ssh? ( net-libs/libssh[sftp] )
 	telepathy? ( net-libs/telepathy-glib )
 	!net-misc/remmina-plugins
@@ -56,6 +58,7 @@ src_configure() {
 		$(cmake-utils_use_with ssh LIBSSH)
 		$(cmake-utils_use_with telepathy TELEPATHY)
 		$(cmake-utils_use_with vte VTE)
+		-DGTK_VERSION=$(use gtk3 && echo 3 || echo 2)
 		-DHAVE_PTHREAD=ON
 	)
 	cmake-utils_src_configure
diff --git a/net-misc/remmina/remmina-9999.ebuild b/net-misc/remmina/remmina-9999.ebuild
index 67003bbf048a..c0fd9d5a31c4 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.13 2012/02/20 20:45:32 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/remmina-9999.ebuild,v 1.14 2012/02/20 22:30:39 floppym Exp $
 
 EAPI="4"
 EGIT_REPO_URI="git://github.com/FreeRDP/Remmina.git"
@@ -13,9 +13,9 @@ HOMEPAGE="http://remmina.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="ayatana avahi crypt debug freerdp gnome-keyring nls ssh telepathy vte"
+IUSE="ayatana avahi crypt debug freerdp gnome-keyring +gtk3 nls ssh telepathy vte"
 
-RDEPEND="x11-libs/gtk+:3
+RDEPEND="
 	net-libs/libvncserver
 	x11-libs/libxkbfile
 	gnome-keyring? ( gnome-base/libgnome-keyring )
@@ -23,6 +23,8 @@ RDEPEND="x11-libs/gtk+:3
 	avahi? ( net-dns/avahi[gtk3] )
 	crypt? ( dev-libs/libgcrypt )
 	freerdp? ( >=net-misc/freerdp-1.0 )
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( x11-libs/gtk+:2 )
 	ssh? ( net-libs/libssh[sftp] )
 	telepathy? ( net-libs/telepathy-glib )
 	!net-misc/remmina-plugins
@@ -44,6 +46,7 @@ src_configure() {
 		$(cmake-utils_use_with ssh LIBSSH)
 		$(cmake-utils_use_with telepathy TELEPATHY)
 		$(cmake-utils_use_with vte VTE)
+		-DGTK_VERSION=$(use gtk3 && echo 3 || echo 2)
 		-DHAVE_PTHREAD=ON
 	)
 	cmake-utils_src_configure