Drop sparc keyword, needs gtk+-3.6 to be keyworded. Update to EAPI5. Drop old.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 18 insertions, 74 deletions

diff --git a/x11-themes/gnome-themes-standard/ChangeLog b/x11-themes/gnome-themes-standard/ChangeLog
index f4797855899f..678e252e7ee9 100644
--- a/x11-themes/gnome-themes-standard/ChangeLog
+++ b/x11-themes/gnome-themes-standard/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-themes/gnome-themes-standard
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-standard/ChangeLog,v 1.33 2012/11/21 23:01:26 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-standard/ChangeLog,v 1.34 2012/12/27 05:01:16 tetromino Exp $
+
+  27 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-themes-standard-3.6.1.ebuild, gnome-themes-standard-3.6.2.ebuild:
+  Drop sparc keyword, needs gtk+-3.6 to be keyworded. Update to EAPI5. Drop
+  old.
 
 *gnome-themes-standard-3.6.2 (21 Nov 2012)
 
diff --git a/x11-themes/gnome-themes-standard/Manifest b/x11-themes/gnome-themes-standard/Manifest
index 32258b148f29..562a589e69ef 100644
--- a/x11-themes/gnome-themes-standard/Manifest
+++ b/x11-themes/gnome-themes-standard/Manifest
@@ -2,17 +2,19 @@
 Hash: SHA256
 
 DIST gnome-themes-standard-3.4.2.tar.xz 3086124 SHA256 aa29d23708e3357775fb7ea2de14b90551a2c732fce297f3372dae005374c3a8 SHA512 33baa6b8630054d12511852037fcd7c6bf8b8dc77f2b05a9ffb94f8a0405fc81546239fc3a9e9632dc5c610a1d08706531774440fadd58b63f5500df0fe39115 WHIRLPOOL f10eb080454d65ff17d000a7e37e8558afd6b0db161ff0b512e21d00f0bfe91cdb2155514609d773c00b3188e15d3ecd1f3f7fb52856be59235417ea4a5be321
-DIST gnome-themes-standard-3.6.1.tar.xz 3605976 SHA256 f56dd1f593b0a853041b54f9167aab0cb3689ced9cd8f8f4d777c3116bb4878a SHA512 317f12cd03ed5b0032c1c26e9f5a57b9df6a3b799e627a2af6dd54b1fc877fb30c62325434d6a3156d9dbc2f8fefbdb835148448604fa969a8a3edf5a3043f98 WHIRLPOOL 05a9d32309cf4eefda1a9875256a67ca06531fcb9d437f0ac89814a7d6051ef643c694117f97e045fd101a4b60ab9b8573aceaa12b8bdf0551241643458944aa
 DIST gnome-themes-standard-3.6.2.tar.xz 3609716 SHA256 c41503d0e18e17188c4fd1be5f6a7e90b08564e2a19d9a318b145a56d4455352 SHA512 79ab14e64ac7de06de0c887a73d91b2275f84a870e7799eca1745773598507016d068cf895a7a5f2bcc743cc259703281738e06e4ca6e7cd815840aadb8c9106 WHIRLPOOL fc4e3cd83b5b29fff902ea9c3c5c5456512e9ffac4b7088870c33311edaa168c17149ed59ea5f2b3dd98612b95c0c4dd160251f38660f926b066744950d8fd3f
 EBUILD gnome-themes-standard-3.4.2.ebuild 1681 SHA256 cf6d42e6b14cb096a51cd7fd849ef9d732aca533bbea891b2a9680befbe5e69d SHA512 cf3f6832320fc5b7ae460c5f9262a9539558fbffee157e5d7b69b7476508d11bffefb49c63191ed9544b899b17c1a0051f24251a89a514dc826103ba71e2098a WHIRLPOOL 2a1fa5eb0b34203d167a371b76e13d67f540415c4a0131f20efce9a2b324a3ec953bb21edc1024f46580816785ec8a6e1b05a65a4def9e259c8188676e882b50
-EBUILD gnome-themes-standard-3.6.1.ebuild 1793 SHA256 b418d0c4bc8ac69f2253dd999e51a6862107c6c8c845db21f182b24ffe0000d6 SHA512 9dee60aa1f54ec4415c93897eb94f660473ab2ed39da728e1fdf6288f12215a7628f4fd808408e47dde8d51a3fdfa44d3f98cfcba4ba941a37e4f6a659e96da3 WHIRLPOOL 70d93251c984c068465c772587e8a68eca453b0d35bd4857297f2751258235e30162b6b6f92309e088288f11031434d7c79ee623b1a1d2171f8c279a816187a9
-EBUILD gnome-themes-standard-3.6.2.ebuild 1774 SHA256 cd0a491dfbdd026b0823cd7c032e105bcedda5b137ba2520214905b6588c5e1a SHA512 abc13c12190a595047468611672ee01beeb194f8e5f4d7e7ceaa02c0f0d81e11ea3ccd7b054211b5646bc2f6422cc7496b5526051e19421886199392cf133061 WHIRLPOOL 7504fc1d70126b5ef6845358b2a68ad4151b28ce718cb2dd512a3e93de5a0acac973b1e01c8bb94156eb6bde1989d2ebf335eef23a4a2fb1faaacab30507d641
-MISC ChangeLog 5891 SHA256 d86f718b1ea200db6a88554f46422a2e68dfdf7172ab2e3047fdb4c2faf3a536 SHA512 868e05c7d1c046284e145197bc38b6e1a273083d7e6551f9d27b2a932df3b19e9a02988c385e11516e89800cbf31edd986dcda44bac65645b867427aa2d1b6d0 WHIRLPOOL f35f506a26f9a2ed12827307c012778402874eb59fbe34802110b50502cf64d922fb9f9d27af9a4d1d125bbdced91edd09a8559703f51cac805f2089045991ea
+EBUILD gnome-themes-standard-3.6.2.ebuild 1750 SHA256 c8d401812b3c1d8f5432f213838c51cb13b85cb5c13c6f0fcde8a540dfd02636 SHA512 a14a0e6c24e8d8580c11cce7545893eeb53b5dfb8da3d3bc61c344b2e1e2f9f0d46bf31ed5fb5a527f92e2c558ad5f6bf4b2059a5bdb6a02c1c0737aa27c49a9 WHIRLPOOL af5f5050d1f6d3068100f85d12488ca4481a059f85ba61251da99ee74095a8a400c59d406a7d42d7beac6273c2e25769db461b95d1b0973e8680e6479ecb59e2
+MISC ChangeLog 6115 SHA256 c1e71b3d14b6131df87ff65dc597fa1c99efd95af0326efdbf9c40553a2b5b1e SHA512 973c8aa2869f21d1f4d591c3a2755c1a6154e85d79b59191a4fb91b5413d8b1f5c317f9bfae2b88990796d2be4c52f8a53133a606dc2a2d71181ca2c3d500fcc WHIRLPOOL 21d0703e6c24367d03ff8019007f8ab07b65cf62f2d5a6d60baa89bb1c2862b9b1ba091edc9052e7f98906ba20ceeffbdd81f7877e18bb8de1e8982053f1903d
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCtXUcACgkQ1fmVwcYIWAYSGwCgvrwOjPa5eaV56G8hJNLna9e7
-Vr8AoLW1OV1AKeKhqQn49UfC5/ocgCfB
-=Xy56
+iQEcBAEBCAAGBQJQ29YeAAoJEJ0WA1zPCt1h4J8H/AhhWTLBCPZOQb5ui5q6NF2C
+41WwYC7VnQkC7dLD2+XTmXK1S032eJfL+2BHtcGDOiOnaUqsWD8h/HAl9wKqg75K
+t9LqqWzJ6ap906ZxPA0QE/aWcOfhP2R5JaVakgBPpnWZdzMiGIKenSYu+Gq7wTDm
+nrPMKc1z8ZpqaUT/Nj4FsWRExaf+s4U+47kYcddIEa9RUPl/kLzLJTUcXCMin8gN
+x3dh+vJA3XpGgFbJuyS0SfZG2H4ExQ8k++TTvBj35I8mK9Ce489WAQYI1pQ3DgJY
+2HLezBrQqPzb2uyP2L2zYHMZvI+WPytd7ervBPNXeukS03oUvvaQv+tNb2FKPos=
+=wWf6
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.6.1.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.6.1.ebuild
deleted file mode 100644
index d358b6df8f81..000000000000
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.6.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-standard/gnome-themes-standard-3.6.1.ebuild,v 1.1 2012/10/17 07:39:33 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Adwaita theme for GNOME Shell"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+gtk"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-
-COMMON_DEPEND="gnome-base/librsvg:2
-	x11-libs/cairo
-	gtk? (
-		x11-libs/gtk+:2
-		>=x11-libs/gtk+-3.5.17:3[X] )
-	>=x11-themes/gtk-engines-2.15.3:2"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig"
-# gnome-themes{,-extras} are OBSOLETE for GNOME 3
-# http://comments.gmane.org/gmane.comp.gnome.desktop/44130
-# Depend on gsettings-desktop-schemas-3.4 to make sure 3.2 users don't lose
-# their default background image
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gsettings-desktop-schemas-3.4
-	!<x11-themes/gnome-themes-2.32.1-r1"
-
-pkg_setup() {
-	DOCS="ChangeLog NEWS"
-	# The icon cache needs to be generated in pkg_postinst()
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-placeholders
-		$(use_enable gtk gtk2-engine)
-		$(use_enable gtk gtk3-engines)
-		GTK_UPDATE_ICON_CACHE=$(type -P true)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	# Install cursors in the right place
-	sed -e 's:^\(cursordir.*\)icons\(.*\):\1cursors/xorg-x11\2:' \
-		-i themes/Adwaita/cursors/Makefile.am \
-		-i themes/Adwaita/cursors/Makefile.in || die
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Make it the default cursor theme
-	cd "${ED}/usr/share/cursors/xorg-x11" || die
-	ln -sfn Adwaita default || die
-}
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.6.2.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.6.2.ebuild
index 8f283fc525f7..ec7afe3a4c07 100644
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.6.2.ebuild
+++ b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.6.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-standard/gnome-themes-standard-3.6.2.ebuild,v 1.1 2012/11/21 23:01:26 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-standard/gnome-themes-standard-3.6.2.ebuild,v 1.2 2012/12/27 05:01:16 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gtk"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	gnome-base/librsvg:2
@@ -39,7 +39,6 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 src_prepare() {
-	DOCS="ChangeLog NEWS"
 	# The icon cache needs to be generated in pkg_postinst()
 	G2CONF="${G2CONF}
 		--disable-static