Switched to tc-has-openmp and remove built_with_use

Package-Manager: portage-2.2_rc79/cvs/Linux x86_64

5 files changed, 22 insertions, 29 deletions

diff --git a/sci-libs/cctbx/ChangeLog b/sci-libs/cctbx/ChangeLog
index 0df8b98f4c55..5715421c5003 100644
--- a/sci-libs/cctbx/ChangeLog
+++ b/sci-libs/cctbx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/cctbx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.7 2010/09/12 08:44:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.8 2010/09/12 12:26:04 jlec Exp $
+
+  12 Sep 2010; Justin Lecher <jlec@gentoo.org>
+  cctbx-2009.11.01.0123-r1.ebuild, cctbx-2010.03.29.2334-r1.ebuild,
+  cctbx-2010.03.29.2334-r2.ebuild:
+  Switched to tc-has-openmp and remove built_with_use
 
 *cctbx-2010.03.29.2334-r2 (12 Sep 2010)
 
diff --git a/sci-libs/cctbx/Manifest b/sci-libs/cctbx/Manifest
index 19039d4c2b9c..6c11414cf29a 100644
--- a/sci-libs/cctbx/Manifest
+++ b/sci-libs/cctbx/Manifest
@@ -8,15 +8,15 @@ AUX 2010.03.29.2334-soname.patch 5177 RMD160 c6cad498c4edb7046696428008408b126ef
 AUX 2010.03.29.2334-tst_server.py.patch 774 RMD160 12e1115b2ccc0b6b01b365925bf311d29ef08c7a SHA1 09549cc6103f502777acced13a3ed483d713dfc0 SHA256 df058d16d2dc5beaac9f1a1fbf2e640994c7e881d449eb01ac338dadbfb15ac3
 DIST cctbx-2009.11.01.0123.tar.gz 14604079 RMD160 77cc84d4b9e35e7a87f807d8669efb939b2e82ce SHA1 7db71a62786b82f47999919a9411938b123d5b4d SHA256 31e7f79424360f963c6eae528a9d289db4b53c1f7fe4aa9de71201e9d14bc5af
 DIST cctbx-2010.03.29.2334.tar.gz 15570372 RMD160 e543578dbe6568f5f8f80b3ce7a20b10e01193bc SHA1 1442dbd5d1ef3b91e718dce039a24fc1637104d3 SHA256 e1fae804caaf8593c7a3f32e4544046f4c00293063d9099721578cc8fbd17213
-EBUILD cctbx-2009.11.01.0123-r1.ebuild 5840 RMD160 df6c57d186ac192de34afa2bf30be70db60677a1 SHA1 984899e01ffcb2b527e4c1c0126d0afa2ebd8038 SHA256 b2b21d5fb452789edcd35eb3828b94dc9d92e96105a7d0f110f566b6a801e66b
-EBUILD cctbx-2010.03.29.2334-r1.ebuild 5975 RMD160 98b2ba0f894bcb003d21ef5d53b5cf7bd619aa8a SHA1 4537c1c2249af3deee68acaf0417844877f6a8a1 SHA256 01825d4dfe20481cdfc7ca86124b22204b0ac3b553b99d0e8e82da7ee11a38f1
-EBUILD cctbx-2010.03.29.2334-r2.ebuild 5716 RMD160 bf7ef685c685160ca20a7784deec8dce04f4bff9 SHA1 111a47d2c32c20e9574528aabfd85a4347f522be SHA256 27f6719f606704137b9c06f936dde030096c9ed7e04910a12f6a7eb76234af9b
-MISC ChangeLog 1653 RMD160 18ec58552782916fb11f990bc6f8cd85fcd38711 SHA1 7c88d84a24f75fad2ba3369bfe446db94098bcd0 SHA256 2c4b0bd6e4312d978848a4ee419d79c28dcaf579c50f3f82379a2cc2373647dd
+EBUILD cctbx-2009.11.01.0123-r1.ebuild 5728 RMD160 68c9b3bd930b3bedb4a60b5384a1a39fa617e613 SHA1 73c3421e971d094658b4093d0bfa828ed6b63a0b SHA256 1ea973959bc3889f4e552e098a72004197e695fdc2ac3512acdbdf4603fe9b2c
+EBUILD cctbx-2010.03.29.2334-r1.ebuild 5863 RMD160 99543d767b0c6ea49d7e437a43705113b7eeb20f SHA1 e6ec2fd9e31e7be10124d9367d1adc811d5f86e4 SHA256 4d3ee5fb680d9fa807366c68e100d8a3068b06211294990eb2abf8fef1ce46e0
+EBUILD cctbx-2010.03.29.2334-r2.ebuild 5604 RMD160 6423b29fd1d69c6d32fc2dadfd5173d937c47546 SHA1 804186c64519a5b86cb1ee273a27437cf84d6f72 SHA256 b598c6234cbc76e3080eb74109a1fefa1bee3ac7c7b349d79809bda22669c6b7
+MISC ChangeLog 1858 RMD160 4952e87cae003346959c93aa8bf00ec483d6b858 SHA1 74e8e948e67ce3a2bf277591a33de4fa6e636fbc SHA256 bca894643aa67aee0f578462c488cd1792ca281188140b61d75f8045554112ae
 MISC metadata.xml 767 RMD160 c2fc3bcc534e407e6066ee98beb6878d78a0f6e9 SHA1 a653677e160cf0726e1747b06b5d0cd95e51ac5f SHA256 ef36fc1a1d5d657ba67f88b303f08eef5a1a814d22a2091c07616dc16928e3fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyMkwUACgkQgAnW8HDreRaq6wCgyUxQYW5TI91iepTa9VTC7aQK
-7ukAnj9WoeHS+7T1HCnfj5rgm1TclfZ0
-=FMZE
+iEYEARECAAYFAkyMxuEACgkQgAnW8HDreRb6wQCbBoD2gzL03/zSNjSplmBZVDNH
+P00AoMFkJlT8V+hemQzwaTeSu0JOXiEL
+=aX4t
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/cctbx/cctbx-2009.11.01.0123-r1.ebuild b/sci-libs/cctbx/cctbx-2009.11.01.0123-r1.ebuild
index a74437ccd4da..519260f31e40 100644
--- a/sci-libs/cctbx/cctbx-2009.11.01.0123-r1.ebuild
+++ b/sci-libs/cctbx/cctbx-2009.11.01.0123-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2009.11.01.0123-r1.ebuild,v 1.4 2010/06/16 07:03:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2009.11.01.0123-r1.ebuild,v 1.5 2010/09/12 12:26:04 jlec Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -32,12 +32,8 @@ MY_S="${WORKDIR}"/cctbx_sources
 MY_B="${WORKDIR}"/cctbx_build
 
 pkg_setup() {
-	if use openmp &&
-	[[ $(tc-getCC)$ == *gcc* ]] &&
-		( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] ||
-		! built_with_use sys-devel/gcc openmp )
-	then
-		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 "
+	if use openmp && ! tc-has-openmp; then
+		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 and icc"
 		ewarn "If you want to build ${PN} with OpenMP, abort now,"
 		ewarn "and switch CC to an OpenMP capable compiler"
 	fi
diff --git a/sci-libs/cctbx/cctbx-2010.03.29.2334-r1.ebuild b/sci-libs/cctbx/cctbx-2010.03.29.2334-r1.ebuild
index df4d0ca01aba..26792e157934 100644
--- a/sci-libs/cctbx/cctbx-2010.03.29.2334-r1.ebuild
+++ b/sci-libs/cctbx/cctbx-2010.03.29.2334-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r1.ebuild,v 1.1 2010/07/03 07:16:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r1.ebuild,v 1.2 2010/09/12 12:26:04 jlec Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -32,12 +32,8 @@ MY_S="${WORKDIR}"/cctbx_sources
 MY_B="${WORKDIR}"/cctbx_build
 
 pkg_setup() {
-	if use openmp &&
-	[[ $(tc-getCC)$ == *gcc* ]] &&
-		( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] ||
-		! built_with_use sys-devel/gcc openmp )
-	then
-		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 "
+	if use openmp && ! tc-has-openmp; then
+		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 and icc"
 		ewarn "If you want to build ${PN} with OpenMP, abort now,"
 		ewarn "and switch CC to an OpenMP capable compiler"
 	fi
diff --git a/sci-libs/cctbx/cctbx-2010.03.29.2334-r2.ebuild b/sci-libs/cctbx/cctbx-2010.03.29.2334-r2.ebuild
index ebc1b2b4849a..6e6353eff59a 100644
--- a/sci-libs/cctbx/cctbx-2010.03.29.2334-r2.ebuild
+++ b/sci-libs/cctbx/cctbx-2010.03.29.2334-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r2.ebuild,v 1.1 2010/09/12 08:44:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r2.ebuild,v 1.2 2010/09/12 12:26:04 jlec Exp $
 
 EAPI="3"
 
@@ -33,12 +33,8 @@ MY_S="${WORKDIR}"/cctbx_sources
 MY_B="${WORKDIR}"/cctbx_build
 
 pkg_setup() {
-	if use openmp &&
-	[[ $(tc-getCC)$ == *gcc* ]] &&
-		( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] ||
-		! built_with_use sys-devel/gcc openmp )
-	then
-		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 "
+	if use openmp && ! tc-has-openmp; then
+		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 and icc"
 		ewarn "If you want to build ${PN} with OpenMP, abort now,"
 		ewarn "and switch CC to an OpenMP capable compiler"
 	fi