fix for #11649

4 files changed, 9 insertions, 88 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index e23c48083f7b..0388d7ab8fc0 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.24 2002/12/07 06:38:09 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.25 2002/12/16 13:46:24 vapier Exp $
 
 *imagemagick-5.4.9.1 (05 Nov 2002)
 
+  16 Dec 2002; Mike Frysinger <vapier@gentoo.org> :
+  Added dosed's to remove -I/usr/include from the -config scripts. #11649
+
   07 Dec 2002; Jack Morgan <jmorgan@gentoo.org> imagemagick-5.4.7.4.ebuild,
   imagemagick-5.4.9.1.ebuild, imagemagick-5.4.9.1-r1.ebuild:
   Changed sparc64 to sparc keyword imagemagick-5.4.7.4.ebuild
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-5.4.9.1 b/media-gfx/imagemagick/files/digest-imagemagick-5.4.9.1
deleted file mode 100644
index e2f63d377344..000000000000
--- a/media-gfx/imagemagick/files/digest-imagemagick-5.4.9.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4b256152936893abe2944cf3e50867a7 ImageMagick-5.4.9-1.tar.bz2 3292934
diff --git a/media-gfx/imagemagick/imagemagick-5.4.9.1-r1.ebuild b/media-gfx/imagemagick/imagemagick-5.4.9.1-r1.ebuild
index b1a5fa9edab7..211cb26bcb2e 100644
--- a/media-gfx/imagemagick/imagemagick-5.4.9.1-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-5.4.9.1-r1.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.4.9.1-r1.ebuild,v 1.2 2002/12/07 06:38:09 jmorgan Exp $
-
-IUSE="perl X cups xml2 lcms"
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.4.9.1-r1.ebuild,v 1.3 2002/12/16 13:46:24 vapier Exp $
 
 inherit libtool
 inherit perl-module
@@ -17,6 +15,7 @@ HOMEPAGE="http://www.imagemagick.org/"
 SLOT="0"
 LICENSE="as-is"
 KEYWORDS="~x86 ~ppc ~sparc"
+IUSE="perl X cups xml2 lcms"
 
 DEPEND="media-libs/libpng
 	media-libs/jbigkit
@@ -66,7 +65,6 @@ src_compile() {
 	cd PerlMagick
 	make clean
 	perl-module_src_prep
-	cd ..
 }
 
 src_install() {
@@ -80,4 +78,7 @@ src_install() {
 	perl-module_src_install
 	
 	rm -f ${D}/usr/share/ImageMagick/*.txt
+
+	dosed "s:-I/usr/include ::" /usr/bin/Magick-config
+	dosed "s:-I/usr/include ::" /usr/bin/Magick++-config
 }
diff --git a/media-gfx/imagemagick/imagemagick-5.4.9.1.ebuild b/media-gfx/imagemagick/imagemagick-5.4.9.1.ebuild
deleted file mode 100644
index 8b406218312c..000000000000
--- a/media-gfx/imagemagick/imagemagick-5.4.9.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.4.9.1.ebuild,v 1.4 2002/12/07 06:38:09 jmorgan Exp $
-
-IUSE="perl X cups xml2 lcms"
-
-inherit libtool
-inherit perl-module
-
-MY_PN=ImageMagick
-MY_P=${MY_PN}-${PV%.*}-${PV#*.*.*.}
-S=${WORKDIR}/${MY_PN}-${PV%.*}
-DESCRIPTION="A collection of tools and libraries for many image formats"
-SRC_URI="http://imagemagick.sourceforge.net/http/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.imagemagick.org/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~x86 ~ppc ~sparc"
-
-DEPEND="media-libs/libpng
-	>=sys-apps/bzip2-1
-	>=sys-libs/zlib-1.1.3
-	>=media-libs/freetype-2.0
-	>=media-libs/jpeg-6b
-	>=media-libs/tiff-3.5.5
-	X? ( virtual/x11 
-		>=app-text/dgs-0.5.9.1 )
-	cups?   ( >=app-text/ghostscript-6.50 )
-	lcms? ( >=media-libs/lcms-1.06 )
-	perl? ( >=sys-devel/perl-5 )
-	xml2? ( >=dev-libs/libxml2-2.4.10 )"
-
-src_compile() {
-	elibtoolize
-
-	local myconf=""
-	use perl || myconf="--without-perl"
-	use lcms || myconf="${myconf} --without-lcms"
-	use xml2 || myconf="${myconf} --without-xml"
-	use X    || myconf="${myconf} --with-x=no"
-
-	# Netscape is still used ?  More people should have Mozilla
-	cp configure configure.orig
-	sed -e 's:netscape:mozilla:g' configure.orig > configure
-
-	#patch to allow building by perl
-	patch -p0 < ${FILESDIR}/perlpatch.diff
-
-	econf \
-		--enable-shared \
-		--enable-static \
-		--enable-lzw \
-		--with-ttf \
-		--with-fpx \
-		--without-gslib \
-		--without-hdf \
-		--with-jbig \
-		--with-wmf \
-		--with-threads \
-		${myconf} || die "bad configure"
-	emake || die "compile problem"
-
-	# More perl stuff 
-	cd PerlMagick
-	make clean
-	perl-module_src_prep
-	cd ..
-}
-
-src_install() {
-	myinst="prefix=${D}/usr PREFIX=${D}/usr"
-	myinst="${myinst} MagickSharePath=${D}/usr/share/ImageMagick/"
-	myinst="${myinst} pkgdocdir=${D}/usr/share/doc/${PF}/html"
-	myinst="${myinst} mandir=${D}/usr/share/man"
-	myinst="${myinst} datadir=${D}/usr/share"
-
-	mydoc="*.txt"
-	perl-module_src_install
-	
-	rm -f ${D}/usr/share/ImageMagick/*.txt
-}