Replace USE="gnome xfce" with USE="gtk" wrt #353121. punt the USE xfce from older versions too, to prevent other maintainers from getting the idea it's OK to use in gentoo-x86

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

6 files changed, 26 insertions, 27 deletions

diff --git a/sys-block/gparted/ChangeLog b/sys-block/gparted/ChangeLog
index 5c10f8c5923a..bd0b9bb2e2ec 100644
--- a/sys-block/gparted/ChangeLog
+++ b/sys-block/gparted/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-block/gparted
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/ChangeLog,v 1.88 2010/11/23 10:14:20 eva Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/ChangeLog,v 1.89 2011/01/29 16:34:35 ssuominen Exp $
+
+  29 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> gparted-0.7.0.ebuild:
+  Replace USE="gnome xfce" with USE="gtk" wrt #353121.
 
 *gparted-0.7.0 (23 Nov 2010)
 
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index 1a0c5223827a..0d7e857985fe 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1,8 +1,8 @@
 DIST gparted-0.5.2.tar.bz2 1304277 RMD160 88d93d36bea9151777f170a4e886e7e9d490a43e SHA1 63170eb49473b7ac270a38adae34bd15ac30006a SHA256 9c7f7dfb2470b811b7609fc84362626a46883b83ea84c58a898053393ca72411
 DIST gparted-0.6.2.tar.bz2 1308738 RMD160 638f5d3f2dc0c1ec993a05f5b616505c924565f2 SHA1 dc26bff18d32099d4e14d7c452bc333eddffac7a SHA256 ac331c94ceb21af23c6d164e4f5aef33238201574104eff9540b15a3768a52eb
 DIST gparted-0.7.0.tar.bz2 1374308 RMD160 826e7cea59647041e80c7df1bd386b2ef3e5ea3e SHA1 709d59d2bea01ab81a1c2fd7e4e002bcb821db5e SHA256 8c498411aeb4ec575c15ef60ac3bde2ef46ae157fa53026a7e3ce85d14ad3be7
-EBUILD gparted-0.5.2.ebuild 2213 RMD160 d96050d0507f342f022635407d5902dd03380a57 SHA1 851d78958a9a8c6e89fc6be7fb628182fe21e86a SHA256 78b964a019d9ae6704383350d8b8bbc20f44f71e5b503e544c75db99fbd757ae
-EBUILD gparted-0.6.2.ebuild 2215 RMD160 7c3db30970687b7fccbc6ee0a44c15a45506f498 SHA1 7554831ed962db6c5434f7ca4e3271f03ed1db6c SHA256 8235a410a3f1d9cf3ec32da37ba97021aa8fd7dfcd7fc02b4e42b040cebb9861
-EBUILD gparted-0.7.0.ebuild 2244 RMD160 cc90ec203b85db4f36d4eb0d0d7edf45503a4a87 SHA1 61e266e97a8f3dc8ee29e9f739db6ede3dd8cd97 SHA256 d3c539fc3a8ebd7102b30fe67f55609ab5da1a62d52d6617de9c45581a59919f
-MISC ChangeLog 12573 RMD160 002b685dc01570b48d3b23c51be52c2750e2e950 SHA1 f66a9543b4ebe42a2a255c9b1079c859c1da1ee6 SHA256 e6e76ab3d1b4c6010dc0553a6186b84724849a9ce5dc437fd9f46464cc0f9719
-MISC metadata.xml 1476 RMD160 8f097d3485040732487e1949c2bf0ac1c6f7b87f SHA1 389aefaf1cb2ed22ca0fdddd8ed24306f70ca957 SHA256 56ecb147220a0b3aafbefd4854d8916ff7dbc7e8cb798c92aee890ac04020976
+EBUILD gparted-0.5.2.ebuild 2172 RMD160 6f3708824e84406f05d95c8c71fd5f7b4e5fec8c SHA1 88720e7921604fc450ce1bc2f994a1b627d83a23 SHA256 d40089350d3a5196614154b3b6c9269e39b7bb1f9e0f77f95d208a825056c641
+EBUILD gparted-0.6.2.ebuild 2174 RMD160 0b61777f1c619578b3d01bd92d4e8d7b018ea6d7 SHA1 ef37d828abf62184424bccd1d06c884198a246a8 SHA256 dfca219d0c1353de6a50be3a07b82bb1aebf8506e049d855fb23831281cb6d30
+EBUILD gparted-0.7.0.ebuild 2194 RMD160 2b25dc9745dd25073f557d1d59191c35986f7ba9 SHA1 8c7c76c5abb3951ecfdc753209696a09576b1db8 SHA256 b9c25a0fbcfea5b6777bb5618e610f7677d88a52d88e8c81c0bffcaf7234c1bc
+MISC ChangeLog 12711 RMD160 6e0f48edd752e6b4c4548d192c63a0aec50ca727 SHA1 a03581d46b3c3f9027c75f22efad737e761eaa9b SHA256 8fe590ec1a8e8beb87bb8a7ffaa661250815d1c96392a5a8dff813a2df8eb3f7
+MISC metadata.xml 1414 RMD160 663db5fed54b2b6cfc385ce50fcdbed898a0e49b SHA1 e9cb5b4bbf50c721f3195091a6a5e1dc524ad31b SHA256 8a2c437905e8ac4311eef3b5938140a372557dc67743f903f65e9c958e2f5f9f
diff --git a/sys-block/gparted/gparted-0.5.2.ebuild b/sys-block/gparted/gparted-0.5.2.ebuild
index 8bce9441ddc8..da6221748574 100644
--- a/sys-block/gparted/gparted-0.5.2.ebuild
+++ b/sys-block/gparted/gparted-0.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/gparted-0.5.2.ebuild,v 1.8 2010/08/20 17:05:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/gparted-0.5.2.ebuild,v 1.9 2011/01/29 16:34:35 ssuominen Exp $
 
 EAPI="1"
 GCONF_DEBUG="no"
@@ -15,14 +15,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE="dmraid fat gnome hfs jfs kde mdadm ntfs reiserfs reiser4 xfs xfce"
+IUSE="dmraid fat gnome hfs jfs kde mdadm ntfs reiserfs reiser4 xfs"
 
 common_depends=">=sys-block/parted-2.2
 	>=dev-cpp/gtkmm-2.16.0"
 
 RDEPEND="${common_depends}
 	gnome? ( x11-libs/gksu )
-	xfce? ( x11-libs/gksu )
 	kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
 
 	>=sys-fs/e2fsprogs-1.41.0
@@ -77,9 +76,9 @@ src_install() {
 		echo "OnlyShowIn=KDE;" >> "${D}"/usr/share/applications/gparted-kde.desktop
 	fi
 
-	if use gnome || use xfce; then
+	if use gnome; then
 		sed -i "s:Exec=:Exec=gksu :" "${D}"/usr/share/applications/gparted.desktop
-		echo "OnlyShowIn=GNOME;XFCE;" >> "${D}"/usr/share/applications/gparted.desktop
+		echo "OnlyShowIn=GNOME;" >> "${D}"/usr/share/applications/gparted.desktop
 	else
 		echo "OnlyShowIn=X-NeverShowThis;" >> "${D}"/usr/share/applications/gparted.desktop
 	fi
diff --git a/sys-block/gparted/gparted-0.6.2.ebuild b/sys-block/gparted/gparted-0.6.2.ebuild
index 04bc09ab8bf4..e538d640ddf7 100644
--- a/sys-block/gparted/gparted-0.6.2.ebuild
+++ b/sys-block/gparted/gparted-0.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/gparted-0.6.2.ebuild,v 1.2 2010/08/20 17:05:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/gparted-0.6.2.ebuild,v 1.3 2011/01/29 16:34:35 ssuominen Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -15,14 +15,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="dmraid fat gnome hfs jfs kde mdadm ntfs reiserfs reiser4 xfs xfce"
+IUSE="dmraid fat gnome hfs jfs kde mdadm ntfs reiserfs reiser4 xfs"
 
 common_depends=">=sys-block/parted-2.3
 	>=dev-cpp/gtkmm-2.16"
 
 RDEPEND="${common_depends}
 	gnome? ( x11-libs/gksu )
-	xfce? ( x11-libs/gksu )
 	kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
 
 	>=sys-fs/e2fsprogs-1.41
@@ -77,9 +76,9 @@ src_install() {
 		echo "OnlyShowIn=KDE;" >> "${D}"/usr/share/applications/gparted-kde.desktop
 	fi
 
-	if use gnome || use xfce; then
+	if use gnome; then
 		sed -i "s:Exec=:Exec=gksu :" "${D}"/usr/share/applications/gparted.desktop
-		echo "OnlyShowIn=GNOME;XFCE;" >> "${D}"/usr/share/applications/gparted.desktop
+		echo "OnlyShowIn=GNOME;" >> "${D}"/usr/share/applications/gparted.desktop
 	else
 		echo "OnlyShowIn=X-NeverShowThis;" >> "${D}"/usr/share/applications/gparted.desktop
 	fi
diff --git a/sys-block/gparted/gparted-0.7.0.ebuild b/sys-block/gparted/gparted-0.7.0.ebuild
index c8c40c1f5bd7..ff2a15418f68 100644
--- a/sys-block/gparted/gparted-0.7.0.ebuild
+++ b/sys-block/gparted/gparted-0.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/gparted-0.7.0.ebuild,v 1.1 2010/11/23 10:14:20 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/gparted-0.7.0.ebuild,v 1.2 2011/01/29 16:34:35 ssuominen Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -15,14 +15,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="btrfs dmraid fat gnome hfs jfs kde mdadm ntfs reiserfs reiser4 xfs xfce"
+IUSE="btrfs dmraid fat gtk hfs jfs kde mdadm ntfs reiserfs reiser4 xfs"
 
 common_depends=">=sys-block/parted-2.3
 	>=dev-cpp/gtkmm-2.16:2.4"
 
 RDEPEND="${common_depends}
-	gnome? ( x11-libs/gksu )
-	xfce? ( x11-libs/gksu )
+	gtk? ( x11-libs/gksu )
 	kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
 
 	>=sys-fs/e2fsprogs-1.41
@@ -77,9 +76,9 @@ src_install() {
 		echo "OnlyShowIn=KDE;" >> "${D}"/usr/share/applications/gparted-kde.desktop
 	fi
 
-	if use gnome || use xfce; then
+	if use gtk; then
 		sed -i "s:Exec=:Exec=gksu :" "${D}"/usr/share/applications/gparted.desktop
-		echo "OnlyShowIn=GNOME;XFCE;" >> "${D}"/usr/share/applications/gparted.desktop
+		echo "NotShowIn=KDE;" >> "${D}"/usr/share/applications/gparted.desktop
 	else
 		echo "OnlyShowIn=X-NeverShowThis;" >> "${D}"/usr/share/applications/gparted.desktop
 	fi
diff --git a/sys-block/gparted/metadata.xml b/sys-block/gparted/metadata.xml
index 504c36780fbe..fef2ec26be29 100644
--- a/sys-block/gparted/metadata.xml
+++ b/sys-block/gparted/metadata.xml
@@ -27,7 +27,6 @@
     (<pkg>sys-fs/reiser4progs</pkg>)</flag>
   <flag name='reiserfs'>Include ReiserFS support
     (<pkg>sys-fs/reiserfsprogs</pkg>)</flag>
-  <flag name='xfce'>Enable integration in XFCE desktop</flag>
   <flag name='xfs'>Include XFS support
     (<pkg>sys-fs/xfsprogs</pkg>, <pkg>sys-fs/xfsdump</pkg>)</flag>
 </use>