Clean up old revision. Version bump for Gnome 3.6.

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key C6085806)

3 files changed, 31 insertions, 81 deletions

diff --git a/gnome-extra/gnome-utils/ChangeLog b/gnome-extra/gnome-utils/ChangeLog
index 5cb3a305ae81..fc406f857c79 100644
--- a/gnome-extra/gnome-utils/ChangeLog
+++ b/gnome-extra/gnome-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gnome-utils
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.232 2012/10/12 07:58:22 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.233 2013/03/29 22:44:14 eva Exp $
+
+*gnome-utils-3.6.0 (29 Mar 2013)
+
+  29 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-utils-3.2.1.ebuild, +gnome-utils-3.6.0.ebuild:
+  Clean up old revision. Version bump for Gnome 3.6.
 
   12 Oct 2012; Ulrich Müller <ulm@gentoo.org> gnome-utils-3.4.0.ebuild:
   Update LICENSE to "metapackage" non-license.
diff --git a/gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild b/gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild
deleted file mode 100644
index c66306e69e7b..000000000000
--- a/gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2012 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.7 2012/05/05 08:23:09 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Utilities for the Gnome desktop"
-HOMEPAGE="https://live.gnome.org/GnomeUtils"
-
-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
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	dev-util/gtk-doc-am
-	gnome-base/gnome-common"
-# eautoreconf needs dev-util/gtk-doc-am, gnome-base/gnome-common
-
-# 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-static
-		--disable-schemas-install
-		--disable-schemas-compile
-		--disable-scrollkeeper"
-	DOCS="AUTHORS ChangeLog NEWS README THANKS"
-}
-
-src_prepare() {
-	# Fix missing freetype2 headers/libs with gtk+-3.4, bug #411939
-	epatch "${FILESDIR}/${PN}-3.2.1-glib-2.32-gtk-3.4.patch"
-	eautoreconf
-
-	# Remove idiotic -D.*DISABLE_DEPRECATED cflags
-	# This method is kinda prone to breakage. Recheck carefully with next bump.
-	# bug 339074
-	LC_ALL=C 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
-	LC_ALL=C find . -iname 'Makefile.in' -exec \
-		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 2 failed"
-
-	if ! use test ; then
-		sed -e 's/ tests//' -i logview/Makefile.{am,in} || die "sed 3 failed"
-	fi
-
-	gnome2_src_prepare
-}
diff --git a/gnome-extra/gnome-utils/gnome-utils-3.6.0.ebuild b/gnome-extra/gnome-utils/gnome-utils-3.6.0.ebuild
new file mode 100644
index 000000000000..e7523b9408bb
--- /dev/null
+++ b/gnome-extra/gnome-utils/gnome-utils-3.6.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2013 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.6.0.ebuild,v 1.1 2013/03/29 22:44:14 eva Exp $
+
+EAPI="5"
+
+DESCRIPTION="Meta package for utilities for the GNOME desktop"
+HOMEPAGE="https://live.gnome.org/GnomeUtils"
+
+LICENSE="metapackage"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND="
+	>=app-admin/gnome-system-log-${PV}
+	>=app-dicts/gnome-dictionary-${PV}
+	>=gnome-extra/gnome-search-tool-${PV}
+	>=media-gfx/gnome-font-viewer-${PV}
+	>=media-gfx/gnome-screenshot-${PV}
+	>=sys-apps/baobab-${PV}
+"