From 9cac688b8582e0a690520d11682cc7a2e40d98d3 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Sun, 6 Nov 2011 04:23:12 +0000
Subject: Bump to 3.2.1 from the gnome overlay, drop old. Notable changes:
 improved screenshot tool.

(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
---
 gnome-extra/gnome-utils/ChangeLog                |  9 ++-
 gnome-extra/gnome-utils/gnome-utils-3.0.1.ebuild | 72 -----------------------
 gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild | 73 ++++++++++++++++++++++++
 3 files changed, 81 insertions(+), 73 deletions(-)
 delete mode 100644 gnome-extra/gnome-utils/gnome-utils-3.0.1.ebuild
 create mode 100644 gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild

(limited to 'gnome-extra/gnome-utils')

diff --git a/gnome-extra/gnome-utils/ChangeLog b/gnome-extra/gnome-utils/ChangeLog
index 0cc254e81096..41d59da19e48 100644
--- a/gnome-extra/gnome-utils/ChangeLog
+++ b/gnome-extra/gnome-utils/ChangeLog
@@ -1,6 +1,13 @@
 # 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.223 2011/10/05 17:41:26 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.224 2011/11/06 04:23:12 tetromino Exp $
+
+*gnome-utils-3.2.1 (06 Nov 2011)
+
+  06 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-utils-3.0.1.ebuild, +gnome-utils-3.2.1.ebuild:
+  Bump to 3.2.1 from the gnome overlay, drop old. Notable changes: improved
+  screenshot tool.
 
   05 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org>
   gnome-utils-2.32.0-r2.ebuild:
diff --git a/gnome-extra/gnome-utils/gnome-utils-3.0.1.ebuild b/gnome-extra/gnome-utils/gnome-utils-3.0.1.ebuild
deleted file mode 100644
index e8dafd4321a0..000000000000
--- a/gnome-extra/gnome-utils/gnome-utils-3.0.1.ebuild
+++ /dev/null
@@ -1,72 +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-3.0.1.ebuild,v 1.1 2011/08/19 11:54:28 nirbheek Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit gnome2
-
-DESCRIPTION="Utilities for the Gnome2 desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc ipv6 test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-
-# libcanberra 0.26-r2 is needed for gtk+:3 fixes
-COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
-	>=x11-libs/gtk+-3.0.3:3
-	>=gnome-base/gconf-2:2
-	>=gnome-base/gsettings-desktop-schemas-0.1.0
-	>=gnome-base/libgtop-2.12:2
-	>=media-libs/libcanberra-0.26-r2[gtk3]
-	x11-libs/libXext
-	x11-libs/libX11"
-
-DEPEND="${COMMON_DEPEND}
-	x11-proto/xextproto
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-1.10 )"
-
-# file collisions
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-control-center-2.90"
-
-pkg_setup() {
-	if ! use debug; then
-		G2CONF="${G2CONF} --enable-debug=minimum"
-	fi
-
-	G2CONF="${G2CONF}
-		$(use_enable ipv6)
-		--enable-zlib
-		--disable-maintainer-flags
-		--disable-static
-		--disable-schemas-install
-		--disable-schemas-compile
-		--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
-}
diff --git a/gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild b/gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild
new file mode 100644
index 000000000000..2ae426c194c8
--- /dev/null
+++ b/gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild
@@ -0,0 +1,73 @@
+# 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 $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Utilities for the Gnome2 desktop"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc ipv6 test"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+
+# libcanberra 0.26-r2 is needed for gtk+:3 fixes
+COMMON_DEPEND=">=dev-libs/glib-2.29.14:2
+	>=x11-libs/gtk+-3.0.3:3
+	>=gnome-base/gconf-2:2
+	>=gnome-base/gsettings-desktop-schemas-0.1.0
+	>=gnome-base/libgtop-2.12:2
+	>=media-libs/libcanberra-0.26-r2[gtk3]
+	x11-libs/libXext
+	x11-libs/libX11"
+
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xextproto
+	app-text/scrollkeeper
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.9
+	doc? ( >=dev-util/gtk-doc-1.10 )"
+
+# file collisions with g-c-c
+# nautilus is used via dbus
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/nautilus-3.0.0
+	!<gnome-base/gnome-control-center-2.90"
+
+pkg_setup() {
+	if ! use debug; then
+		G2CONF="${G2CONF} --enable-debug=minimum"
+	fi
+
+	G2CONF="${G2CONF}
+		$(use_enable ipv6)
+		--enable-zlib
+		--disable-maintainer-flags
+		--disable-static
+		--disable-schemas-install
+		--disable-schemas-compile
+		--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
+}
-- 
cgit v1.2.3-65-gdbad