Version bump for gtk+-3.6; no longer includes a dark theme. Remove old.

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

5 files changed, 31 insertions, 93 deletions

diff --git a/x11-themes/zukitwo/ChangeLog b/x11-themes/zukitwo/ChangeLog
index fd12597db781..afd2a8abdcd1 100644
--- a/x11-themes/zukitwo/ChangeLog
+++ b/x11-themes/zukitwo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-themes/zukitwo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/zukitwo/ChangeLog,v 1.14 2012/10/04 15:07:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/zukitwo/ChangeLog,v 1.15 2012/12/27 19:14:24 tetromino Exp $
+
+*zukitwo-2012.12.16 (27 Dec 2012)
+
+  27 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -zukitwo-2011.12.29.ebuild, -zukitwo-2011.12.29-r1.ebuild,
+  -zukitwo-2012.06.12.ebuild, +zukitwo-2012.12.16.ebuild:
+  Version bump for gtk+-3.6; no longer includes a dark theme. Remove old.
 
   04 Oct 2012; Agostino Sarubbo <ago@gentoo.org> zukitwo-2012.07.02.ebuild:
   Stable for amd64, wrt bug #427544
diff --git a/x11-themes/zukitwo/Manifest b/x11-themes/zukitwo/Manifest
index f43b343d0f59..908b47ed269d 100644
--- a/x11-themes/zukitwo/Manifest
+++ b/x11-themes/zukitwo/Manifest
@@ -1,10 +1,21 @@
-DIST zukitwo-2011.12.29.tar.xz 182220 SHA256 fe1726513a5fb4808d2e8f5bedfc4103bdc9b707d7293b6de956ec8e7870550d SHA512 5068b07b7add05aacc8537d96b72bfe886f976b5cca2d8b58b5bcf07a9d208c0e0ee18bca2d49b213f2a346e38ffd028148d73bd84c3c16242683b62d542fd06 WHIRLPOOL efb573c6f9d09f32cee9362c794fb7b2d469d6afbad18323d327952731548f4175e9c5316a61c2a0b9ce4298b3291878c7dd6d00b6ccb3a3232fcd3862764a01
-DIST zukitwo-2012.06.12.tar.xz 170472 SHA256 16f30e6e02929f23417441b893639bad7f73ad08d23b1dd055b47f9250e77bf5 SHA512 6ed5f5525ed625376ffbab75d09b86627501ca4fb6537b828e5b683c5bc6b8fa1e1fbf5b48eac075b9a469b4859eda638b8af08b899405699d5a5e2459d41636 WHIRLPOOL 84519effb199d47d590a564e0db71b15714a2ccaca4d6d2f355af9a51641b922bd16e75947ef2b04215cc59e30c5a1e87249dc7d3870b8e880bc0b421909679f
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST zukitwo-2012.07.02.tar.xz 169384 SHA256 d3b50a71f00a06e6f4af530b47add96a1d1802267d35528f3cbc2ebd7eeee822 SHA512 c3fd02762d8e41a6becb56380eaf22e2c13f888a7481086826783d1a8ff5477007ab957d5a07ceed7abb12d6393ed671e5cac0047b2c4d00a600970fda9edf8a WHIRLPOOL fb35f382c5b393073edd55d7c86e49883a8866088c2c277a068a6673359eb50b0615395c8ff892fb35a298c60835d6c1dda99369536f4567daf885801638dade
-EBUILD zukitwo-2011.12.29-r1.ebuild 1231 SHA256 172a1b6cb3842384fcdf0bd7389507d775341b1d1c77342f29c9d2fcfaa93f57 SHA512 210c74065c53063c1a03a7b7890fe5e55130fd72930458690649a1eb8c8bb612ad26614b3c02453897192d1712b108835457f15480b01a7e1aa5447314784b18 WHIRLPOOL b53fad1963e66de7e1158952edb859d1c010fb22453cb2690a8567fd4772aa75921a74abc113430378729cf82d09e4f2d39d1a068649498cae7bc83c1b6ac2c9
-EBUILD zukitwo-2011.12.29.ebuild 1213 SHA256 158a6a3a7d0a2bf73d09e06a408157e0e048f468b5cea5eb6e74f65419afbb80 SHA512 f2ef9759c32a07459f4c38f592a861e1501ad5a9f5bb69876a0346a982030e37f27885b0406a9a789250f6723b77c2f98d5b375ff13021bfcd2e324284a0c208 WHIRLPOOL cc34eb46afce6bc49aec687c3d27f970c57649d5bfb2a5ffd08e0652ad01cc365b7f66b38668ba9aa42525c7a958e69dd268f46a687330f429ce16c384a1865a
-EBUILD zukitwo-2012.06.12.ebuild 1167 SHA256 597183300d45c1e1aa7fdb0a8d772766da2fadc09ec416cec3de3ff90abcc5c9 SHA512 47fe99454b8b481ba7d0b9457315a115299d47476f505ad136153ee67b857601789b20079e8df11b9897a11a8b933baa2522f823e4b21b68ee2d688e2497552c WHIRLPOOL 5cebddf1d10e0481ca232a52c00b1b74e6a7c785d841bca5587f5569ffe597e549e4a01f4692ef7b2dca607c38b7d95f2de1548f32e9f47af61d20f8c9e41c7d
+DIST zukitwo-2012.12.16.tar.xz 219124 SHA256 7a7ef66042aa83400893c1b9298973f8fee97750b6c5734fbbd28cfb483e4b32 SHA512 8588baca2af05fc346e997c8e85de743b374e6c6c57a44c3797f47402f727d2910c6b6e63d3d17713c74239db3b0e72afe602572fe4f5739908b50b17b679e62 WHIRLPOOL a8e0b9c5198a02833f81a96073c4c7cbcac8e932acc9ef6e056d99c79c24588975adeac3526d479f61077a42e7b3ad42d0e25183b06d51b0d9c229805b45af9f
 EBUILD zukitwo-2012.07.02-r1.ebuild 1170 SHA256 ef25e65afad3681f731e8647fa465963f6cefab46ffd593800a93565e649d18a SHA512 01ed6d4a6efb06f5f0ae46235ad12c1d740696205871169774b2a1ecd282cf80fed94179f396f05217fa2572bb54bc9f8221d3449225cee6e1a16619b2915f95 WHIRLPOOL 16ba4c65c4818e0f54e27ceb86b4927a4a82de834d6cb0219481d50f18b80e9590996f1a06c016b28e699def7d6afa7f218a78bbf6c508db4ffacc1de6df8299
 EBUILD zukitwo-2012.07.02.ebuild 1105 SHA256 e549a44a9e4a8113a8b8734a50ed12ac7541601678d578fdecc941e47e78cd40 SHA512 d3863594ecfdb56a8121e9ceeca566f16f092908b59da9df020855314c38ef708c5d8078d90edb6227f7d0aca6c191d146b1d70dcefc97437e831bd3aea2ffff WHIRLPOOL 3c63d2b18acb829f830a973e3e266e50b36c753c7b255ac62413c34078075671f638233d03ccce43f3ee184aa98c7afd07e0d2523e290170941af217faa34078
-MISC ChangeLog 3113 SHA256 716fd9b5497faa891e93e7abc75fa4d18ce46dea820543fe7964571f6f167931 SHA512 ad04cd71b73d15d7d8c21eb4c63e07cf19fc38b0f17206552db1b05f9c8fba7ba72f8605a6a211cb769913626d58aee04094a856775de7b62213c5fb87380370 WHIRLPOOL 29b3ff5d333195c8c2d13a3919309993eaa148df9312bfadca95eea83326992afd5c624c4c10333fcaeb4df582741f2bca5a4af363faa5fb96a2ec8fcb62b438
+EBUILD zukitwo-2012.12.16.ebuild 1148 SHA256 9c83f48d8e07d390cb7c8d9c96fa4e0f478d67efe088eced4eba53fdbe8fe89b SHA512 c3a90cbea5beabd6a21ee1b1a8a62ec398b3055ea0a5337069f4ccefa42e57902d41dce97f8285e1f0e42db049f828fc4dcb73625b0488c236b836322bc06d4d WHIRLPOOL b57ffccaaf1921a9eafd62eaefef774fb6116fa00c47e06a342de9aead0598ac243ee3b28764f0efbaec8f36155eba17b34707ad21e03aeed3d34ea1c698b237
+MISC ChangeLog 3407 SHA256 1f8df9178b9295b9a3f9ceb9b36d7bac335fba3db62586ccf32f1237f27d18b2 SHA512 3a49d77c42de737801050f61b4af9f146ae8e71902cca5514627e6ff516cc304f71c9ebc03114f53a7baebfb06b759d44a7a7f741b9bfcde2883137b4cb7747f WHIRLPOOL 24fb8e114fd1342f258c7f41ccff76df014a5a68be5966f33ee9a09d1288dce3b846c19c28cc7ff19942a38ff1b24915cfd810a0691e5ab9f45a05f46f675bd9
 MISC metadata.xml 256 SHA256 e399c42cf39f10936cd5b407e6f8b9faf0c549d20455092fa02d0267aeb8bfdb SHA512 c81efef9c1a9baa348984f236dac77ddeeaaca1650c4c0ae5ad49532dd78b7955820d38c696325173616a388d4f9e47e4a1a09495c54e467f1b911449079b182 WHIRLPOOL 15fb1de48812efffa7b6ef10c3f3687aa6a95607903194c4c65eceb644d15d7c1976be8bbadf1424784bbc67d0243b78c6bba60cb1a226823272e858cb01f320
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQ3J4RAAoJEJ0WA1zPCt1hw1cH/2xGCvVHcJYZtTu/oW/94GA7
+o9kKw8MATvJn/qnyV6Iecvs6Aw9QrYrPkpj6At8PwanpAewKmT4B82B2UdM/ZUgn
+/iIz7/2Az44fMCsK/cGQyvova2l356hSm9uGnVpAyDglLbu3LbHx09nXiHRc3Lvo
+g80WVWD7bx+2XHOnzLgWetGjY3G7d46MihOBaHYKJtsIXCOZSYb9Zsks9UK6TW6n
+2s20lcBtsAMWDCxjXlSnV1LVJmj7FfokeuOga7wBsEpLetM34TljiNVOUVdBHbmg
+unwB67kqf7JiciJasmRf335nylYoFz4MJPsiFaghY3YH6jbr3d8NFYuyLnJjQTY=
+=qh4d
+-----END PGP SIGNATURE-----
diff --git a/x11-themes/zukitwo/zukitwo-2011.12.29-r1.ebuild b/x11-themes/zukitwo/zukitwo-2011.12.29-r1.ebuild
deleted file mode 100644
index 10e8e7639f2a..000000000000
--- a/x11-themes/zukitwo/zukitwo-2011.12.29-r1.ebuild
+++ /dev/null
@@ -1,40 +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/zukitwo/zukitwo-2011.12.29-r1.ebuild,v 1.1 2012/05/05 01:33:17 tetromino Exp $
-
-EAPI="4"
-
-DESCRIPTION="Theme for GNOME 2 and 3"
-HOMEPAGE="http://gnome-look.org/content/show.php/Zukitwo?content=140562"
-# Upstream download URI updates file contents without changing the filename
-SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome-shell"
-
-RDEPEND="media-fonts/ubuntu-font-family
-	>=x11-libs/gtk+-2.10:2
-	>=x11-libs/gtk+-3.2:3
-	>=x11-themes/gtk-engines-murrine-0.98.1.1
-	>=x11-themes/gtk-engines-unico-1.0.1
-	gnome-shell? ( x11-themes/zukitwo-shell )"
-DEPEND="app-arch/xz-utils"
-
-# INSTALL file contains useful information for the end user
-DOCS=( INSTALL README )
-
-src_prepare() {
-	# Gentoo uses normal nautilus, not nautilus-elementary
-	sed -e 's:apps/nautilus-e.rc:apps/nautilus.rc:' \
-		-i Zukitwo{,-Dark,-Resonance}/gtk-2.0/gtkrc || die
-}
-
-src_install() {
-	insinto /usr/share/themes
-	doins -r Zukitwo Zukitwo-Dark Zukitwo-Resonance
-	insinto /usr/share/themes/Zukitwo
-	doins panelbg.png
-	default
-}
diff --git a/x11-themes/zukitwo/zukitwo-2011.12.29.ebuild b/x11-themes/zukitwo/zukitwo-2011.12.29.ebuild
deleted file mode 100644
index e1f0841b774a..000000000000
--- a/x11-themes/zukitwo/zukitwo-2011.12.29.ebuild
+++ /dev/null
@@ -1,40 +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/zukitwo/zukitwo-2011.12.29.ebuild,v 1.4 2012/05/05 01:33:17 tetromino Exp $
-
-EAPI="4"
-
-DESCRIPTION="Theme for GNOME 2 and 3"
-HOMEPAGE="http://gnome-look.org/content/show.php/Zukitwo?content=140562"
-# Upstream download URI updates file contents without changing the filename
-SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-fonts/ubuntu-font-family
-	>=x11-libs/gtk+-2.10:2
-	>=x11-libs/gtk+-3.2:3
-	>=x11-themes/gtk-engines-murrine-0.98.1.1
-	>=x11-themes/gtk-engines-unico-1.0.1
-	!x11-themes/zukitwo-shell"
-DEPEND="app-arch/xz-utils"
-
-# INSTALL file contains useful information for the end user
-DOCS=( INSTALL README )
-
-src_prepare() {
-	# Gentoo uses normal nautilus, not nautilus-elementary
-	sed -e 's:apps/nautilus-e.rc:apps/nautilus.rc:' \
-		-i Zukitwo{,-Dark,-Resonance}/gtk-2.0/gtkrc || die
-}
-
-src_install() {
-	insinto /usr/share/themes
-	doins -r Zukitwo Zukitwo-Dark Zukitwo-Resonance Zukitwo-Shell
-	insinto /usr/share/themes/Zukitwo
-	doins panelbg.png
-	default
-}
diff --git a/x11-themes/zukitwo/zukitwo-2012.06.12.ebuild b/x11-themes/zukitwo/zukitwo-2012.12.16.ebuild
index 9f7f12b1e0b6..f862dabbad18 100644
--- a/x11-themes/zukitwo/zukitwo-2012.06.12.ebuild
+++ b/x11-themes/zukitwo/zukitwo-2012.12.16.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/zukitwo/zukitwo-2012.06.12.ebuild,v 1.1 2012/06/25 05:24:43 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/zukitwo/zukitwo-2012.12.16.ebuild,v 1.1 2012/12/27 19:14:24 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 DESCRIPTION="Theme for GNOME 2 and 3"
 HOMEPAGE="http://gnome-look.org/content/show.php/Zukitwo?content=140562"
@@ -15,9 +15,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE="gnome-shell"
 
 RDEPEND=">=x11-libs/gtk+-2.10:2
-	>=x11-libs/gtk+-3.4:3
+	>=x11-libs/gtk+-3.6:3
+	>=x11-themes/gnome-themes-standard-3.6
 	>=x11-themes/gtk-engines-murrine-0.98.1.1
-	>=x11-themes/gtk-engines-unico-1.0.2
 	gnome-shell? ( x11-themes/zukitwo-shell )"
 DEPEND="app-arch/xz-utils"
 
@@ -27,12 +27,12 @@ DOCS=( INSTALL README )
 src_prepare() {
 	# Gentoo uses normal nautilus, not nautilus-elementary
 	sed -e 's:apps/nautilus-e.rc:apps/nautilus.rc:' \
-		-i Zukitwo{,-Dark}/gtk-2.0/gtkrc || die
+		-i Zukitwo/gtk-2.0/gtkrc || die
 }
 
 src_install() {
 	insinto /usr/share/themes
-	doins -r Zukitwo Zukitwo-Dark
+	doins -r Zukitwo
 	insinto /usr/share/themes/Zukitwo
 	doins panelbg.png
 	default