Switch to eapi2 so the built_with_use can be replaced by a proper use-depend. Also add DEPEND to RDEPEND as that seems to be missing.

Package-Manager: portage-2.1.6.7/cvs/Linux i686

3 files changed, 21 insertions, 29 deletions

diff --git a/media-plugins/vdr-music/ChangeLog b/media-plugins/vdr-music/ChangeLog
index a48e06d8317a..31b5d035cb12 100644
--- a/media-plugins/vdr-music/ChangeLog
+++ b/media-plugins/vdr-music/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-music
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/ChangeLog,v 1.6 2009/01/13 20:54:17 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/ChangeLog,v 1.7 2009/02/24 00:41:04 zzam Exp $
+
+  24 Feb 2009; Matthias Schwarzott <zzam@gentoo.org> vdr-music-0.2.0.ebuild:
+  Switch to eapi2 so the built_with_use can be replaced by a proper
+  use-depend. Also add DEPEND to RDEPEND as that seems to be missing.
 
   13 Jan 2009; Matthias Schwarzott <zzam@gentoo.org>
   +files/vdr-music-0.2.0-gcc4.3.diff, vdr-music-0.2.0.ebuild:
diff --git a/media-plugins/vdr-music/Manifest b/media-plugins/vdr-music/Manifest
index 6cb58fb8f937..6656e77f2385 100644
--- a/media-plugins/vdr-music/Manifest
+++ b/media-plugins/vdr-music/Manifest
@@ -7,13 +7,13 @@ AUX vdr-music-0.2.0-graphtftcoverfix.diff 7418 RMD160 c38b89db49ce9ed07a8b8a08bd
 AUX vdr-music-0.2.0-lyrics.diff 650 RMD160 8355089f1c70542f894659014c910452dc084310 SHA1 7c0c826806e3f3c29c9bbb6b121f1239e5fa8914 SHA256 854319d92e5d4a6840be922d4c891dbb01813fadb2377236379b75e50fdcf12f
 AUX vdr-music-0.2.0-vdr-1.5.x.diff 742 RMD160 a7719705515819f5c991f85f8bb7bc71d0f2b9fa SHA1 18a0b48224b241d4f8333a5dbf12874df913ff76 SHA256 5db123db44bad1309fd478e1ad46f86d01de02f5f1655d766868f569e0c293c9
 DIST vdr-music-0.2.0.tar.gz 507411 RMD160 131aebca586d26d65d4616c5fa2e58a6fa109d11 SHA1 f1bf23c12580299643194278553cf71b901773f1 SHA256 f01149d0d32cc32dabbf8868f2ef0c45540205a102d69138ccedc57976740b20
-EBUILD vdr-music-0.2.0.ebuild 2844 RMD160 cbe34775fd6bdb23f9ba968d5d1aa610a22f7f33 SHA1 ca1e8b9a5e12203e43664a663a1ed639e672bad6 SHA256 e10e72c165b63c193658879c2e0fece36857bc78373e4c2d55a750f75ee9dafa
-MISC ChangeLog 1336 RMD160 3765b9b15cb6be31834fe2f11c0bde10618a7be5 SHA1 809f62fb296cc5b96be881a9cbf2ec32437ae458 SHA256 09744822dee6008731389178571811900676599ab58d32d03ffe3614c2c400d7
+EBUILD vdr-music-0.2.0.ebuild 2586 RMD160 851a3db10d547c892ed14279a899ffcd7b5d27e6 SHA1 e6b4dab58e49fbe1d868b3373d4c69a53c7f168c SHA256 e4bed6dc98e9dde95577e6f1064d029bce5bce133ce010472fbf3d847e1fdc40
+MISC ChangeLog 1552 RMD160 bb1e87c32305e43e3c644ee48c489a23380050f2 SHA1 755116c0a1e7a254566de9ce87cb87442e865583 SHA256 cc2b6333729908d86b3212e3bbacca5fdc03e47026154962bdcd93d898a12713
 MISC metadata.xml 504 RMD160 325523ec2d5aeb7302a5b75bf11e8186cf46836a SHA1 2ec61cdc0fc73dc183699d23cb88dd3202927be7 SHA256 ba58537a2d75f5bd8d3237d79f2dbb6cfb2e5fb58426a2be4f20961eb3591b37
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkls/38ACgkQt2vP6XvVdOda5ACgq+6sdVGY/V3hYCuTW0WKB4an
-qzkAoNzhZ8skWZdzG9/u3QV1FFrRFuZp
-=lOkI
+iEYEARECAAYFAkmjQiYACgkQt2vP6XvVdOds9QCeOZRKr434qNFRnOidYCGR0zgG
+SzkAoJsgj6MS1bfi68ag1T72Gp5aVNSZ
+=nVAZ
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-music/vdr-music-0.2.0.ebuild b/media-plugins/vdr-music/vdr-music-0.2.0.ebuild
index 6f337ff7c386..3282a4e94cdc 100644
--- a/media-plugins/vdr-music/vdr-music-0.2.0.ebuild
+++ b/media-plugins/vdr-music/vdr-music-0.2.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 2003-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/vdr-music-0.2.0.ebuild,v 1.4 2009/01/13 20:54:17 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/vdr-music-0.2.0.ebuild,v 1.5 2009/02/24 00:41:04 zzam Exp $
+
+EAPI="2"
 
 inherit vdr-plugin
 
@@ -21,35 +23,19 @@ PATCHES=("${FILESDIR}/${P}-gentoo.diff"
 DEPEND=">=media-video/vdr-1.3.30
 	media-libs/libmad
 	media-libs/libid3tag
-	imagemagick? ( media-gfx/imagemagick )
+	imagemagick? ( media-gfx/imagemagick[png] )
 	vorbis? ( media-libs/libvorbis )
 	sndfile? ( media-libs/libsndfile )
 	oss? ( media-libs/alsa-oss )
-	!imagemagick? ( media-libs/imlib2 )"
+	!imagemagick? ( media-libs/imlib2[png] )"
 
-RDEPEND="dev-java/blackdown-jre
+RDEPEND="${DEPEND}
+	dev-java/blackdown-jre
 	media-tv/shoutcast2vdr
 	sys-process/at
 	graphtft? ( >=media-plugins/vdr-graphtft-0.1.5 )"
 
-pkg_setup() {
-
-	use imagemagick && local LIB="media-gfx/imagemagick"
-	use !imagemagick && local LIB="media-libs/imlib2"
-
-		if ! built_with_use $LIB png; then
-			echo
-			eerror "Please recompile $LIB with"
-			eerror "USE=\"png\""
-			die "$LIB need png support"
-		fi
-
-	vdr-plugin_pkg_setup
-}
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
+src_prepare() {
 	use graphtft && epatch "${FILESDIR}/${P}-graphtftcoverfix.diff"
 
 	use !ff-card && sed -i Makefile -e "s:HAVE_FFCARD=1:#HAVE_FFCARD=1:"
@@ -59,6 +45,8 @@ src_unpack() {
 	use oss && sed -i Makefile -e "s:#WITH_OSS_OUTPUT=1:WITH_OSS_OUTPUT=1:"
 	use 4mb-mod && sed -i Makefile -e "s:#HAVE_OSDMOD=1:HAVE_OSDMOD=1:"
 	use debug && sed -i Makefile -e "s:#DBG=1:DBG=1:"
+
+	vdr-plugin_src_prepare
 }
 
 src_install() {