Remove gtk3 use flag per ssuominen. Bug 404579.

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

3 files changed, 32 insertions, 31 deletions

diff --git a/net-misc/remmina/ChangeLog b/net-misc/remmina/ChangeLog
index c1e63d955775..65feca883203 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.27 2012/02/21 15:59:04 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/ChangeLog,v 1.28 2012/03/08 16:30:05 floppym Exp $
+
+  08 Mar 2012; Mike Gilbert <floppym@gentoo.org> remmina-1.0.0-r1.ebuild,
+  remmina-9999.ebuild:
+  Remove gtk3 use flag per ssuominen. Bug 404579.
 
   21 Feb 2012; Mike Gilbert <floppym@gentoo.org> remmina-1.0.0-r1.ebuild,
   remmina-9999.ebuild:
diff --git a/net-misc/remmina/remmina-1.0.0-r1.ebuild b/net-misc/remmina/remmina-1.0.0-r1.ebuild
index c8c4d38d7c97..b4fec3a2831e 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.6 2012/02/21 15:59:04 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/remmina-1.0.0-r1.ebuild,v 1.7 2012/03/08 16:30:05 floppym Exp $
 
 EAPI="4"
 
@@ -13,31 +13,29 @@ 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 +gtk3 nls ssh telepathy vte"
+IUSE="ayatana avahi crypt debug freerdp gnome-keyring nls ssh telepathy vte"
 
 # net-libs/libvncserver is bundled; add dep for next release
 RDEPEND="
+	x11-libs/gtk+:3
 	x11-libs/libxkbfile
-	gnome-keyring? ( gnome-base/libgnome-keyring )
+	avahi? ( net-dns/avahi[gtk3] )
+	ayatana? ( dev-libs/libappindicator )
 	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 )
-	)
+	gnome-keyring? ( gnome-base/libgnome-keyring )
 	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
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+"
+RDEPEND+="
+	!net-misc/remmina-plugins
+"
 
 DOCS=( README )
 
@@ -63,7 +61,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)
+		-DGTK_VERSION=3
 		-DHAVE_PTHREAD=ON
 	)
 	cmake-utils_src_configure
diff --git a/net-misc/remmina/remmina-9999.ebuild b/net-misc/remmina/remmina-9999.ebuild
index 20871dfac12d..1a5ff1569a59 100644
--- a/net-misc/remmina/remmina-9999.ebuild
+++ b/net-misc/remmina/remmina-9999.ebuild
@@ -1,14 +1,15 @@
 # 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.16 2012/02/21 15:59:04 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/remmina-9999.ebuild,v 1.17 2012/03/08 16:30:05 floppym Exp $
 
 EAPI="4"
-EGIT_REPO_URI="git://github.com/FreeRDP/Remmina.git"
 
 inherit gnome2-utils cmake-utils git-2
 
 DESCRIPTION="A GTK+ RDP, VNC, XDMCP and SSH client"
 HOMEPAGE="http://remmina.sourceforge.net/"
+SRC_URI=""
+EGIT_REPO_URI="git://github.com/FreeRDP/Remmina.git"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,28 +17,26 @@ KEYWORDS=""
 IUSE="ayatana avahi crypt debug freerdp gnome-keyring +gtk3 nls ssh telepathy vte"
 
 RDEPEND="
+	x11-libs/gtk+:3
 	net-libs/libvncserver
 	x11-libs/libxkbfile
-	gnome-keyring? ( gnome-base/libgnome-keyring )
+	avahi? ( net-dns/avahi[gtk3] )
+	ayatana? ( dev-libs/libappindicator )
 	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 )
-	)
+	gnome-keyring? ( gnome-base/libgnome-keyring )
 	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
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+"
+RDEPEND+="
+	!net-misc/remmina-plugins
+"
 
 DOCS=( README )
 
@@ -51,7 +50,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)
+		-DGTK_VERSION=3
 		-DHAVE_PTHREAD=ON
 	)
 	cmake-utils_src_configure