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

Package-Manager: portage-2.1.2-r9

5 files changed, 147 insertions, 5 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/Manifest b/media-gfx/imagemagick/Manifest
index 9aa009738735..a338c627f485 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -10,19 +10,27 @@ AUX imagemagick-6.3.0.5-no-lMagick.patch 685 RMD160 01693f7d6074391848e2a536d077
 MD5 176b8c8344b81fc7d4e64b5374667223 files/imagemagick-6.3.0.5-no-lMagick.patch 685
 RMD160 01693f7d6074391848e2a536d077044f9adaef59 files/imagemagick-6.3.0.5-no-lMagick.patch 685
 SHA256 09bbaa9ed82ba495392b8f2aad1dd28542f3b1b1d8bc7cf4dd75f936b042ca9a files/imagemagick-6.3.0.5-no-lMagick.patch 685
+AUX imagemagick-6.3.0.5-parallel-build.patch 436 RMD160 68ede460a0aee676fa6f3a0dd7f90235bcf09f6a SHA1 14b19aa92d86be6db4fad68f13530f415c03fbdf SHA256 95958bf107327f7f1d598f4ca9357a2f0bb31464754865e611c4b754e2b72990
+MD5 52e5d5817f8c4815f4cd851f8239ab5f files/imagemagick-6.3.0.5-parallel-build.patch 436
+RMD160 68ede460a0aee676fa6f3a0dd7f90235bcf09f6a files/imagemagick-6.3.0.5-parallel-build.patch 436
+SHA256 95958bf107327f7f1d598f4ca9357a2f0bb31464754865e611c4b754e2b72990 files/imagemagick-6.3.0.5-parallel-build.patch 436
 AUX imagemagick-perl.patch 1864 RMD160 da9d7b2f4f61630f551707ecaffe3c4362c575a0 SHA1 cb52a2281f2fa2930fe948e91619f5a012e2f8a0 SHA256 282b83f713de099eb45af947e6d9eded5f51a51d285ceb5486744c93132e23ad
 MD5 d4ff8f64c60d78f04bac78748164f3fb files/imagemagick-perl.patch 1864
 RMD160 da9d7b2f4f61630f551707ecaffe3c4362c575a0 files/imagemagick-perl.patch 1864
 SHA256 282b83f713de099eb45af947e6d9eded5f51a51d285ceb5486744c93132e23ad files/imagemagick-perl.patch 1864
 DIST ImageMagick-6.3.0-5.tar.bz2 5384739 RMD160 1e1fb1a0d3a782c63fb2f31fe575066fa556621e SHA1 c9f24810d2edc3d04886d32fe69a362c7415e79f SHA256 04a4f6116fab2ab631f3cb42bcdcb5e39e60fa862af5da9decba3eadb5298e30
+EBUILD imagemagick-6.3.0.5-r1.ebuild 2917 RMD160 578779ef200c2bee134a452f5943f8f530d34e0c SHA1 453e9d5f28d70cd9f3725bcf930f0f1eb1fd0181 SHA256 f805ad9ba8cded46a987332f43e003bb93f248e844d7f3de1c6a38601217d589
+MD5 cc0c29c4eeb692f8ef66f4b30b934f32 imagemagick-6.3.0.5-r1.ebuild 2917
+RMD160 578779ef200c2bee134a452f5943f8f530d34e0c imagemagick-6.3.0.5-r1.ebuild 2917
+SHA256 f805ad9ba8cded46a987332f43e003bb93f248e844d7f3de1c6a38601217d589 imagemagick-6.3.0.5-r1.ebuild 2917
 EBUILD imagemagick-6.3.0.5.ebuild 2890 RMD160 ede79f48cc752517730a73af7dc4b9287548a8d8 SHA1 5069c1bacc2bd6589b0a36d20890e40cd63f96b4 SHA256 594fba3e5365719673bca3ca9849eb2aaa8004aa04c5ae5246daaea7e1a157d9
 MD5 8761727e05bec552d35f91356fbec645 imagemagick-6.3.0.5.ebuild 2890
 RMD160 ede79f48cc752517730a73af7dc4b9287548a8d8 imagemagick-6.3.0.5.ebuild 2890
 SHA256 594fba3e5365719673bca3ca9849eb2aaa8004aa04c5ae5246daaea7e1a157d9 imagemagick-6.3.0.5.ebuild 2890
-MISC ChangeLog 32026 RMD160 73d1aa9d7fa19dd062cc9e87ab8a8114f82fb98b SHA1 4952fbd02fd498b848b7afcab0b3fba8a6c6b7ca SHA256 4d0447356894a83f5f13c148b63160b4d91681d18ebc139f52b2dc7038b74380
-MD5 facc023f19f2138cbfffb702630eec1f ChangeLog 32026
-RMD160 73d1aa9d7fa19dd062cc9e87ab8a8114f82fb98b ChangeLog 32026
-SHA256 4d0447356894a83f5f13c148b63160b4d91681d18ebc139f52b2dc7038b74380 ChangeLog 32026
+MISC ChangeLog 32304 RMD160 8bf51e75520b1acf331a515347f59d8d68b0d1d0 SHA1 341b518692feab136ff200f81be84f1cd7f5070f SHA256 4e7b28090e4aa03f1d7fbbc7ccc4c7f401760dc48c53e049a198d52cd18f5e49
+MD5 fabbe80c1852bfadbdddfde0ef9d61d4 ChangeLog 32304
+RMD160 8bf51e75520b1acf331a515347f59d8d68b0d1d0 ChangeLog 32304
+SHA256 4e7b28090e4aa03f1d7fbbc7ccc4c7f401760dc48c53e049a198d52cd18f5e49 ChangeLog 32304
 MISC metadata.xml 224 RMD160 00e125be58c08e634a6053e3d265d2f36aab18ad SHA1 07c66bc3a581bf683765507da34f69623cb94ad8 SHA256 d7920747aa57936d24496c8ee5016502a9acc8108a5b01e8d1b813813d4250b3
 MD5 3dc350be33069338fa083ca16ec11cc8 metadata.xml 224
 RMD160 00e125be58c08e634a6053e3d265d2f36aab18ad metadata.xml 224
@@ -30,3 +38,6 @@ SHA256 d7920747aa57936d24496c8ee5016502a9acc8108a5b01e8d1b813813d4250b3 metadata
 MD5 0d12f992e50e9939892f4d4681d0b4a5 files/digest-imagemagick-6.3.0.5 265
 RMD160 3b12a2962e36cf4831ec9bc578749a2a8d76fc64 files/digest-imagemagick-6.3.0.5 265
 SHA256 8997c64672cad644af5b2a211a8da22f360cf80e561e83182d57bafa71d0287f files/digest-imagemagick-6.3.0.5 265
+MD5 0d12f992e50e9939892f4d4681d0b4a5 files/digest-imagemagick-6.3.0.5-r1 265
+RMD160 3b12a2962e36cf4831ec9bc578749a2a8d76fc64 files/digest-imagemagick-6.3.0.5-r1 265
+SHA256 8997c64672cad644af5b2a211a8da22f360cf80e561e83182d57bafa71d0287f files/digest-imagemagick-6.3.0.5-r1 265
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
+
+}