diff options
Diffstat (limited to 'media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild')
| -rw-r--r-- | media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild b/media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild index 6b5bb5b27160..b4976d6f9e79 100644 --- a/media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild @@ -1,10 +1,10 @@ # 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.9 2009/06/04 17:33:42 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild,v 1.10 2009/07/23 03:27:00 gengor Exp $ EAPI="2" -inherit eutils multilib perl-app toolchain-funcs +inherit eutils multilib perl-app toolchain-funcs versionator MY_PN=ImageMagick MY_P=${MY_PN}-${PV%.*} @@ -70,12 +70,12 @@ pkg_setup() { if use corefonts && ! use truetype ; then elog "corefonts USE-flag requires the truetype USE-flag to be set." - elog "disabling corefonts support for now" + elog "disabling corefonts support for now." fi } src_prepare() { - # fix doc dir, bug 91911 + # 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 @@ -97,17 +97,16 @@ 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 + # openmp support only works with >=sys-devel/gcc-4.3, bug #223825 + if use openmp && version_is_at_least 4.3 $(gcc-version) ; then + if built_with_use =sys-devel/gcc-$(gcc-fullversion)* openmp ; then myconf="${myconf} --enable-openmp" + else + elog "disabling openmp support (requires >=sys-devel/gcc-4.3 with USE='openmp')" + myconf="${myconf} --disable-openmp" fi else - elog "disabling openmp support (gcc is not built with openmp support)" + elog "disabling openmp support (requires >=sys-devel/gcc-4.3)" myconf="${myconf} --disable-openmp" fi |