From 152bc2f0974631c85ddbf54174fae58273214968 Mon Sep 17 00:00:00 2001
From: Pacho Ramos <pacho@gentoo.org>
Date: Mon, 5 Dec 2011 11:29:40 +0000
Subject: Drop old and fix description, bug #393143 by Justin Lecher.

(Portage version: 2.1.10.39/cvs/Linux x86_64)
---
 gnome-extra/gnome-utils/ChangeLog                  |  6 +-
 .../gnome-utils/gnome-utils-2.32.0-r1.ebuild       | 75 ----------------------
 gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild   |  4 +-
 3 files changed, 7 insertions(+), 78 deletions(-)
 delete mode 100644 gnome-extra/gnome-utils/gnome-utils-2.32.0-r1.ebuild

(limited to 'gnome-extra')

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/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"
-- 
cgit v1.2.3-65-gdbad