Commit patches by Sven from bug #155804. Undoing my own previous changes because they made loud sucking noises.

(Portage version: 2.1.2-r9)

4 files changed, 132 insertions, 1 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index aee75f1cc816..876fde26bd9e 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.213 2007/02/15 17:57:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.214 2007/03/06 23:54:10 jer Exp $
+
+*imagemagick-6.3.0.5-r1 (06 Mar 2007)
+
+  06 Mar 2007; Jeroen Roovers <jer@gentoo.org>
+  +files/imagemagick-6.3.0.5-parallel-build.patch,
+  +imagemagick-6.3.0.5-r1.ebuild:
+  Sven's patches from bug #155804. Undoing my own previous changes because of
+  the loud sucking noises.'
 
   15 Feb 2007; Jeroen Roovers <jer@gentoo.org>
   +files/imagemagick-6.3.0.5-no-lMagick.patch, imagemagick-6.3.0.5.ebuild:
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-6.3.0.5-r1 b/media-gfx/imagemagick/files/digest-imagemagick-6.3.0.5-r1
new file mode 100644
index 000000000000..5b5c1d2885d7
--- /dev/null
+++ b/media-gfx/imagemagick/files/digest-imagemagick-6.3.0.5-r1
@@ -0,0 +1,3 @@
+MD5 1c60e1c1600da054f4f10bece3f4ffe7 ImageMagick-6.3.0-5.tar.bz2 5384739
+RMD160 1e1fb1a0d3a782c63fb2f31fe575066fa556621e ImageMagick-6.3.0-5.tar.bz2 5384739
+SHA256 04a4f6116fab2ab631f3cb42bcdcb5e39e60fa862af5da9decba3eadb5298e30 ImageMagick-6.3.0-5.tar.bz2 5384739
diff --git a/media-gfx/imagemagick/files/imagemagick-6.3.0.5-parallel-build.patch b/media-gfx/imagemagick/files/imagemagick-6.3.0.5-parallel-build.patch
new file mode 100644
index 000000000000..e0353b2492e6
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-6.3.0.5-parallel-build.patch
@@ -0,0 +1,12 @@
+--- PerlMagick/Makefile.am.orig	2007-02-28 01:10:33.000000000 +0100
++++ PerlMagick/Makefile.am	2007-02-28 01:12:12.000000000 +0100
+@@ -41,7 +41,8 @@
+ 
+ if WITH_PERL_DYNAMIC
+ 
+-$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER)
++# add LIBMAGICK in deps to fix parallel make issue
++$(PERLMAKEFILE): perl-sources $(LIBMAGICK) $(PERLMAKEMAKER)
+ 	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
+ 
+ install-exec-perl: $(PERLMAKEFILE)
diff --git a/media-gfx/imagemagick/imagemagick-6.3.0.5-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.3.0.5-r1.ebuild
new file mode 100644
index 000000000000..932555ff8543
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.3.0.5-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.3.0.5-r1.ebuild,v 1.1 2007/03/06 23:54:10 jer Exp $
+
+inherit eutils multilib perl-app
+
+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="ftp://ftp.imagemagick.org/pub/${MY_PN}/${MY_P2}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 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 )
+	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* media-fonts/corefonts )
+	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}"
+
+	epatch "${FILESDIR}"/${PN}-6.3.0.5-docs.patch
+
+	# bug #155804:
+	epatch "${FILESDIR}"/${P}-parallel-build.patch
+
+	# from bug #146713, sent upstream
+	epatch "${FILESDIR}"/${P}-configure-windows-fonts.patch
+
+	autoreconf || die "autoreconf failed"
+}
+
+src_compile() {
+	econf \
+		--with-threads \
+		--with-modules \
+		$(use_with perl) \
+		--with-gs-font-dir=/usr/share/fonts/default/ghostscript \
+		$(use_with truetype 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
+
+	# Fix perllocal.pod file collision
+	use perl && fixlocalpod
+
+}