cleanup; added patch to fix missing imagemagick header; thanks also to g.naray on #241618 for reporting this

(Portage version: 2.1.4.5)

4 files changed, 22 insertions, 59 deletions

diff --git a/media-plugins/vdr-mp3ng/ChangeLog b/media-plugins/vdr-mp3ng/ChangeLog
index 47d4855a08cb..ad365b262811 100644
--- a/media-plugins/vdr-mp3ng/ChangeLog
+++ b/media-plugins/vdr-mp3ng/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-mp3ng
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/ChangeLog,v 1.13 2008/04/29 11:37:34 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/ChangeLog,v 1.14 2008/10/25 11:18:13 hd_brummy Exp $
+
+  25 Oct 2008; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/imagemagick-6.4.x.diff, -vdr-mp3ng-0.0.1_pre3.ebuild,
+  vdr-mp3ng-0.0.1_pre4.ebuild:
+  cleanup; added patch to fix missing imagemagick header; thanks also to
+  g.naray on #241618 for reporting this
 
   29 Apr 2008; Matthias Schwarzott <zzam@gentoo.org>
   vdr-mp3ng-0.0.1_pre3.ebuild, vdr-mp3ng-0.0.1_pre4.ebuild:
diff --git a/media-plugins/vdr-mp3ng/files/imagemagick-6.4.x.diff b/media-plugins/vdr-mp3ng/files/imagemagick-6.4.x.diff
new file mode 100644
index 000000000000..98b9270537ef
--- /dev/null
+++ b/media-plugins/vdr-mp3ng/files/imagemagick-6.4.x.diff
@@ -0,0 +1,13 @@
+diff -Naur mp3ng-0.9.13-MKIV-pre3.orig/Makefile mp3ng-0.9.13-MKIV-pre3/Makefile
+--- mp3ng-0.9.13-MKIV-pre3.orig/Makefile	2008-10-25 12:43:59.000000000 +0200
++++ mp3ng-0.9.13-MKIV-pre3/Makefile	2008-10-25 12:44:59.000000000 +0200
+@@ -122,7 +122,8 @@
+ 
+ ifdef HAVE_MAGICK
+   DEFINES += -DHAVE_MAGICK
+-  LIBS += -lMagick -lMagick++
++  LIBS += -lMagickWand -lMagickCore -lMagick++
++  INCLUDES += -I/usr/include/ImageMagick
+ endif
+ 
+ ifdef HAVE_XPM
diff --git a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre3.ebuild b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre3.ebuild
deleted file mode 100644
index 4ef732dd66c3..000000000000
--- a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre3.ebuild,v 1.5 2008/04/29 11:37:34 zzam Exp $
-
-inherit vdr-plugin eutils
-
-MY_PV=0.9.13-MKIV-pre3
-MY_P=${PN}-${MY_PV}
-
-S=${WORKDIR}/mp3ng-0.9.13-MKIV-pre3
-
-DESCRIPTION="Plugin to play mp3 and ogg on VDR"
-HOMEPAGE="http://www.glaserei-franz.de/VDR/Moronimo2/vdrplugins.htm"
-SRC_URI="http://www.glaserei-franz.de/VDR/Moronimo2/downloads/${MY_P}.tar.gz
-		mirror://gentoo/${PN}-pictures-0.0.1.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~amd64"
-IUSE="vorbis oss imagemagick"
-
-DEPEND=">=media-video/vdr-1.2.6
-		media-libs/libmad
-		media-libs/libid3tag
-		sys-libs/zlib
-		media-libs/libsndfile
-		vorbis? ( media-libs/libvorbis )
-		imagemagick? ( media-gfx/imagemagick )
-		!imagemagick? ( media-libs/imlib2 )"
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	epatch "${FILESDIR}/${P}-gentoo.diff"
-	epatch "${FILESDIR}/${P}-gcc4.diff"
-
-	use !vorbis && sed -i "s:#WITHOUT_LIBVORBISFILE:WITHOUT_LIBVORBISFILE:" Makefile
-	use oss && sed -i "s:#WITH_OSS_OUTPUT:WITH_OSS_OUTPUT:" Makefile
-	use imagemagick && sed -i Makefile -e "s:HAVE_IMLIB2:#HAVE_IMLIB2:" \
-		-e "s:#HAVE_MAGICK:HAVE_MAGICK:"
-
-	has_version ">=media-video/vdr-1.3.37" && epatch "${FILESDIR}/${P}-1.3.37.diff"
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto /etc/vdr/plugins/mp3ng
-	doins	"${FILESDIR}/mp3ngsources"
-
-	insinto /usr/share/vdr/mp3ng
-	doins "${WORKDIR}/${PN}-pictures-0.0.1"/*.jpg
-
-	newbin examples/mount.sh.example mount-mp3ng.sh
-
-	dodoc HISTORY MANUAL README README-MORONIMO examples/network.sh.example
-}
diff --git a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre4.ebuild b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre4.ebuild
index 92d1c88c55b2..63092a3248db 100644
--- a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre4.ebuild
+++ b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre4.ebuild,v 1.5 2008/04/29 11:37:34 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre4.ebuild,v 1.6 2008/10/25 11:18:13 hd_brummy Exp $
 
 inherit vdr-plugin eutils
 
@@ -43,6 +43,7 @@ src_unpack() {
 		-e "s:#HAVE_MAGICK:HAVE_MAGICK:"
 
 	has_version ">=media-video/vdr-1.3.37" && epatch "${FILESDIR}/${P}-1.3.37.diff"
+	has_version ">=media-gfx/imagemagick-6.4" && epatch "${FILESDIR}/imagemagick-6.4.x.diff"
 }
 
 src_install() {