Convert built_with_use to USE deps.

(Portage version: 2.2_rc63/cvs/Linux x86_64)

2 files changed, 16 insertions, 21 deletions

diff --git a/x11-themes/tango-icon-theme-extras/ChangeLog b/x11-themes/tango-icon-theme-extras/ChangeLog
index bdd70ad761af..2c1476df7bdb 100644
--- a/x11-themes/tango-icon-theme-extras/ChangeLog
+++ b/x11-themes/tango-icon-theme-extras/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-themes/tango-icon-theme-extras
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/tango-icon-theme-extras/ChangeLog,v 1.22 2010/01/06 19:42:30 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/tango-icon-theme-extras/ChangeLog,v 1.23 2010/02/24 14:12:14 ssuominen Exp $
+
+  24 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+  tango-icon-theme-extras-0.1.0-r1.ebuild:
+  Convert built_with_use to USE deps.
 
   06 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   tango-icon-theme-extras-0.1.0-r1.ebuild:
diff --git a/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r1.ebuild b/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r1.ebuild
index 9cc9f1525837..39d9ca5acdeb 100644
--- a/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r1.ebuild
+++ b/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r1.ebuild,v 1.12 2010/01/06 19:42:30 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r1.ebuild,v 1.13 2010/02/24 14:12:14 ssuominen Exp $
 
+EAPI=2
 inherit eutils gnome2-utils
 
-DESCRIPTION="This is an extension to the Tango Icon Theme. It includes Tango icons for iPod Digital Audio Player (DAP) devices and the Dell Pocket DJ DAP."
+DESCRIPTION="Tango icons for iPod Digital Audio Player (DAP) devices and the Dell Pocket DJ DAP."
 HOMEPAGE="http://tango.freedesktop.org"
 SRC_URI="http://tango.freedesktop.org/releases/${P}.tar.gz"
 
@@ -16,33 +17,23 @@ IUSE="png"
 RESTRICT="binchecks strip"
 
 RDEPEND=">=x11-misc/icon-naming-utils-0.6.0
-	media-gfx/imagemagick
 	>=gnome-base/librsvg-2.12.3
 	>=x11-themes/tango-icon-theme-0.8"
 DEPEND="${RDEPEND}
+	media-gfx/imagemagick[png?]
 	dev-util/pkgconfig"
 
-pkg_setup() {
-	if use png && ! built_with_use media-gfx/imagemagick png; then
-		die "Build media-gfx/imagemagick with USE=png."
-	fi
-}
-
-src_compile() {
-	econf $(use_enable png png-creation) \
+src_configure() {
+	econf \
+		$(use_enable png png-creation) \
 		$(use_enable png icon-framing)
-	emake || die "emake failed."
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS 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; }