Fix compile by removing old include path from Makefile to stop eclass destroying it. Find imagemagick via pkgconfig. Fixed quoting.

Package-Manager: portage-2.1.5_rc6

5 files changed, 56 insertions, 19 deletions

diff --git a/media-plugins/vdr-text2skin/ChangeLog b/media-plugins/vdr-text2skin/ChangeLog
index d72fdbbe7b85..eb1f62509a52 100644
--- a/media-plugins/vdr-text2skin/ChangeLog
+++ b/media-plugins/vdr-text2skin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-text2skin
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/ChangeLog,v 1.2 2007/08/19 12:13:11 zzam Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/ChangeLog,v 1.3 2008/05/06 20:35:14 zzam Exp $
+
+  06 May 2008; Matthias Schwarzott <zzam@gentoo.org>
+  +files/20070506/07_pkgconfig_magick.diff, files/20070506/series,
+  vdr-text2skin-1.0.20070506.ebuild:
+  Fix compile by removing old include path from Makefile to stop eclass
+  destroying it. Find imagemagick via pkgconfig. Fixed quoting.
 
   19 Aug 2007; Matthias Schwarzott <zzam@gentoo.org>
   +files/20070506/05_vdr-1.5.4.diff, +files/20070506/06_vdr-1.5.7.diff,
diff --git a/media-plugins/vdr-text2skin/Manifest b/media-plugins/vdr-text2skin/Manifest
index 4a9807d56ce2..f6b45d083fb4 100644
--- a/media-plugins/vdr-text2skin/Manifest
+++ b/media-plugins/vdr-text2skin/Manifest
@@ -1,11 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 20070506/01_gcc-4.diff 1855 RMD160 0f91d9e4355a0daeb3b2a179816bfcbe0a448c1a SHA1 6a9a7848d5fb424505c16d7a60e91bed7928b95c SHA256 469cd4f775a11da21a23e2799c886f5c6b173a5f9504b4c401559954860f6bc8
 AUX 20070506/02_uint64.diff 794 RMD160 b91687e0ad2e5560d3b0e35bb85bfd0df97bc67c SHA1 e1a6ee8763bb5ff7be0ee08eaabacbbe947e3fa8 SHA256 b3545629d2232fe7daa1c3fa36db344b33942d14ae7583a433c36fbedf04c12c
 AUX 20070506/03_gentoo.diff 434 RMD160 190fb931c9481e6d692a270344b4c995e7aa03b0 SHA1 4fa89190551b6d1435195cccbc31a6ed4dfd415b SHA256 eff41ebe1807f1bbcf8d797d53ae0561d3747b1c0e5f64e8dfa80ac69e8cd63a
 AUX 20070506/04_no_direct_blit.diff 440 RMD160 101738bd5ac6359deb016965d6cf3024e6a2efe2 SHA1 5a5a50ef10b93f3eb43565767f2c0b602fd79f7e SHA256 c4cdabc7e629cf71c8e6cd15dbc548e1997352c75065ad7809b3c0b84fda22b0
 AUX 20070506/05_vdr-1.5.4.diff 1815 RMD160 6caa9d437a25a3ff3131c4af517f142dc4a2a2de SHA1 9c24a0ba573d3a9ef293e7f8d1fa1c226a04b91a SHA256 98c1a1dccf9c6a83b5410a791ed7b6b3a3fb59843359168147f1cf51417341a1
 AUX 20070506/06_vdr-1.5.7.diff 3122 RMD160 9afd5c427501d75aea76edb50280ad447ca1b8b8 SHA1 a904d4f856757df4dc268fe1911bebafc332fdcb SHA256 2033f10e2f5db48b4cca558ac344324930fc15406992383e706f1a13299e0178
-AUX 20070506/series 103 RMD160 9dfa6935af03ec681ab2865732f06b625f5f5c5c SHA1 d2dd914a6f2800b65862afddc9c72c614d4a0217 SHA256 5b90bb703eb4bb6601def782f04a38970a54a6913ffebcf73db0143eb7a519b2
+AUX 20070506/07_pkgconfig_magick.diff 433 RMD160 97d8e084e942d15cd881cc0156e99020bd72f61e SHA1 4212c02e5d0c0c809549e2a4295b8088f93c4ae3 SHA256 0b2f758f5a7b2a93c45f5e56e92f9f6e584985f68a2d2087f7875b7032747b87
+AUX 20070506/series 128 RMD160 9b61168fb205fdba9d997592b81999cd14e1a101 SHA1 f83f19e9c19685c84715a3a65c99e3283ef88047 SHA256 bde28f27721e8aa6c1be7e11afb483312554f0a175a33dfde20884af87e31e83
 DIST text2skin-1.1-cvs_ext-0.10-patched-20070506.tar.bz2 81003 RMD160 536b22e3d61ee9978319dd301b5360f220fc3b3d SHA1 a9efacdd26a03ae39234cb3c7772509802ae7e13 SHA256 e1e6314a14568402e75c9b9fb5a81d76877d22e37c81ff102c380fdaed676d0f
-EBUILD vdr-text2skin-1.0.20070506.ebuild 1421 RMD160 83bf30cae794b171bba7e72ea9f95946dc14893a SHA1 e3f321b5202797636348ebb775053e67c9602a5a SHA256 1785affb299237d6e5fe4b2516d2264d9606866524f8bfe1b08a8763ff4fbb69
-MISC ChangeLog 876 RMD160 9dcd6f68aeaca4a2d7baa7ee42ec7e4494861f81 SHA1 eb05fad9878bebad8baa076d306c174ebd5cb85d SHA256 ac1ff126082e6c41d074b5e3ed2c9b112d9da2eccd6b4238bfd9746de72dd377
+EBUILD vdr-text2skin-1.0.20070506.ebuild 1663 RMD160 88920e0b960b084c1d86728f21612a1ae1ff7bc8 SHA1 dd27413a4b1f3f9259b4b7ac172fedecee55d67f SHA256 b948bb7a3e4bc320f4f1082841e4af04dc8b468396b1d45971479d033a5a0e28
+MISC ChangeLog 1170 RMD160 b467fcd3802fb97be9519f668541109490ce8053 SHA1 99e91ba8b2054bfd8c073be80e29de1a93b80800 SHA256 b2afcf6cd2b45eec320b7d10b2afc98604472b11c5674fd5e43a17b23f28bd7b
 MISC metadata.xml 254 RMD160 f04eaf436b177162c4bc30410e0be18c10aa7eb8 SHA1 0eb18080a9e96806e546958b2f13a3ec24288d21 SHA256 8071ffd41e5c7bd3f22bd02b1bc6b2967a6b53836836ede58a62a99eddea2b9b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkggwQ0ACgkQt2vP6XvVdOdi6ACfYVJ5QPoP2EafP+2pc0h4ywGl
+wlIAnRQzl+Qz3xhV1ZxXhpRYyd/BQ5sr
+=3UnJ
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-text2skin/files/20070506/07_pkgconfig_magick.diff b/media-plugins/vdr-text2skin/files/20070506/07_pkgconfig_magick.diff
new file mode 100644
index 000000000000..0466fe2fc38b
--- /dev/null
+++ b/media-plugins/vdr-text2skin/files/20070506/07_pkgconfig_magick.diff
@@ -0,0 +1,12 @@
+--- text2skin-1.1-cvs_ext-0.10/Makefile.orig	2008-05-06 22:27:03.133654132 +0200
++++ text2skin-1.1-cvs_ext-0.10/Makefile	2008-05-06 22:28:19.793658721 +0200
+@@ -80,7 +80,8 @@
+ 
+ ifdef HAVE_IMAGEMAGICK
+ 	DEFINES += -DHAVE_IMAGEMAGICK
+-	LIBS += -lMagick -lMagick++
++	INCLUDES += $(shell pkg-config --cflags ImageMagick++)
++	LIBS += $(shell pkg-config --libs ImageMagick++)
+ #	LIBS += $(shell Magick++-config --ldflags --libs)
+ endif
+ 
diff --git a/media-plugins/vdr-text2skin/files/20070506/series b/media-plugins/vdr-text2skin/files/20070506/series
index d163a73f63ab..6c4b49da5bda 100644
--- a/media-plugins/vdr-text2skin/files/20070506/series
+++ b/media-plugins/vdr-text2skin/files/20070506/series
@@ -4,3 +4,4 @@
 04_no_direct_blit.diff
 05_vdr-1.5.4.diff
 06_vdr-1.5.7.diff
+07_pkgconfig_magick.diff
diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild
index 8e67634b6915..1c2eb4853121 100644
--- a/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild
+++ b/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild,v 1.4 2007/08/19 12:13:11 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild,v 1.5 2008/05/06 20:35:14 zzam Exp $
 
 inherit vdr-plugin versionator
 
@@ -17,18 +17,22 @@ LICENSE="GPL-2"
 KEYWORDS="~x86"
 IUSE="truetype direct_blit"
 
-DEPEND=">=media-video/vdr-1.3.18
+COMMON_DEPEND=">=media-video/vdr-1.3.18
 	media-gfx/imagemagick
 	truetype? ( media-libs/freetype )
 	!media-plugins/vdr-text2skin-cvs"
 
-PATCHES="
-	${FILESDIR}/${MY_PV}/01_gcc-4.diff
-	${FILESDIR}/${MY_PV}/02_uint64.diff
-	${FILESDIR}/${MY_PV}/03_gentoo.diff
-	${FILESDIR}/${MY_PV}/05_vdr-1.5.4.diff
-	${FILESDIR}/${MY_PV}/06_vdr-1.5.7.diff
-	"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}"
+
+PATCHES=("${FILESDIR}/${MY_PV}/01_gcc-4.diff"
+	"${FILESDIR}/${MY_PV}/02_uint64.diff"
+	"${FILESDIR}/${MY_PV}/03_gentoo.diff"
+	"${FILESDIR}/${MY_PV}/05_vdr-1.5.4.diff"
+	"${FILESDIR}/${MY_PV}/06_vdr-1.5.7.diff"
+	"${FILESDIR}/${MY_PV}/07_pkgconfig_magick.diff")
 
 S="${WORKDIR}/${MY_BASE}"
 
@@ -36,14 +40,17 @@ SKINDIR=/usr/share/vdr/${VDRPLUGIN}
 ETC_SKIN_DIR=/etc/vdr/plugins/${VDRPLUGIN}
 
 src_unpack() {
-	vdr-plugin_src_unpack
+	vdr-plugin_src_unpack unpack
 
 	cd "${S}"
 	use truetype || sed -i Makefile -e 's/^HAVE_FREETYPE/#HAVE_FREETYPE/'
+	sed -i Makefile -e 's:-I\$(DVBDIR)/linux/include::'
 
 	if ! use direct_blit; then
 		epatch "${FILESDIR}/${MY_PV}/04_no_direct_blit.diff"
 	fi
+
+	vdr-plugin_src_unpack all_but_unpack
 }
 
 src_install() {
@@ -52,8 +59,8 @@ src_install() {
 	keepdir "${SKINDIR}"
 
 	exeinto "${SKINDIR}/contrib"
-	doexe ${S}/contrib/skin_to_*.pl
-	doexe ${S}/contrib/transform.pl
+	doexe "${S}"/contrib/skin_to_*.pl
+	doexe "${S}"/contrib/transform.pl
 
-	dodoc ${S}/Docs/*.txt
+	dodoc "${S}"/Docs/*.txt
 }