version bump, improve >=sys-devel/gcc-4.3 detection

Package-Manager: portage-2.2_rc23/cvs/Linux i686

3 files changed, 185 insertions, 2 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index f7dcf9eda1fb..5caaac0aa2c6 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.329 2009/02/08 16:09:25 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.330 2009/02/08 17:01:41 maekke Exp $
+
+*imagemagick-6.4.9.2 (08 Feb 2009)
+
+  08 Feb 2009; Markus Meier <maekke@gentoo.org> +imagemagick-6.4.9.2.ebuild:
+  version bump, improve >=sys-devel/gcc-4.3 detection
 
   08 Feb 2009; Tobias Klausmann <klausman@gentoo.org>
   imagemagick-6.4.8.3.ebuild:
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 7cf9d97ea01c..122b759f5fb0 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -5,6 +8,7 @@ DIST ImageMagick-6.4.4-6.tar.bz2 8856594 RMD160 e64f485d54118d6c99df392001645da2
 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
 DIST ImageMagick-6.4.8-3.tar.bz2 8880004 RMD160 2ac2842b4b66e70eedaba392f5d43977338792ed SHA1 f0ed8778e928e2d039a9e7817268a930dc803761 SHA256 b1dcebd1a3e98095dd49f887b23fd1990ca6bb456d2776080fb045aef8893e54
+DIST ImageMagick-6.4.9-2.tar.bz2 8894243 RMD160 ed2b6fd062b48fd6e96bdb0b5185f781d877599e SHA1 93d315ec266feca39f286ce6d3e89d54d0130a90 SHA256 5c9bec39f1f690e59669f575decba31d65cf234dc3f04ce9eda99020648fe293
 EBUILD imagemagick-6.3.3.ebuild 2722 RMD160 3cb1bfec6ea49aedf35b26b804ce11b858bc6e64 SHA1 dd9e9482d92e0e5af7fd34814a9340b955faf3c8 SHA256 ac065b03da2154f5e26d6418f4d1b0670b0c13ee3a3b6f4f250baa4f580c5dc9
 EBUILD imagemagick-6.3.4.ebuild 2731 RMD160 ff8305814d13be0d542231c909b4b39134cf2ab4 SHA1 7b4fabefddb827abcbfdfb47c87933c118cafb44 SHA256 ea742826c5e4cc50a05b98c47aee6d8fb0165a91cb5ac3e02c2d15e2f7e54e4c
 EBUILD imagemagick-6.4.4.6.ebuild 4872 RMD160 5bb4b5a29e87f2cb7e85c648e7e4d58021c34b17 SHA1 9efc1444800a9636080ab316b97c8fd5a657ee1e SHA256 d4bc339ff66cd47c71eadd9e9039bdb7bead51655b232494482a373cf9a9578d
@@ -12,5 +16,13 @@ EBUILD imagemagick-6.4.5.7-r1.ebuild 4687 RMD160 2c43ad120c1fe47e320f2eefa3e44ea
 EBUILD imagemagick-6.4.5.7.ebuild 4895 RMD160 f918dea58a6769757a948ef0cda2eb72405d3c13 SHA1 4566c8fdc28f1a51467387ec811fde59061b2b81 SHA256 994070e176db691cc99845294d9008b7bc6f64f4f3a8e0eb32137367c9a6ed70
 EBUILD imagemagick-6.4.5.9.ebuild 4699 RMD160 127a248e02ef6ec7c1ac07931f1d37b36d47a308 SHA1 4d75197fc1389cd86c31123bb650942f3242015e SHA256 283615186efad0f5d1a17296b488f72967d3c62d4816e160302cdc3e000e9552
 EBUILD imagemagick-6.4.8.3.ebuild 4673 RMD160 8b21661daad74c812165d2b3060c7cfe46552ad7 SHA1 98b9e004c645bd97a644c9c96485b43831fe1461 SHA256 1e36b822ba802a2377564be2a7555ffdcb984ebab8533579b9739f10650a4740
-MISC ChangeLog 49828 RMD160 accd94829484c8308bde5a6ac434d5adc6ba21ca SHA1 8e3ebdace78372158586fe1b5b64d60dbc6b9c46 SHA256 343f82ce641243ccd2b31d071c1f4b5a3ccf2b86aef4667bc831d94dc76bad90
+EBUILD imagemagick-6.4.9.2.ebuild 4716 RMD160 4a8553b8a2074956cc0db18f5666c8571c19ccf7 SHA1 731abf9b362c4e40210e7300fd83ec92f0c3ba07 SHA256 e901f98bd86ac99d4476908d9a8f515d3eba1e4eb412ef755405ccd76eb0a0af
+MISC ChangeLog 49994 RMD160 eec9ddf9e2a593df8417c12c2fb2ff820aedae1b SHA1 98fcc089fe89dac421ef7248f8f97e4807b8fa5a SHA256 93a3fe6e0083d22841f1a3393cf63bdd8406154d7af43cbdc2647e11b9100da3
 MISC metadata.xml 620 RMD160 facd588ff7e13cf1a573927c5f3e653f384bb4b2 SHA1 e989aa7d14e2a1c7382b5fdf1c395ed7dcf7d6cb SHA256 86955c079d63a4faacc4be59e01a4ce47934fc35f5b89f6accfdb755cd4ff2df
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmPEEgACgkQkKaRLQcq0GKIawCgnS+wZjvFccmYk/nKznkmmPzK
+duAAoKHwu3M5JUics66M3a4Xf4SYqLaR
+=L63d
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.4.9.2.ebuild b/media-gfx/imagemagick/imagemagick-6.4.9.2.ebuild
new file mode 100644
index 000000000000..f7ad4b8e8655
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.4.9.2.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.9.2.ebuild,v 1.1 2009/02/08 17:01:41 maekke 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="mirror://imagemagick/${MY_P2}.tar.bz2
+		 mirror://imagemagick/legacy/${MY_P2}.tar.bz2"
+
+LICENSE="imagemagick"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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_P2}"
+
+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.2" ]] ; 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 (gcc is not built with 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)
+}
+
+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
+}