Use more readable CTARGET setup logic.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

6 files changed, 41 insertions, 26 deletions

diff --git a/dev-util/mingw64-runtime/ChangeLog b/dev-util/mingw64-runtime/ChangeLog
index 328484e6fc16..3d836b4d9d66 100644
--- a/dev-util/mingw64-runtime/ChangeLog
+++ b/dev-util/mingw64-runtime/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/mingw64-runtime
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw64-runtime/ChangeLog,v 1.18 2014/09/09 18:16:49 alonbl Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw64-runtime/ChangeLog,v 1.19 2015/02/27 08:11:21 vapier Exp $
+
+  27 Feb 2015; Mike Frysinger <vapier@gentoo.org> mingw64-runtime-2.0.8.ebuild,
+  mingw64-runtime-3.0.0.ebuild, mingw64-runtime-3.1.0.ebuild,
+  mingw64-runtime-3.2.0-r1.ebuild:
+  Use more readable CTARGET setup logic.
 
   09 Sep 2014; Alon Bar-Lev <alonbl@gentoo.org> -mingw64-runtime-2.0.1.ebuild,
   -mingw64-runtime-2.0.7.ebuild:
diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
index 907bddc71983..815cb7d35ce0 100644
--- a/dev-util/mingw64-runtime/Manifest
+++ b/dev-util/mingw64-runtime/Manifest
@@ -5,16 +5,26 @@ DIST mingw-w64-v2.0.8.tar.gz 7017057 SHA256 1a5a2c57f90c7f1b5eb8402a52f93de64592
 DIST mingw-w64-v3.0.0.tar.bz2 7012419 SHA256 ffd381a53cb774843667ccdaeb3a23f86be77b0344355e1a5947b3ceb8343c67 SHA512 7fc438908328ae4429f79dfaaae92bc7e88bc0f46517bdebdc3c45b3e8062ff6c27f166eb51103c2d49aae01851d82f33e0b031c8d98198baaeb119e19221989 WHIRLPOOL ea2820ab24dcd6f35fab0404b2bd26273b117731bb25e2e3ef753e9a3a9b6661564605cdae7ed5e6e4f9fc6b3c3d000761fa44afa19f79b5d6deaebca44f709c
 DIST mingw-w64-v3.1.0.tar.bz2 7021162 SHA256 ece7a7e7e1ab5e25d5ce469f8e4de7223696146fffa71c16e2a9b017d0e017d2 SHA512 9f418694aa0f072e2f08766fcee8929ac3022187750028781336243e050495b9709bb9ae87b4a83a8e9d3856478c525d8636277a4c219e282421b269dafa68d8 WHIRLPOOL 90a3a7056df7c4da2e605da1578e65b16e0f831370d8b1d399fed48945828604a94f9402b2d53bc4ca26623f1d34e6c45c862bf1f7590ddf9325fd4a053a18fb
 DIST mingw-w64-v3.2.0.tar.bz2 7053254 SHA256 78a0de610829a1145ae12c4a29603344963a0b8156ba39a9a31a0e79c3b29142 SHA512 dd483bcf7ba0e698a33a0b02a811b181e601cd344b87dafd0f6c477f68efb9a617a4109046fd06735242623f87833cf97688f057583e1378d6d84e7818927593 WHIRLPOOL 99ba5ddaa99c40309d12d75d3953deaf9cc31280ad2446793d1525702963edd1b33e91053e99bdfd06d37980049d30b7fb4e9f3a5358f8277c2fabe587c56037
-EBUILD mingw64-runtime-2.0.8.ebuild 2027 SHA256 0b6108ac6a2a6114cf28536a09082b7391c862f7af4f629aadff58330ec721ac SHA512 7253f6cb737ceb251893e9eeef7e4aa19c2928800780dd4ef69608d0ff49eb6577abb432bf209433b4a876806a5a12f3733e97487a6da367405d726c782bae2d WHIRLPOOL 5916ad806f53f34e33d3f13bb3a9e5b6ea0f8a58c3867c5b56574d2fe988935c91c03d82a0f5253c31e22e08912efe1c658e17c351166de9610abf6a622dff82
-EBUILD mingw64-runtime-3.0.0.ebuild 1952 SHA256 03a322392a44e48ccdade077f75993a4688666e33e5d1a26e1eb01928e10b6d4 SHA512 c98d0b771e4e33896147dbdef98c26976b2d6ae2f3404d9304413eede3a9b72ecba9a5cb2320e587067a9eca0f0b953f3f78b9a39c92485bf2b4b079e1e448e8 WHIRLPOOL 85619756847f7044a4f8a9d8d8d1fcbc304fde815a5ce61e8be68839a5000645c2fbd30911c23c7367b1d88b2aaa8418fbca2f530e5529954afb26b79aaf1d2a
-EBUILD mingw64-runtime-3.1.0.ebuild 1952 SHA256 daef8673aa0b15fba9a766948bc515b264db25e9c5f077ff2d389039019d9729 SHA512 ad9ff02658b6e89841d355cbbe8670949f9b523461f19dd577f7d071348ae69391373448ee73acbb686ce6e40d1e3d2497aa5a9fb10975d13f69bc95b323d777 WHIRLPOOL 25de1f29e8075a9eaf909771d328d4412b0f782284c5114c78ab10b518158369c629ef6ac68249b3f3af21fd3c5ed41d9f1aab9d3f5f3147b4b635f8711d3173
-EBUILD mingw64-runtime-3.2.0-r1.ebuild 1955 SHA256 0aff769e222209a4104fd6391f1d83b714913edafc1bfe24abf5845af9866951 SHA512 3775ad1a89aec099543b96cd6ea0749439dbe6cb86aeba6f3372900328600b992cbb05126c86e48bc0fbe45637c8876af1e71e741b253e0c0c260743e19503a5 WHIRLPOOL 857bde06afc18cc63b88f9885f8e9521366865c0594c87b6471d8f013fe2b794af59e5ed1911846183210dc843532f55643abad94c8f0660b91465f4ecc466bf
-MISC ChangeLog 3196 SHA256 79e5a1b672d511bd166e7f75b82008985323fd9825a42ab6b4af74a05ccb6c91 SHA512 edca52b417332587aa63ffc4d93eb94e2e83523ff469fd2ea922cbeecf512ea3562fa7dbbcc40be8aa11832a5138a39df24ee1f35f8701ef25030097a9dd930d WHIRLPOOL 2cff6ec9845b67b024853004b09cbfae66cc4b538ed46f5a9485f4f46c551e8139c6bd68ed6aef03208960cc12b4d54e5c362bbf2b5eae49b473672469ab7ee3
+EBUILD mingw64-runtime-2.0.8.ebuild 2015 SHA256 032d6d13ae4cf387463e0cb2d882e4214b5213893a393b62dfa534053a4db93b SHA512 2010b474e6935950e63476765fa188122ee21153e83b03022d1e1d5dd2c63ce8f1fddfed5bc3900538bb551876fa1b2b1c1ae03db475eb0ccb68cb5f4eabec44 WHIRLPOOL e58bec5b0f8c66a61476f782850b810f84c5ce9de4dfcdaece378acdd593039b66d2968a9b95b16ae76f1b47a1767fba066215cf738b9dbf25feb8d60646376e
+EBUILD mingw64-runtime-3.0.0.ebuild 1941 SHA256 774637965e445448435ee807fd6caabec50b9f7b766ca63a0771ddbb796ef1dc SHA512 06037a7acc5c776dd81a140151450165f37ac05355c8a9a8a544f2d06bbb6a927d0d2b145dee5dea1bf48bcb04fc86d2a20bec0b07f41932c30c06e88796fe79 WHIRLPOOL d55a080114b64db204c7462ce33cfc0a53e3a0b9d9b1f80d8a6d9074c0b24340f687cd13dc4ccc75691080c4b4f1265996d4c9f292a5b47a1d0f33f88b4e8f54
+EBUILD mingw64-runtime-3.1.0.ebuild 1941 SHA256 dd523273a5bebc796914cedab196a05a85610767087cc29c0d8ecc6b9868aeec SHA512 c350055980db87d1f7dfbd8b720403da7e4d0025ef5fdc63beb1df8102601516e3fb6a79688604095fe3856cd81c2662024fb60dab8f42e159a198a41e108a8f WHIRLPOOL d350475f19e7d373aca71368c131959a3964cd2d00c2d883ff52ce179fcc250ac30cbed53ae90716f42307199bb5a45ce9b569e71a75ec1e08b32a79b6584f44
+EBUILD mingw64-runtime-3.2.0-r1.ebuild 1944 SHA256 c21eb75825b8e76347b30d767769cca578fb8ccf12e6344ec56dc482e2509673 SHA512 5a5a6eef95bb30fccbf677b9fb38f9754dcf45d23a3d71687e97900623335968419e4e9552293ada254306f79c1ad4b0788fc70566684bdde8e78c90d78915f8 WHIRLPOOL 429d152e8166cfd494f6ec3b8148545365d33a52ee7fce9fabbebc37e0e9c12e85cd1ef5061868db10e5074fe78d2c192f8e9c7801f3dcf23691917ee0565108
+MISC ChangeLog 3415 SHA256 ffe220de1ea12504272e8e11972e3f380aee5c5612a358ec79261af72b611ecd SHA512 47b7fe9eee44e3d7d51e093ecec1a2a67fc44a86b00ccdeee504ea303227951467ed5d61055993ebd0b078fa72e83ae01c7b738800bfac33f0560f53490d2f06 WHIRLPOOL 8c4dd37672a1b59ee6c78b311b7dcba50970e12bca98aa7d63a2b4b9258d72eab7db20eb3c6fef7062f50e867217044b2be0efb2f06bf9e804f72add1616d809
 MISC metadata.xml 228 SHA256 24d02522b86de4d4fdd4a19b0f07556cf0d371ccad8d870339068793dfe18570 SHA512 811d51b71d4a117389dbf64a5c307466c9416761f7fb2b12a335ee501ce515f1bc1924f5dd610cdac06b3ffdec7f58bd75d3a2c3ef9182a1ad1263c07f34593a WHIRLPOOL 9bc77b7dcf1138516c9ae0eae06f6952492acb2ac7f78fad77b2503e6afc7d835a5b7d537354232fa080593e11a3d6bf03cd4716fca1b65825a2c0a40ca377d0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlQPRBUACgkQXYk9GL8g3FGP+gD/fBLGT0lp8zgLm1ynAqQEdqey
-5YPT0mQampjNwh72/lIA/jJjHNxn1F08xBTFdUWuhwIGptKlaM7PIsPSQ8D2f1kt
-=PtZk
+iQIcBAEBCAAGBQJU8CaqAAoJEPGu1DbS6WIA5l8P/Rcxux256f6Rhq95YCrDK4hU
+G5VV05AaoyT6XpSNIy17EFsSG9Pj/TuCyJ9YJOJ8k0Ba3n6tLF6zQ2xnLFdRO9Is
+/8NwxWWrabyruEOHz6Ce8SLnmGv5ZThBXE8S2E3rYSkYwbXobPLyYk1Ppf+8ec6i
+b8B+g+UghEb68vABK08vSjLyit7x+WUyE9CWHrkkCXs4/sC8yoFG35H9a0Rq2fFH
+pddTWvNsOCnbIV8Oo4HL0utvC3FcUJ9JGoZbo9ezSgYAJ+B6p0u65RyDBVfz6NJC
+VKQ96L+FfxPl2+7lH6sXAUXVMT0/bJiDJaL1q0+awyzExhRefBZXyQUiaHkOGJT1
+NugYtRK4zVmMxa2DhSg4h8eq/6wB0HpJUyqXzk4zRfa3MPgjf9kgZOAzMVbDs5WB
+53NMzpPEkziU8MI4jYyd2iXDAQr2X6BUa1wskJK4mEBhdk/NpTMQx12BG/AHVZ8c
+KVK9V5TNfeOdLYXtWDv3Y+JrDCnCZKLAApENOOE7c7gCwmjHZusKjJ/qUqoH7J8q
+9Efjv29/EcDMxjre4cQqZQ1Qu3VM+1j7Se8LtGUkNmwvP8LBWTGyi0WVhSTaMMhx
+ZjeIkdYljxu8PTY5I4cskbYb8DrAEdT15Jv5zUdXtDbN3TDNo7lyWXmzXT7mkj9D
+YseJaBjTm66CM4Um8Id8
+=NnXF
 -----END PGP SIGNATURE-----
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-2.0.8.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-2.0.8.ebuild
index 3b4a867a16d2..b16e6be5046c 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-2.0.8.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-2.0.8.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw64-runtime/mingw64-runtime-2.0.8.ebuild,v 1.1 2013/06/20 14:39:13 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw64-runtime/mingw64-runtime-2.0.8.ebuild,v 1.2 2015/02/27 08:11:21 vapier Exp $
 
 export CBUILD=${CBUILD:-${CHOST}}
 export CTARGET=${CTARGET:-${CHOST}}
 if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
 	fi
 fi
 
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild
index b287ca1c440c..d2bf85ea6eea 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild,v 1.2 2013/10/13 19:23:48 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild,v 1.3 2015/02/27 08:11:21 vapier Exp $
 
 EAPI=5
 
 export CBUILD=${CBUILD:-${CHOST}}
 export CTARGET=${CTARGET:-${CHOST}}
 if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
 	fi
 fi
 
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild
index 49e7bbf091b0..243da8d14796 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild,v 1.1 2014/01/10 19:25:41 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild,v 1.2 2015/02/27 08:11:21 vapier Exp $
 
 EAPI=5
 
 export CBUILD=${CBUILD:-${CHOST}}
 export CTARGET=${CTARGET:-${CHOST}}
 if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
 	fi
 fi
 
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild
index 001c03adbcb6..f451b75d2f77 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild,v 1.1 2014/09/09 17:52:13 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild,v 1.2 2015/02/27 08:11:21 vapier Exp $
 
 EAPI=5
 
 export CBUILD=${CBUILD:-${CHOST}}
 export CTARGET=${CTARGET:-${CHOST}}
 if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
 	fi
 fi