bump to 6.4.2.0: add openmp USE-flag (bug #223817)

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26-rc7 i686

3 files changed, 155 insertions, 5 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index dd06b3de0adb..2f32b008f081 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.284 2008/05/25 12:38:52 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.285 2008/06/25 22:03:46 maekke Exp $
+
+*imagemagick-6.4.2.0 (25 Jun 2008)
+
+  25 Jun 2008; Markus Meier <maekke@gentoo.org> +imagemagick-6.4.2.0.ebuild:
+  bump to 6.4.2.0: add openmp USE-flag (bug #223817)
 
 *imagemagick-6.4.1.3 (25 May 2008)
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index d24e1c84af8c..65e05865becb 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -16,18 +16,20 @@ DIST ImageMagick-6.3.5-10.tar.bz2 7571418 RMD160 b8436a7a5ada2793177f47621d031c8
 DIST ImageMagick-6.3.8-3.tar.bz2 8792547 RMD160 31e8c34c654f207d8f1a216ed6184530aad8c96d SHA1 6a9ff40bf6f8812216298b2fad79c55d8900479b SHA256 d5df4328a660c94613a9587fd7386e13a00d5c4e115fd86b94205d21bdc33f8b
 DIST ImageMagick-6.4.0-6.tar.bz2 8826474 RMD160 19abac0458df07c5b90a131e3ca011f05104f8f4 SHA1 891128e03ea4d024d77794c91f6a1bcfa855058c SHA256 fa3763f1df89ef9be7416f9cd08f85d02a0240abb3f0bf21122d04e8b87d5bb1
 DIST ImageMagick-6.4.1-3.tar.bz2 8833518 RMD160 066ef3ce270ea5c3fe0b79deab657c6bd8649af8 SHA1 d5769c2c827eff280aa955057dba07bbc0dee401 SHA256 5136ca5fd29fe700546ffff75f4635f8d01917ab0756feefe418984b96c02735
+DIST ImageMagick-6.4.2-0.tar.bz2 8842016 RMD160 a0b074ec66c4d6149b3aa392cf4b0cbc6a6ea35e SHA1 a8fcb4839b124e2a900db6babdc307bf6695b8f1 SHA256 b427d83c223243760b7d9ccb1d926a9ce9a4e38d5eec262a713da7986a80cf91
 EBUILD imagemagick-6.3.3.ebuild 2690 RMD160 78f27e2aea0e06ff092328d4082b6a6d0857270e SHA1 769b0d4df8008cf2992e5d2daa53b67db67af6d9 SHA256 a993f97c6064baf130c3183c60a26de325ab10ba409b5dff0af4203275103822
 EBUILD imagemagick-6.3.4.ebuild 2699 RMD160 ec3ea0cfce3bb848a8bd5663594af3508d3959e9 SHA1 4c41e4cf194da3c3ee3c9c745d8b66cd03064cf1 SHA256 3ace432b149f986a33ec449dbb5f59187190b5d0a22d1192332ed45df3750f36
 EBUILD imagemagick-6.3.5.10.ebuild 3049 RMD160 96173689b9fbe5113923e455bb5f49d821f34329 SHA1 9c0c8606abd5438ccaa9f6945870fc190a98f08d SHA256 02e17636b371ef56b3abefa9553b030c77760d29198840c59df7802e5e5be6aa
 EBUILD imagemagick-6.3.8.3-r1.ebuild 3941 RMD160 39c44253826f6e1ba33be5d9770360fb88199e1e SHA1 1cca98a78ad875454005d6e6c5c391bed6e7cd00 SHA256 4f63862b953a7735edcf7275bcb7f6edb8d79ec6f482d00f26dbc70c2034627a
 EBUILD imagemagick-6.4.0.6.ebuild 3929 RMD160 5568b1e5a0010eb8a2055e6b5db51b1f24de8b84 SHA1 cd172df5243c6512e0ec07727314639a7802a391 SHA256 50b48efb290277279273f0400d7317a3e8797ebeb30d4f122a15777c3bb7c91a
 EBUILD imagemagick-6.4.1.3.ebuild 3930 RMD160 70655d082da3d3329eb60d75b44ddfe39297d31b SHA1 4a11c4fe2d5e0de0b8ff2d9247142e93e9cdc735 SHA256 82ebede6d7aba1a958b0e1f02132cd1372f291d3fd55ff596057c2c6dcb7d524
-MISC ChangeLog 42837 RMD160 f9691b19565a642313609686ece52cec7dec213a SHA1 649906bb465b31d07d0d20c173b7308a366a6cd4 SHA256 9310e53207c16d0560e1786029e2503a0708ce7af004f6fca2d835f60f924642
+EBUILD imagemagick-6.4.2.0.ebuild 3962 RMD160 56eb0c4858a5702b6c2428eff612364777b9178f SHA1 2e781a673f2df934e892f3580ea1545015f1c6ba SHA256 73bf2d13f46ecec5521212778869db94325464b63fb2797d500dbfd860e6a625
+MISC ChangeLog 43004 RMD160 efc87819c25eb0ef4688bfc5874853cb1eee6852 SHA1 a54c3fcad8a4cb811ff5ca5e928bb5ec410bb2c0 SHA256 f16c0bef4dfd151751260178338f0bfbe8d5bf0a1387ef637ccd82eef6af86ba
 MISC metadata.xml 162 RMD160 724f25e8bd2d17056a9f820449e0ddc858f31cce SHA1 620b205b2cddc55f63199267eeb30e9f4c6a817b SHA256 7cccbeab15ef93a962010750e32971ffff1226321adc83df7ff572dea8ff63c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkg5XhEACgkQkKaRLQcq0GKCQwCeLLeRE255JwoWYvG4isumMUQe
-gCwAoKzaWulnZ3BiWGcAWhGxvILv47EJ
-=gmmg
+iEYEARECAAYFAkhiwQgACgkQkKaRLQcq0GIUwwCgp8X7uWIh8qtpQ1LN7sKfd09r
+ddQAnA1HAotzMLwo6QysLfrzwuO/vwps
+=B+47
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.4.2.0.ebuild b/media-gfx/imagemagick/imagemagick-6.4.2.0.ebuild
new file mode 100644
index 000000000000..9b56ceb63a2e
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.4.2.0.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.2.0.ebuild,v 1.1 2008/06/25 22:03:46 maekke 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="imagemagick"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="bzip2 djvu doc fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k lcms nocxx
+	openexr openmp perl png q8 q32 svg tiff truetype X wmf xml zlib"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	djvu? ( app-text/djvu )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( media-libs/libfpx )
+	graphviz? ( >=media-gfx/graphviz-2.6 )
+	gs? ( virtual/ghostscript )
+	jbig? ( media-libs/jbigkit )
+	jpeg? ( >=media-libs/jpeg-6b )
+	jpeg2k? ( media-libs/jasper )
+	lcms? ( >=media-libs/lcms-1.06 )
+	openexr? ( media-libs/openexr )
+	perl? ( >=dev-lang/perl-5.8.6-r6 !=dev-lang/perl-5.8.7 )
+	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 )
+	zlib? ( sys-libs/zlib )
+	X? (
+		x11-libs/libXext
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		svg? ( >=gnome-base/librsvg-2.9.0 )
+	)
+	!dev-perl/perlmagick
+	!sys-apps/compare"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	>=sys-devel/libtool-1.5.2-r6
+	X? ( x11-proto/xextproto )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use djvu && ! built_with_use app-text/djvu threads; then
+		eerror "app-text/djvu has to be built with threads support."
+		die "build app-text/djvu with USE=\"threads\""
+	fi
+	# for now, only build svg support when X is enabled, as librsvg
+	# pulls in quite some X dependencies.
+	if use svg && ! use X ; then
+		elog "the svg USE-flag requires the X USE-flag set."
+		elog "disabling svg support for now."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# fix doc dir, bug 91911
+	sed -i -e \
+		's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/${PF}":g' \
+		"${S}"/configure || die
+
+}
+
+src_compile() {
+	local myconf
+	if use q32 ; then
+		myconf="${myconf} --with-quantum-depth=32"
+	elif use q8 ; then
+		myconf="${myconf} --with-quantum-depth=8"
+	else
+		myconf="${myconf} --with-quantum-depth=16"
+	fi
+
+	if use X && use svg ; then
+		myconf="${myconf} --with-rsvg"
+	else
+		myconf="${myconf} --without-rsvg"
+	fi
+
+	econf \
+		${myconf} \
+		--without-included-ltdl \
+		--with-ltdl-include=/usr/include \
+		--with-ltdl-lib=/usr/$(get_libdir) \
+		--with-threads \
+		--with-modules \
+		$(use_with perl) \
+		--with-gs-font-dir=/usr/share/fonts/default/ghostscript \
+		$(use_enable hdri) \
+		$(use_enable openmp) \
+		$(use_with truetype windows-font-dir /usr/share/fonts/corefonts) \
+		$(use_with !nocxx magick-plus-plus) \
+		$(use_with bzip2 bzlib) \
+		$(use_with djvu) \
+		$(use_with fontconfig) \
+		$(use_with fpx) \
+		$(use_with gs dps) \
+		$(use_with gs gslib) \
+		$(use_with graphviz gvc) \
+		$(use_with jbig) \
+		$(use_with jpeg jpeg) \
+		$(use_with jpeg2k jp2) \
+		$(use_with lcms) \
+		$(use_with png) \
+		$(use_with svg rsvg) \
+		$(use_with tiff) \
+		$(use_with truetype freetype) \
+		$(use_with wmf) \
+		$(use_with xml) \
+		$(use_with zlib) \
+		$(use_with X x) \
+		$(use_with openexr) \
+		|| die "econf failed"
+	emake || die "compile problem"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Installation of files into image failed"
+
+	# dont need these files with runtime plugins
+	rm -f "${D}"/usr/$(get_libdir)/*/*/*.{la,a}
+
+	use doc || rm -r "${D}"/usr/share/doc/${PF}/{www,images,index.html}
+	dodoc NEWS.txt ChangeLog AUTHORS.txt README.txt
+
+	# Fix perllocal.pod file collision
+	use perl && fixlocalpod
+}