Steal bitness check from dev-libs/nss

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

5 files changed, 69 insertions, 31 deletions

diff --git a/sci-chemistry/cns/ChangeLog b/sci-chemistry/cns/ChangeLog
index 94490d68d0d2..92f606bef454 100644
--- a/sci-chemistry/cns/ChangeLog
+++ b/sci-chemistry/cns/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/cns
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/ChangeLog,v 1.37 2011/05/28 12:09:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/ChangeLog,v 1.38 2011/05/28 12:19:18 jlec Exp $
+
+  28 May 2011; Justin Lecher <jlec@gentoo.org> cns-1.2.1-r5.ebuild,
+  cns-1.2.1-r6.ebuild, cns-1.3_p5.ebuild:
+  Steal bitness check from dev-libs/nss
 
   28 May 2011; Justin Lecher <jlec@gentoo.org> cns-1.2.1-r6.ebuild:
   Removed bad alias definition
diff --git a/sci-chemistry/cns/Manifest b/sci-chemistry/cns/Manifest
index 9e35cdf64ed1..c2d50bb80235 100644
--- a/sci-chemistry/cns/Manifest
+++ b/sci-chemistry/cns/Manifest
@@ -21,16 +21,16 @@ DIST cns_solve_1.21_all-mp.tar.gz 32748040 RMD160 0da9c1858e858474a8798149b7692b
 DIST cns_solve_1.21_all.tar.gz 32739912 RMD160 ab763373923264497d1ccb507cab23b2e1af9826 SHA1 93059805e14f0482cf58755daecc52cf97863215 SHA256 a581c6a0e9e5ffd45f025520959921d7ba91bb5d1e6569f1c81e709bb6f87c81
 DIST cns_solve_1.3_all.tar.gz 61221912 RMD160 6bce0ddeb04651223be46c0d94504d57da2b3e60 SHA1 51d069b8799d574b2d6124474ba8bcd1655f237e SHA256 9f7e38575d101870cf87a23a1bbaac378ed2cf60a9fada71868a10e4cbf6e1e2
 EBUILD cns-1.1.ebuild 3717 RMD160 ae93fd6f7d98f712bfe9a33575d4b9e2ba968474 SHA1 4207e83d89243dfe4ad7de9fbf041580c3280376 SHA256 1ddaf3295413b4b283c8ca5f46a99db13c1cefa465f3fab3440681aa8471e001
-EBUILD cns-1.2.1-r5.ebuild 6531 RMD160 210c79aea82731fadb2d8db38723b38847dbc032 SHA1 1884eef27d91066fa6c20d58d83c82e90dcbccc7 SHA256 9fbaacdc8d2abd7d1a07b440ac4e60539c3a55e361d20f7d244a13cf8105fe87
-EBUILD cns-1.2.1-r6.ebuild 6502 RMD160 f2d2574d9dd9376034f9bfcb539529cdbe1ec693 SHA1 92779875f48abab33a568dc8dd38eb0dc2a40640 SHA256 94fc0410659f74f656528126b8632f7835b69a989b7bcf20938607358e04194a
+EBUILD cns-1.2.1-r5.ebuild 6884 RMD160 a22b41e797f492432b424dbb1fd4e5dd00edff61 SHA1 57b572ceff6c1c573bce14cb27849c39ff44b729 SHA256 06a1e205ad5db822875bcf6e9772fb2439f1ba38a9a99c6bed5f57fa90bb3e59
+EBUILD cns-1.2.1-r6.ebuild 6904 RMD160 0a090c994cfa9e3429a896d107bbe578ab81edaf SHA1 0334b1a72fd8656af431ce18fa5852557665bef6 SHA256 cf6fb7f2e7694618e84edf79749704474abdd61da79faca2763e69866fee8ded
 EBUILD cns-1.2.1.ebuild 5628 RMD160 b38bca164baf5724872290391c26abf8cddf399b SHA1 7e9086664361ac6322202ddc61a9b6135ace5ba3 SHA256 13f1bd0da74882cc55e13a03c3fb2a3c9462800102be7f26af0ea81632415ee4
-EBUILD cns-1.3_p5.ebuild 5787 RMD160 147b61b60712970aee73f64bfcf3361576eb3255 SHA1 859694f279be95201e96af7d2596665cdfc533b5 SHA256 e882076639e54e880688370034231df363c7a0ddd7981b5caf588c041dbb4cce
-MISC ChangeLog 6811 RMD160 2ad4a3712bd95ef76a7fabe3f0e555a2c1297dd3 SHA1 f12b364bd0cc6faf9f18ef1644577083886dba48 SHA256 7519bf07b2759817141ea0dbbbafd5440a31d56fd52c5f19b4d10452eb2f16d0
+EBUILD cns-1.3_p5.ebuild 6140 RMD160 4a9b11a40591511218c1ba939da7dc795eb7df36 SHA1 8e16bed1927a0b8cb21ce86745407e3624cca9ab SHA256 40b794e99a702d7b5984cf0e7f2f2b407aa7b3a8bcb98c53724fad21901ec88f
+MISC ChangeLog 6962 RMD160 9592da93ae1a8b56f148e6ff3dbe52f1754f47e7 SHA1 8df2f5d504124eef09887c6d7b0a6300249fe118 SHA256 14d08a93d48a4990de97de18e6eebc76474e99b279d3810b61c985f5fcfcdc50
 MISC metadata.xml 302 RMD160 d60d9cd875115eaba68ad4b504bff76b39a136b0 SHA1 ecdd8feeea2de489927403f1941acfc582c17222 SHA256 a374144760a8ac1f72b1c625c41f98cee3f74511c964133bda119da580664c50
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3g5gYACgkQgAnW8HDreRZsqgCdEQz8xi3jqFq5olRVWY5WaPxx
-FigAnjSMgqw2zJLIHa4jAWv3W0uh9hPf
-=K4P8
+iEUEARECAAYFAk3g6E0ACgkQgAnW8HDreRZK0QCggX7StkSUlUUq9NAr7erox1Ue
+KQgAlA9llzphAbB+jHE3O+smCZLTU+Y=
+=ANaC
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/cns/cns-1.2.1-r5.ebuild b/sci-chemistry/cns/cns-1.2.1-r5.ebuild
index b06f3930156b..aa45879a4e2c 100644
--- a/sci-chemistry/cns/cns-1.2.1-r5.ebuild
+++ b/sci-chemistry/cns/cns-1.2.1-r5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 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.7 2011/05/11 07:27:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r5.ebuild,v 1.8 2011/05/28 12:19:18 jlec Exp $
 
-EAPI="3"
+EAPI=3
 
 inherit eutils toolchain-funcs versionator flag-o-matic
 
@@ -52,9 +52,22 @@ pkg_setup() {
 	get_fcomp
 }
 
+get_bitness() {
+	echo > "${T}"/test.c
+	$(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o
+	case $(file "${T}"/test.o) in
+		*64-bit*|*ppc64*|*x86_64*) export _bitness="64";;
+		*32-bit*|*ppc*|*i386*) export _bitness="32";;
+		*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
+   esac
+}
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}-gentoo.patch
-	epatch "${FILESDIR}"/${PV}-parallel.patch
+	epatch \
+		"${FILESDIR}"/${PV}-gentoo.patch \
+		"${FILESDIR}"/${PV}-parallel.patch
+
+	get_bitness
 
 	if use aria; then
 	pushd "${WORKDIR}"/aria* >& /dev/null
@@ -72,19 +85,17 @@ src_prepare() {
 		use openmp && \
 			append-flags -fopenmp && append-ldflags -fopenmp
 		COMP="gfortran"
-		use amd64 && \
+		[[ ${_bitness} == 64 ]] && \
 			append-fflags -fdefault-integer-8
 	elif [[ $(tc-getFC) == if* ]]; then
 		epatch "${FILESDIR}"/${PV}-ifort.patch
 		use openmp && \
 			append-flags -openmp && append-ldflags -openmp
 		COMP="ifort"
-		use amd64 && append-fflags -i8
-		append-fflags -Vaxlib
-		append-ldflags -Vaxlib
+		[[ ${_bitness} == 64 ]] && append-fflags -i8
 	fi
 
-	use amd64 && \
+	[[ ${_bitness} == 64 ]] && \
 		append-cflags "-DINTEGER='long long int'"
 
 	# Set up location for the build directory
diff --git a/sci-chemistry/cns/cns-1.2.1-r6.ebuild b/sci-chemistry/cns/cns-1.2.1-r6.ebuild
index e3ffb706245d..b63ea17178c9 100644
--- a/sci-chemistry/cns/cns-1.2.1-r6.ebuild
+++ b/sci-chemistry/cns/cns-1.2.1-r6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 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-r6.ebuild,v 1.3 2011/05/28 12:09:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r6.ebuild,v 1.4 2011/05/28 12:19:18 jlec Exp $
 
-EAPI="3"
+EAPI=3
 
 inherit eutils toolchain-funcs versionator flag-o-matic
 
@@ -52,9 +52,22 @@ pkg_setup() {
 	get_fcomp
 }
 
+get_bitness() {
+	echo > "${T}"/test.c
+	$(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o
+	case $(file "${T}"/test.o) in
+		*64-bit*|*ppc64*|*x86_64*) export _bitness="64";;
+		*32-bit*|*ppc*|*i386*) export _bitness="32";;
+		*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
+   esac
+}
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}-gentoo.patch
-	epatch "${FILESDIR}"/${PV}-parallel.patch
+	epatch \
+		"${FILESDIR}"/${PV}-gentoo.patch \
+		"${FILESDIR}"/${PV}-parallel.patch
+
+	get_bitness
 
 	if use aria; then
 	pushd "${WORKDIR}"/aria* >& /dev/null
@@ -72,17 +85,17 @@ src_prepare() {
 		use openmp && \
 			append-flags -fopenmp && append-ldflags -fopenmp
 		COMP="gfortran"
-		use amd64 && \
+		[[ ${_bitness} == 64 ]] && \
 			append-fflags -fdefault-integer-8
 	elif [[ $(tc-getFC) == if* ]]; then
 		epatch "${FILESDIR}"/${PV}-ifort.patch
 		use openmp && \
 			append-flags -openmp && append-ldflags -openmp
 		COMP="ifort"
-		use amd64 && append-fflags -i8
+		[[ ${_bitness} == 64 ]] && append-fflags -i8
 	fi
 
-	use amd64 && \
+	[[ ${_bitness} == 64 ]] && \
 		append-cflags "-DINTEGER='long long int'"
 
 	# Set up location for the build directory
diff --git a/sci-chemistry/cns/cns-1.3_p5.ebuild b/sci-chemistry/cns/cns-1.3_p5.ebuild
index a2833808dd5f..de5d9f4cbcdd 100644
--- a/sci-chemistry/cns/cns-1.3_p5.ebuild
+++ b/sci-chemistry/cns/cns-1.3_p5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.3_p5.ebuild,v 1.1 2011/02/13 12:09:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.3_p5.ebuild,v 1.2 2011/05/28 12:19:18 jlec Exp $
 
-EAPI="3"
+EAPI=3
 
 inherit eutils toolchain-funcs versionator flag-o-matic
 
@@ -52,11 +52,23 @@ pkg_setup() {
 	get_fcomp
 }
 
+get_bitness() {
+	echo > "${T}"/test.c
+	$(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o
+	case $(file "${T}"/test.o) in
+		*64-bit*|*ppc64*|*x86_64*) export _bitness="64";;
+		*32-bit*|*ppc*|*i386*) export _bitness="32";;
+		*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
+   esac
+}
+
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PV}-gentoo.patch \
 		"${FILESDIR}"/${PV}-delete.patch
 
+	get_bitness
+
 	if use aria; then
 		pushd "${WORKDIR}"/aria* >& /dev/null
 			# Update the cns sources in aria for version 1.2.1
@@ -72,18 +84,16 @@ src_prepare() {
 		use openmp && \
 			append-flags -fopenmp && append-ldflags -fopenmp
 		COMP="gfortran"
-		use amd64 && \
+		[[ ${_bitness} == 64 ]] && \
 			append-fflags -fdefault-integer-8
 	elif [[ $(tc-getFC) == if* ]]; then
 		use openmp && \
 			append-flags -openmp && append-ldflags -openmp
 		COMP="ifort"
-		use amd64 && append-fflags -i8
-		append-fflags -Vaxlib
-		append-ldflags -Vaxlib
+		[[ ${_bitness} == 64 ]] && append-fflags -i8
 	fi
 
-	use amd64 && \
+	[[ ${_bitness} == 64 ]] && \
 		append-cflags "-DINTEGER='long long int'"
 
 	# Set up location for the build directory