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

(Portage version: 2.2.0_alpha87/cvs/Linux x86_64)

4 files changed, 18 insertions, 7 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/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