QA: Fix broken and inconsistent detection logic wrt utilization of >=sys-devel/gcc-4.3 built with USE="openmp".

(Portage version: 2.1.6.13/cvs/Linux i686)

4 files changed, 45 insertions, 31 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index f3fe0e87db4a..bf90b701563c 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.356 2009/06/04 17:33:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.357 2009/07/23 03:27:00 gengor Exp $
+
+  23 Jul 2009; Gordon Malm <gengor@gentoo.org> imagemagick-6.5.1.0.ebuild,
+  imagemagick-6.5.2.7.ebuild, imagemagick-6.5.2.9.ebuild:
+  QA: Fix broken and inconsistent detection logic wrt utilization of
+  >=sys-devel/gcc-4.3 built with USE="openmp".
 
   04 Jun 2009; Raúl Porcel <armin76@gentoo.org> imagemagick-6.5.2.9.ebuild:
   arm/ia64/s390/sh stable wrt #271502
diff --git a/media-gfx/imagemagick/imagemagick-6.5.1.0.ebuild b/media-gfx/imagemagick/imagemagick-6.5.1.0.ebuild
index 6c216943609e..ecea811188a3 100644
--- a/media-gfx/imagemagick/imagemagick-6.5.1.0.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.5.1.0.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.1.0.ebuild,v 1.9 2009/05/22 14:38:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.5.1.0.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%.*}
@@ -68,12 +68,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
@@ -95,17 +95,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
 
diff --git a/media-gfx/imagemagick/imagemagick-6.5.2.7.ebuild b/media-gfx/imagemagick/imagemagick-6.5.2.7.ebuild
index e59df257253b..45818ee0912f 100644
--- a/media-gfx/imagemagick/imagemagick-6.5.2.7.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.5.2.7.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.7.ebuild,v 1.1 2009/05/24 18:06:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.5.2.7.ebuild,v 1.2 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%.*}
@@ -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}"
@@ -71,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
@@ -98,6 +97,19 @@ src_configure() {
 		myconf="${myconf} --without-rsvg"
 	fi
 
+	# 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 (requires >=sys-devel/gcc-4.3)"
+		myconf="${myconf} --disable-openmp"
+	fi
+
 	use truetype && myconf="${myconf} $(use_with corefonts windows-font-dir /usr/share/fonts/corefonts)"
 
 	econf \
@@ -123,7 +135,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) \
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