Clean up old revision. Version bump for Gnome 3.6.

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

4 files changed, 36 insertions, 97 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/Manifest b/gnome-extra/gnome-utils/Manifest
index ebcd1f2fe0fc..28c7ca0e9d5b 100644
--- a/gnome-extra/gnome-utils/Manifest
+++ b/gnome-extra/gnome-utils/Manifest
@@ -7,26 +7,15 @@ AUX gnome-utils-2.32.0-new-icons2.patch 564 SHA256 31edf1380334941fc092d21be21ba
 AUX gnome-utils-3.2.1-glib-2.32-gtk-3.4.patch 1676 SHA256 5632f8a8bd3ed0af34f24aaa9b42639b7bae350e9f40995b0db8748d47a0aa08 SHA512 b64528f450d34af7f0a303beb53839919a7160676050040864498bf16cb632aef2bd4ab2cc52e1bd287a3d5f998fa15dc014e4fc33ba9dc07e1e3129bf7beb41 WHIRLPOOL 07d3764ceb992c9895ccdf82718f21328c9998fe8de6ab2d3326ee8f3fb6411105c5f450c74562306070f3dd7bffd586e940554c391c1723326cb2096b1da956
 DIST gnome-utils-2.32.0-icons.tar.xz 153632 SHA256 234e86914fa49daf3b11ffe7efb7090a3caf4146dce41414724b597e0e9c508e SHA512 208f547ce95aa4d31d9e605132187fcf5076738c44c6513ccc9c291735d3b64b11f3de8c2e544f585a5a2d4cf02eafcbd1ac670e5beb50dbd4063538f3f668fd WHIRLPOOL 2fe200b8a3383f84e21e594209aeb8d4b36f58812b8b965f73f4084904baea1733bcb1cbfabf874e8a2bf77dc33b3cd7f7e563574f8f961a2acddd457a602b6d
 DIST gnome-utils-2.32.0.tar.bz2 7705320 SHA256 033a55cf442096b28ea6292043354feafe000d1e5f4ebb962a9b6d72eb9a93fa SHA512 77d0cbbe6982ee9a7c08bfddfdd010416188cae02a633f76e7fbe9eb927206bf80a6b95475290f032995fb9afe8afb9ab8a986679ae4e9226d1b40a1243d0435 WHIRLPOOL 60deb4e802ac45753ca294975c7f08d916690b82c646c3d1013f0157ac7c27a0e13e01240fba04673c9c6a2d52c5ac1e11bb5a7aceefd14c60a6dce0fc5ea3c7
-DIST gnome-utils-3.2.1.tar.xz 7273572 SHA256 3ac1942dbf4d9d394e2fcc5f30a4480b1b1e5d44ee0c2d4f61689f4a221ba328
 EBUILD gnome-utils-2.32.0-r2.ebuild 2517 SHA256 10f2ac17f0d2a4bb4b9c501462d04c48df1d6f43909fd7ca71dea79d6421d79a SHA512 dd103b986e09f9b0d06875fb8503c138494f7912be74e184b817b95f5f44bdb6e73735e2b6d84c570e1b062352a8c5c965c998aeeecc078436e821683339d54d WHIRLPOOL 819103993a8e12f8c3afbe0358b4ad7b9c3e51d2c901bffcddfe92a8bbb2ac449feabc49125aeaac95f1017433a0c9c9b04601ad9bedd15095d528dc82958e60
-EBUILD gnome-utils-3.2.1.ebuild 2282 SHA256 9252ddbc390295103bf08a51ea9e8f0a3a23c8c2227e1e5dcd37931c7f671821 SHA512 86cec2e0d8a6bc840f25b459614cc68d047bb044e9ab74092ee63e518631ac6cef09e3ae396d011c053942bb1d111652426afde8494e53c690efd00cd2cf800a WHIRLPOOL 0417aa937b1e22a1c47fa3f8881dd85f00ab61e9d84fa3b7ea1b9c08b462e321131fe94ff2a16a13f33365033448e29f1993089136a91676a46e564362113417
 EBUILD gnome-utils-3.4.0.ebuild 729 SHA256 d4c94ec90eb81947e3817807190600bb780d93c5a54b39078a1b913443fa5750 SHA512 f21365773a64db41df68a3f0f23eb9aa8fb244be97f755117cc5340fc47d1da55848380de7c5a10f9123d924e1488c321747e3c0223a2b202d51c648d319c893 WHIRLPOOL e4af9c5551e48256031d2747185bbe82e61c8c3b2d23b5b6f74ee785950025d7da8d1939f219717f3765da0b1935e4c6d7b6787f1a5c44790780339130058fe3
-MISC ChangeLog 30260 SHA256 73a769281b0c7c358a3c1261a9a382a330942fd9f5464cf7fc5075bbd9414435 SHA512 3e169f2099bbedb92bc625cd977ba73f2b4de374c61d30164e40d6f68306827641b6be8c2856f0e45a3b60b8505cbc3b3c285945520d618123b7175d9233ad94 WHIRLPOOL 035e8b7487d3d0d402234e1de7a43dedcbcfee52c871b867a7891fa6e9f54623defda9a2ba0a3673173bdc2e0ebdc4d272bc93c2d153b465ff2e6c41b7fd19f7
+EBUILD gnome-utils-3.6.0.ebuild 729 SHA256 99a8334efc14c8ba0e8a5dc97c1b29451a58f4e8bdbc6ecf6dd475f917d46440 SHA512 380ddeb386705dd87be0abbc03bc19334f4d787f5350b07391f751bee2ef081db34ee754be6383a98ed9f4b0000ccbbc1790a31f77e2e78b476853f523bb70c5 WHIRLPOOL 313845c364977cb6d30b2cccbd271d2ab560ebf59f0c370ed18abf07994d3cfba3bab751c85374bf51a6f5fd6b85d9a7efbec8240f7979b16ce4be407252e8f2
+MISC ChangeLog 30458 SHA256 94933815b4dd0c2902ff65cc1d8ed45b35dcdad76967403d92338c73cca4806c SHA512 1872bdaa1f6ed8b1ca92a6e62168378cfe67bc141d58e93bbc9dc4108d38fee141ceab1b22ef7362696a5c38e528d79aea070776af2a5f8269c662026374fdc1 WHIRLPOOL 03d6539b99b188e70aea6ef6d673c800c0dd8aa6b6f7becffb8618142404aa70cb61c97883d65a051f707bfe7eadbe24136d5edda6c174ed8863ab0695fa8ca3
 MISC metadata.xml 305 SHA256 3c6d345a89e0c8dbacd26f232e8220bd2558bc90cff9041e3e07f2f44ce4bb85 SHA512 79170bd678b349d369a81373a81a33432425d7a9e2d8ff494511e326bbe00de5bfb2601a2d898c532b0d2e6557660d72f78380bcc56fadcc6470bf7e6620859b WHIRLPOOL be8cc6fb95531b56f9db629ea8471dcffaec4b89fa1a2a862ea6c48cd816d902952e17f12f0daaf58d0e0ad35ce1fc13645edd1461818674f1d4bc934c1b3686
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQd8/WAAoJEDxpGckxwJCBAdoQAKBvCDI9nCwcjynRL5z85YH/
-4Kyo4y+lDjKVWOFViyHwrlKefRGCKCUB2+BG8FJRPjEeCWMp8WSav/VBf60/mZnV
-zLdbCKr/tKwTehm7rbxWD7K8haGVLz1qaezK+qIu06uY6z5oa2taA5zHj0WFUO1o
-VFtITSpFShy0kVuxFEkMjWJRfsQhkxVs9h5PVahGptC3RSLG2zYAAxxxBRKTHdLg
-dQd+Sv9IciaqlEPqEz++2zh0WNw38539O6v/dcH4Z5x5T+i61ib+sfgZr7T2wZmG
-ypLGVxufv3N2Dkunez+3Z7NYJplusoWbir59wyUaOdwhp+ttWQ5MYb35Z25kmHFk
-IX/YGNlnJd2P6HJF6eonOtVxASOC99kJK087YoK0khnzl+rDSEdrTdJ7MllKRuLc
-3xLDUBsjMcX0xw/a6K/haSIQgJqSBnjAKQ1PMX4sC35lNS7strLCXrz97j37U8OU
-s9MDDqpik1kQbFUMTjpraWJDBdAdonmZnN0DcyTzVep9ZVCljuIv+YTSEgWpA5FF
-PGbwPFriJDb0qow5zzoCYJwkiitNRFf3rzp2i5xhCT+Jh3BglhrVoEadpietoafY
-bZeLkGAgqvuozfvIhbwZ8fanOMzLahTeq2FGISgSL61t34qfzpipvsZFWvOQ2uuu
-5k9HsB4AzxrwEN5BWohj
-=OWTa
+iEYEAREIAAYFAlFWGT8ACgkQ1fmVwcYIWAZSowCgopfXqlVP0xoD0nHn1DTG8UPg
+o5QAn2wfvtJZ3n+mboEvWIbskyYSiEtR
+=/HkV
 -----END PGP SIGNATURE-----
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}
+"