Moved to usage of tc-has-openmp

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

9 files changed, 31 insertions, 76 deletions

diff --git a/sci-chemistry/cns/ChangeLog b/sci-chemistry/cns/ChangeLog
index ddf3bacbbbc6..f95e00723f9b 100644
--- a/sci-chemistry/cns/ChangeLog
+++ b/sci-chemistry/cns/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/cns
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/ChangeLog,v 1.26 2010/11/17 13:10:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/ChangeLog,v 1.27 2010/11/17 13:14:53 jlec Exp $
+
+  17 Nov 2010; Justin Lecher <jlec@gentoo.org> cns-1.2.1.ebuild,
+  cns-1.2.1-r1.ebuild, cns-1.2.1-r2.ebuild, cns-1.2.1-r3.ebuild,
+  cns-1.2.1-r4.ebuild, cns-1.2.1-r5.ebuild, cns-1.3.ebuild:
+  Moved to usage of tc-has-openmp
 
 *cns-1.3 (17 Nov 2010)
 
diff --git a/sci-chemistry/cns/Manifest b/sci-chemistry/cns/Manifest
index 7da8baa911d8..c733e6e9db7e 100644
--- a/sci-chemistry/cns/Manifest
+++ b/sci-chemistry/cns/Manifest
@@ -24,20 +24,20 @@ DIST cns_solve_1.2_all.tar.gz 30456531 RMD160 45cff57b3f026d730032cfc1c9476880f7
 DIST cns_solve_1.3_all.tar.gz 61208156 RMD160 430e733e05166330b93977e48b72546c4ddabadd SHA1 b708e3006627642279ae571c31d6ec013adaa4c6 SHA256 de5c0be8ab924f5cbd57b1d651fcfea32a76766b7ff4af69556203191b4e40b6
 EBUILD cns-1.1.ebuild 3598 RMD160 c659528cda734552ca1faa9bc85c371b92d90d46 SHA1 e891a1be5f873e869bce5a6b617bbfd54a7aa71d SHA256 2be38322ddc333590c4d891f675921cabb0e18ef795042c1c4a849beb0793f6b
 EBUILD cns-1.2-r1.ebuild 4467 RMD160 cc3f1a26a8c28c111f25b74572dc4af3bb1d56c9 SHA1 f4da145be4190c1837e3262291f75c9eeaa3ef2d SHA256 ac40399a59987612e7602811cb79fdb4ae0295d23222afb6947ad1b79f5a8238
-EBUILD cns-1.2.1-r1.ebuild 5585 RMD160 d25d66002ffe133c390912e265f81aae860134c9 SHA1 239355135deb0213fe9bb9c85c480e3bce86a887 SHA256 9c91c6093b03f28c7c59cd73aa08c32397867fce5bfc28a6f1b5534a92c73ec4
-EBUILD cns-1.2.1-r2.ebuild 6132 RMD160 8dd964fed1d90f708689d6e63e9ec0dc6b9f45cf SHA1 7ebbf35a7e8ec2e2f246389a3fdfcf93e8fb5d87 SHA256 853162df3142ce1a46e05d77b2e50672cda0a41efd25daee1261109d91493aaf
-EBUILD cns-1.2.1-r3.ebuild 6258 RMD160 353ad806f567cc71f4137f75f78743ed38d14fed SHA1 9424d69c95fa65418b6c34b2675dc7827f465b59 SHA256 0ee874568facb4e188d4718f034c8cdb60f1517cdc663996468f5b1f6ad46d4e
-EBUILD cns-1.2.1-r4.ebuild 6582 RMD160 544cf18f4dd459c7d2325da7998fef6db0eebaa3 SHA1 e263f40adcd54c724b341e3b49d79286521fe352 SHA256 192c853f998484cd71a7d6bec6a35071c5846dd74cbc67c6bca7ff08c2a029d1
-EBUILD cns-1.2.1-r5.ebuild 6589 RMD160 0faf1a389e72ef6b75a17930ccc814ec6777926c SHA1 bc14809d78f7bcbbea8dbb31ed5a4c57aa25f93c SHA256 fd257513ef87379d509c7f7ed55ab98dbafbc15d297d0c01cc50e5bb02f8686b
-EBUILD cns-1.2.1.ebuild 5620 RMD160 84fae2bc1f0780f77b931ee23a18acdd7353e766 SHA1 4b58160d9a20c103a7f443491ed5e1d5bade2afe SHA256 8504163c5874f0e90582ef37a44800ec2dbf9b112282682c237236e708ed79cf
+EBUILD cns-1.2.1-r1.ebuild 5327 RMD160 fa2e0f1bc2fdfa4e02d604e2817883807f6b5ea9 SHA1 7f6b1399adc7061ec909ea66dde2dff06cdcb251 SHA256 0af2ce051ee96ac718cdc59f27e5967670dd9cbc8ab5007ce11506ac9e42db36
+EBUILD cns-1.2.1-r2.ebuild 5874 RMD160 bc3683b1198b9d4a5a8cb39cb5ad6ad84723bc5c SHA1 339b1b30453f92226c6dd4572033560924638442 SHA256 e2ba53524d0ba3f88dd53771bbc215b61515a4656709e9e132da324409bcbf70
+EBUILD cns-1.2.1-r3.ebuild 6001 RMD160 3baf38d3eb5d6e10495021c4d16a9ce7a68c6a40 SHA1 f53ff1d9e29ea995333ea020c67c67f860e92543 SHA256 9a1073f0854240fdb1071f6781e9143f8a49bde3e75ed9e5366974d5601927b1
+EBUILD cns-1.2.1-r4.ebuild 6325 RMD160 b5c2274d2444936f7ad9f07c709b49405e130084 SHA1 5e91b608bce9752bb5db19586e3e154b408defc8 SHA256 44846d453de6db002d7bb958300aec2d61cf667d713ac80398493b3ed847f15a
+EBUILD cns-1.2.1-r5.ebuild 6326 RMD160 44c265d926f700ef98d1a64d1745b245c27b1697 SHA1 98d96eb619145f9187f14009a8545ec465eab999 SHA256 4e37f415646bccd74fc135e95cec817d4200db019bad6ca4117ea5bee7b40954
+EBUILD cns-1.2.1.ebuild 5400 RMD160 797c8483bda9853ca2f5311cc2ad4c8ad3b3a08d SHA1 7cc8f6366b6eb6759744a95ad56f4d65b32add02 SHA256 70b971e0f65d2cec08bb10e8f5d81a9c13b727c876b6b8fab0572239b8295078
 EBUILD cns-1.2.ebuild 3497 RMD160 9e097171ebd44f1a7e5dd317beeb6b65aefac2f6 SHA1 3afc4b415d2ef559b717843a05bc6afb8ee651a2 SHA256 1a6094c8bca3797e62c375a2370cc7425e9c1dd1106d20f202681bc5a87da1fc
-EBUILD cns-1.3.ebuild 5763 RMD160 719c446c9efb69ab36e308a8ea1673e22b1c9357 SHA1 e6921f1814aa51b8d6e757700fcba68f7bc2dd4f SHA256 cfa1b1f03c51cb3c0fbe60c7e3f81f2d55be0aed7950e6181b70ce492763efd2
-MISC ChangeLog 4679 RMD160 ce4873d827a347d47ae19a3bf5c51b215cfa2282 SHA1 c990b481eab917d844dba4152e758b47d8edb1ee SHA256 c9d306e158e161e223bdcd6fe26e8fa1399a90577b85e36b8a7343137ee1a291
+EBUILD cns-1.3.ebuild 5506 RMD160 717a6f38c0b12533e1e2e8a12b8dea550aa49faa SHA1 2685b0803f85eb7416a5519d70d2805f9bd4b683 SHA256 f7f2737d5ab41cd5eb03cc071b1515dab7b0b54386fda5a85545ffceb8988b69
+MISC ChangeLog 4904 RMD160 9b1d0ac9947c0132dab51195a2c72f2f67e4dd10 SHA1 01a7b26e75d276c3efb0f1a6574847ae38a861f8 SHA256 e563d0b02d7e410558f07ad5a80428fd7d251bb0a209a004dbb0c96c4d78fab5
 MISC metadata.xml 302 RMD160 d60d9cd875115eaba68ad4b504bff76b39a136b0 SHA1 ecdd8feeea2de489927403f1941acfc582c17222 SHA256 a374144760a8ac1f72b1c625c41f98cee3f74511c964133bda119da580664c50
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzj1DIACgkQgAnW8HDreRYqDgCg0AFLX4y4VGLvqqJc0HBN4+mr
-LY4An3zbhOaZ+Jlxr3v86v28cSFf4ui6
-=35Xe
+iEYEARECAAYFAkzj1V0ACgkQgAnW8HDreRa8BgCgsdk7E2kDOR0e88RTXEinWdbR
+EMMAoM0e5a7dHpWBdJlNlvKzlKB8l1b2
+=5/A7
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/cns/cns-1.2.1-r1.ebuild b/sci-chemistry/cns/cns-1.2.1-r1.ebuild
index 43cb66d7f7b8..8d722bed9e09 100644
--- a/sci-chemistry/cns/cns-1.2.1-r1.ebuild
+++ b/sci-chemistry/cns/cns-1.2.1-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-chemistry/cns/cns-1.2.1-r1.ebuild,v 1.3 2010/06/28 21:05:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r1.ebuild,v 1.4 2010/11/17 13:14:53 jlec Exp $
 
 EAPI="2"
 
@@ -36,14 +36,7 @@ pkg_nofetch() {
 
 pkg_setup() {
 	fortran_pkg_setup
-
-	if [[ $(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 "
-		ewarn "Switch CC to an OpenMP capable compiler"
-	fi
+	tc-has-openmp
 }
 
 src_prepare() {
diff --git a/sci-chemistry/cns/cns-1.2.1-r2.ebuild b/sci-chemistry/cns/cns-1.2.1-r2.ebuild
index 1f255cd6d6c3..6a3dd0f4bdc4 100644
--- a/sci-chemistry/cns/cns-1.2.1-r2.ebuild
+++ b/sci-chemistry/cns/cns-1.2.1-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-chemistry/cns/cns-1.2.1-r2.ebuild,v 1.3 2010/06/28 21:05:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r2.ebuild,v 1.4 2010/11/17 13:14:53 jlec Exp $
 
 EAPI="3"
 
@@ -39,14 +39,7 @@ pkg_nofetch() {
 
 pkg_setup() {
 	fortran_pkg_setup
-
-	if [[ $(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 "
-		ewarn "Switch CC to an OpenMP capable compiler"
-	fi
+	tc-has-openmp
 }
 
 src_prepare() {
diff --git a/sci-chemistry/cns/cns-1.2.1-r3.ebuild b/sci-chemistry/cns/cns-1.2.1-r3.ebuild
index dbaadbaff966..25206633cc7e 100644
--- a/sci-chemistry/cns/cns-1.2.1-r3.ebuild
+++ b/sci-chemistry/cns/cns-1.2.1-r3.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-chemistry/cns/cns-1.2.1-r3.ebuild,v 1.2 2010/06/28 21:05:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r3.ebuild,v 1.3 2010/11/17 13:14:53 jlec Exp $
 
 EAPI="3"
 
@@ -39,14 +39,7 @@ pkg_nofetch() {
 
 pkg_setup() {
 	fortran_pkg_setup
-
-	if [[ $(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 "
-		ewarn "Switch CC to an OpenMP capable compiler"
-	fi
+	tc-has-openmp
 }
 
 src_prepare() {
diff --git a/sci-chemistry/cns/cns-1.2.1-r4.ebuild b/sci-chemistry/cns/cns-1.2.1-r4.ebuild
index e0fcb147b539..1b0cd0580fdd 100644
--- a/sci-chemistry/cns/cns-1.2.1-r4.ebuild
+++ b/sci-chemistry/cns/cns-1.2.1-r4.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-chemistry/cns/cns-1.2.1-r4.ebuild,v 1.2 2010/06/28 21:05:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r4.ebuild,v 1.3 2010/11/17 13:14:53 jlec Exp $
 
 EAPI="3"
 
@@ -39,14 +39,7 @@ pkg_nofetch() {
 
 pkg_setup() {
 	fortran_pkg_setup
-
-	if [[ $(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 "
-		ewarn "Switch CC to an OpenMP capable compiler"
-	fi
+	tc-has-openmp
 }
 
 src_prepare() {
diff --git a/sci-chemistry/cns/cns-1.2.1-r5.ebuild b/sci-chemistry/cns/cns-1.2.1-r5.ebuild
index ba5850280fcc..dba5ac437980 100644
--- a/sci-chemistry/cns/cns-1.2.1-r5.ebuild
+++ b/sci-chemistry/cns/cns-1.2.1-r5.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-chemistry/cns/cns-1.2.1-r5.ebuild,v 1.1 2010/11/16 20:05:49 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r5.ebuild,v 1.2 2010/11/17 13:14:53 jlec Exp $
 
 EAPI="3"
 
@@ -39,14 +39,7 @@ pkg_nofetch() {
 
 pkg_setup() {
 	fortran_pkg_setup
-
-	if [[ $(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 "
-		ewarn "Switch CC to an OpenMP capable compiler"
-	fi
+	tc-has-openmp
 }
 
 src_prepare() {
diff --git a/sci-chemistry/cns/cns-1.2.1.ebuild b/sci-chemistry/cns/cns-1.2.1.ebuild
index 7c0cb33baa01..d1c8c4b27e92 100644
--- a/sci-chemistry/cns/cns-1.2.1.ebuild
+++ b/sci-chemistry/cns/cns-1.2.1.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-chemistry/cns/cns-1.2.1.ebuild,v 1.6 2010/06/28 21:05:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1.ebuild,v 1.7 2010/11/17 13:14:53 jlec Exp $
 
 inherit eutils fortran toolchain-funcs versionator flag-o-matic
 
@@ -32,15 +32,7 @@ pkg_nofetch() {
 
 pkg_setup() {
 	fortran_pkg_setup
-
-	if use openmp; then
-		if [[ gcc-major-version < 4 ]] \
-			|| ( [[ gcc-major-version < 4 ]] && [[ gcc-minor-version < 2 ]] ); then
-			local msg="Sorry, you need gcc 4.2 or newer to use OpenMP."
-			eerror "$msg"
-			die "$msg"
-		fi
-	fi
+	tc-has-openmp
 }
 
 src_unpack() {
diff --git a/sci-chemistry/cns/cns-1.3.ebuild b/sci-chemistry/cns/cns-1.3.ebuild
index 22e5224782de..8b6dd88b00be 100644
--- a/sci-chemistry/cns/cns-1.3.ebuild
+++ b/sci-chemistry/cns/cns-1.3.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-chemistry/cns/cns-1.3.ebuild,v 1.1 2010/11/17 13:10:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.3.ebuild,v 1.2 2010/11/17 13:14:53 jlec Exp $
 
 EAPI="3"
 
@@ -39,14 +39,7 @@ pkg_nofetch() {
 
 pkg_setup() {
 	fortran_pkg_setup
-
-	if [[ $(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 "
-		ewarn "Switch CC to an OpenMP capable compiler"
-	fi
+	tc-has-openmp
 }
 
 src_prepare() {