[gentoo-commits] proj/gnome:master commit in: x11-themes/gnome-themes-standard/

[Gilles Dartiguelongue]

commit:     0a4a8b55d6bacfa41dee4db044c1b6266fe96611
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 15 09:48:01 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec  1 14:35:02 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0a4a8b55

x11-themes/gnome-themes-standard: 3.8.4 → 3.10.0

---
 ....ebuild => gnome-themes-standard-3.10.0.ebuild} | 59 ++++++++++------------
 .../gnome-themes-standard-9999.ebuild              | 52 ++++++++++---------
 x11-themes/gnome-themes-standard/metadata.xml      |  5 ++
 3 files changed, 59 insertions(+), 57 deletions(-)

diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-9999.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.10.0.ebuild
similarity index 52%
copy from x11-themes/gnome-themes-standard/gnome-themes-standard-9999.ebuild
copy to x11-themes/gnome-themes-standard/gnome-themes-standard-3.10.0.ebuild
index c532a1a..79491e3 100644
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-9999.ebuild
+++ b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.10.0.ebuild
@@ -1,69 +1,64 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
-DESCRIPTION="Adwaita theme for GNOME Shell"
-HOMEPAGE="http://www.gnome.org/"
+DESCRIPTION="Standard Themes for GNOME Applications"
+HOMEPAGE="https://git.gnome.org/browse/gnome-themes-standard/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gtk"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
-COMMON_DEPEND="gnome-base/librsvg: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[X] )
-	>=x11-themes/gtk-engines-2.15.3:2"
+		>=x11-libs/gtk+-2.24.15:2
+		>=x11-libs/gtk+-3.9.12:3 )
+"
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40
 	sys-devel/gettext
-	virtual/pkgconfig"
+	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}
 	>=gnome-base/gsettings-desktop-schemas-3.4
-	!<x11-themes/gnome-themes-2.32.1-r1"
-
-pkg_setup() {
-	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)"
-}
+	!<x11-themes/gnome-themes-2.32.1-r1
+"
 
 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
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# The icon cache needs to be generated in pkg_postinst()
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable gtk gtk2-engine) \
+		$(use_enable gtk gtk3-engine) \
+		GTK_UPDATE_ICON_CACHE=$(type -P true)
 }
 
 src_install() {
 	gnome2_src_install
 
 	# Make it the default cursor theme
-	cd "${ED}/usr/share/cursors/xorg-x11" || die
-	ln -sfn Adwaita default || die
+	dosym Adwaita /usr/share/cursors/xorg-x11/default
 }

diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-9999.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-9999.ebuild
index c532a1a..aec975a 100644
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-9999.ebuild
+++ b/x11-themes/gnome-themes-standard/gnome-themes-standard-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
@@ -11,8 +11,8 @@ if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
 
-DESCRIPTION="Adwaita theme for GNOME Shell"
-HOMEPAGE="http://www.gnome.org/"
+DESCRIPTION="Standard Themes for GNOME Applications"
+HOMEPAGE="https://git.gnome.org/browse/gnome-themes-standard/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
@@ -20,50 +20,52 @@ IUSE="+gtk"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
 fi
 
-COMMON_DEPEND="gnome-base/librsvg: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[X] )
-	>=x11-themes/gtk-engines-2.15.3:2"
+		>=x11-libs/gtk+-2.24.15:2
+		>=x11-libs/gtk+-3.9.12:3 )
+"
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40
 	sys-devel/gettext
-	virtual/pkgconfig"
+	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}
 	>=gnome-base/gsettings-desktop-schemas-3.4
-	!<x11-themes/gnome-themes-2.32.1-r1"
-
-pkg_setup() {
-	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)"
-}
+	!<x11-themes/gnome-themes-2.32.1-r1
+"
 
 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
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# The icon cache needs to be generated in pkg_postinst()
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable gtk gtk2-engine) \
+		$(use_enable gtk gtk3-engine) \
+		GTK_UPDATE_ICON_CACHE=$(type -P true)
 }
 
 src_install() {
 	gnome2_src_install
 
 	# Make it the default cursor theme
-	cd "${ED}/usr/share/cursors/xorg-x11" || die
-	ln -sfn Adwaita default || die
+	dosym Adwaita /usr/share/cursors/xorg-x11/default
 }

diff --git a/x11-themes/gnome-themes-standard/metadata.xml b/x11-themes/gnome-themes-standard/metadata.xml
new file mode 100644
index 0000000..da6fd63
--- /dev/null
+++ b/x11-themes/gnome-themes-standard/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>