Version bump. Clean up old revisions.

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

4 files changed, 44 insertions, 71 deletions

diff --git a/x11-themes/gnome-themes-standard/ChangeLog b/x11-themes/gnome-themes-standard/ChangeLog
index b4427a909952..f4797855899f 100644
--- a/x11-themes/gnome-themes-standard/ChangeLog
+++ b/x11-themes/gnome-themes-standard/ChangeLog
@@ -1,6 +1,13 @@
 # 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.32 2012/10/28 16:39:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-standard/ChangeLog,v 1.33 2012/11/21 23:01:26 eva Exp $
+
+*gnome-themes-standard-3.6.2 (21 Nov 2012)
+
+  21 Nov 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-themes-standard-3.0.2.ebuild, -gnome-themes-standard-3.2.1.ebuild,
+  +gnome-themes-standard-3.6.2.ebuild:
+  Version bump. Clean up old revisions.
 
   28 Oct 2012; Raúl Porcel <armin76@gentoo.org>
   gnome-themes-standard-3.4.2.ebuild:
diff --git a/x11-themes/gnome-themes-standard/Manifest b/x11-themes/gnome-themes-standard/Manifest
index f729d4bcb4ea..32258b148f29 100644
--- a/x11-themes/gnome-themes-standard/Manifest
+++ b/x11-themes/gnome-themes-standard/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST gnome-themes-standard-3.0.2.tar.bz2 1205473 SHA256 1def884063aa441860e20dd9925bb7c3b6f917bae44f77b1ada999940c463809 SHA512 37276c3eeb73c225ba5c91b05de5f755735dc5ee4e9abafb5b4515221a88caedb34848f9f4b8d880388ce0d63e8e8b8481cba55f0ca2157438be328a6172a0c1 WHIRLPOOL 887761450b445a4532f12a8dba96ae21bec5e5ec1ab334f4d4b857def668713262619045eabe70dfbd8b223e4abddc55a29c314afe0a80c961b56ede12867528
-DIST gnome-themes-standard-3.2.1.tar.xz 1053120 SHA256 ab9e7f6001f4f18420df6a66407ace4340ee815b31e571bc55de7983370e26f3 SHA512 998deef12ba778cb66213daaf45011037550e250999fca9389eea0db9fe99118d49954cbb51ae5a2eef41cc86417f93d5e895bcae3ab2cc922c760ce638db238 WHIRLPOOL 8103eae2d15b41014e260ccd8130f8238511784d4db2c64b5baa411e04ad1f55769abd87d979456ba6c249371a24d661b2f36ccf8bbbe8a28fcc69fdbfd6febf
 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
-EBUILD gnome-themes-standard-3.0.2.ebuild 1399 SHA256 0a6da9303f07be25af022c7f9d0bc935daa746b3b540eae83c2a8c2c45139458 SHA512 8c2d25e3f47c60d443dbbeaec0dbe87ec90d8e3cbe832cf3d086fb4eb91106cb26297b5c1e9bc1e2aa1b87e0a9c0ec32b78e3fde2ced47138c80f55c658cdca6 WHIRLPOOL 272fb1e60aaa9d76414c0491e5912006760c43f10acb24c70e35f350c5f3bd9411648ff347a97ee39f0e04ea8d94a53259e01617d33e0daf4dc54590efc6af24
-EBUILD gnome-themes-standard-3.2.1.ebuild 1422 SHA256 dcf2bccf3576662b9c763ad55cf47f98db8abf01240d4b9502d14438694f3dbf SHA512 4e46831b39493a59fd2cbd3eeb004da2d6409d437dda2be2566d53e69be05d5e6742952238ed50f87e135df16d846a731db9069178cc3b6405514410b362be49 WHIRLPOOL 373d7306aed69c38cd0d8e38b182d57815b81b84ea074162c2b21fc36e5e15d26ff59d9744fa2ef5f43a770d89fa6f7291c58ee697e915eb87bccfda093b8970
+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
-MISC ChangeLog 5641 SHA256 8728347554ccc38d9a2c348396f22009c7133886f4ed8624c979b26c69b91b9c SHA512 8f4cd548cb7e49035ffbf64ae0940c7a05cb1f2010e46e7915dfd5d89080cd7ce65f9dbff0d01c26115be6760ef1105194f58c10128521e1841df982746c2d21 WHIRLPOOL 63a89bc5860645ffd72567758617c36d733b6df43b329f4d55d04b9440afa94d822ea4caa85e1775ff8c03b90d4b7e307888a4218b231d2c22126c0fcb88cce4
+EBUILD gnome-themes-standard-3.6.2.ebuild 1774 SHA256 cd0a491dfbdd026b0823cd7c032e105bcedda5b137ba2520214905b6588c5e1a SHA512 abc13c12190a595047468611672ee01beeb194f8e5f4d7e7ceaa02c0f0d81e11ea3ccd7b054211b5646bc2f6422cc7496b5526051e19421886199392cf133061 WHIRLPOOL 7504fc1d70126b5ef6845358b2a68ad4151b28ce718cb2dd512a3e93de5a0acac973b1e01c8bb94156eb6bde1989d2ebf335eef23a4a2fb1faaacab30507d641
+MISC ChangeLog 5891 SHA256 d86f718b1ea200db6a88554f46422a2e68dfdf7172ab2e3047fdb4c2faf3a536 SHA512 868e05c7d1c046284e145197bc38b6e1a273083d7e6551f9d27b2a932df3b19e9a02988c385e11516e89800cbf31edd986dcda44bac65645b867427aa2d1b6d0 WHIRLPOOL f35f506a26f9a2ed12827307c012778402874eb59fbe34802110b50502cf64d922fb9f9d27af9a4d1d125bbdced91edd09a8559703f51cac805f2089045991ea
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCNX6kACgkQuQc30/atMkALjQCfbtVHY+8gDG2fAn6wd6p70ehA
-uqMAoLikqBR1i3tM70jIOGoqwrfXU5yf
-=Bzl1
+iEYEAREIAAYFAlCtXUcACgkQ1fmVwcYIWAYSGwCgvrwOjPa5eaV56G8hJNLna9e7
+Vr8AoLW1OV1AKeKhqQn49UfC5/ocgCfB
+=Xy56
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.0.2.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.0.2.ebuild
deleted file mode 100644
index d9bfdbe34151..000000000000
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.0.2.ebuild
+++ /dev/null
@@ -1,48 +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.0.2.ebuild,v 1.11 2012/09/25 15:20:05 tetromino Exp $
-
-EAPI="3"
-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=""
-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=">=x11-libs/gtk+-3.0.8:3
-	>=x11-themes/gtk-engines-2.15.3:2"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	sys-devel/gettext"
-# gnome-themes{,-extras} are OBSOLETE for GNOME 3
-# http://comments.gmane.org/gmane.comp.gnome.desktop/44130
-RDEPEND="${COMMON_DEPEND}
-	!<x11-themes/gnome-themes-2.32.1-r1"
-
-# FIXME: --enable-placeholders fails
-G2CONF="--disable-static --disable-placeholders"
-DOCS="ChangeLog NEWS"
-
-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.2.1.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.6.2.ebuild
index 667ae377f1e7..8f283fc525f7 100644
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.2.1.ebuild
+++ b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.6.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.1.ebuild,v 1.11 2012/09/25 15:20:05 tetromino Exp $
+# $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 $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -13,31 +13,47 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE=""
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+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/gtk+-3.1.18:3
-	>=x11-themes/gtk-engines-2.15.3:2"
+COMMON_DEPEND="
+	gnome-base/librsvg:2
+	x11-libs/cairo
+	>=x11-themes/gtk-engines-2.15.3:2
+	gtk? (
+		x11-libs/gtk+:2
+		>=x11-libs/gtk+-3.5.17:3 )
+"
 DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
 	>=dev-util/intltool-0.40
-	sys-devel/gettext"
+	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}
-	!<x11-themes/gnome-themes-2.32.1-r1"
-
-# FIXME: --enable-placeholders fails
-G2CONF="--disable-static --disable-placeholders"
-DOCS="ChangeLog NEWS"
+	>=gnome-base/gsettings-desktop-schemas-3.4
+	!<x11-themes/gnome-themes-2.32.1-r1
+"
 
 src_prepare() {
-	gnome2_src_prepare
+	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)"
+
 	# 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
+
+	gnome2_src_prepare
 }
 
 src_install() {