Drop old and fix description, bug #393143 by Justin Lecher.

Package-Manager: portage-2.1.10.39/cvs/Linux x86_64

4 files changed, 14 insertions, 86 deletions

diff --git a/gnome-extra/gnome-utils/ChangeLog b/gnome-extra/gnome-utils/ChangeLog
index 41d59da19e48..19a07943fc79 100644
--- a/gnome-extra/gnome-utils/ChangeLog
+++ b/gnome-extra/gnome-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-utils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.224 2011/11/06 04:23:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.225 2011/12/05 11:29:40 pacho Exp $
+
+  05 Dec 2011; Pacho Ramos <pacho@gentoo.org> -gnome-utils-2.32.0-r1.ebuild,
+  gnome-utils-3.2.1.ebuild:
+  Drop old and fix description, bug #393143 by Justin Lecher.
 
 *gnome-utils-3.2.1 (06 Nov 2011)
 
diff --git a/gnome-extra/gnome-utils/Manifest b/gnome-extra/gnome-utils/Manifest
index cf7997ceb4bf..db7f32627156 100644
--- a/gnome-extra/gnome-utils/Manifest
+++ b/gnome-extra/gnome-utils/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX gnome-utils-2.32.0-fix-uninitialized.patch 903 RMD160 bd78aea0fd11c764e7816bbe4ff9ecf2aa008bc3 SHA1 60b5875f874fbb6da90db7ef6d99199e3f637514 SHA256 e4ded0888d6350452ffc4053edd3c5133fc86807c76c4a6f9d2e311ec2fe3919
 AUX gnome-utils-2.32.0-new-icons.patch 5478 RMD160 157d0dbe228aa773e7ef6783ad940ca4737d1e25 SHA1 00b3b9cdba1e81bfc6ff044652a479bd2524d45b SHA256 9410f0dd5cc2f7484330f5fdaa336355e0b43cd5501ec118db5d14136f870b36
@@ -7,15 +7,14 @@ AUX gnome-utils-2.32.0-new-icons2.patch 564 RMD160 7000ac4e61e129ab40d8d0a09740e
 DIST gnome-utils-2.32.0-icons.tar.xz 153632 RMD160 3e0f88fced7ab807a425de67ce90834894a41b70 SHA1 231f49f11233c1bf5f95763f12d1447fee2c222c SHA256 234e86914fa49daf3b11ffe7efb7090a3caf4146dce41414724b597e0e9c508e
 DIST gnome-utils-2.32.0.tar.bz2 7705320 RMD160 c25667eec2ba4fd0d704c10a92e2e6b071eb1bfc SHA1 68ef7e12280969bde9bee4bbd566ad4ab0572e77 SHA256 033a55cf442096b28ea6292043354feafe000d1e5f4ebb962a9b6d72eb9a93fa
 DIST gnome-utils-3.2.1.tar.xz 7273572 RMD160 a0e34b7057c0b77b58f7310ec8a8a3af238071bd SHA1 2f837a420ea73ad1a1cab56656b450e704f2faab SHA256 3ac1942dbf4d9d394e2fcc5f30a4480b1b1e5d44ee0c2d4f61689f4a221ba328
-EBUILD gnome-utils-2.32.0-r1.ebuild 2097 RMD160 254ec2cd5e9b4184c4f7d08beec62d1bec052396 SHA1 d11d4ff6afad8411f5e34dd36c34cf44384cb7e5 SHA256 3515ead2b8df786dc635d16dce6bec826f28e1303343ed763442e33298c045b7
 EBUILD gnome-utils-2.32.0-r2.ebuild 2507 RMD160 059c2934220838aba3d6eb68d5d4cf8d1a6b5e08 SHA1 92dc074b4c612b4cc4098034aa8c09f3dde4bd47 SHA256 9dbd894462343ca6535b29a7cc7bd88e11be31607e42f052048aad60dcdafad8
-EBUILD gnome-utils-3.2.1.ebuild 2024 RMD160 01ae39adf9b7e666dc29aeb48419738bb2570aa3 SHA1 2d7ff23bf26eb635168a0c319f3fa5800fdd55f6 SHA256 a1c176e4718607c37abb7bb8ac91fd1f1211ec100c370958fbc52ebde3ac45d1
-MISC ChangeLog 28677 RMD160 62431aefe8d99af08db66e974f056edbab65d33b SHA1 1274c0ecec3568367a3599d2b470bb4b8702b302 SHA256 2eb44ea1842df0ae0b6cf1e3305935a69ca0d783adbb448101b2d9466e461131
+EBUILD gnome-utils-3.2.1.ebuild 2019 RMD160 e8841fcac3a5dee1ef81332a41836b83347a3695 SHA1 fe74174a4676bff88676400388cbbf8a07314212 SHA256 7c6e585c50d89adb1c933373bc1a583271c4f96bc875a7da535a81fde4cd2d75
+MISC ChangeLog 28841 RMD160 47095e3f7cd1105656fa61b31a21323d1b5b98df SHA1 451b8582df632e93b30986a5f7f2987c66112975 SHA256 9e828a30434a6569ae8c021640c60f771431af33a8e2b6d0cb94235f6ef1e1d0
 MISC metadata.xml 305 RMD160 c788a49e4dc8332a8f5a5a79268ed2bff3d164c8 SHA1 9aa1970fee27c41f0eebf198f94b1fa41b3644b9 SHA256 3c6d345a89e0c8dbacd26f232e8220bd2558bc90cff9041e3e07f2f44ce4bb85
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk62C7YACgkQdjK8w9WeBnDQuQD/fjlby3K06ViyPucxRpr6P5G2
-AnZfeOs8YQhXWkddjfEA/16p4cvDbJ0Ye6/OTvmd2goDRszdzsjqJSeIk/7pKKTr
-=6u+i
+iEYEARECAAYFAk7cqyoACgkQCaWpQKGI+9TiFQCfd016kC0HKnyIQvPFYD3kSfFP
+zOYAn0/1UUShBq/w6aQ38E1T7bRNx3nl
+=xcpw
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-utils/gnome-utils-2.32.0-r1.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.32.0-r1.ebuild
deleted file mode 100644
index a471dff495e0..000000000000
--- a/gnome-extra/gnome-utils/gnome-utils-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/gnome-extra/gnome-utils/gnome-utils-2.32.0-r1.ebuild,v 1.8 2011/03/23 08:14:44 nirbheek Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="Utilities for the Gnome2 desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="bonobo doc ipv6 test"
-
-RDEPEND=">=dev-libs/glib-2.20:2
-	>=x11-libs/gtk+-2.20:2
-	>=gnome-base/libgtop-2.12
-	>=gnome-base/gconf-2:2
-	>=media-libs/libcanberra-0.4[gtk]
-	x11-libs/libXext
-	x11-libs/libX11
-	bonobo? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) )"
-
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	app-text/gnome-doc-utils
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-1.10 )"
-
-pkg_setup() {
-	if ! use debug; then
-		G2CONF="${G2CONF} --enable-debug=minimum"
-	fi
-
-	G2CONF="${G2CONF}
-		$(use_enable ipv6)
-		$(use_enable bonobo gdict-applet)
-		--disable-maintainer-flags
-		--enable-zlib
-		--disable-static
-		--disable-schemas-install
-		--disable-scrollkeeper"
-	DOCS="AUTHORS ChangeLog NEWS README THANKS"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Remove idiotic -D.*DISABLE_DEPRECATED cflags
-	# This method is kinda prone to breakage. Recheck carefully with next bump.
-	# bug 339074
-	find . -iname 'Makefile.am' -exec \
-		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed"
-	# Do Makefile.in after Makefile.am to avoid automake maintainer-mode
-	find . -iname 'Makefile.in' -exec \
-		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed"
-
-	if ! use test ; then
-		sed -e 's/ tests//' -i logview/Makefile.{am,in} || die "sed 2 failed"
-	fi
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed failed"
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
-}
diff --git a/gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild b/gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild
index 2ae426c194c8..5486eafa0806 100644
--- a/gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-3.2.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/gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild,v 1.1 2011/11/06 04:23:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild,v 1.2 2011/12/05 11:29:40 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -8,7 +8,7 @@ GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
-DESCRIPTION="Utilities for the Gnome2 desktop"
+DESCRIPTION="Utilities for the Gnome desktop"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"