Closing up bug 121142, patch courtest of Sven - thanks Sven :) PerlMagick now builds cleanly on the first try

(Portage version: 2.1.2_pre1)

4 files changed, 153 insertions, 1 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 5f2ac1079092..c9e7f5033191 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.198 2006/09/15 18:29:14 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.199 2006/09/21 02:22:12 mcummings Exp $
+
+*imagemagick-6.2.9.5-r1 (21 Sep 2006)
+
+  21 Sep 2006; Michael Cummings <mcummings@gentoo.org>
+  +files/imagemagick-perl.patch, +imagemagick-6.2.9.5-r1.ebuild:
+  Closing up bug 121142, patch courtest of Sven - thanks Sven :) PerlMagick
+  now builds cleanly on the first try
 
   15 Sep 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   imagemagick-6.2.9.5.ebuild:
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-6.2.9.5-r1 b/media-gfx/imagemagick/files/digest-imagemagick-6.2.9.5-r1
new file mode 100644
index 000000000000..945ff71d74a2
--- /dev/null
+++ b/media-gfx/imagemagick/files/digest-imagemagick-6.2.9.5-r1
@@ -0,0 +1,3 @@
+MD5 c927f9afcac089e47a166b5c4476a8d8 ImageMagick-6.2.9-5.tar.bz2 5378476
+RMD160 58a199b5af7e62a75471a72885f9c8baed43b248 ImageMagick-6.2.9-5.tar.bz2 5378476
+SHA256 e0f096ec7939ffc9ac5a7750c9cf6eac4854de7dbf9e7bac8ecec9a66da8cc05 ImageMagick-6.2.9-5.tar.bz2 5378476
diff --git a/media-gfx/imagemagick/files/imagemagick-perl.patch b/media-gfx/imagemagick/files/imagemagick-perl.patch
new file mode 100644
index 000000000000..7d87c70268a1
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-perl.patch
@@ -0,0 +1,43 @@
+Index: PerlMagick/Makefile.am

+===================================================================

+--- PerlMagick/Makefile.am	(Revision 4660)

++++ PerlMagick/Makefile.am	(Arbeitskopie)

+@@ -45,11 +45,10 @@

+ 	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)

+ 

+ install-exec-perl: $(PERLMAKEFILE)

+-	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \

+-	$(MAKE) CC='@CC@' install && \

+-	$(MAKE) clean && rm -f  Makefile.old )

++	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install

+ 

+-all-perl:

++all-perl: $(PERLMAKEFILE)

++	cd $(PERLMAGICK) && $(MAKE) CC='@CC@'

+ 

+ uninstall-exec-perl: $(PERLMAKEFILE)

+ 	echo "Uninstall not supported for PerlMagick"

+Index: PerlMagick/Makefile.PL.in

+===================================================================

+--- PerlMagick/Makefile.PL.in	(Revision 4660)

++++ PerlMagick/Makefile.PL.in	(Arbeitskopie)

+@@ -53,16 +53,16 @@

+    'CCFLAGS'     => "$Config{'ccflags'} @CFLAGS@",

+ 

+    # Linker flags for building an executable

+-   'LDFLAGS'    =>  "-L../magick/.libs -L@MAGICKLIBDIR@ $Config{'ldflags'}",

++   'LDFLAGS'    =>  "-L../magick/.libs -lMagick $Config{'ldflags'}",

+ 

+    # Linker flags for building a dynamically loadable module

+-   'LDDLFLAGS'  => "-L../magick/.libs -L@MAGICKLIBDIR@ $Config{'lddlflags'}",

++   'LDDLFLAGS'  => "-L../magick/.libs -lMagick $Config{'lddlflags'}",

+ 

+    # Install PerlMagick binary into ImageMagick bin directory

+    'INSTALLBIN'	=> '@BIN_DIR@',

+ 

+    # Library specification

+-   'LIBS'	=> ['-lMagick @MAGICK_DEP_LIBS@'],

++   'LIBS'	=> [ '-L@MAGICKLIBDIR@ @LDFLAGS@ @MAGICK_DEP_LIBS@' ],

+ 

+    # Perl binary name (if a Perl binary is built)

+    'MAP_TARGET'	=> 'PerlMagick',

diff --git a/media-gfx/imagemagick/imagemagick-6.2.9.5-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.2.9.5-r1.ebuild
new file mode 100644
index 000000000000..5e8c59185453
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.2.9.5-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.9.5-r1.ebuild,v 1.1 2006/09/21 02:22:12 mcummings Exp $
+
+inherit eutils multilib
+
+MY_PN=ImageMagick
+MY_P=${MY_PN}-${PV%.*}
+MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.}
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.imagemagick.org/"
+SRC_URI="mirror://sourceforge/imagemagick/${MY_P2}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="bzip2 doc fpx graphviz gs jbig jpeg jpeg2k lcms mpeg nocxx perl png tiff truetype X wmf xml zlib"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	zlib? ( sys-libs/zlib )
+	media-fonts/corefonts
+	X? (
+		x11-libs/libXext
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+	)
+	gs? ( virtual/ghostscript )
+	lcms? ( >=media-libs/lcms-1.06 )
+	mpeg? ( >=media-video/mpeg2vidcodec-12 )
+	png? ( media-libs/libpng )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	xml? ( >=dev-libs/libxml2-2.4.10 )
+	truetype? ( =media-libs/freetype-2* )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	jbig? ( media-libs/jbigkit )
+	jpeg? ( >=media-libs/jpeg-6b )
+	jpeg2k? ( media-libs/jasper )
+	perl? ( >=dev-lang/perl-5.8.6-r6 !=dev-lang/perl-5.8.7 )
+	!dev-perl/perlmagick
+	!sys-apps/compare
+	graphviz? ( media-gfx/graphviz )
+	fpx? ( media-libs/libfpx )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	>=sys-devel/libtool-1.5.2-r6
+	X? ( x11-proto/xextproto )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	chmod +x config.sub
+	epatch "${FILESDIR}"/${PN}-6.2.5.4-docs.patch
+	epatch "${FILESDIR}"/imagemagick-perl.patch
+}
+
+src_compile() {
+	econf \
+		--with-threads \
+		--with-modules \
+		$(use_with perl) \
+		--with-gs-font-dir=/usr/share/fonts/default/ghostscript \
+		--with-windows-font-dir=/usr/share/fonts/corefonts \
+		$(use_with !nocxx magick-plus-plus) \
+		$(use_with bzip2 bzlib) \
+		$(use_with fpx) \
+		$(use_with gs gslib) \
+		$(use_with graphviz gvc) \
+		$(use_with jbig) \
+		$(use_with jpeg jpeg) \
+		$(use_with jpeg2k jp2) \
+		$(use_with lcms) \
+		$(use_with mpeg mpeg2) \
+		$(use_with png) \
+		$(use_with tiff) \
+		$(use_with truetype ttf) \
+		$(use_with wmf) \
+		$(use_with xml) \
+		$(use_with zlib) \
+		$(use_with X x) \
+		|| die "econf failed"
+	emake || die "compile problem"
+
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dosed "s:-I/usr/include ::" /usr/bin/Magick{,++}-config
+
+	# dont need these files with runtime plugins
+	rm -f "${D}"/usr/$(get_libdir)/*/*/*.{la,a}
+
+	! use doc && rm -r "${D}"/usr/share/doc/${PF}/html
+	dodoc NEWS ChangeLog AUTHORS README.txt QuickStart.txt Install-unix.txt
+
+}