Minor version bump that improves PerlMagick and OpenMP usage.

Package-Manager: portage-2.2_rc19/cvs/Linux 2.6.28-rc5-00117-g7f0f598 x86_64

3 files changed, 176 insertions, 12 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index c940e51b206e..d258b4dd1ed4 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,12 @@
 # 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.323 2008/12/23 17:49:18 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.324 2008/12/29 04:05:37 robbat2 Exp $
+
+*imagemagick-6.4.5.9 (29 Dec 2008)
+
+  29 Dec 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +imagemagick-6.4.5.9.ebuild:
+  Minor version bump that improves PerlMagick and OpenMP usage.
 
   23 Dec 2008; Markus Meier <maekke@gentoo.org>
   -imagemagick-6.3.5.10.ebuild, -imagemagick-6.4.0.6.ebuild,
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 1598a828e702..2257d58ec3a3 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX imagemagick-6.3.3-docs.patch 605 RMD160 5efee8976d9bab8308fdb7d167ab85f5e9247026 SHA1 5b989f21e4b2295541b64abb86869761b4a41b67 SHA256 e08792995e61887cdbac5b1ab9f31500840d5be6e73164be02e1ad5412bce602
 DIST ImageMagick-6.3.3-8.tar.bz2 5633820 RMD160 fe9ad987909ae1364257de54463ff1f06240f8c8 SHA1 3a8593f0b5e5458647b3bc954e477eb925672f67 SHA256 e2b557f971fa5875647ad4c848025a095eb5784a4296d884ff162212eab8db4e
 DIST ImageMagick-6.3.4-4.tar.bz2 5796376 RMD160 519126459cd80e4c07f23aa21147d579fa4b7789 SHA1 117fd8552961149992c78c045d7de191f7692bb8 SHA256 bcaac2d9d416c055642b4f92b2c8057e5fed4f8d70703e423ad19b3662b096c3
 DIST ImageMagick-6.4.4-6.tar.bz2 8856594 RMD160 e64f485d54118d6c99df392001645da213e2756b SHA1 703b0e5017fcffd4f6dca4f607862e984d8b5d1a SHA256 9c85e5c43adce21588fc0eaa526fa514797d985760cd302b904e27112e01da91
 DIST ImageMagick-6.4.5-7.tar.bz2 8889574 RMD160 e519b19e1d584a62c911b5b1b57641bafcd732b5 SHA1 154ec72e118974f016f513eccf3e7bddd102dbbb SHA256 1e98ed76650263f84a3b827400dbdb1105f5d335c7a2782c5fbd83a971ab48ae
+DIST ImageMagick-6.4.5-9.tar.bz2 8900134 RMD160 f6bacce146442d5c7a961589d778a2ce6123623c SHA1 34496734b15e90e55ccea6ff5e8428d89f2cddb2 SHA256 e98e6ab8196b7bc2942b31429d85110efe05a1dbd695c56dd0a132b24beb35b7
 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.4.4.6.ebuild 4841 RMD160 ece3878f864c1f24cc761b5aa6214730648328b4 SHA1 bc865e676ae04dfa29c51af684328747e70e4b2d SHA256 407de616e02d4ebd92b69d2241f1f7d73dcf8a6b840c8cf3badaef73398ae277
 EBUILD imagemagick-6.4.5.7-r1.ebuild 4656 RMD160 31b12f6e01b10b85e8b28eab363eaf8c780c4065 SHA1 0f91bf46cfc7acee54be70f945b7a6893c095639 SHA256 7f7ae665d7a45616221502ad339f76bcc8c96a2f8ea63c69767a8db9e181ca59
 EBUILD imagemagick-6.4.5.7.ebuild 4864 RMD160 5923058317859725d891fcaf9475a58825e56c22 SHA1 273d140a9f0e7e1b4f24cb70b682b72896a81ca3 SHA256 810ee9f400047d65cd683eca7178f15b5a08279c9ee3362a79c5925e6a863da5
-MISC ChangeLog 48642 RMD160 d4212e6ec276a4425e3f43320ce569980f359253 SHA1 42ff76a3f1df1cfeea78e941b78373256626e9b2 SHA256 fbfa28857a25b2f057b433d670dc26f62477a4469eb1d4ef91dd0bcf9dba5ca3
+EBUILD imagemagick-6.4.5.9.ebuild 4654 RMD160 b94b8476b56f52dd78248f2f79ca943e251c3027 SHA1 e96d95239ed02c9d4fd9d9adb98bc6750d27b056 SHA256 c3975a6d968b845a80261019c2ee77abdca080140483b36130a9a3c6aaa6961f
+MISC ChangeLog 48828 RMD160 baf1d344d7e25e9ddeb4b162a6ec55425874e8b4 SHA1 5b34b0eb804cce3b47ae6c9014edc3a51d630e3e SHA256 07be7e7f05474b43fccb2f20b07c409a1c922bcfa31813abad558161f95a6216
 MISC metadata.xml 620 RMD160 facd588ff7e13cf1a573927c5f3e653f384bb4b2 SHA1 e989aa7d14e2a1c7382b5fdf1c395ed7dcf7d6cb SHA256 86955c079d63a4faacc4be59e01a4ce47934fc35f5b89f6accfdb755cd4ff2df
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklRJO8ACgkQkKaRLQcq0GJl9gCfcIr/togHStmZQx4Rj/Z+zIhW
-8/MAn3FNyVKlTdNMH4dDS+zJ2jST6O/W
-=wsOR
------END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.4.5.9.ebuild b/media-gfx/imagemagick/imagemagick-6.4.5.9.ebuild
new file mode 100644
index 000000000000..b4dd049b5d2c
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.4.5.9.ebuild
@@ -0,0 +1,166 @@
+# 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.5.9.ebuild,v 1.1 2008/12/29 04:05:37 robbat2 Exp $
+
+EAPI="2"
+
+inherit eutils multilib perl-app toolchain-funcs
+
+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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="bzip2 +corefonts djvu doc fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k
+	lcms nocxx openexr openmp perl png q8 q32 raw svg tiff truetype X wmf xml zlib"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	djvu? ( app-text/djvu[threads] )
+	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 )
+	raw? ( media-gfx/ufraw )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	truetype? ( =media-libs/freetype-2*
+		corefonts? ( media-fonts/corefonts ) )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	xml? ( >=dev-libs/libxml2-2.4.10 )
+	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
+	>=sys-devel/libtool-1.5.2-r6"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	X? ( x11-proto/xextproto )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	# 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
+
+	if use corefonts && ! use truetype ; then
+		elog "corefonts USE-flag requires the truetype USE-flag to be set."
+		elog "disabling corefonts support for now"
+	fi
+}
+
+src_prepare() {
+	# 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_configure() {
+	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
+
+	#openmp support only works with >=sys-devel/gcc-4.3
+	# see bug #223825
+	if use openmp && built_with_use --missing false sys-devel/gcc openmp; then
+		if [[ $(gcc-version) != "4.3" ]] ; then
+			ewarn "you need sys-devel/gcc-4.3 to be able to use openmp, disabling."
+			myconf="${myconf} --disable-openmp"
+		else
+			myconf="${myconf} --enable-openmp"
+		fi
+	else
+		elog "disabling openmp support"
+		myconf="${myconf} --disable-openmp"
+	fi
+
+	use truetype && myconf="${myconf} $(use_with corefonts windows-font-dir /usr/share/fonts/corefonts)"
+
+	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_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 openexr) \
+		$(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) \
+		|| die "econf failed"
+}
+
+src_test() {
+	# make check only works after make install,
+	# --> only run if this version is already installed
+	if has_version ~${CATEGORY}/${P} ; then
+		emake -j1 check || die "make check failed"
+	fi
+}
+
+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
+}