Remove unnecessary USE="gtk2" wrt #374057

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

4 files changed, 22 insertions, 20 deletions

diff --git a/app-admin/gtkdiskfree/ChangeLog b/app-admin/gtkdiskfree/ChangeLog
index 7314c713ff53..98b7fc61d6f0 100644
--- a/app-admin/gtkdiskfree/ChangeLog
+++ b/app-admin/gtkdiskfree/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/gtkdiskfree
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gtkdiskfree/ChangeLog,v 1.33 2012/04/19 22:35:49 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gtkdiskfree/ChangeLog,v 1.34 2012/04/20 08:55:10 ssuominen Exp $
+
+  20 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> gtkdiskfree-2.0.1.ebuild,
+  metadata.xml:
+  Remove unnecessary USE="gtk2" wrt #374057
 
   19 Apr 2012; Michael Weber <xmw@gentoo.org> metadata.xml:
   Proxy-maint with Samuel Bauer.
diff --git a/app-admin/gtkdiskfree/Manifest b/app-admin/gtkdiskfree/Manifest
index 406b68c9a9fe..5b57cb23f0d5 100644
--- a/app-admin/gtkdiskfree/Manifest
+++ b/app-admin/gtkdiskfree/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX 1.9.3-makefile-DESTDIR.patch 550 RMD160 5c84eb76e24fb69cc7c4365b2d3946432239a40b SHA1 ed2f271179900da52dec51db38d22b87dba26a8f SHA256 bdeb951ebac7d7453815cecc5ef36bd263d53556681d1f76e14bddcae5c9fb03
 AUX gtkdiskfree-1.9.3-make-382.patch 794 RMD160 e9b6bb6fec4b8c7bcb97025c89b6dd30f9e0ab00 SHA1 ec19e3f2f9ef84f950c37955393052c541613540 SHA256 d8e8141c657315222a23cdb3825f89336c0317d18ea37fc45dca5a2bc1c6e82b
@@ -7,13 +7,17 @@ AUX gtkdiskfree-1.9.3-tempfile.patch 1184 RMD160 4c1cf0e50b69e4847369825c336add3
 DIST gtkdiskfree-1.9.3.tar.gz 255448 RMD160 5ea6843d7e05e99eed536792ef88e725f01df27c SHA1 1bc309da843fdf54b0384902b11f36176746c576 SHA256 88ddccc51a060590476db7ed29137e474b70cca94ad28220d3122ab4b143d120
 DIST gtkdiskfree-2.0.1.tar.gz 354661 RMD160 a8010cb38979e0f3374a91f8618389fb60eefd49 SHA1 15c83ac1a599ab67e8c286307e5bd919ebb46593 SHA256 eb4369db5ff98df487b43fd59f998f3524a87896686cd2e9c5adccea3bfe7e94
 EBUILD gtkdiskfree-1.9.3-r1.ebuild 896 RMD160 34997a53bd93fa5e88b6f91c9dcb59f94eebc674 SHA1 1ec68be804b7cb6935c3950305a0fe96c9790e71 SHA256 773d33399bc93d850f20eb8c9cf3fd1b31f0a8798a3b1d0531b726df3d43c76c
-EBUILD gtkdiskfree-2.0.1.ebuild 699 RMD160 7a8fbe3a80da52b90e340f284c15fdb9309e4927 SHA1 b665e5c7800004bbecddc899dbd2a75cd58e1885 SHA256 20957aeb41a41983c71cac594cfa6cb1f825687d4a8580d5f5c2de57800aa47a
-MISC ChangeLog 4215 RMD160 bb33cd22fbbcf68dd2b88b8d40569141054d1d84 SHA1 9773f531d4772bf053b42461c5e7a2c5ab686996 SHA256 58093deda24a4374df93530a1291af817ea839df9c86a67852e0ecbbdf5067b2
-MISC metadata.xml 611 RMD160 536abf9da807867b449f0e8bf800d6b623a9917d SHA1 78d30e326f35bc2af6a1dcdb85525482f1105506 SHA256 62cc2f391428f5fd172dc4a1f3ae11c58924ddc173866f168da4217b104d6e0b
+EBUILD gtkdiskfree-2.0.1.ebuild 644 RMD160 d1abc47962d6857a6222b591591540d746ab4cc2 SHA1 5d25fcddcfb482ea5812ee295a27fd43d694cc59 SHA256 39f44ef3c4414d4a5fda734f6e1392989f0974ac9a9832cb11026469f0f85e8f
+MISC ChangeLog 4362 RMD160 a78802c0991d57a6454c283438fe4124804de673 SHA1 72c82341208efc9c87e6b300633a340e2ed9c613 SHA256 d22197fa1db1c2d482eaeb65150e2e21f1f79c45c496abc7bca67dc675e57232
+MISC metadata.xml 548 RMD160 65e269186f554a2d8f7fdfccffc7588f853acbc8 SHA1 a903cae664d3a6c8ff31fdbc33a52e9a71a5f253 SHA256 30f573a79005d33d68ffead92054c44b4ed4ab3a5ae7082e576363a9a15d647d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk+Qk0oACgkQknrdDGLu8JCaDwD/X1ZFjsRTJH4ts6YH2A5G//8Q
-EWcQBcr0DtK0FkxKLogBAIXj63ru7b4Hi6WiTP3Gyfqw8T8mKLGgIj++QhKgvBLS
-=/z4K
+iQEcBAEBAgAGBQJPkSQSAAoJEEdUh39IaPFNHQoH/AiQrXuuIJMYW1kdQaLIKHD1
+1CBT1ZXas6aaERpN9pEQ2DNPJd08TgZO4UpxApqng6G6BPuRaGY6uw4VA5G9e7lD
+GarJh0wN7bZrG+AR15GT2qlvq8aN7TeYGsUgrgPsQG/QKc5QYRUIW+St8XoBepVY
+IGekIc5H56vG77Gq908wHu0sY5LWQup+7VQlBnFEr8pIQpVSfQnNv7fBInwArfrP
+nAIZwrw5ZNhpS6opgdzudgdn1BGONFsQuV1E1rtNmUX9b18M2N9vARbTwyCMzFMk
+4CUYcQqu7VScN+4P77rk/iI2KlRMd9mMrFlmZDGJ42RA3fLvR+GESGj7dUupomM=
+=Jjn0
 -----END PGP SIGNATURE-----
diff --git a/app-admin/gtkdiskfree/gtkdiskfree-2.0.1.ebuild b/app-admin/gtkdiskfree/gtkdiskfree-2.0.1.ebuild
index ffdf79fe0255..0fc99cd02fd1 100644
--- a/app-admin/gtkdiskfree/gtkdiskfree-2.0.1.ebuild
+++ b/app-admin/gtkdiskfree/gtkdiskfree-2.0.1.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gtkdiskfree/gtkdiskfree-2.0.1.ebuild,v 1.1 2012/04/19 20:44:13 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gtkdiskfree/gtkdiskfree-2.0.1.ebuild,v 1.2 2012/04/20 08:55:10 ssuominen Exp $
 
 EAPI=4
 
-inherit eutils
-
 DESCRIPTION="Graphical tool to show free disk space"
 HOMEPAGE="https://gitorious.org/gtkdiskfree"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
@@ -13,10 +11,9 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gtk2 nls"
+IUSE="nls"
 
-RDEPEND="gtk2? ( x11-libs/gtk+:2 )
-	!gtk2? ( x11-libs/gtk+:3 )"
+RDEPEND="x11-libs/gtk+:3"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
@@ -24,5 +21,5 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}-master
 
 src_configure() {
-	econf $(use_with gtk2) $(use_enable nls)
+	econf $(use_enable nls) --without-gtk2
 }
diff --git a/app-admin/gtkdiskfree/metadata.xml b/app-admin/gtkdiskfree/metadata.xml
index ac4ad53db75b..2b8845160196 100644
--- a/app-admin/gtkdiskfree/metadata.xml
+++ b/app-admin/gtkdiskfree/metadata.xml
@@ -12,9 +12,6 @@
 	<description>Proxy maintainer. CC him on bugs</description>
 </maintainer>
 <longdescription>
-gtkdiskfree is a gtk2 extension to the cli tool df, does the same and more
+gtkdiskfree is a gtk extension to the cli tool df, does the same and more
 </longdescription>
-<use>
-  <flag name="gtk2">force x11-libs/gtk+:2</flag>
-</use>
 </pkgmetadata>