Convert to USE dep and add gnome2_icon_savelist.

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

3 files changed, 34 insertions, 49 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/Manifest b/x11-themes/tangerine-icon-theme/Manifest
index 6a435f7a98ec..4def7ecfdce0 100644
--- a/x11-themes/tangerine-icon-theme/Manifest
+++ b/x11-themes/tangerine-icon-theme/Manifest
@@ -1,5 +1,5 @@
 DIST gentoo-logo.svg 13764 RMD160 62b740f670377486eb1350c4f180d9f0ab63948c SHA1 a81d7fb4be541547be78d648bbeb0d3c51f1a41e SHA256 ad81a212991cd24faaddbc260c806c805fd7a67f65b24655908a8971fa10794e
 DIST tangerine-icon-theme_0.26.tar.gz 1167388 RMD160 0b35f6c60fce6f0228568f0945158579e577da47 SHA1 38602a729a5d760eebbd79a79905a834ba449553 SHA256 ff35de84580b15a472994f6338a50b96e4df3da2ab5c4cb086c7e0a1af82ea5a
-EBUILD tangerine-icon-theme-0.26.ebuild 1726 RMD160 40390efe5d73737e2b1d5b10a0de6844d8c47a30 SHA1 1c4c5cb7a562e4a69a823950d61faed54dbaf2f6 SHA256 64591bcd812bc8eab408605f7d3ed78ab078e3d689a401f7c1a9d8055a5ebbc7
-MISC ChangeLog 2344 RMD160 b3f5188cb6d57b486e141e2daeb4462582ba1eb9 SHA1 36376d42156745d7ddbcd3dba837d9fb7bbd9d7e SHA256 d33d61a5f2fa239e2a38b8c0bb40bcac1708bddf605998ff13b7efd369f4b467
+EBUILD tangerine-icon-theme-0.26.ebuild 1645 RMD160 4f29292d6682bc150482fcd251d3f3b8ffcf9391 SHA1 4430a953ae7f4a72aa176c5e546d5f47e2aa2929 SHA256 f6d9e3e263f7379070167b43b087c44f85b2e39a31073a4d61adbdfd39d1c204
+MISC ChangeLog 2266 RMD160 5edd4d11478ebe71efd6b7635e65423a1ac50b8c SHA1 bff4f2fce7f63accd01a2715256960fd6b439984 SHA256 c11dd43214439f1f9d2a8f758c63cd60ea9d5de0c00633ff874324d5c595b8bc
 MISC metadata.xml 264 RMD160 be1b3b8155d9d6d2702dfb692b7c998f5370278e SHA1 f3c97918bfe923253c41ef9e94cfe99e46052828 SHA256 d824a65accf5dbc00189475b321dd057acbe102afd40c1614b7a38cbcf1eb468
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; }