Guard Darwin version checks for Darwin CHOSTs only

Package-Manager: portage-2.2.14-prefix/cvs/SunOS i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

7 files changed, 29 insertions, 24 deletions

diff --git a/sys-devel/binutils-apple/ChangeLog b/sys-devel/binutils-apple/ChangeLog
index 67d081350d14..3256bd7e2340 100644
--- a/sys-devel/binutils-apple/ChangeLog
+++ b/sys-devel/binutils-apple/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/binutils-apple
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.41 2015/02/04 17:33:20 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.42 2015/02/04 17:39:58 grobian Exp $
+
+  04 Feb 2015; Fabian Groffen <grobian@gentoo.org> binutils-apple-4.2-r1.ebuild,
+  binutils-apple-4.2.ebuild, binutils-apple-4.3-r1.ebuild,
+  binutils-apple-4.3.ebuild, binutils-apple-5.1.ebuild:
+  Guard Darwin version checks for Darwin CHOSTs only
 
   04 Feb 2015; Fabian Groffen <grobian@gentoo.org>
   +files/ld64-241.9-lto-noremarks.patch, binutils-apple-6.1.ebuild:
diff --git a/sys-devel/binutils-apple/Manifest b/sys-devel/binutils-apple/Manifest
index 8df3023aff01..0cb0014d4105 100644
--- a/sys-devel/binutils-apple/Manifest
+++ b/sys-devel/binutils-apple/Manifest
@@ -92,18 +92,18 @@ DIST libunwind-llvm-115426.tar.bz2 74622 SHA256 e77a42c04eda5e3db61fc8b5bc98a55c
 EBUILD binutils-apple-3.1.2.ebuild 5289 SHA256 0a31bf755b37ed52a419835d9eec8d30f04b144636056099da8c5f6654b002ff SHA512 193e7de4616757bc1ad563db10fe0258946f46cedd9e6d373f43e734f2f8c95c55d454822117c65d2475b94cc406d3376279ae96920a414a7f1b2f8369cd324a WHIRLPOOL f7cd96e476d1f77c6acfe8679c18ff3c21744dcf9629bb5c8c3ef4bbe23395930e25f66c6204e64231b1bee5efc0a842eab5422eb695952ac7578d6c5bdafb9d
 EBUILD binutils-apple-3.2.6.ebuild 6670 SHA256 ca78066436229a98e1e41086f6a1748bce194c34ea14b2ce1f6313a6f13f46f1 SHA512 835b719a1a94028672c29d2fa9357a7691f4011d542a2b9d5ffaed50e36d43db36ddaa5a856d681af441a13129799c11bd638e5bb099b21e1146871cbc5342b6 WHIRLPOOL 8dc06f087bb3ca607a821fc488a658560d1abbf35471021abb08da1d30ed6165c78cb4e27e27d85badbb9ecaa33f3706daa839faee7c31fc75516dcf673efdef
 EBUILD binutils-apple-3.2.ebuild 5914 SHA256 64a69c51cebe16792e7de383107e3ff539ea7c9de8a5357d39648534361a012d SHA512 5809311b5988f3cbc81920a7b52cdc8507eeecb0244919c34e68db9bc8267393c1c3b03bfd0f14446af85a47540fa304c3dec54c0474f536adec696bd3568e0d WHIRLPOOL 6966ebcd42309802f2acd257109461cf1c88f4569cf025c4a6c6f0f6f5688dcdf248becff95109afc556995f6230f83958a920f1ba9b5ff7fd4b3fa521f3ccee
-EBUILD binutils-apple-4.2-r1.ebuild 9728 SHA256 fb4f2a626dda493fce8df9151b049b8d96f227b7578d7851dfb854ee15d1e6a4 SHA512 85c80e4358375c1027a58e80068b2eb6f6ca19fe70ab09e10d32927fff49c3a419b91731e587825df1e9f7c885e462d98c867804596a31053d90cd9057e96952 WHIRLPOOL 0b5921e562653b5954bc2671a77e78523141e50045873bf28c9c611ef44452e9936abbe8fbaebf64557ca434f638a4e4a3a8a25529113039bb15ee2c002b73e6
-EBUILD binutils-apple-4.2.ebuild 8744 SHA256 dc6a457f8916974209b0b7c733c0c2d2800268da41b4f3fba106410e612e7d7b SHA512 feaabec24e80246e058ca40f0c6f00745a1d70b2249eea2f8b3b640419584587afa51ea919172f0023ab6e3d1409c5076f0d2a3544e9fe679bf91585eba09042 WHIRLPOOL 15e11365b21095b52a915756800ba92a755fc4b6ff84af10999f55627e3fb139f54ccd3bb6d27c94354e25862c6e57b8a7fa96306129dd4a41715e680a12eca1
-EBUILD binutils-apple-4.3-r1.ebuild 9357 SHA256 323dbe7095afe1d94333a06519ffaa9d1c34375ed1e17fdf0cc0daa0d8438f73 SHA512 f4819579a5a165d48b159cc3d8a88690996a3a96e3d6f9d6abd38d5f41d26c3a2e2d780f010893f9a153fe726acc01e7e7914b41f8bf346722270bf490cbfc79 WHIRLPOOL f8e8bcd0f02cde78cab3f91d4f7f9929768bdd4d2866700d8857357a1ce6305d39a20af3c658a303f6a2c55d427e788d7156b2b8a6ce8b4616bca523ef28bf06
-EBUILD binutils-apple-4.3.ebuild 8543 SHA256 b84402d9d8175779b15aeb1a029b8c74456c157b0e9e8358ea63c6464f39eec6 SHA512 161812b264eb95653f34115574c0fa11f2968e8949de826c353da76aa663d39aa981e146dc70b8b2aeb7416727f500537d2f3173974a5e64a21dbac2d9c0a1f4 WHIRLPOOL 56d9f3de5c95056c7170740b4bf1c651f47d97747e14110f773e9a08661e7d4fed8673723b72bcb8bc5275737b595a7a327cc1b3d9a7c2e86924fe33e462c830
-EBUILD binutils-apple-5.1.ebuild 10969 SHA256 2fcf6d482172f479874c0f0f4ce678fe9acb5c3600992ecc52cccb564c995342 SHA512 45afb1df26edb3cd55a7e5e35053ea360a8b4427ee467ea9aff2096dbea77e0afe38045cd37296a693c3aad9b211dbe22ef438f0130f11aab807dc34cfd28b4f WHIRLPOOL 078d7114c4734280ae5830c9b9933af0b7f3e824b33a07fc7e9bf43bdc3e9ff0f6226cb94c6b6507af14a22359ed5c7477abf1af10dee9ea70ed8136181cd43c
+EBUILD binutils-apple-4.2-r1.ebuild 9778 SHA256 34854172c77ae0c176f43cd445fbd3aa7bece07e6cc79c68e58a2b9510f12234 SHA512 2adfb0bf89de17622f5c54e68f38a4f1adfa5f2d479af2a42e5aae9d8b298a5a6692ef208aa0eaa27f1be4cac1f44024dd782ae7d17a1eb685cda3f934cfad9f WHIRLPOOL ed54a41baba59d3cacc34efe48131b67b21181a9d8d80636db12c23cb7e25c9fcb7d6f9cbb86d21db25db1b31b2a8c98be4a1b03980e8bf44c033b99160218d2
+EBUILD binutils-apple-4.2.ebuild 8768 SHA256 5fcde867e151466cd788b8e801e2918cf95382cd26ebf243f73bfa391c955344 SHA512 0d705700ee6bd1443c053700bdda7c78f3d2e8e417a41cbe9eaa80cd3a46bbb48f9fa70443657114ef28a08a90aedbd341cb611f45cfcf2cf514cb9d62e9167b WHIRLPOOL 07a10f3d63c33a8c7abe5c091a07f921096114e39be6d3df98759bb0a033f4bdbb02da054baa891d5d2648e27c74e47aafbd7de1538200975411716008051d9a
+EBUILD binutils-apple-4.3-r1.ebuild 9407 SHA256 ed57f465e998606e725025fbbb515b2dfe21d3fdcff59a436324d3de031b492e SHA512 95e9c65f6b9f7a64cc3358494fc8d34a9f311fbbed259164a02ff1db65c13049a8e51eeb38b3abf0a9d05eadee258836fbaf6415d59b4c8fda91e69688db92c0 WHIRLPOOL 50e0c83cb5bf253fc45a613206c14fa346abb701a3e2501e021b93896b8d2a4831dfece7cc3b338845f8cb7eaa17119ed963d9ee6ffffcc76f92ae1c5de2d638
+EBUILD binutils-apple-4.3.ebuild 8567 SHA256 034168d6f02f2ee5883dd9134e027ad73194e855cdeeaa92b5dd8f5427b2b409 SHA512 6c03ce180b0dad38e2a0de98119a9282410c2af09bd7e169fe9f04ca41af6cc1906a4d7d12e807b93c1d274fdc9ba305fcf98a4deaec379837b3ebdd75a3a260 WHIRLPOOL 7f630372d950daca6050ca7198ec63e571a21c2bdae967ee14c7b287e28dc20377279bec5b681a34f5b2573cea106d2e816ce29f2ed9c51b07936753dd303da4
+EBUILD binutils-apple-5.1.ebuild 11045 SHA256 0149f73e214123b3e81b6811570cb7dd1a0c7ecb262cc64dba96b007857c0934 SHA512 2c7cd487c5ab9f9395e76be7e9f26e96079842194ee652303e26bc7f9c29aaa7513f1de545bf8d83672e50be4fd7f7691833805c23bdd310b65304f484d6f32b WHIRLPOOL 8ed49ba19d76b9b8f1ca48637887dc9f74dca12423c35176a532d2cc185dc715b1f28860631398e88435fe31f1c5e705d5a9744e1f5b711a458073c873895ba3
 EBUILD binutils-apple-6.1.ebuild 11002 SHA256 2958d9065b15f56e17452a393c406f8d4b489a14826fbff514d02ac2c7621ffb SHA512 f5276adcdad07a94e49b976c4ee68c3d15ad81d525f7381ba702734af47594c67478394f105a7fe71e208ce99b0384fd907f2e850e523a871f45009ba3694aaa WHIRLPOOL be5a7c0791d3d2bc117b0996fdfa6578c2ff425cc1632f9c81fe4b301cbdd9e3e0619cf547acea1c78681d974efada9fa89c9082e6533a71244d45b58a0b8534
-MISC ChangeLog 13979 SHA256 5ad129d3c6d04e39ce276d276d97bdcbaf5635067d61a47e10068386b4d5bb15 SHA512 deb30c8620efad1723d60fd834a0597a52e35cc046df1e28e464c136e8f6c597f52b6a52fe8692278d3adfe713db5a34b68685a003509acd10186d9324dc7794 WHIRLPOOL 2ed91e8087660b86000296318751c633988458af13d1cda1b3acf5ab4cb37a18fe3012cfb058b3c0721211a92f1190276331470de98586ee616e8ecfa52df9f8
+MISC ChangeLog 14229 SHA256 45ab9ea2de90d4f2ef094e4f8423ec1dc4ab04333763dedf1ceb5ba43c8adc17 SHA512 7ce79ca2d573f514d3c897d486fe1fa64b15591de7f5e949806921da7d2218efed68b5ce34297aa8af90d8e00e0cb2f6f65236cc1b823a10535d6c5f5f20f726 WHIRLPOOL 4a993ff9dd8073967116f9c3d7351321ac8174c4846760cb900210ad94523d2dcdf4eb1202e05f0105e57c8ffb316fac38508c147ff54d5d7a22f058debe0e57
 MISC metadata.xml 302 SHA256 899f79a24a243a7aa89abd5513bf75a9af445051813ebe137320ddc27bb22849 SHA512 20531dd7fdd3e84f20b1151bbe85e148643f7b26cfd77fadf649cd2b5c3ef4b3beeaf99299f0eb671250762ad10094ecdc1ff22c0b2eac0f7cb9f8d90aa21bed WHIRLPOOL e441ebd6ca8a5b2cd44b8a55fecb33f4895c1016f3b62bfa13c0e1e6fecf15ce3f58aaab3f19ea231cdc67bad2bcda31aabe7973b19feca70cd9cf7c9d5c69a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTSV+EACgkQX3X2B8XHTokabQCfYWN7m8rP8Z92Z5w4lSrAB6PW
-NpsAoKBPYs9kN+ZeTmT1kFzi10ZHVXGK
-=HJnk
+iEYEAREIAAYFAlTSWXAACgkQX3X2B8XHTonr5gCeMnC0G/DgL3a6FJPhjV1NfpK6
+49MAnjntZzrSLxedv5qFVMjqhekw65Rg
+=Saio
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/binutils-apple/binutils-apple-4.2-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-4.2-r1.ebuild
index 28f9f505e661..dbc6c5d13c10 100644
--- a/sys-devel/binutils-apple/binutils-apple-4.2-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.2-r1.ebuild,v 1.2 2015/02/04 02:55:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.2-r1.ebuild,v 1.3 2015/02/04 17:39:58 grobian Exp $
 
 EAPI="3"
 
@@ -93,7 +93,7 @@ src_prepare() {
 
 	# mimic OS X Leopard-style Availability.h macros for libunwind.h on
 	# older systems
-	[[ ${CHOST#*-darwin} -le 8 ]] && \
+	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] && \
 		echo "#define __OSX_AVAILABLE_STARTING(x,y)  " > include/Availability.h
 
 	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
@@ -191,7 +191,7 @@ src_configure() {
 	append-cppflags -DNDEBUG
 
 	CCTOOLS_OFLAG=
-	if [ ${CHOST#*-darwin} -le 8 ] ; then
+	if [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] ; then
 		# cctools expect to use UNIX03 struct member names.
 		# This is default on > 10.4. Activate it on <= 10.4 by defining
 		# __DARWIN_UNIX03 explicitly.
diff --git a/sys-devel/binutils-apple/binutils-apple-4.2.ebuild b/sys-devel/binutils-apple/binutils-apple-4.2.ebuild
index d3d94b5bbde3..80f5244f2bcd 100644
--- a/sys-devel/binutils-apple/binutils-apple-4.2.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.2.ebuild,v 1.7 2015/01/31 02:33:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.2.ebuild,v 1.8 2015/02/04 17:39:58 grobian Exp $
 
 EAPI="3"
 
@@ -77,7 +77,7 @@ src_prepare() {
 	ln -s ../../${LIBUNWIND}/src libunwind || die
 	cp ../../${LIBUNWIND}/include/*.h include/ || die
 	# mimic OS X Lion-style Availability.h macros
-	if [[ ${CHOST#*-darwin} -le 10 ]] ; then
+	if [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 10 ]] ; then
 		{
 			echo "#define __OSX_AVAILABLE_STARTING(x,y)  "
 			echo "#define __OSX_AVAILABLE_BUT_DEPRECATED(a,b,c,d)  "
diff --git a/sys-devel/binutils-apple/binutils-apple-4.3-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-4.3-r1.ebuild
index 616504949029..7502d69b586e 100644
--- a/sys-devel/binutils-apple/binutils-apple-4.3-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.3-r1.ebuild,v 1.2 2015/02/04 02:55:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.3-r1.ebuild,v 1.3 2015/02/04 17:39:58 grobian Exp $
 
 EAPI="3"
 
@@ -91,7 +91,7 @@ src_prepare() {
 
 	# mimic OS X Leopard-style Availability.h macros for libunwind.h on
 	# older systems
-	[[ ${CHOST#*-darwin} -le 8 ]] && \
+	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] && \
 		echo "#define __OSX_AVAILABLE_STARTING(x,y)  " > include/Availability.h
 
 	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
@@ -175,7 +175,7 @@ src_configure() {
 	append-cppflags -DNDEBUG
 
 	CCTOOLS_OFLAG=
-	if [ ${CHOST#*-darwin} -le 8 ] ; then
+	if [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] ; then
 		# cctools expect to use UNIX03 struct member names.
 		# This is default on > 10.4. Activate it on <= 10.4 by defining
 		# __DARWIN_UNIX03 explicitly.
diff --git a/sys-devel/binutils-apple/binutils-apple-4.3.ebuild b/sys-devel/binutils-apple/binutils-apple-4.3.ebuild
index c391dacba6f5..474c32aa961b 100644
--- a/sys-devel/binutils-apple/binutils-apple-4.3.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.3.ebuild,v 1.5 2015/01/31 02:33:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.3.ebuild,v 1.6 2015/02/04 17:39:58 grobian Exp $
 
 EAPI="3"
 
@@ -77,7 +77,7 @@ src_prepare() {
 	ln -s ../../${LIBUNWIND}/src libunwind || die
 	cp ../../${LIBUNWIND}/include/*.h include/ || die
 	# mimic OS X Lion-style Availability.h macros
-	if [[ ${CHOST#*-darwin} -le 10 ]] ; then
+	if [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 10 ]] ; then
 		{
 			echo "#define __OSX_AVAILABLE_STARTING(x,y)  "
 			echo "#define __OSX_AVAILABLE_BUT_DEPRECATED(a,b,c,d)  "
diff --git a/sys-devel/binutils-apple/binutils-apple-5.1.ebuild b/sys-devel/binutils-apple/binutils-apple-5.1.ebuild
index 4e6fb36f7cc0..92adfdeeb1bb 100644
--- a/sys-devel/binutils-apple/binutils-apple-5.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-5.1.ebuild,v 1.2 2015/01/31 02:33:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-5.1.ebuild,v 1.3 2015/02/04 17:39:58 grobian Exp $
 
 EAPI="3"
 
@@ -101,7 +101,7 @@ src_prepare() {
 
 	# mimic OS X Leopard-style Availability.h macros for libunwind.h on
 	# older systems
-	[[ ${CHOST#*-darwin} -le 8 ]] && \
+	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] && \
 		echo "#define __OSX_AVAILABLE_STARTING(x,y)  " > include/Availability.h
 
 	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
@@ -200,11 +200,11 @@ src_configure() {
 	append-cppflags -DNDEBUG
 
 	# Block API and thus snapshots supported on >= 10.6
-	[ ${CHOST#*-darwin} -ge 10 ] && \
+	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -ge 10 ]] && \
 		append-cppflags -DSUPPORT_SNAPSHOTS
 
 	CCTOOLS_OFLAG=
-	if [ ${CHOST#*-darwin} -le 8 ] ; then
+	if [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] ; then
 		# cctools expect to use UNIX03 struct member names.
 		# This is default on > 10.4. Activate it on <= 10.4 by defining
 		# __DARWIN_UNIX03 explicitly.