Version bump with gnome-3.6 visual fixes. Use a single flag for gtk2 and gtk3 engines for simplicity. Drop old.

Package-Manager: portage-2.2.0_alpha137/cvs/Linux x86_64

5 files changed, 27 insertions, 76 deletions

diff --git a/x11-themes/gnome-themes-standard/ChangeLog b/x11-themes/gnome-themes-standard/ChangeLog
index 13bc794563d3..a815abd10d62 100644
--- a/x11-themes/gnome-themes-standard/ChangeLog
+++ b/x11-themes/gnome-themes-standard/ChangeLog
@@ -1,6 +1,14 @@
 # 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.30 2012/10/16 04:58:08 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-standard/ChangeLog,v 1.31 2012/10/17 07:39:33 tetromino Exp $
+
+*gnome-themes-standard-3.6.1 (17 Oct 2012)
+
+  17 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-themes-standard-3.6.0.1.ebuild, -gnome-themes-standard-3.6.0.2.ebuild,
+  +gnome-themes-standard-3.6.1.ebuild, metadata.xml:
+  Version bump with gnome-3.6 visual fixes. Use a single flag for gtk2 and gtk3
+  engines for simplicity. Drop old.
 
   16 Oct 2012; Anthony G. Basile <blueness@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 baec3145096a..130fb24eb9e4 100644
--- a/x11-themes/gnome-themes-standard/Manifest
+++ b/x11-themes/gnome-themes-standard/Manifest
@@ -4,19 +4,21 @@ 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.0.1.tar.xz 3582060 SHA256 122a3f56ba97597cc888c59451851c456f28e5558d258cb3d54b8bb79a6d45a4 SHA512 e049a073c54e43b55e01a67775eabbc44745aa5f3b74f724f02236edbb5e3904bb07845974887b5e529ed987160495a2cef91eb9d4353b6584d83dc16e13b96d WHIRLPOOL 30e238ff3c426237688889bc042e3a46e524d7402c888cb76cad43d5187e7b3c715119984fd2304edd2a4bd0e42d70ecdc6188e4be4d23a02f500d92aa71a6e3
-DIST gnome-themes-standard-3.6.0.2.tar.xz 3594444 SHA256 3f3c0448d7cda9a9381570c9869df2a7b2ef8587d85817bc5bbcf24870244490 SHA512 051981fef2d0b2cdb948fa0ba08d63837ea0aa7eaee9fb23fce80041be7f064be7fa7ef7d7f3e94d23e81a32310c7b708e8620e578165d83976c8f5898ee4795 WHIRLPOOL 4b6110c6f68900270af54051059c0e06d113d63143fe598496a9d165adcd95aa6aa8fe6f783e4b387ee65c246982e8abc288254bd9f0a1fa7b941d58874a72d3
+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
 EBUILD gnome-themes-standard-3.4.2.ebuild 1685 SHA256 70d9e5f5d109bf0be1d460582c6b5d34a2a8d6ef4ba4b37c2c13a11699ece403 SHA512 bbc6e973b45e02cafe4ab5d8e5e31f6eee8844d74438e730f8ef4d7cebecdfdd01c23e0061eb799a5dd10def559769e9642ee689349e0870afde8e6e3620542f WHIRLPOOL 015166b57c2f027161eb71b5f5bfd1d772f4742a21f8dee71c91d5e8e7ba91a497c046ad7b8ac3864b22afda960d348e356eca089ae8243a7e672e70f4a645e4
-EBUILD gnome-themes-standard-3.6.0.1.ebuild 1743 SHA256 36783786be6328dceb5eedf3151d650af1db8ff1b5521a19a7e9a1690ce70701 SHA512 775a2f2d89c07b0c180ed6a3c1ad5e6859a7b568820539e8f64bd6a1f7d2d742a3b87a52d48e205193981c1277f6167dcfd253ffe2236b28a3c07f762e7588f2 WHIRLPOOL 32d9a24a6a0a50acf01c80d7b3844d5eb312dcfa96214b39ab63801e13f3517b60ba9cc668ccc4f4f3f09af7c428e98028f7a912d24ac6a6c7dd176c553c9e47
-EBUILD gnome-themes-standard-3.6.0.2.ebuild 1743 SHA256 fd523dee201f59b10fa132fd6cba6930d7cd7555da43a80e2eaaf4ae1e053db2 SHA512 20261efc4b8e38a13c36a8403c1d74313f993a21cb2c492e88df31ba68dd17ef795451309cfee5acb9b223b41d179e243b533de2cb9d6783c8eecd615b78cf97 WHIRLPOOL 7309ac4f4184f187d9a851c86905ae9bfa020daa7204efb513746ea27af3c383f3a1d96452103c2b92d5935bee9afb1e43595b12ca2b31846f691a11e4310d45
-MISC ChangeLog 5166 SHA256 e45ffb1beb53daef3077403fdd17ea27506e1d8ca3dd5f2c1ae50886b72da694 SHA512 ac2a2049e3b568073519243e0cc64c392c2208a5c5ffaf686549a37415ea8cfd3c1f24abce71e88dcb16c877408f9db1e8dcdb864faf6aafd62ead303384760c WHIRLPOOL ef0a90ac6c78ec0e130536c3cc55877698520257bf21ee992f0b615b018837c5d803aa35220d6ff8519ab3c9160bf8b0d3831db186ba76a48898af97c1afeda9
-MISC metadata.xml 223 SHA256 c5d3c38f8f104e0ab20791e57475ffe02eff44357ae39d84b5cf2a1ba4423a36 SHA512 aa2c088ac29195b7c8741eac0a35c47a81fad1a2065b42150d797430230b7910962128cdc4523b7684f978a9ac76b6061fd74235a2d5bb6f58421cd6ed99dfd2 WHIRLPOOL 7114a1adb9d7606ec8490f7ddcc8be9131c3fc7b95821a41f89235cb0b0472c571697457a3bfe96b06d6eab1597673f8bbd8b0efd90d662b65e309b3641f3308
+EBUILD gnome-themes-standard-3.6.1.ebuild 1793 SHA256 b418d0c4bc8ac69f2253dd999e51a6862107c6c8c845db21f182b24ffe0000d6 SHA512 9dee60aa1f54ec4415c93897eb94f660473ab2ed39da728e1fdf6288f12215a7628f4fd808408e47dde8d51a3fdfa44d3f98cfcba4ba941a37e4f6a659e96da3 WHIRLPOOL 70d93251c984c068465c772587e8a68eca453b0d35bd4857297f2751258235e30162b6b6f92309e088288f11031434d7c79ee623b1a1d2171f8c279a816187a9
+MISC ChangeLog 5520 SHA256 70d0704c6494e491ea2fa3e685152e96b3633a543678ff18de657985969332ad SHA512 74f7d654aebe710bfc6fb1673ad259d65a922dc6f2eaa352af7d71ab9cd11a792f3343be4d24fcdf804e2b561e8e6fa86a0601bdb4d460248ef593a921df1b1d WHIRLPOOL db7a42d36a0e5b86b40d618dccc2b95f5f085a22a1e0fe47005596e7b86d41d9cb0a93aa7f501948662009db4adbca970756a313099f97af428e17ddd9543c3f
+MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlB86SYACgkQl5yvQNBFVTUAagCeKmYSgVtZaFUWv2P9+J/obMJv
-B7wAn31BWUoZOcWuuCglMJfuDcPUeCpG
-=gDBS
+iQEcBAEBCAAGBQJQfmC2AAoJEJ0WA1zPCt1h4ZYH/3x/0b6HNa6ezQ31tzSxwn80
+YWdSYcWeDXndan3Vwec3V+dmslw1GJiGho1Xr/uxXfcwg60ETWtQVCcZ6RhFbMbn
+DzOeXxXmyQzAK8gWSR1MARnCJ9ezTvXOgvq3sgfocHfY/RQ9QRqVRpN6lD9SzISA
+09DD+KLdbvVsaw0rem8jKI9RdX6/qqH7xBnfPJbpusac74Xg5gkyyUj2hqcoZVMS
+dxg+LjY6K1/9TNMqFEh1LYLnIwVB2LHxn3PzGnmbYuww+ODenebg7nXcdiXCTMLV
+aGyTiMckWvYkSvWIc6N97XMejfQ49ETBWjF6RppvMUTTc19feBWDQNIPkf9AcJM=
+=sfT/
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.6.0.2.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.6.0.2.ebuild
deleted file mode 100644
index 68eab7c1ace0..000000000000
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.6.0.2.ebuild
+++ /dev/null
@@ -1,59 +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.0.2.ebuild,v 1.1 2012/09/25 20:13:37 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="+gtk3"
-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
-	gtk3? ( >=x11-libs/gtk+-3.5.17:3 )
-	>=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 gtk3 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.0.1.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.6.1.ebuild
index b3a15b9c569c..d358b6df8f81 100644
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.6.0.1.ebuild
+++ b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.6.1.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.6.0.1.ebuild,v 1.1 2012/09/25 15:20:05 tetromino Exp $
+# $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"
@@ -13,12 +13,14 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE="+gtk3"
+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
-	gtk3? ( >=x11-libs/gtk+-3.5.17:3 )
+	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
@@ -38,7 +40,8 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-static
 		--disable-placeholders
-		$(use_enable gtk3 gtk3-engines)
+		$(use_enable gtk gtk2-engine)
+		$(use_enable gtk gtk3-engines)
 		GTK_UPDATE_ICON_CACHE=$(type -P true)"
 }
 
diff --git a/x11-themes/gnome-themes-standard/metadata.xml b/x11-themes/gnome-themes-standard/metadata.xml
index 1d88d2deaf1e..da6fd63d0085 100644
--- a/x11-themes/gnome-themes-standard/metadata.xml
+++ b/x11-themes/gnome-themes-standard/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
-<use>
-	<flag name="gtk3">Enable GTK3 theme engines</flag>
-</use>
 </pkgmetadata>