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

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

4 files changed, 14 insertions, 87 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/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