commit for ppc too, tested by xart. remove old.

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

4 files changed, 9 insertions, 86 deletions

diff --git a/sys-apps/gnome-disk-utility/ChangeLog b/sys-apps/gnome-disk-utility/ChangeLog
index 2d74ca5c506a..2d46f4738ca8 100644
--- a/sys-apps/gnome-disk-utility/ChangeLog
+++ b/sys-apps/gnome-disk-utility/ChangeLog
@@ -1,10 +1,10 @@
 # ChangeLog for sys-apps/gnome-disk-utility
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.47 2011/04/29 17:33:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.48 2011/04/29 17:42:09 ssuominen Exp $
 
   29 Apr 2011; Samuli Suominen <ssuominen@gentoo.org>
   gnome-disk-utility-2.32.1.ebuild:
-  ppc64 stable wrt #361125
+  ppc/ppc64 stable wrt #361125
 
   24 Apr 2011; Samuli Suominen <ssuominen@gentoo.org>
   gnome-disk-utility-2.32.1.ebuild:
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index b493927a4f43..185290bb7bd1 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -4,17 +4,15 @@ Hash: SHA256
 AUX gnome-disk-utility-2.30.1-optional-avahi.patch 3265 RMD160 f6e29b0421b5b7feb0fab96d8e0c4cc13785858b SHA1 9bcf767d9da569a9469e364b19776ca80ad4843f SHA256 84fa2f6ed58003b881a8169c2f253ea453afdc7f28beca583a76af8a27fd828d
 AUX gnome-disk-utility-2.32.1-non-utf8-crash.patch 1044 RMD160 d24bd35f6f3b02c9939e5a48b17ee58657272cf5 SHA1 a4cec1a87279c11d9f79e8b9ffcbec1a1b0f3acb SHA256 818b70360978968457d2c50738347c6726ed8d0c007eb57074881a7e33652526
 AUX gnome-disk-utility-2.32.1-optional-avahi.patch 3271 RMD160 6e401303d5bfefa01f843992898dd3c1e4bf4187 SHA1 2672f51196101503688ca73be17bbddae0ee897a SHA256 30965971604b96489857eb7d2703ab0e7ca053ded5cd50fd5fed9ceb34235df2
-DIST gnome-disk-utility-2.32.0.tar.bz2 2209712 RMD160 7bc7afb2d8d235085f8a1adfd6f2ff4ade626417 SHA1 f3721db8957596e9772974c1c9da68ae268ad514 SHA256 03e461b6bda7f773f8018d25fa3213d3073d4dc83a76e6b39d962652f4de6a98
 DIST gnome-disk-utility-2.32.1.tar.bz2 2216871 RMD160 d3572b44890e2aa89f2268ba684ba80732dd0ea1 SHA1 afd03dc2c59629d4789045e0b967bd17b71f70f2 SHA256 fb3f6c8962eca9706fd96e1f0b431c1284536298bc927e8413e763054c618e99
-EBUILD gnome-disk-utility-2.32.0-r1.ebuild 1950 RMD160 b5a4f765e33739c440c4d403a0aea03116466da6 SHA1 93d7bf483fcc5bc48c7407d8c9b10991fd69304b SHA256 bb9254cc6fb312e5351f31562128d7af9d933e1f4a1d1fc3e3e3978a24ba0550
 EBUILD gnome-disk-utility-2.32.1-r1.ebuild 2048 RMD160 d0994bb1860193b3b1872c8d023ea42f77becd86 SHA1 d4b52a31aa66f483510d039d88c8466613cd8a51 SHA256 68fb54c6ec02f15c20857c8b956ed3f735bce90406214124833b7f6262575c61
-EBUILD gnome-disk-utility-2.32.1.ebuild 1894 RMD160 8ff16b71b3b01601832e8d948e7fe6f70e254324 SHA1 28537b4c239a8f7228686544797bde99c49bbf18 SHA256 3b7afa7783eb3e9f01a6a8e7d99a997d15c1872109d71d0a04aa2e394595b78c
-MISC ChangeLog 7861 RMD160 5c44a28f15cde8aefa2e39d082b31f6bb1facd25 SHA1 b96c742b8ecfcab593efc6881a20f909969c94e9 SHA256 25675d0f41b15e966ddea166372f8ccf8723cc40e9d6dde12dc40758a25a0607
+EBUILD gnome-disk-utility-2.32.1.ebuild 1893 RMD160 2d68d23e4583e77ab7b5bc233f41d1ecfd9f6837 SHA1 83848de6aeccb689d43d0511f451df44444e59ca SHA256 619d308a3125a821a0c4c56e45089e78dda2801b20b698a91db23c9920a89347
+MISC ChangeLog 7865 RMD160 5043773fd6f1f16a54e857e00190f8efb00c5a19 SHA1 b40a622330e22cb89443f04f3f3e76c7bc80a435 SHA256 be537e3826397c5ab5e65404481415b0c4b3b44d3a70545e2feaf149f20bbaf7
 MISC metadata.xml 411 RMD160 a1c12c7620efc6350a471ec6dfa23c86603f4a63 SHA1 3a1d45a1c201852a8067b535b214777ad95754ab SHA256 194a3aa8e459cf8efd11f19a1368a0764877a356578aec429100ffd969cd34bf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk269ssACgkQXkR9YqOcLPGAMQEAjckg6aoUxdZ4sTDSelN0b8Ix
-gB4NNOAXeW8aunbKGgIBAKo4bvTDvQnM3Qut54r9bJd+2V4EJxpMxAq8LJpjVi2A
-=Nxhs
+iF4EAREIAAYFAk26+N0ACgkQXkR9YqOcLPEJKwD/QJOgNwSSjCWINrvSmICDUMXi
++/hAhVONNLBGZUSjAVgA/05IumfyfKCPY+fX1xuq8FSafMBPS3Sbd7qibQiBUVju
+=pA6M
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.0-r1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.0-r1.ebuild
deleted file mode 100644
index cdf520ca0938..000000000000
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.0-r1.ebuild,v 1.9 2011/04/24 08:17:03 ssuominen Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Disk Utility for GNOME using devicekit-disks"
-HOMEPAGE="http://git.gnome.org/cgit/gnome-disk-utility/"
-SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86"
-IUSE="avahi doc fat gnome-keyring nautilus remote-access"
-
-CDEPEND="
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/libunique-1:1
-	>=x11-libs/gtk+-2.20:2
-	=sys-fs/udisks-1.0*[remote-access?]
-	>=dev-libs/libatasmart-0.14
-	<x11-libs/libnotify-0.7
-	avahi? ( >=net-dns/avahi-0.6.25[gtk] )
-	gnome-keyring? ( || (
-		gnome-base/libgnome-keyring
-		<gnome-base/gnome-keyring-2.29.4 ) )
-	nautilus? ( >=gnome-base/nautilus-2.24 )
-"
-RDEPEND="${CDEPEND}
-	x11-misc/xdg-utils
-	fat? ( sys-fs/dosfstools )
-	!!sys-apps/udisks"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	gnome-base/gnome-common
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/scrollkeeper
-	app-text/gnome-doc-utils
-
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	>=dev-util/gtk-doc-am-1.13
-
-	doc? ( >=dev-util/gtk-doc-1.3 )"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable avahi avahi-ui)
-		$(use_enable nautilus)
-		$(use_enable remote-access)
-		$(use_enable gnome-keyring)"
-	DOCS="AUTHORS NEWS README TODO"
-}
-
-src_prepare() {
-	sed -i \
-		-e '/printf/s:nautilus:xdg-open:' \
-		src/palimpsest/gdu-section-volumes.c || die #350919
-
-	# Keep avahi optional, upstream bug #631986
-	epatch "${FILESDIR}/${PN}-2.30.1-optional-avahi.patch"
-
-	intltoolize --force --copy --automake || die
-	eautoreconf
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
-}
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild
index 0e58190fd0f2..849ecf7b1523 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild,v 1.10 2011/04/29 17:33:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild,v 1.11 2011/04/29 17:42:09 ssuominen Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~ppc ppc64 sh sparc x86"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86"
 IUSE="avahi doc fat gnome-keyring nautilus remote-access"
 
 CDEPEND="