Drop gnome-shell USE flag on =2012.07.02 to allow stabilization.

4 files changed, 59 insertions, 28 deletions

diff --git a/x11-themes/zukitwo/ChangeLog b/x11-themes/zukitwo/ChangeLog
index f279130de1a7..6de9a734b5ac 100644
--- a/x11-themes/zukitwo/ChangeLog
+++ b/x11-themes/zukitwo/ChangeLog
@@ -1,6 +1,12 @@
 # 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.11 2012/07/05 00:37:35 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/zukitwo/ChangeLog,v 1.12 2012/07/21 20:24:08 tetromino Exp $
+
+*zukitwo-2012.07.02-r1 (21 Jul 2012)
+
+  21 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  zukitwo-2012.07.02.ebuild, +zukitwo-2012.07.02-r1.ebuild:
+  Drop gnome-shell USE flag on =2012.07.02 to allow stabilization.
 
 *zukitwo-2012.07.02 (05 Jul 2012)
 
diff --git a/x11-themes/zukitwo/Manifest b/x11-themes/zukitwo/Manifest
index 7fc0aaf180f6..ee0c11d0b240 100644
--- a/x11-themes/zukitwo/Manifest
+++ b/x11-themes/zukitwo/Manifest
@@ -1,23 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST zukitwo-2011.12.29.tar.xz 182220 RMD160 88636a2c4a076974db05de1e7fa1fc183bd351da SHA1 35df2d69b60241cc162de047bc15d5fbe52e061a SHA256 fe1726513a5fb4808d2e8f5bedfc4103bdc9b707d7293b6de956ec8e7870550d
-DIST zukitwo-2012.06.12.tar.xz 170472 RMD160 3a25f767e6baa9a2866fec567af6fae2f971a148 SHA1 cd4b635dc2ee2ab7dbb483f0201a6bd1c5db2091 SHA256 16f30e6e02929f23417441b893639bad7f73ad08d23b1dd055b47f9250e77bf5
-DIST zukitwo-2012.07.02.tar.xz 169384 RMD160 13be8a79b2b940094796bb9f0f00024126e5c93e SHA1 b13413dca62d858dfc9324d93dff5e6442b301f5 SHA256 d3b50a71f00a06e6f4af530b47add96a1d1802267d35528f3cbc2ebd7eeee822
-EBUILD zukitwo-2011.12.29-r1.ebuild 1231 RMD160 5ba13595b2b5c171cb8ed3518968e6c448c5a91a SHA1 dd1689166e9e7582792687b29febd28add7f7863 SHA256 172a1b6cb3842384fcdf0bd7389507d775341b1d1c77342f29c9d2fcfaa93f57
-EBUILD zukitwo-2011.12.29.ebuild 1213 RMD160 053de58fc0238f11fde7c98382989e8a483ac40c SHA1 5e0e536ffee11828bc12f245aa0936cba316f09a SHA256 158a6a3a7d0a2bf73d09e06a408157e0e048f468b5cea5eb6e74f65419afbb80
-EBUILD zukitwo-2012.06.12.ebuild 1167 RMD160 8cfbba36ab8e60afd392d7c9447c14600276159c SHA1 007c7d920a8028ff71f2d98f42dbc5ecbea202a9 SHA256 597183300d45c1e1aa7fdb0a8d772766da2fadc09ec416cec3de3ff90abcc5c9
-EBUILD zukitwo-2012.07.02.ebuild 1167 RMD160 bf13d3fe98c02a1b06e9f6b39df16a498dce9058 SHA1 ffafb5c6e712271d548d2cdd1caebe9e471f6db1 SHA256 4632476b692b36b6cc8ad027d833e61388ea15cc631685f12e1f729a1f457d39
-MISC ChangeLog 2667 RMD160 62545affbbc4f2c91955de95ce22caf22f9feca2 SHA1 0e5ee9c96d97bd734e2dd5e61936509a7ecdc4b2 SHA256 00afcecdcd8e96bf5383d1cd78d4abecaf313c6c7301178b1d9dc8f4e7e8b0f6
-MISC metadata.xml 256 RMD160 6a9e8a7b393dad7db053cfb14dedc502ab6bc728 SHA1 9b5915ca1c296370457977867cedb8f8f9c1db74 SHA256 e399c42cf39f10936cd5b407e6f8b9faf0c549d20455092fa02d0267aeb8bfdb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBAgAGBQJP9OHUAAoJEJ0WA1zPCt1hkf8H/j44rLCo3b73ddDDghbkhyE4
-a9uGqcgx12CQugGFphVVkouK2N1rqLs3QqKhmrwlOpxz5zh5ne5AaYpzuhvJjodj
-hKuI3lyt+ZDacqdtJKEhQeLWFflsZKym5+y/iMOZ2aZmGg5nFyUbqnyektzmP7R5
-gevxPYUofrYZBXOQyKxWvF2lqUyRcbrWInv3bfHce9/Ub1FXEDWbyAsVAh6QglD1
-AV78dV2BSKLcsvcTVrMRRyajyF2MlJwGdjdIOiIDElwAUg+pzWAP7w8g81MNNKAJ
-/n+pKCh4u/D1x2E8NjlwJEfnbBysMlj8rZpnk2Mc2JNF+vHp53/UUd3MOyvPpf4=
-=ggBb
------END PGP SIGNATURE-----
+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
+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
+EBUILD zukitwo-2012.07.02-r1.ebuild 1167 SHA256 4632476b692b36b6cc8ad027d833e61388ea15cc631685f12e1f729a1f457d39 SHA512 7ee136871a07bfcd5ce365e3c1a5f18800ac171c51ec649562b91c86ca2263e29b58b38c893fed29ded0e4cbd5adea4ede87515725f5aa23e7567930e0139e6b WHIRLPOOL 214952518e9409ad36a04af4a8d4d1773a5327e70a13f23adba61fac0289a6a20460e8448af4fe7db12b3473b14cb45f8bbddd12f8841b58e883c7cf24d14722
+EBUILD zukitwo-2012.07.02.ebuild 1113 SHA256 612c7d94c80baa47efbbca95186d97a7c38e57db14ffca4accbbeb54a2ea21b2 SHA512 420e748d2075652394fd0515d282a5d38b039cad264c8c12ffead15bbb45e99a4c27ea0b40af7a4e0e6a92259a73da259ccf64254af0ae5f46f54b5f09844a08 WHIRLPOOL 050874c9dbf537dd4b35d187a9caea556589c9664906b885f5b221271d7588131f5bdac88139501b65222df4d989975e5e299146d57a25f40e75db8e676068cd
+MISC ChangeLog 2892 SHA256 5a37425c582fefde8ea6c2c563807e86904cb184e78edd5850f8b1b1af57bb8f SHA512 68ad05c8cdf8ad2feea5f7c2ee05d6de5b1ba322beb8bd593b35a8b1a2bf42fc0da2846ccccf586e36accd34ece0053cca49f8cb59e6075527729145aef8bf6c WHIRLPOOL 6b2999399da1420b9f8b73f1a34904aa70d57bd063ae0a04110e114e9d09fa55246d1fcc832f5939f9d152b4dafedd5401c52aadf4678d71106786022f366c61
+MISC metadata.xml 256 SHA256 e399c42cf39f10936cd5b407e6f8b9faf0c549d20455092fa02d0267aeb8bfdb SHA512 c81efef9c1a9baa348984f236dac77ddeeaaca1650c4c0ae5ad49532dd78b7955820d38c696325173616a388d4f9e47e4a1a09495c54e467f1b911449079b182 WHIRLPOOL 15fb1de48812efffa7b6ef10c3f3687aa6a95607903194c4c65eceb644d15d7c1976be8bbadf1424784bbc67d0243b78c6bba60cb1a226823272e858cb01f320
diff --git a/x11-themes/zukitwo/zukitwo-2012.07.02-r1.ebuild b/x11-themes/zukitwo/zukitwo-2012.07.02-r1.ebuild
new file mode 100644
index 000000000000..151eb851e0ab
--- /dev/null
+++ b/x11-themes/zukitwo/zukitwo-2012.07.02-r1.ebuild
@@ -0,0 +1,39 @@
+# 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.07.02-r1.ebuild,v 1.1 2012/07/21 20:24:08 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=">=x11-libs/gtk+-2.10:2
+	>=x11-libs/gtk+-3.4:3
+	>=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"
+
+# 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}/gtk-2.0/gtkrc || die
+}
+
+src_install() {
+	insinto /usr/share/themes
+	doins -r Zukitwo Zukitwo-Dark
+	insinto /usr/share/themes/Zukitwo
+	doins panelbg.png
+	default
+}
diff --git a/x11-themes/zukitwo/zukitwo-2012.07.02.ebuild b/x11-themes/zukitwo/zukitwo-2012.07.02.ebuild
index cf81bde554e8..7b2dc8c38265 100644
--- a/x11-themes/zukitwo/zukitwo-2012.07.02.ebuild
+++ b/x11-themes/zukitwo/zukitwo-2012.07.02.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/zukitwo/zukitwo-2012.07.02.ebuild,v 1.1 2012/07/05 00:37:35 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/zukitwo/zukitwo-2012.07.02.ebuild,v 1.2 2012/07/21 20:24:08 tetromino Exp $
 
 EAPI="4"
 
@@ -12,13 +12,12 @@ SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gnome-shell"
+IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.10:2
 	>=x11-libs/gtk+-3.4:3
 	>=x11-themes/gtk-engines-murrine-0.98.1.1
-	>=x11-themes/gtk-engines-unico-1.0.2
-	gnome-shell? ( x11-themes/zukitwo-shell )"
+	>=x11-themes/gtk-engines-unico-1.0.2"
 DEPEND="app-arch/xz-utils"
 
 # INSTALL file contains useful information for the end user