masked r2 addresses bug 8299

5 files changed, 120 insertions, 3 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 04746b41dfe9..62a2c0e4e588 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,8 +1,13 @@
 # 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.17 2002/09/16 01:22:31 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.18 2002/09/24 22:32:54 mcummings Exp $
 
+*imagemagick-5.4.7-r2 (24 Sep 2002)
+  
+  24 Sep 2002; <mcummings@gentoo.org> : addresses bug 8299
+  
 *imagemagick-5.4.7-r1 (15 Sep 2002)
+  
   15 Sep 2002; <mcummings@gentoo.org> : version bump is at Grant's suggestion
   since the last version would install, this makes sure anyone that installed
   it gets the working copy.
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-5.4.7-r2 b/media-gfx/imagemagick/files/digest-imagemagick-5.4.7-r2
new file mode 100644
index 000000000000..693df6a4434d
--- /dev/null
+++ b/media-gfx/imagemagick/files/digest-imagemagick-5.4.7-r2
@@ -0,0 +1 @@
+MD5 2059a2dad90a797cd6bb26734b37bb45 ImageMagick-5.4.7-1.tar.bz2 2897178
diff --git a/media-gfx/imagemagick/files/perlpatch.diff b/media-gfx/imagemagick/files/perlpatch.diff
new file mode 100644
index 000000000000..2bd242f378fd
--- /dev/null
+++ b/media-gfx/imagemagick/files/perlpatch.diff
@@ -0,0 +1,29 @@
+--- Makefile.in	Fri Aug  9 15:02:07 2002
++++ Makefile.in.new	Tue Aug 13 12:36:23 2002
+@@ -683,12 +683,12 @@ perl-sources:
+ 	touch perl-sources
+ 
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER)
+-@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
++#@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
+ 
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE)
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
+-@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	$(MAKE) CC='@CC@' install && \
+-@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	$(MAKE) clean && rm -f  Makefile.old )
++@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	$(MAKE) CC='@CC@' install)
++#@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	$(MAKE) clean && rm -f  Makefile.old )
+ 
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@uninstall-exec-perl: $(PERLMAKEFILE)
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	echo "Uninstall not supported for PerlMagick"
+@@ -715,8 +715,8 @@ perl-sources:
+ @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) -f Makefile.aperl CC='@CC@' test
+ 
+ @WITH_PERL_TRUE@clean-perl: $(PERLMAKEFILE)
+-@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' clean && rm -f Makefile.old PerlMagick
+-@WITH_PERL_TRUE@	rm -f perl-sources
++#@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' clean && rm -f Makefile.old PerlMagick
++#@WITH_PERL_TRUE@	rm -f perl-sources
+ 
+ @WITH_PERL_TRUE@distclean-perl: clean-perl
+ 
diff --git a/media-gfx/imagemagick/imagemagick-5.4.7-r1.ebuild b/media-gfx/imagemagick/imagemagick-5.4.7-r1.ebuild
index de3165383b9c..aca787aa4389 100644
--- a/media-gfx/imagemagick/imagemagick-5.4.7-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-5.4.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.4.7-r1.ebuild,v 1.1 2002/09/16 01:22:32 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.4.7-r1.ebuild,v 1.2 2002/09/24 22:32:54 mcummings Exp $
 
 inherit libtool
 inherit perl-module
@@ -54,7 +54,6 @@ src_compile() {
 		--without-jbig \
 		--without-wmf \
 		--with-threads \
-		--without-perl \
 		${myconf} || die "bad configure"
 
 	emake || die "compile problem"
diff --git a/media-gfx/imagemagick/imagemagick-5.4.7-r2.ebuild b/media-gfx/imagemagick/imagemagick-5.4.7-r2.ebuild
new file mode 100644
index 000000000000..3186498750ee
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-5.4.7-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.4.7-r2.ebuild,v 1.1 2002/09/24 22:32:54 mcummings Exp $
+
+inherit libtool
+inherit perl-module
+
+MY_PN=ImageMagick
+MY_P=${MY_PN}-${PV}-1
+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"
+
+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
+
+}