diff options
| author |   Markus Meier <maekke@gentoo.org> | 2009-06-02 22:24:31 +0000 |
|---|---|---|
| committer | Markus Meier <maekke@gentoo.org> | 2009-06-02 22:24:31 +0000 |
| commit | 63caedb3e6db1fad89e129d2b1dc304031e1f1a2 (patch) | |
| tree | de0718153922a315955d03f2ad6000f38ab91e34 /media-gfx/imagemagick | |
| parent | Stable for HPPA (bug #272285). (diff) | |
| download | historical-63caedb3e6db1fad89e129d2b1dc304031e1f1a2.tar.gz historical-63caedb3e6db1fad89e129d2b1dc304031e1f1a2.tar.bz2 historical-63caedb3e6db1fad89e129d2b1dc304031e1f1a2.zip | |
remove >=sys-devel/gcc-4.3.0[openmp] dep for USE=openmp, as it was before...
Package-Manager: portage-2.2_rc33/cvs/Linux i686
Diffstat (limited to 'media-gfx/imagemagick')
| -rw-r--r-- | media-gfx/imagemagick/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/imagemagick/Manifest | 14 | ||||
| -rw-r--r-- | media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild | 18 |
3 files changed, 32 insertions, 6 deletions
diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog index ca7dcf8c2be2..4c91ef5a5426 100644 --- a/media-gfx/imagemagick/ChangeLog +++ b/media-gfx/imagemagick/ChangeLog @@ -1,6 +1,10 @@ # 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.354 2009/06/02 18:16:52 klausman Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.355 2009/06/02 22:24:31 maekke Exp $ + + 02 Jun 2009; Markus Meier <maekke@gentoo.org> imagemagick-6.5.2.9.ebuild: + remove >=sys-devel/gcc-4.3.0[openmp] dep for USE=openmp, as it was + before... 02 Jun 2009; Tobias Klausmann <klausman@gentoo.org> imagemagick-6.5.2.9.ebuild: diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index 9a47782cb665..84762ccde98f 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -1,8 +1,18 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST ImageMagick-6.5.1-0.tar.bz2 8795149 RMD160 e8f2f5eed7d9131c143d61d94a3738e2ffd58681 SHA1 d712a89dd45fc7e3bb55c66df5c03d2cc0d691d9 SHA256 c19677e8b4cd2322555436392fcf2a60cffac559c4d2aafcf60e6a59bd7fc466 DIST ImageMagick-6.5.2-7.tar.bz2 8805044 RMD160 98e5df115b285438720fd92fdbaa17a5ee1c95c4 SHA1 289084e4091ffcc2bb687a3e193580a585810c19 SHA256 b9f21f2b04df6166dd34cad49335a5d9f83c088feb103f039ea94949b8dc25af DIST ImageMagick-6.5.2-9.tar.bz2 8819668 RMD160 01aa6604339eaee031b06aae27a4074ac36a88e1 SHA1 1eb8cb876742dba833917c30b10bfef215d4f261 SHA256 5bc9958ce4db8d36c6bd92f8e7c95aafc63aeb03694cdf1fdd4b3f3ae953ef4c EBUILD imagemagick-6.5.1.0.ebuild 4697 RMD160 7d96da6ac9844a33b1e86f017e2aafe0875af2c5 SHA1 485b6fcbe660c574a004ba67e963287d489b711f SHA256 2b28d61047693d19877b145502e4abc3a1bc78032fe88df688c06642515919b0 EBUILD imagemagick-6.5.2.7.ebuild 4391 RMD160 c8d5b0b299fa544289f667fb1f013b0d31584ee0 SHA1 a6385e24ad144f38ca6f86f1e4483d737ea7fc0f SHA256 d04c6ad2367064ad6a6a0a972e232c76af59f443629aa68fa68708a6839c4ec0 -EBUILD imagemagick-6.5.2.9.ebuild 4386 RMD160 d0f5d9a4afd0fc811ea960e77b2355bafc91c0eb SHA1 7b7e45904fdd85d1f27e7884250ff83c84d3f555 SHA256 6bdeb448febaa88ff434f71301bbdfb58d1fbf99787f7e3ecefcbfde55e66f91 -MISC ChangeLog 53242 RMD160 f652aafeed73788648bd2cdd940556ca535f3c64 SHA1 c113cde9b9250cac5589ba8326e8ee094517b9a7 SHA256 b5296f2ad0458876c7b370045f868c7b19f91454c630b189932a0eb157ff83b9 +EBUILD imagemagick-6.5.2.9.ebuild 4796 RMD160 fc707aef7b01c0c7d34352f314e3265aa1d55111 SHA1 0c9df1482656a87028f0cc960900fd3e2cfa2dc5 SHA256 fba65fa1007f6f386673fed990675da9daca0170f796b0f09586554ebca86c09 +MISC ChangeLog 53398 RMD160 60e9be7c8911900d69d26854817bbefee90cd185 SHA1 ef36b1427f088d22da6c637c7be771ed1eaf5af8 SHA256 8b37850831bf4741a7654fd19173824a3061b483722bf2abd8135b85a0b2c09d MISC metadata.xml 620 RMD160 facd588ff7e13cf1a573927c5f3e653f384bb4b2 SHA1 e989aa7d14e2a1c7382b5fdf1c395ed7dcf7d6cb SHA256 86955c079d63a4faacc4be59e01a4ce47934fc35f5b89f6accfdb755cd4ff2df +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEARECAAYFAkolpvwACgkQkKaRLQcq0GI8NQCcDjtpMrkWoZeWGwnXvbRiokoc +rb8AnA//cDOLZ1pSgIfmI3diljgErHbM +=eppd +-----END PGP SIGNATURE----- diff --git a/media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild b/media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild index f80acd1e56f9..3fd01598708b 100644 --- a/media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild @@ -1,6 +1,6 @@ # 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.5.2.9.ebuild,v 1.7 2009/06/02 18:16:52 klausman Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild,v 1.8 2009/06/02 22:24:31 maekke Exp $ EAPI="2" @@ -56,7 +56,6 @@ RDEPEND="bzip2? ( app-arch/bzip2 ) DEPEND="${RDEPEND} >=sys-apps/sed-4 - openmp? ( >=sys-devel/gcc-4.3.0[openmp] ) X? ( x11-proto/xextproto )" S="${WORKDIR}/${MY_P2}" @@ -98,6 +97,20 @@ src_configure() { 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 \ @@ -123,7 +136,6 @@ src_configure() { $(use_with jpeg2k jp2) \ $(use_with lcms) \ $(use_with openexr) \ - $(use_enable openmp) \ $(use_with png) \ $(use_with svg rsvg) \ $(use_with tiff) \ |