Version bump with support for gtk+-3.4 and gnome-3.4; split the gnome-shell theme out into a separate package, zukitwo-shell, to allow simultaneous support for gtk+-3.4 and gnome-shell-3.2. Drop old.

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

5 files changed, 63 insertions, 8 deletions

diff --git a/x11-themes/zukitwo/ChangeLog b/x11-themes/zukitwo/ChangeLog
index 44528ab6b375..da382322c100 100644
--- a/x11-themes/zukitwo/ChangeLog
+++ b/x11-themes/zukitwo/ChangeLog
@@ -1,6 +1,16 @@
 # 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.6 2012/04/29 16:24:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/zukitwo/ChangeLog,v 1.7 2012/05/05 01:33:17 tetromino Exp $
+
+*zukitwo-2012.05.03 (05 May 2012)
+*zukitwo-2011.12.29-r1 (05 May 2012)
+
+  05 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -zukitwo-2011.12.05.ebuild, zukitwo-2011.12.29.ebuild,
+  +zukitwo-2011.12.29-r1.ebuild, +zukitwo-2012.05.03.ebuild, metadata.xml:
+  Version bump with support for gtk+-3.4 and gnome-3.4; split the gnome-shell
+  theme out into a separate package, zukitwo-shell, to allow simultaneous
+  support for gtk+-3.4 and gnome-shell-3.2. Drop old.
 
   29 Apr 2012; Markus Meier <maekke@gentoo.org> zukitwo-2011.12.29.ebuild:
   x86 stable, bug #410611
diff --git a/x11-themes/zukitwo/metadata.xml b/x11-themes/zukitwo/metadata.xml
index da6fd63d0085..ad57197928e5 100644
--- a/x11-themes/zukitwo/metadata.xml
+++ b/x11-themes/zukitwo/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<use>
+	<flag name="gnome-shell">Install theme for <pkg>gnome-base/gnome-shell</pkg></flag>
+</use>
 </pkgmetadata>
diff --git a/x11-themes/zukitwo/zukitwo-2011.12.05.ebuild b/x11-themes/zukitwo/zukitwo-2011.12.29-r1.ebuild
index 259d8b0a3890..10e8e7639f2a 100644
--- a/x11-themes/zukitwo/zukitwo-2011.12.05.ebuild
+++ b/x11-themes/zukitwo/zukitwo-2011.12.29-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.05.ebuild,v 1.1 2011/12/11 07:18:41 tetromino Exp $
+# $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"
 
@@ -12,13 +12,14 @@ SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+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"
+	>=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
@@ -32,7 +33,7 @@ src_prepare() {
 
 src_install() {
 	insinto /usr/share/themes
-	doins -r Zukitwo Zukitwo-Dark Zukitwo-Resonance Zukitwo-Shell
+	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
index e5763d6e3c73..e1f0841b774a 100644
--- a/x11-themes/zukitwo/zukitwo-2011.12.29.ebuild
+++ b/x11-themes/zukitwo/zukitwo-2011.12.29.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-2011.12.29.ebuild,v 1.3 2012/04/29 16:24:17 maekke Exp $
+# $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"
 
@@ -18,7 +18,8 @@ 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/gtk-engines-unico-1.0.1
+	!x11-themes/zukitwo-shell"
 DEPEND="app-arch/xz-utils"
 
 # INSTALL file contains useful information for the end user
diff --git a/x11-themes/zukitwo/zukitwo-2012.05.03.ebuild b/x11-themes/zukitwo/zukitwo-2012.05.03.ebuild
new file mode 100644
index 000000000000..6199316a7dfc
--- /dev/null
+++ b/x11-themes/zukitwo/zukitwo-2012.05.03.ebuild
@@ -0,0 +1,40 @@
+# 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.05.03.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.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
+}