This can coexist with gnome-themes-extras and gnome-themes-2.32.1-r1. Remove old.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

3 files changed, 9 insertions, 55 deletions

diff --git a/x11-themes/gnome-themes-standard/ChangeLog b/x11-themes/gnome-themes-standard/ChangeLog
index 5a3108ba21ff..c7c26848876e 100644
--- a/x11-themes/gnome-themes-standard/ChangeLog
+++ b/x11-themes/gnome-themes-standard/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-themes/gnome-themes-standard
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-standard/ChangeLog,v 1.2 2011/06/02 16:54:41 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-standard/ChangeLog,v 1.3 2011/07/07 13:50:51 pacho Exp $
+
+  07 Jul 2011; Pacho Ramos <pacho@gentoo.org>
+  -gnome-themes-standard-3.0.1.ebuild, gnome-themes-standard-3.0.2.ebuild:
+  This can coexist with gnome-themes-extras and gnome-themes-2.32.1-r1. Remove
+  old.
 
 *gnome-themes-standard-3.0.2 (02 Jun 2011)
 
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.0.1.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.0.1.ebuild
deleted file mode 100644
index 5056ba8329d2..000000000000
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.0.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 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.1.ebuild,v 1.1 2011/05/01 13:02:30 nirbheek 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}
-	>=x11-misc/icon-naming-utils-0.8.7
-	>=dev-util/pkgconfig-0.19
-	>=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
-	!x11-themes/gnome-themes-extras"
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-# 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.0.2.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.0.2.ebuild
index a9d589a2b2d8..af3db5b8e166 100644
--- 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
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.1 2011/06/02 16:54:41 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-standard/gnome-themes-standard-3.0.2.ebuild,v 1.2 2011/07/07 13:50:51 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -26,8 +26,8 @@ DEPEND="${COMMON_DEPEND}
 # gnome-themes{,-extras} are OBSOLETE for GNOME 3
 # http://comments.gmane.org/gmane.comp.gnome.desktop/44130
 RDEPEND="${COMMON_DEPEND}
-	!x11-themes/gnome-themes
-	!x11-themes/gnome-themes-extras"
+	!<x11-themes/gnome-themes-2.32.1-r1"
+
 # This ebuild does not install any binaries
 RESTRICT="binchecks strip"
 # FIXME: --enable-placeholders fails