Convert to USE dep and add gnome2_icon_savelist.

(Portage version: 2.1.6.11/cvs/Linux x86_64)

2 files changed, 32 insertions, 47 deletions

diff --git a/x11-themes/tangerine-icon-theme/ChangeLog b/x11-themes/tangerine-icon-theme/ChangeLog
index c4f07d330349..ba0be22f600e 100644
--- a/x11-themes/tangerine-icon-theme/ChangeLog
+++ b/x11-themes/tangerine-icon-theme/ChangeLog
@@ -1,9 +1,10 @@
 # ChangeLog for x11-themes/tangerine-icon-theme
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/tangerine-icon-theme/ChangeLog,v 1.15 2008/11/24 17:30:03 ssuominen Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/tangerine-icon-theme/ChangeLog,v 1.16 2009/04/28 11:05:51 ssuominen Exp $
 
-  24 Nov 2008; <ssuominen@gentoo.org> metadata.xml:
-  Rename my old e-mail drac at gentoo.org to ssuominen at gentoo.org.
+  28 Apr 2009; Samuli Suominen <ssuominen@gentoo.org>
+  tangerine-icon-theme-0.26.ebuild:
+  Convert built_with_use to USE dep.
 
   06 Nov 2007; Raúl Porcel <armin76@gentoo.org>
   -tangerine-icon-theme-0.20.ebuild, -tangerine-icon-theme-0.22.ebuild,
@@ -20,14 +21,14 @@
 
 *tangerine-icon-theme-0.26 (29 Sep 2007)
 
-  29 Sep 2007; Samuli Suominen <drac@gentoo.org>
+  29 Sep 2007; Samuli Suominen <ssuominen@gentoo.org>
   +tangerine-icon-theme-0.26.ebuild:
   Version bump with Gentoo branding fixed wrt #193212, thanks to Pacho Ramos
   for reporting.
 
 *tangerine-icon-theme-0.22 (22 Aug 2007)
 
-  22 Aug 2007; Samuli Suominen <drac@gentoo.org>
+  22 Aug 2007; Samuli Suominen <ssuominen@gentoo.org>
   +tangerine-icon-theme-0.22.ebuild:
   Version bump.
 
@@ -39,17 +40,13 @@
   tangerine-icon-theme-0.20.ebuild:
   x86 stable
 
-  16 Jun 2007; Samuli Suominen <drac@gentoo.org>
-  tangerine-icon-theme-0.20.ebuild:
-  Add missing quotes.
-
   07 Jun 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   tangerine-icon-theme-0.20.ebuild:
   Stable on sparc
 
 *tangerine-icon-theme-0.20 (16 May 2007)
 
-  16 May 2007; Samuli Suominen <drac@gentoo.org>
+  16 May 2007; Samuli Suominen <ssuominen@gentoo.org>
   -tangerine-icon-theme-0.15.ebuild, +tangerine-icon-theme-0.20.ebuild:
   Version bump.
 
@@ -57,10 +54,10 @@
   tangerine-icon-theme-0.15.ebuild:
   Keyworded ~sparc
 
-  11 Mar 2007; Samuli Suominen <drac@gentoo.org>
+  11 Mar 2007; Samuli Suominen <ssuominen@gentoo.org>
   tangerine-icon-theme-0.15.ebuild:
   Use Gentoo logo instead of Ubuntu logo as start-here.svg
-  Bug 170427. Thanks to Pacho Ramos for reporting.
+  Bug 170427, thanks to Pacho Ramos for reporting.
 
   11 Mar 2007; Peter Weller <welp@gentoo.org>
   tangerine-icon-theme-0.15.ebuild:
@@ -68,7 +65,7 @@
 
 *tangerine-icon-theme-0.15 (10 Mar 2007)
 
-  10 Mar 2007; Samuli Suominen <drac@gentoo.org>
+  10 Mar 2007; Samuli Suominen <ssuominen@gentoo.org>
   +tangerine-icon-theme-0.15.ebuild:
   Initial commit.
 
diff --git a/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.ebuild b/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.ebuild
index e166bd0359ad..5de0492b09a1 100644
--- a/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.ebuild
+++ b/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.ebuild,v 1.4 2007/11/06 17:13:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.ebuild,v 1.5 2009/04/28 11:05:51 ssuominen Exp $
 
-inherit autotools eutils gnome2-utils
+EAPI=2
+inherit autotools gnome2-utils
 
 DESCRIPTION="a derivative of the standard Tango theme, using a more orange approach"
 HOMEPAGE="http://packages.ubuntu.com/gutsy/x11/tangerine-icon-theme"
@@ -14,54 +15,41 @@ SLOT="0"
 KEYWORDS="amd64 sparc x86"
 IUSE="png"
 
-RESTRICT="binchecks strip"
-
 RDEPEND=">=x11-misc/icon-naming-utils-0.8.2
-	media-gfx/imagemagick
+	media-gfx/imagemagick[png?]
 	>=gnome-base/librsvg-2.12.3
 	>=x11-themes/gnome-icon-theme-2.18"
 DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.19
-	>=dev-util/intltool-0.33
+	dev-util/pkgconfig
+	dev-util/intltool
 	sys-devel/gettext"
+RESTRICT="binchecks strip"
 
-pkg_setup() {
-	if use png && ! built_with_use media-gfx/imagemagick png; then
-		die "Build media-gfx/imagemagick with USE=png."
-	fi
-}
-
-src_unpack() {
-	unpack ${PN}_${PV}.tar.gz
-	cd "${S}"
-
-	cp "${DISTDIR}"/gentoo-logo.svg scalable/places/start-here.svg
+src_unpack() { unpack ${PN}_${PV}.tar.gz; }
+src_prepare() {
+	cp "${DISTDIR}"/gentoo-logo.svg scalable/places/start-here.svg \
+		|| die "cp failed"
 
 	for res in 16 22 32; do
-		rsvg -w ${res} -h ${res} scalable/places/start-here.svg ${res}x${res}/places/start-here.png
+		rsvg -w ${res} -h ${res} scalable/places/start-here.svg \
+			${res}x${res}/places/start-here.png || die "rsvg failed"
 	done
 
-	intltoolize --force --copy --automake || die "intltoolize failed."
+	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	econf $(use_enable png png-creation) \
 		$(use_enable png icon-framing)
-	emake || die "emake failed."
 }
 
 src_install() {
-	addwrite "/root/.gnome2"
-
-	emake DESTDIR="${D}" install || die "emake install failed."
+	addwrite /root/.gnome2
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog README
 }
 
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }