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.

(Portage version: 2.1.6.7/cvs/Linux i686)

2 files changed, 15 insertions, 23 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/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() {