fix for new imagemagick include dir struct

Package-Manager: portage-2.1.4.4

4 files changed, 29 insertions, 8 deletions

diff --git a/media-plugins/vdr-skinenigmang/ChangeLog b/media-plugins/vdr-skinenigmang/ChangeLog
index 175c7388c826..276ad3b5342e 100644
--- a/media-plugins/vdr-skinenigmang/ChangeLog
+++ b/media-plugins/vdr-skinenigmang/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-skinenigmang
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinenigmang/ChangeLog,v 1.5 2008/03/09 18:31:09 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinenigmang/ChangeLog,v 1.6 2008/08/04 21:06:32 hd_brummy Exp $
+
+  04 Aug 2008; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/imagemagick-6.4.x.diff, vdr-skinenigmang-0.0.6.ebuild:
+  fix for new imagemagick include dir struct
 
 *vdr-skinenigmang-0.0.6 (09 Mar 2008)
 
diff --git a/media-plugins/vdr-skinenigmang/Manifest b/media-plugins/vdr-skinenigmang/Manifest
index 2ed1758c049a..e11dfdfc2213 100644
--- a/media-plugins/vdr-skinenigmang/Manifest
+++ b/media-plugins/vdr-skinenigmang/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX imagemagick-6.4.x.diff 460 RMD160 19a5f2764a3be46bc7f32dbdb877ba815e560037 SHA1 5d4fe219faa8102b96dedefd871a88809558b62c SHA256 084e57e3fab2b568e6307d8f444cfa2f70a2dc357cdb03058ae60dd24b47be8b
 AUX rc-addon.sh 336 RMD160 821c3d37d0920cfc88449f0751423f357e633de1 SHA1 994dd58c4d2be1edc39cd0faf90ecd7cb8fbf39c SHA256 c9e1ad09ddcb93e47223bb3c4a64827dada84a8d942dbc442aa2b49184cf09fd
 DIST vdr-skinenigmang-0.0.3.tgz 46758 RMD160 5c18f2e62c2052ca89d021a1939c25ae50e2ad79 SHA1 fbd2e2bb12aff8c8296ba6d713751f7982392956 SHA256 a58b21ffefff40af039911e91c2327eafb25d69f863823171576da8ace566084
 DIST vdr-skinenigmang-0.0.4.tgz 53355 RMD160 253bf8f2e6ccf1e8c4c9e62e84d697a3875ff278 SHA1 978aa937cc8683a501952ff1b93fec3de0fc11b2 SHA256 3ec6b967240e42b41b40b9582f0ad20374ba279739762dfe00ae148b5acf5579
@@ -9,13 +10,14 @@ DIST vdr-skinenigmang-0.0.6.tgz 100439 RMD160 e2e0cabd267a01067ca17647eecfbe2a63
 EBUILD vdr-skinenigmang-0.0.3.ebuild 698 RMD160 e32d7aea276005282205f252b49f17baba1c8b10 SHA1 9ba45fbfe1edf2940d4c725a6c05529080b96830 SHA256 b50acec81db33f07a3c29c2ec931cc05957f5267c6721607de10dfbb6bb2728b
 EBUILD vdr-skinenigmang-0.0.4.ebuild 868 RMD160 7c4dde0267de9b476c9e282537734722076cb6fd SHA1 436847f358e2ce005e186318eb2e8619360796eb SHA256 bb4e9df38956a328d6bffc9c2544aaaa4897dcfeb2c424496b92cd80ccc6224f
 EBUILD vdr-skinenigmang-0.0.5.ebuild 873 RMD160 e18c3e1bbbb7bcb6aae0588a2df5938199afb39a SHA1 54ab70ac2cecae0158a3c88f1856bfe332416b38 SHA256 0070989d1148b387c7e3030f88fff29fc41778fe341ad33340a694731bf1bc88
-EBUILD vdr-skinenigmang-0.0.6.ebuild 1068 RMD160 dab5ae41d50af4c056e62ae5dc23d1810e8007ac SHA1 b44d17f644e6d6d204b319126b586984eb962566 SHA256 5082719fabbabbb95c41fda664ddc78da44eb3840bb7efda847d2a8233595148
-MISC ChangeLog 1061 RMD160 b75cb74af79a0dea7502abb621a09bf37116d584 SHA1 2750adfc83be4f802163a3d633c891ed06688169 SHA256 c3b491bebaa1905b056181e8b75ecfa1e043ad4674a29ac1994274d8a37fa3af
+EBUILD vdr-skinenigmang-0.0.6.ebuild 1164 RMD160 de2c01af83c4c4003b29b04fdbf4ae326afbd07d SHA1 83e972e02a6c032783340086f4ee37a9741a3816 SHA256 159023948e6d9996f439a0017411097585d8eca254d303ffda2d6d11e94754c9
+MISC ChangeLog 1231 RMD160 49ec2b3c0c56f1ea31daa7e9d5620d2e09069088 SHA1 e1699dc82b4c61db92ed1d466f42ea9110ff300f SHA256 5c2510efb6397d385ef63d313e929f22423ab5f7c75ffda64062f99fed968236
 MISC metadata.xml 385 RMD160 5402b50a5d2d42b59c9dddde0c7e9bbb1de0995e SHA1 8035b846ec5ffc6a75e2d7fbbed2cac3e9cf0814 SHA256 d33711c20cf70540856eef5e8811923f2455861c84a525ca9b0830117dcfde94
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFH1Cz9t2vP6XvVdOcRAkU4AJ9zqFLOH/mV+6Hp1azGIwRkxmgQXQCg0MTi
-KPC6BLdyCC9ClA+j+Yq2aLA=
-=wHfa
+iD8DBQFIl29odn07HTTCgIoRAv3eAJ9pYrOk90OYBgKcdZ1aIuCzpGTpiACcDZbM
+01p2icrz/d2Y66yS73FuLrE=
+=IUKy
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-skinenigmang/files/imagemagick-6.4.x.diff b/media-plugins/vdr-skinenigmang/files/imagemagick-6.4.x.diff
new file mode 100644
index 000000000000..7eb6a3b77a41
--- /dev/null
+++ b/media-plugins/vdr-skinenigmang/files/imagemagick-6.4.x.diff
@@ -0,0 +1,13 @@
+fix for new imagemagick include dir structur
+Joerg Bornkessel hd_brummy@gentoo.org 2008 Aug 04
+diff -Naur skinenigmang-0.0.6.orig/Makefile skinenigmang-0.0.6/Makefile
+--- skinenigmang-0.0.6.orig/Makefile	2008-08-04 22:39:06.000000000 +0200
++++ skinenigmang-0.0.6/Makefile	2008-08-04 22:39:51.000000000 +0200
+@@ -139,6 +139,7 @@
+ ifdef HAVE_IMAGEMAGICK
+ OBJS += bitmap.o
+ LIBS += -lMagick++
++INCLUDES += -I/usr/include/ImageMagick
+ endif
+ 
+ ifdef HAVE_FREETYPE
diff --git a/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.0.6.ebuild b/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.0.6.ebuild
index 4d445c35aebc..c97c261f49fa 100644
--- a/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.0.6.ebuild
+++ b/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.0.6.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-skinenigmang/vdr-skinenigmang-0.0.6.ebuild,v 1.1 2008/03/09 18:31:09 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.0.6.ebuild,v 1.2 2008/08/04 21:06:32 hd_brummy Exp $
 
 inherit vdr-plugin
 
@@ -31,6 +31,8 @@ src_unpack() {
 	if has_version ">=media-video/vdr-1.5.9"; then
 		sed -i -e 's/.*$(VDRLOCALE).*/ifeq (1,1)/' Makefile
 	fi
+
+	has_version ">=media-gfx/imagemagick-6.4" && epatch "${FILESDIR}/imagemagick-6.4.x.diff"
 }
 
 src_install() {