Version bump. Clean up old revisions.

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

3 files changed, 38 insertions, 63 deletions

diff --git a/x11-themes/gnome-themes-standard/ChangeLog b/x11-themes/gnome-themes-standard/ChangeLog
index b4427a909952..f4797855899f 100644
--- a/x11-themes/gnome-themes-standard/ChangeLog
+++ b/x11-themes/gnome-themes-standard/ChangeLog
@@ -1,6 +1,13 @@
 # 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.32 2012/10/28 16:39:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-standard/ChangeLog,v 1.33 2012/11/21 23:01:26 eva Exp $
+
+*gnome-themes-standard-3.6.2 (21 Nov 2012)
+
+  21 Nov 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-themes-standard-3.0.2.ebuild, -gnome-themes-standard-3.2.1.ebuild,
+  +gnome-themes-standard-3.6.2.ebuild:
+  Version bump. Clean up old revisions.
 
   28 Oct 2012; Raúl Porcel <armin76@gentoo.org>
   gnome-themes-standard-3.4.2.ebuild:
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.0.2.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.0.2.ebuild
deleted file mode 100644
index d9bfdbe34151..000000000000
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.0.2.ebuild
+++ /dev/null
@@ -1,48 +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.0.2.ebuild,v 1.11 2012/09/25 15:20:05 tetromino Exp $
-
-EAPI="3"
-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=""
-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=">=x11-libs/gtk+-3.0.8:3
-	>=x11-themes/gtk-engines-2.15.3:2"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	sys-devel/gettext"
-# gnome-themes{,-extras} are OBSOLETE for GNOME 3
-# http://comments.gmane.org/gmane.comp.gnome.desktop/44130
-RDEPEND="${COMMON_DEPEND}
-	!<x11-themes/gnome-themes-2.32.1-r1"
-
-# FIXME: --enable-placeholders fails
-G2CONF="--disable-static --disable-placeholders"
-DOCS="ChangeLog NEWS"
-
-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.2.1.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.6.2.ebuild
index 667ae377f1e7..8f283fc525f7 100644
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.2.1.ebuild
+++ b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.6.2.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.2.1.ebuild,v 1.11 2012/09/25 15:20:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-standard/gnome-themes-standard-3.6.2.ebuild,v 1.1 2012/11/21 23:01:26 eva Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -13,31 +13,47 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE=""
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+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/gtk+-3.1.18:3
-	>=x11-themes/gtk-engines-2.15.3:2"
+COMMON_DEPEND="
+	gnome-base/librsvg:2
+	x11-libs/cairo
+	>=x11-themes/gtk-engines-2.15.3:2
+	gtk? (
+		x11-libs/gtk+:2
+		>=x11-libs/gtk+-3.5.17:3 )
+"
 DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
 	>=dev-util/intltool-0.40
-	sys-devel/gettext"
+	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}
-	!<x11-themes/gnome-themes-2.32.1-r1"
-
-# FIXME: --enable-placeholders fails
-G2CONF="--disable-static --disable-placeholders"
-DOCS="ChangeLog NEWS"
+	>=gnome-base/gsettings-desktop-schemas-3.4
+	!<x11-themes/gnome-themes-2.32.1-r1
+"
 
 src_prepare() {
-	gnome2_src_prepare
+	DOCS="ChangeLog NEWS"
+	# The icon cache needs to be generated in pkg_postinst()
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-placeholders
+		$(use_enable gtk gtk2-engine)
+		$(use_enable gtk gtk3-engines)
+		GTK_UPDATE_ICON_CACHE=$(type -P true)"
+
 	# 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
+
+	gnome2_src_prepare
 }
 
 src_install() {