sci-libs/gsl: Move compiler specific checks into src_prepare to macke the package binary friendly, #463724

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

4 files changed, 17 insertions, 14 deletions

diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog
index 2dacb6a7b51c..ec1cec542e00 100644
--- a/sci-libs/gsl/ChangeLog
+++ b/sci-libs/gsl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/gsl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.84 2013/02/21 21:36:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.85 2013/03/29 12:17:43 jlec Exp $
+
+  29 Mar 2013; Justin Lecher <jlec@gentoo.org> gsl-1.14-r1.ebuild,
+  gsl-1.15.ebuild:
+  Move compiler specific checks into src_prepare to macke the package binary
+  friendly, #463724
 
   21 Feb 2013; Justin Lecher <jlec@gentoo.org> -gsl-1.13-r1.ebuild,
   -gsl-1.13-r2.ebuild, gsl-1.14.ebuild, gsl-1.14-r1.ebuild, gsl-1.15.ebuild,
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index 3be61c9f430e..2fe097b7bb51 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -9,15 +9,15 @@ AUX gsl-1.14-cblas.patch 17218 SHA256 82b88b7a8cbe6f1020a7474726e92b7ce1ec152ad7
 AUX gsl-1.15-cblas.patch 17217 SHA256 1d69dd2d1b37abd541b86fed2b28e9f63e947f92f1b85af1c2f83074b12a8491 SHA512 fd099610b612b44a8b8ab8efd6350894fe7df46c94cf20e9d4377360c4cc31b11a8d9e18f6db6db9d8f4b7098b1d1569167ddb29e30396c656e381d25c1ec852 WHIRLPOOL 4794cfb018f50e59e11eb60bf11d348a7131360d757868aa9f08e75f432ee786d82143cdb3743ce3a526649cc2877b45dbe14eb49464cea9f23add0db87638b5
 DIST gsl-1.14.tar.gz 3128269 SHA256 3d4a47afd9a1e7c73b97791b4180d8cc4d5f0e5db6027fe06437f1f3f957fafb
 DIST gsl-1.15.tar.gz 3281134 SHA256 85b907e57902e2b7606ef3aef960302ffdd13bd9dc5b8fcbfa75e4f0bf340ea3 SHA512 dcea557bcd34d4ee6d2c52741c2f95702e5e6110a99f033b412489b1930d21a40ead29392f754656375801d706df01199878263e856ca3081f9a514dc3299185 WHIRLPOOL 06ffffb83ea56cf6306878063770a117e096352dda3c3dd4a7526153bc770969f61e38fa08c02ec01335bd812581db15e4e5164a7da2363741179268cb393478
-EBUILD gsl-1.14-r1.ebuild 3119 SHA256 e5e7f0e896a372bb67c4962940e81a1b842849c47ec3647d8f879d8503e1e365 SHA512 d318bf16e893209e2fd36a584e0a37ffd40d6e613533fa3569197be0da91761bdb6388aff78fe1ef5aad86c04ae76e54b758f1c8b8a43fb7c84f9c546b9c1990 WHIRLPOOL 76e7a90769b8d1342499d4e3d537ee20551d3e4417bcb34997e6efb05a035d7b6c36dc6cb2e1ccc8239a0c233f66a065d3fead7216b7e3df00f0b88c82f04e34
+EBUILD gsl-1.14-r1.ebuild 3119 SHA256 13e5512a1cd3f235efe9cd092b087fe4714a19e27f606d59c8bc737e0fd20d2a SHA512 c4ed226aa8907a750cdf3384a124db67db084fcc5025cd0cf20fe5a5d2e338ce5f6c75d7aea3e3baa7fb205692d78faa3e8045683bafe2f30bd2c8cb12107da7 WHIRLPOOL c54d9ff3c959f119d23a20e477bcc2c973302ca2977286c1d693ebb6087614a8fde5105f369ab69f4f29e3729e7eda6072a57d546c1e12efe58341f6cacf62de
 EBUILD gsl-1.14.ebuild 2865 SHA256 3b25d58fd023dc99a790e243e648c4e9cfac466d86429fd400c9e139a3fcd3f6 SHA512 6de22c0b20b987de529aaaaedde6bcb40742fd7e3f31122a92614d2674f91ee994af061d9240bef4ffce386b04dc555f1c125a56f6876a987c9aaafa89769aa4 WHIRLPOOL c4e8be5f0b6d191f121ee87a8dcdf5123056cb8e7c79ea1db67d5b6606f7b967f0aad499f17260447af8808a60271213604350cc8954c463aa74dc2f73d94ccd
-EBUILD gsl-1.15.ebuild 3160 SHA256 a36ae754dfa97d532506bca516c364f4e9d3f7996dc55615263f5c6980320a35 SHA512 320d23ec1b460a52a0b85f818ba4cb1c7cad481fb743af1c9220239ce40ffd84b3d1bf384d757a98c3d3ec42d4d64352d51235cb124baf9a95d8a6a237858448 WHIRLPOOL c5e46c864f042507f2569b8b4b69d40ebcd91352d25cf7348178438e1dd06b6020aeb76940dc2081365f7fa47139da541f2255e6274b515418cea790cdd0688a
-MISC ChangeLog 12956 SHA256 7faf1922bb5622599380247006d3c01817cf46e3d1b8f4543e3bb2d1d9e33308 SHA512 73615d091073135dc41603db7d71d10055c59a33c740f2af797347a625bee38abc6a34045019a430a90ed138522f792f5e76230a2867c2d94de90c19ed9f1e76 WHIRLPOOL 006653098f5ead45cf0b89b037f6125073b0978c9ce73e0e5b30a04f673ee5223ede6320ea03b3f1ac52b10a0da767819342df98e9d30fcc95827389a7455e51
+EBUILD gsl-1.15.ebuild 3144 SHA256 5a55cee973ed787a05afeacbb180b662965db42441592c9d802db392069ee8e4 SHA512 9a8a3508133d8dbf3c9daba064d2fd7b2de6c64901b439347bed4f4ef4a6b9ea8dd4cb1fa19f27fa34bcb9255b85df3ea1e7321186c11c035344fb75d4053b15 WHIRLPOOL fc7859ca3f21b856fb914687e23886c7654406125d66877f231c288a1a237262bafc3e6b0d92145e6d82f0a98df4cdd7e470b2bd5327a20d19326ecea0d7d95b
+MISC ChangeLog 13140 SHA256 d4a44218259efb238a39d1f0d8309db4498627ed6b09d8407a71a1e2407f1fdf SHA512 8bcfada6497224eb6934b78e92b5b8dcf3056eac77b54a5970f33b4ebabc8f458189ae8742bfcd24f481491504e93c21b5a5ef0a774fed897e96b43247ae863f WHIRLPOOL cd27c756e32ed27c106d344eeb31fc8c93810c13b3e7ed858f9d91f9fda7167cc3b8f2bfee0ba8bf85ef37f97d6e4f4d984977ed49a0a413c549eaf57a62541a
 MISC metadata.xml 1026 SHA256 6df14f9543ae80840437ac04fca5f5b4ca052a722c5146b015eeb26b1c11f1f4 SHA512 02751504e7a1563ca2008426536d03c8d5f00272519f73dccbe4df8f93fa26132fa57eee085cee9e1ce68e396893ef602283d8cd6722ba2f27bb322b8c201951 WHIRLPOOL fcbfd38fc5d1bafc3d3e08d0031b401fd5d67f1dcc1318c9ef57fa443d8998c6f9975d4f9a2b08e1d10e5e0e557511508193fd9742dc6e415067ccd723f740d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlEmk38ACgkQgAnW8HDreRZAhwCeObrwd5Yudqx7iQoDEm0XvEYP
-5cwAniq41RZjDqfU6MmLwjgjK3AOr4kz
-=gwoW
+iEYEAREKAAYFAlFVhmgACgkQgAnW8HDreRZBPACePenAFSWQUPKkOMgMOYT8eCxk
+TSUAnAltXQQom6EL8u0R94pbr0alvxED
+=q5fL
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/gsl/gsl-1.14-r1.ebuild b/sci-libs/gsl/gsl-1.14-r1.ebuild
index 8cd784d678e8..752c76cf7760 100644
--- a/sci-libs/gsl/gsl-1.14-r1.ebuild
+++ b/sci-libs/gsl/gsl-1.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.14-r1.ebuild,v 1.7 2013/02/21 21:36:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.14-r1.ebuild,v 1.8 2013/03/29 12:17:43 jlec Exp $
 
 EAPI="3"
 
@@ -30,16 +30,16 @@ pkg_setup() {
 		ewarn "Please install and/or eselect another cblas"
 		die "Circular gsl dependency"
 	fi
+}
 
+src_prepare() {
 	# bug 349005
 	[[ $(tc-getCC)$ == *gcc* ]] && \
 		[[ $(tc-getCC)$ != *apple* ]] && \
 		[[ $(gcc-major-version)$(gcc-minor-version) -eq 44 ]] \
 		&& filter-mfpmath sse
 	filter-flags -ffast-math
-}
 
-src_prepare() {
 	epatch "${FILESDIR}"/${P}-cblas.patch
 	eautoreconf
 
diff --git a/sci-libs/gsl/gsl-1.15.ebuild b/sci-libs/gsl/gsl-1.15.ebuild
index 00265481fc63..c4e7f3a56f7c 100644
--- a/sci-libs/gsl/gsl-1.15.ebuild
+++ b/sci-libs/gsl/gsl-1.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.15.ebuild,v 1.5 2013/02/21 21:36:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.15.ebuild,v 1.6 2013/03/29 12:17:43 jlec Exp $
 
 EAPI=4
 
@@ -36,7 +36,7 @@ pkg_pretend() {
 	fi
 }
 
-pkg_setup() {
+src_prepare() {
 	ESELECT_PROF="gsl"
 
 	# bug 349005
@@ -45,9 +45,7 @@ pkg_setup() {
 		[[ $(gcc-major-version)$(gcc-minor-version) -eq 44 ]] \
 		&& filter-mfpmath sse
 	filter-flags -ffast-math
-}
 
-src_prepare() {
 	epatch "${FILESDIR}"/${P}-cblas.patch
 	eautoreconf