Use more readable CTARGET setup logic.

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

38 files changed, 183 insertions, 156 deletions

diff --git a/sys-devel/binutils-apple/ChangeLog b/sys-devel/binutils-apple/ChangeLog
index 3256bd7e2340..be0556fa3030 100644
--- a/sys-devel/binutils-apple/ChangeLog
+++ b/sys-devel/binutils-apple/ChangeLog
@@ -1,6 +1,13 @@
 # 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.42 2015/02/04 17:39:58 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.43 2015/02/27 08:14:46 vapier Exp $
+
+  27 Feb 2015; Mike Frysinger <vapier@gentoo.org> binutils-apple-3.1.2.ebuild,
+  binutils-apple-3.2.6.ebuild, binutils-apple-3.2.ebuild,
+  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, binutils-apple-6.1.ebuild:
+  Use more readable CTARGET setup logic.
 
   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,
diff --git a/sys-devel/binutils-apple/Manifest b/sys-devel/binutils-apple/Manifest
index 0cb0014d4105..35f2436c9bd9 100644
--- a/sys-devel/binutils-apple/Manifest
+++ b/sys-devel/binutils-apple/Manifest
@@ -89,21 +89,31 @@ DIST ld64-97.17.tar.gz 421947 SHA256 02bd46af0809eaa415d096d7d41c3e8e7d80f7d8d18
 DIST libunwind-30.tar.gz 82811 SHA256 6ac97d18cc2b05e6de1269bf5af03b81948bd2200dae827527f3dc618b82bd41 SHA512 57106eafa1516791b4e0db2de6c6336bc0c1cbd8bf098a6d3a809fafa457802c95a7aeae9137f4ca5922a3018dfd8f597907ea4187b0afbbf267500eae00041f WHIRLPOOL c3caf5ba593cffa2f0a9cdb256f518524e9500eaf0a013c4973dc9881b16efa0c388e70407bbed1fd331f100af2da01ddeee12d33b3afc1213d69c32ab5e1d0b
 DIST libunwind-35.3.tar.gz 90002 SHA256 2bcc95553a44fa3edca41993ccfac65ba267830cb37c85dca760b34094722e56 SHA512 b7d9a86ef24f1fe9ca14517471e03a910219a229af9f0d4cf94435115971360640451107ba20c93fb1aab788f8b6eb5ed580ee08fdaa990b9fa43e9ae360c6b4 WHIRLPOOL 838912e46031b3a6796bfe854f0244991ce5bc3b59b95855224c9e84639e57b69f541b7993658360721423533dca75037248ea90f5e274b332f27319fdd85a9a
 DIST libunwind-llvm-115426.tar.bz2 74622 SHA256 e77a42c04eda5e3db61fc8b5bc98a55c6a015a9b02a74aab0f35d551fc38272f SHA512 01d78852632072ae48e95cfcf893dbb5325d4a3f4535a3cd3bc2afd5388c5f76995454219c8c6c2c2767abb2edc23bfe0212508c57b1d6db1c4a5d80cc5d4f9a WHIRLPOOL 0c7c8b8493b83e9c1337ab323697cfc255d1ef3e9ae2042df3a4f7480948a25fd571eb88a49e33168587d0994ec2d1371f2ef4d7834d7b41f77722d9693e8d55
-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 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 14229 SHA256 45ab9ea2de90d4f2ef094e4f8423ec1dc4ab04333763dedf1ceb5ba43c8adc17 SHA512 7ce79ca2d573f514d3c897d486fe1fa64b15591de7f5e949806921da7d2218efed68b5ce34297aa8af90d8e00e0cb2f6f65236cc1b823a10535d6c5f5f20f726 WHIRLPOOL 4a993ff9dd8073967116f9c3d7351321ac8174c4846760cb900210ad94523d2dcdf4eb1202e05f0105e57c8ffb316fac38508c147ff54d5d7a22f058debe0e57
+EBUILD binutils-apple-3.1.2.ebuild 5277 SHA256 f6565cd3961d82a2ee11218e0bf48aaefb1da2fd70d75ce85f7ac3f5ac40e24c SHA512 14e50defc19a5e3beed8c8312b3fc361acf1f932613aa4142e1fc33e34041f019e2efccf1518102ca37a8637e1e07a77dc5016adbe2ee429f0e6cfa5200d0516 WHIRLPOOL c4db3166f0f137b06bbcbb22a5704b4e44cfd31f371567967b42cca6baf1f6912a51f23dee067df3899371180aff1d93fead05be27365ed76d17007654d2d272
+EBUILD binutils-apple-3.2.6.ebuild 6658 SHA256 af8eed1be79b5b6eb2ba63de6a8d391f0233f73a4c0ed9ad7412dee192de20ee SHA512 ca0feee2913e38a95e53347be2b1708f3876bb46fca40bef7fb7edd5bb244086ccfc5ebad78b187d968096320fcacea99b32c4ed129baa63863806258124c591 WHIRLPOOL 35c6ea1d5416ab981f3f6a84813aaa5679a8906f1783708559ed15ba94fc1e06ae4f1091e2d90462a13cc74174272b8193ff20219d7cc162bcc3941928203389
+EBUILD binutils-apple-3.2.ebuild 5903 SHA256 6b3a4ff6cdaf238d7dd9d96db0929471d522172ab08647298322180cfcd4dedf SHA512 0080613c9367d4b0e553e3ad2479cd980f5062a17e08d9e6c89e7db403f3165b240d8f40ec3cf3d23ac5eda2e23fd1d327ebd24e4f790d34aeabf2c6a79e2d22 WHIRLPOOL 155b581d5995be83180c44f51a8ccdbfbb4485bc4db6f7b66daef61bfc28b07856e56274f3f5db12223a8255e631541d91775a67a6a7cdc19212b29936f8fcf7
+EBUILD binutils-apple-4.2-r1.ebuild 9766 SHA256 beabaaf2218e1a963841b636af3c74fd3eb8d75ccd5242320346de1be65a6bdb SHA512 da07b740ab0b96588009c7c3f5ca599418def3b23baf43e24507b52636e854c8dae159d654f693de89f7ccd6f23b29cd6d71a3f26038551eda6ccc58b7d6e615 WHIRLPOOL d33aac5fe9537dc3798e945e5fefb35ac71528f3ce705cdeeb21d0594789ef5f8b1b47f578f24e5ab8167b1a4609a3435951a1925bd159f2b72a8c238effbc06
+EBUILD binutils-apple-4.2.ebuild 8756 SHA256 eec999846b99427faea0590c658d8dad3a31cc2c07de86fd910db001c380dd85 SHA512 1e672ec931ef2dbdc6d76897618c7a5a263c79a0bb6babc718d93b6bf2f1f16ab79dc16ab45778a25459261c1b340cb8eae21c073ca65b0e42eaa5880e61d237 WHIRLPOOL 6761a0f84f991dc62e6250fc4f0386d6f687c9b8deced0d8c572f19702e63b9f953ecadc5f18bb93fa673b749d86dfdaa6c5799de330d288687fbbd6c59b00d7
+EBUILD binutils-apple-4.3-r1.ebuild 9395 SHA256 a64cf17de22148f1c6d5cdf4ea59cb08f8fcbca53c7d780a4935c3e3872b9326 SHA512 aab0e41b06aa00158dbf8c70f69c2dbb4349f37c9c3bf942b26d9be5cf880e2519bc373f8b37100e46b9742104c7e0bb5c2e2acfc5bb624debaf0c7d33693b0e WHIRLPOOL df2f7f5a4d2991b15b12b9728afcb376e5f9e926fdee3501dc045b97edab4a7ec62adccbc1e5f7834b3a7b3d9986fdef455e681901c2a39c33cdf3569039e4a0
+EBUILD binutils-apple-4.3.ebuild 8555 SHA256 82ba248687a6b6bd175dd5d979512dd1fd9cec7a86accc4658ec3f3997980bbf SHA512 b865761dfca842153a0b1c6946acbfce53a024b34b635e209675b0014a0e2f98ae0608705a1b5d9cd11099f06146afebbd9f8e4f9c23f888ca41d363269b5a5f WHIRLPOOL 6f562baa2c1f696c65d2c4cfa6ef2a757f6f394070008166a737f6fde955148d6ffe93c63b778eac66942d8d79c9e51a4d10eb01439453c43170ddd55899c5f0
+EBUILD binutils-apple-5.1.ebuild 11033 SHA256 e23007a7cfe7b9726130b0d13fd7ad4aa81ffd164e650b27ca95abf0a40f9e4f SHA512 a9664ed34375b653a4b932c931827a65c085b97620457b389b021d6785a0ebcacad685ffdbbe18bbc7a48b94c0fc1a9d3c0f96e8d4a4d7308bb0460a0b3e47ba WHIRLPOOL a1d2086554fbc291cd16e886339ec8d8795e812b32e8724a996e5b9c78e1ed20deab5e3e7597d64503ba1f50c882f0bac34b570ae09808c8d742f019e14ef1bb
+EBUILD binutils-apple-6.1.ebuild 10990 SHA256 e500197618e83bc3c717bdccb9a6d83da76371a96c76a7a1e31518055e8545df SHA512 d4ca2d5efc44ee736c767743d9b4384c7403609264d0dda9fc240834fac331fef095e75d3f029434b1258fbfc4b4981b60e51036c4c07ee39c1c9b0e31de1b58 WHIRLPOOL 75c1db240cd5be28d7f0b0075cd7f7776274c0aa8841aa822146a8d87ab16e8efe2faac0ae80ec1b44599329c7f4fb64a960b4382c1b9449d59e9ee6fb65db9d
+MISC ChangeLog 14581 SHA256 b7f16fa10b420312d11bfe0b19cc634b26d73599bcd3600011e72ce5ee555a9a SHA512 8fefd09b9b05ab898b4ff9c7ea4f6dacc14984c5f147bc005d8a4caab910bc84dc0ee843d62339f588079e00917030328545d81f2ac133fa25da363ddb44c5ed WHIRLPOOL c5c849b5ab2c2a0f62a22049c8ba225aa0f183a810651075ad91af9cb40543608ab90c47a82cc748e9c50b06a3638c53ae9d180098a80020759c721ac1105d0f
 MISC metadata.xml 302 SHA256 899f79a24a243a7aa89abd5513bf75a9af445051813ebe137320ddc27bb22849 SHA512 20531dd7fdd3e84f20b1151bbe85e148643f7b26cfd77fadf649cd2b5c3ef4b3beeaf99299f0eb671250762ad10094ecdc1ff22c0b2eac0f7cb9f8d90aa21bed WHIRLPOOL e441ebd6ca8a5b2cd44b8a55fecb33f4895c1016f3b62bfa13c0e1e6fecf15ce3f58aaab3f19ea231cdc67bad2bcda31aabe7973b19feca70cd9cf7c9d5c69a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTSWXAACgkQX3X2B8XHTonr5gCeMnC0G/DgL3a6FJPhjV1NfpK6
-49MAnjntZzrSLxedv5qFVMjqhekw65Rg
-=Saio
+iQIcBAEBCAAGBQJU8Cd5AAoJEPGu1DbS6WIAt+gQAJIwzsonrAXtPrvhV+vof928
+2JH2i96P29AsMO2xad5arAo3tuSbzRObGfzhYbExQOYKzcAp3yhz2IZ5kgpgtrJw
+Njtbxo9CJfbJkzcBu5t3SzVZX3jsHqIM3cL5AEMIqm2qSzIPWkMQJ1Qali54Kjfq
+6IFS4H7I+ZTAUknJKLdr6SPg6Pb/fUAm6wAZTCJLT37t7rwVnPGb3MXZ1V6KjM8Y
+5zEk1oDGLnkHb82QlBZbvPUygH1Z0D+mXzIQxvckilMvNgBIYR2mseMksZoMsfSe
+PCITWIks5vvXaEhY33SQ6bS08Yro+MC7WAJlHk8L9g1J9DrAYNDo7v71Pt/rOu9H
+qzDUk/X60vTEpzm+WKkwzgDfMD3RSJHmMeI57CpzvVmWFCjYGPN8AsyYXUnmSGGh
+b1wx3Nr7vtijC7EeHzG7PKU+9zzBvAzWc7Ttsj0ET2cid5eanzYCMY14MaFaBsBO
+ofQs6jiQ28vjoG6x7jlGnV+l08eUh4QX2yEY8iuOWf7yO98UcVKQ8FcopfE941kQ
+2Q0h5el6pqevHBZTE015ZP3k0IH9In750h8rQTrR7QFDAmJQeJyEkjj23Zir5peg
+nC2ycKD7qOeknJ/+BHN0qH+DVbCEhwEgsd4MqheQNdGLcxbq2ITDTM0YDc4lmoLg
+1EqKvacqiWM0Rg0ZkFcc
+=wime
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/binutils-apple/binutils-apple-3.1.2.ebuild b/sys-devel/binutils-apple/binutils-apple-3.1.2.ebuild
index 033b7dfb5bc7..db572fdba872 100644
--- a/sys-devel/binutils-apple/binutils-apple-3.1.2.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-3.1.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-3.1.2.ebuild,v 1.4 2015/01/31 02:33:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.1.2.ebuild,v 1.5 2015/02/27 08:14:46 vapier Exp $
 
 EAPI="3"
 
@@ -27,8 +27,8 @@ DEPEND="${RDEPEND}
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
diff --git a/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild
index e2cd2fea9bd3..6897ce05e70f 100644
--- a/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-3.2.6.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-3.2.6.ebuild,v 1.2 2015/01/31 02:33:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild,v 1.3 2015/02/27 08:14:46 vapier Exp $
 
 EAPI="3"
 
@@ -32,8 +32,8 @@ DEPEND="${RDEPEND}
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
diff --git a/sys-devel/binutils-apple/binutils-apple-3.2.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.ebuild
index 06612cf08bc5..ecf70a438a54 100644
--- a/sys-devel/binutils-apple/binutils-apple-3.2.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-3.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-3.2.ebuild,v 1.9 2015/01/31 02:33:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.2.ebuild,v 1.10 2015/02/27 08:14:46 vapier Exp $
 
 EAPI="3"
 
@@ -31,8 +31,8 @@ DEPEND="${RDEPEND}
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
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 dbc6c5d13c10..b6be7f28d428 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.3 2015/02/04 17:39:58 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.2-r1.ebuild,v 1.4 2015/02/27 08:14:46 vapier Exp $
 
 EAPI="3"
 
@@ -33,8 +33,8 @@ DEPEND="${RDEPEND}
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
diff --git a/sys-devel/binutils-apple/binutils-apple-4.2.ebuild b/sys-devel/binutils-apple/binutils-apple-4.2.ebuild
index 80f5244f2bcd..f407f1158530 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.8 2015/02/04 17:39:58 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.2.ebuild,v 1.9 2015/02/27 08:14:46 vapier Exp $
 
 EAPI="3"
 
@@ -36,8 +36,8 @@ DEPEND="${RDEPEND}
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
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 7502d69b586e..9760667f0a9d 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.3 2015/02/04 17:39:58 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.3-r1.ebuild,v 1.4 2015/02/27 08:14:46 vapier Exp $
 
 EAPI="3"
 
@@ -33,8 +33,8 @@ DEPEND="${RDEPEND}
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
diff --git a/sys-devel/binutils-apple/binutils-apple-4.3.ebuild b/sys-devel/binutils-apple/binutils-apple-4.3.ebuild
index 474c32aa961b..8beaec05b1e3 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.6 2015/02/04 17:39:58 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.3.ebuild,v 1.7 2015/02/27 08:14:46 vapier Exp $
 
 EAPI="3"
 
@@ -36,8 +36,8 @@ DEPEND="${RDEPEND}
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
diff --git a/sys-devel/binutils-apple/binutils-apple-5.1.ebuild b/sys-devel/binutils-apple/binutils-apple-5.1.ebuild
index 92adfdeeb1bb..a529f8d11e62 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.3 2015/02/04 17:39:58 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-5.1.ebuild,v 1.4 2015/02/27 08:14:46 vapier Exp $
 
 EAPI="3"
 
@@ -33,8 +33,8 @@ DEPEND="${RDEPEND}
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
diff --git a/sys-devel/binutils-apple/binutils-apple-6.1.ebuild b/sys-devel/binutils-apple/binutils-apple-6.1.ebuild
index 03dc1a91d4b9..c32f033079f8 100644
--- a/sys-devel/binutils-apple/binutils-apple-6.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-6.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-6.1.ebuild,v 1.3 2015/02/04 17:33:20 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-6.1.ebuild,v 1.4 2015/02/27 08:14:46 vapier Exp $
 
 EAPI="3"
 
@@ -33,8 +33,8 @@ DEPEND="${RDEPEND}
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
diff --git a/sys-devel/gdb/ChangeLog b/sys-devel/gdb/ChangeLog
index 0e76581e57d1..d57ac85c4379 100644
--- a/sys-devel/gdb/ChangeLog
+++ b/sys-devel/gdb/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-devel/gdb
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.289 2015/02/20 19:53:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.290 2015/02/27 08:14:05 vapier Exp $
+
+  27 Feb 2015; Mike Frysinger <vapier@gentoo.org> gdb-6.6-r2.ebuild,
+  gdb-6.7.1-r3.ebuild, gdb-6.8-r1.ebuild, gdb-6.8-r2.ebuild, gdb-7.0.1.ebuild,
+  gdb-7.1.ebuild, gdb-7.2.50.20101117.4.15.ebuild, gdb-7.2.ebuild,
+  gdb-7.3.1-r1.ebuild, gdb-7.3.1.ebuild, gdb-7.3.ebuild, gdb-7.4.1.ebuild,
+  gdb-7.4.ebuild, gdb-7.5.1.ebuild, gdb-7.5.ebuild, gdb-7.6.1.ebuild,
+  gdb-7.6.2.ebuild, gdb-7.6.ebuild, gdb-7.7-r1.ebuild, gdb-7.7.1.ebuild,
+  gdb-7.8.1.ebuild, gdb-7.8.2.ebuild, gdb-7.8.ebuild, gdb-7.9.ebuild,
+  gdb-9999.ebuild:
+  Use more readable CTARGET setup logic.
 
 *gdb-7.9 (20 Feb 2015)
 
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 8d78e8da0a98..c229e4890b01 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -41,47 +41,47 @@ DIST gdb-7.8.1.tar.xz 17669136 SHA256 497722b58386f4428c3474281eb3ef1c872404998b
 DIST gdb-7.8.2.tar.xz 17678568 SHA256 605954d5747d5f08ea4b7f48e958d1ebbf39265e18f7f36738deeabb83744485 SHA512 face5bf1b4ce144fc8604fc84620beed956177a11fd632b4e41906fc7f632910b2b43a50e6cfdfd6cbd876ee527c813bddab8df29dc560a6c36694cdb8edc4e4 WHIRLPOOL b0e5adc8e98c8363c25b86a8f47d07863a97f215c74b4fe2fcce4e72ce82867bafea60cb51d26f3814e895a93e047ca962b19fb2557e9c74a0ab3d88b1e6ee1d
 DIST gdb-7.8.tar.xz 17664316 SHA256 49c4abe174f79f54e1f9e75210ffb590d9b497d5b5200b5398c0e073a4ecb875 SHA512 e3977393c3a9bc2860d845928f457f4696a87106ccf30569cb69a82893deeab9b05fd1cffa4316cc5cfdfd3ad11a2d5660ed07a9965fa3d696a0ec604702557f WHIRLPOOL fb97f1fbee170fccf462d25fd6b4a218a8126b75465b59e21322ff2cacf2707d6b037d593663a4f52ae293c72d012a69a65377ee6827de18da80159c829b672d
 DIST gdb-7.9.tar.xz 17859428 SHA256 9b315651a16528f7af8c7d8284699fb0c965df316cc7339bb0b7bae335848392 SHA512 850202a477b486a75dc8196efead79c95bc675e348064a5eefee2a50215d40f62e9e052e9b8df29f997f91430f6e7454883652c701f5b1e688d9e2c575876c83 WHIRLPOOL 597cbe8b8c9da7e2188f6d207738fd9679c3a841fec9483f67ff91156d7886636b1da61bf1255155115655d87648278a0670ad381afde931c7c6ab6e762a9ecd
-EBUILD gdb-6.6-r2.ebuild 1950 SHA256 0359eefcce2250acf529a48035c435e7d0478d6a18380bfe2dad36f001c62e35 SHA512 dc4cfdb00bf4be2a201ba071ce1757ea402850840e6926d53aa1deecdb8d6d9e409f32e1e7fc25db4e7c202fdbd672bc30ff2541c39ee18ff3fa785e4a0e6037 WHIRLPOOL 4ffed64c7db4689072c8694583157458f8afb0358cc31cedd28c4f53dbde05216eaa15283c3a66a71ffa72041a0fa72394665a86946b0f39c21dc4c73d8952a9
-EBUILD gdb-6.7.1-r3.ebuild 2042 SHA256 ba940b8d4c17770b2f26a47079a8e4566be55a00bbe93907e2abb3a60ef4d39c SHA512 280831526c3f4f86945f527e6b6f9f72f93d30229953f65e54fd5f01c149ab5c091c8a60cd713b48387a34fcd877c921598a28002d1f81774b572d7c3309ca4b WHIRLPOOL 874cd17c2156b7cdb57c4e444ef158bd7229351cb4d0e85fc0f349ad8f6f1df1fb1c195033c3a8280a22ae79ec155bea3dda38d12cf90acf6aebb40f5a1d5699
-EBUILD gdb-6.8-r1.ebuild 2201 SHA256 507258af3645f31d1334bb2d987b1a5165033ef7645877d0d2282ef8da4efb83 SHA512 3a1439b8327d6315aa06c65b2e0115d7232e3fea580ba60dcef2810f26620270840219864d414c7aa94984a12690e5ceaa0df8378849b6d0b07984f36f0ffd9b WHIRLPOOL e8e7eb473f91b5cd1b806c72625b5471cf7ec13e33ec4d9356fbdaae946619e3159244725d1b7da8c5737212b72fda58e3f75798dc08272df1a0e4762e270a9f
-EBUILD gdb-6.8-r2.ebuild 2265 SHA256 57b01497d827b55cd7cfcf30f97fdc5268410a369420c55e431b0a4ce7c0afd2 SHA512 1395f83f18e56c7ab25ad3658fe56078f58df1ba7e0da9765b17c1bac2ddf119bb7a0014c1344659892bf8262ed3d0c20b4b13f993a76a618f555bed2ce9ba02 WHIRLPOOL 5573594595f6f92404a431e165326492417b398d4d5ebdf9f2ea902f8f2b9b0b155aa74a06ebc3224722a5664f1fad58c8e80c1c4427c298d61a99ae08caac0b
-EBUILD gdb-7.0.1.ebuild 2647 SHA256 92010fdde10dbdbc5ae00b9126ffba7b21181e8ae2581eb1ea3c9e1fca454acd SHA512 5941cfcc06a49b2336043a9bfd912741c336b649c55d9ce5debb2312708784dfdf34002ccf9436337902570d20ed9d38e0af7461872953f713aa754b8401369d WHIRLPOOL afb156ffe4b323b9aed264490adac6a796bca07de0d59bf3dcc964557e337123dd7d6c0103b56a9db42b2f7865e4b6a7f6bb234e5f01f0fe7ad0347db97f6c75
-EBUILD gdb-7.1.ebuild 2605 SHA256 25232a5a02bcba81be69ee828dfaf03ca4a7f7011ae17fe1a0d10f04cd67db53 SHA512 e837d3c85285f6b51f99b7c8549cfd5c83ae280abc65c0794e7b860374817e0cf32650465f083f73055643969ed840c573de844a815c879b3acf8f6db352756d WHIRLPOOL c634b0f020d110d7331669703391188f54413698af61de8e410bca67af18f4bc3bc7a56892cd35f0b5f0fd8b20ee455216b1b68a0d6d25ff73c52eed9f98f8d9
-EBUILD gdb-7.2.50.20101117.4.15.ebuild 3056 SHA256 935e27eb25d86d765fabbd10b1addc60949273f914fd3b56f300995dbd1e7973 SHA512 36f435875e2918c1eee14db3f8f3031a628cbc49e520b41e44745138a371ac97fda72cbf075dba83570c4f8f6dcb970446bfefb180e9217459744c91ea7e4588 WHIRLPOOL b43a1638df4e6e736690e97ee15e13c2fab25664114b6583bcdd262c3bc2da23cf8eed41119099b4707075f7218d95696b58d98591f4175d5d658156268b47f3
-EBUILD gdb-7.2.ebuild 3481 SHA256 d707386e092ee8b41a74d74e12b7981f7a76537e7975f2269b4581f643bf4535 SHA512 378e15a8dc29107cb8e2c3f1eea80bf8e518c37ca14a0f2c328fcee4bba3e211e32f22b0807de511dced574fa83c689865f8531004d8408261cc773a0c1d2c5f WHIRLPOOL e6442c497f6123c89396f1d9c35d21ea15cc5bde189beb35b994e81839e8c3510d921d9530bea8f318899777a8bf56fab301a4a36567eadd2634505a81b2fc07
-EBUILD gdb-7.3.1-r1.ebuild 5131 SHA256 62e0a6f96535f25b9bb7afea3f7453f4ea08ea7dbbce81cb0e808a5a09f9f2c8 SHA512 996b676655a94726d1c913d6355c7bc77e093a6b7d6f864110287479667725973910176ff026c1ee32ead0da13dc38f3393ab29c3cd50cee5b19a82872757a3c WHIRLPOOL f751906e581f3e27d5ea8801db6f4dd6aa5ff4cf8aeeb5cf16d6305bdfa987d28798a07305f1e6a6f5050c94a717a5a989ab84971fdbb3a0e035ac3abfb8cb08
-EBUILD gdb-7.3.1.ebuild 3878 SHA256 f546a8db61efe47d10939abacfc18d7818a147804dfb4216edde58a3fe660bce SHA512 b862893eae882a165b09f1d2432af72d42bafafaba378606a6380472a4ba77daa85c841c2b74255b58386c4fa089fbcdc3da9a87d9798030e6b577379b51d26a WHIRLPOOL a752433bff11891b21d75e9a3d88491c06ec64eeb4bdce6c660f1ac70d95df25c474abc1200d633ab8aab5a9380e3eb6f89de95c5812c9ec6bb618e6d3c3be60
-EBUILD gdb-7.3.ebuild 3794 SHA256 381c3114ff72b541d0a9858d01ba3d423500a67aee9f92797a82a1afc26f31cd SHA512 7a67339c071d3375c77a1e84ed4135fe543997bb5533cfb971eee1b4f666960b467bdda1fbb4744b23258b8164291bc690e68df3b4aca7dcaf81f662b3e7d7a6 WHIRLPOOL 46542ebdf79cfc11ce0c7b467dd1cb49cb71e4e5430bec23679fd0a27b2e2c5caf1accdcae1d8473873e9c71d7f46be67ab40e8f2906471515b5bb9e6aa55729
-EBUILD gdb-7.4.1.ebuild 5232 SHA256 31201a7c52a9547070353a138d966c24059cb5ca96919374bff2ba48b21d01e1 SHA512 c74d3e312cb8fea9f1279215fd7554040d87c8d4af828058014b52ba99dd5fbb88727cd9bd8b298fe45f26b16ad33daf936152c701b943393d486f2a3c7b6862 WHIRLPOOL dddbdf4cdff1832d814856577e5f7d5534326037c600867a9f61bf809417fcd2ec06ae2e3e0fccada73c08e545287ecfb6e57a395a80e6ae95a4c59cecea8ea2
-EBUILD gdb-7.4.ebuild 5218 SHA256 666892b984deba305b6e87782ea7c0e7fb370aa6433780e0a151a4982c346bc3 SHA512 9e33e68ad315f4454ec2000fde2827bf2c7ef01d7204039b688f3bd51f1d542381f5c04d694107d628224612d68b4928f148a8a60160af419671d794e9d4e4bf WHIRLPOOL e82a7bc549af90b585b6b2926e79e7898e6edc95d936a089490faaf05edc192477c38956fb981d3767426f8ef3449c462b710f21dc23a4046777dedb086050f9
-EBUILD gdb-7.5.1.ebuild 5239 SHA256 9a9b3bef2ab2abeddfdca24d1c7d917819aedcdf7548e6a60e98dc6cf60ac7e9 SHA512 314356776f82746291d0d6754814cad6895ba15daee39f2bf3bde97d440fa5c9a0988815d4c7174c55012d2ec517aff9650e79bea438fe2112a063329d2a0f19 WHIRLPOOL 1356ad02127400449ce68a3a4ed7c0e0a98a0d920b89f3597d900d6faa49187506991a6dee8983c3bf89dff043bd511217651dad015e66e62e1a28d44eaa4fa1
-EBUILD gdb-7.5.ebuild 5221 SHA256 3832e428fda5cff03d3030a7921e1415fda5648fdaa2ccb5697e165da48f2b68 SHA512 208eb76a25efe47e88189c2f10701c8b1ecba7c71f4462632b736cd073f848c297bc51f32ba31531a8b68e612ab1c36c46283bdbe38d042c2cdb99c56aa713ad WHIRLPOOL 7ec7aeb0f3db79cf597e5d7b0ad57ff86bca7bb2894730a19bbc261fa44308131ca33d317b99766dee9ed34750ca5322f8df4ff7358cfb2bd6dcec87b499b54b
-EBUILD gdb-7.6.1.ebuild 5761 SHA256 b4a35b2fec5f7832c53b18708aa150cdf25e7091880ab65954586d1e3c8565be SHA512 c68c2f920967867909f178abb66689d7a5468d72945361f06e432a91c7fc776504283112607f06970b9a1425676cf826633f893af6952bb429f3c011c1970692 WHIRLPOOL 8e3f38562949573baa9427e3b2f1ce05126dde90e6941ad23a0e269d9f8f593ab21f8deaa718b2f302416150b2b4369f4ed1653d4476011e72e448f55ac0b4ff
-EBUILD gdb-7.6.2.ebuild 5757 SHA256 94104600bc3ff26d2475ed911ed8e73c4e635468d31e687fea08cc904ae08758 SHA512 a56af6b051a3902868b3e5478f431328da6787e614ceffd34ed4b8b78190524748ea07dabdc2c660781f2b35c79cb7629bbc9a41f8ce213362ffac7de11799f7 WHIRLPOOL f8c0026377d6015bdb562c65b79b677f97b5422694da3429c99be16e777e8701713c4d68a1a6676d194772521920a7621664ae911dfb908294533c19584d0fc7
-EBUILD gdb-7.6.ebuild 5299 SHA256 027db94b8f4e73dd913a532fe369de4f2368718af38642f2a49c63043a595930 SHA512 7730d4337af8815d9cc3c3a9a81a8d0837dee574b0e906c7cae21c6716f70947afd5f015b1d6ca987531be033323d6218ba8d4fceb12af640d201a1928824317 WHIRLPOOL fb3a5142a25b50ae504ca89727ae2111a47c4d38ea7096e5f1d1dffe28347f8f63eb5c6ce66463a47fca6ae7c371ee9303783876cb11efee381cb37de61f6bde
-EBUILD gdb-7.7-r1.ebuild 5651 SHA256 58956043e70afa9213cee04d5f00ee1b370baa2ed3f1136030a70a06f8608408 SHA512 61743345e338b1f567eea06c809510414d3fd038ad3cfb7a6e037e19985aeb5061a4bf8ab67adf16a8eea39dd9193a0dc090f8574a8db26d7c4269220f9b4bf8 WHIRLPOOL 2af4b781d68c24219e928736970393e4f367be2cb324f42712f3b646cb36e34a6ff6f8cbf656c99d6e6b8f95f5a75d6b2f8564a44f68011ea5ded239fda32fdb
-EBUILD gdb-7.7.1.ebuild 6074 SHA256 116a43a5f1c468057a18346d0dee15062d02c5536ad28960f1913d8c589e497a SHA512 d8bf78f97eaafb1eda2fc2621fb0d4eb1428c92991d1cb26175fe7b508eb79594b6376a166b9a2e545ea3db300d98eaf56be7ab034818191cd7abbd085e53bda WHIRLPOOL 479e0615f8ecb89718082f946399ec94c88b060bbd21ab5e0b176797c3b77c2f1bf45b5b7a08d349f91babacea01a71413bdb4f9488ac2971361022cc0d7ca6d
-EBUILD gdb-7.8.1.ebuild 5949 SHA256 c0dd4383acc2878eafad9c06c06a4e6e0c459d66e3d67eca9d15d9ea6da52eb6 SHA512 08a86ebda77c7729afb5f711fe2903542f6e466cd0b739042193c527e767a3022e9d09930c00f3bb309a0b792ab402ce84af479751b09237fef1f3409dba0fc2 WHIRLPOOL 1940f4f08e946c8de6e5f102c1d86853c93f9f78338ece9739ccf64b26fcd9fbb84f53f7d35c82d72d59241eb97349bfbb63d6a572293ae52e9ab7d307c0121d
-EBUILD gdb-7.8.2.ebuild 5949 SHA256 2132171e88505277f5e30a8e836b7a9dcb227d06dbf3d2a2039924a13b1f0b6c SHA512 d351a24dd4d3dde262d53c95913dd62aef09739e44690fcd133b0d58eccc84175ecb420a7e988b8306d3d15d567e6113c2b4fe4c38648bc507636f4f1c2dbe9d WHIRLPOOL 65a23f61d5e10b69cd1236d8d9b351c4127ac745debfcfa6191ff9bfff97019e86177279468c5f32be6dda669cbb7416018499c25e8ac89c47e5d3d69116395b
-EBUILD gdb-7.8.ebuild 5873 SHA256 763f7d1be1f82028fdcc76bb7b758efd6240aadcb8b185db03eb782695b994c2 SHA512 5ce51497cc34d6ea6f87fab59436a59becd301fdf41c569841b585346261094bd6458ec405dd53aeff5c0c6f7204d41013095001cdbb0eefe3cc9457e8e67ff4 WHIRLPOOL 9597a11864bfce5023fb360d00b37d996337f5c418bc3a46d043dcb66c2580acf7a7db21fb584edf034fa00ed692a74038bcf62e50cc98c39780e1b28b3fbd68
-EBUILD gdb-7.9.ebuild 5946 SHA256 04052c10dc42955c2b53fcfad828d4ba50b577cc412bc581bc9a0ce5c4ddaacd SHA512 ebc1a0f6060a6b26d9b392c1b8d7f4e4b8601b832fb55d32eb34724742a34e64730c9c237b08b61b16d3102f8ced2ca7b6d638db546191f13e8b920d93794a06 WHIRLPOOL b5484a3cb16a025c5eccbd5fcbefadef6e193ee711d4ab725776e7f8689ab1ac8b9b9f8ebc18f3f952c23c472b8750ec1ded3ffa76bf128f4d5fe8d40d1aa4b6
-EBUILD gdb-9999.ebuild 5948 SHA256 d113155d244ebc6b62bfb4d55526547cbf1e581681c616d28477f0d3283814c2 SHA512 509d4a21c55af72460dd723726dc4e0055689d58a318badf4076fcc221220dae5a1d13f5e0190164fce4b6e8c6700c6bf201263aad46649651cb6ae1307beb75 WHIRLPOOL b9c57c11c36ee19ba3a907cdd88fe17ff54b21e8c8cdbd8394c98e42985e3984cb9ea295fa27fc5d97f10fb1a5451e10eaa97d490a085cf13c852166b1c37920
-MISC ChangeLog 38529 SHA256 25859bdcfa9c657d4618f9848ef7c2eaec66b84df4d01c956d60f8f3c17619ab SHA512 55214c1a1304fa203ba2b1701bfa0cb18384e87147e842eeee691751976829bca56a789b9681133088eafa74617ee64cd1d294c72feeb5e90aba28475abf7eaa WHIRLPOOL 94dc269d17cd4e2bcc760f22aa89036b29d0c9d60bc6d8e52488827cd5c33693a2f19cdb6159d6d1e10f15314f6ec313e932fb8ebc05bd2e0ecee00b07f38f71
+EBUILD gdb-6.6-r2.ebuild 1939 SHA256 1a01fef76c09573c751de1369d545e3a1eace756965358522ea288c107792b9b SHA512 483275d932eb477d6b0b89c7f3b0ea390afd60832255633892949993d7825e9d8c4f12e006f832a18fb0a02d430668c12d0ed732e275ac816c126c85b7301887 WHIRLPOOL 15cf267219f1249ab508e8e27a22d8de65eb0db5fae53fdb31e38fcc299c1cb907908e804d0124ed54cea916297788607a9aac4dc8f18b953ecf72b5ca2528f3
+EBUILD gdb-6.7.1-r3.ebuild 2031 SHA256 c863be140dd7c009673dbeb3db9fc37fe3fc01c3d4d0936a24f94834140ca121 SHA512 39f936df46f1a476c9806f181cb9f056b78fc9929863cc217cd043322c06cf683328b8e1660c4827373227b1b95edcf8cefc2c28c12aebe053eda98eb7f7ecc4 WHIRLPOOL a8cf6dbd568fc9a67f35452167e2f6ef2e607cf532be238b7aa3e9145dbbd8f47e98de6e0a838507f69e195dc75b731b2ba2436471ac82c818900ffecbe7ec9e
+EBUILD gdb-6.8-r1.ebuild 2190 SHA256 2157cf3aaeb2fbed44c3386bc360e5e620ace90c067ba90cba16e2dc05c94eef SHA512 c7b5b4b489c9e74c70f45b6dca872a414d1074aafb4696b2aea9dee0136a981208910c5e0e093afeb22b7b5b7d0cbbdcd3ed6efb80f21c19a6152f4fa7b49dc8 WHIRLPOOL a43c80b43108721637f059512c87381dccbeb22755be806b997e6484c4b78d44eafed3615d8767c2f0b82612cb4156c4e6a18d55a4ea734dded4d23458784126
+EBUILD gdb-6.8-r2.ebuild 2254 SHA256 abda79679c1ddaa8a0fdc0ea6a374660569176cefe5fd1d1b8316168bc799be9 SHA512 15dd4fa4d337b6b7e2ed749356714e97fae95c126e545163a0da490656fbbcf8a236826683e8cf1048997c51762936450161d1ada38738ce42cbeddacbce0170 WHIRLPOOL 7aad4ab72b7f7163068af262050e9a468d488bb4856913c0610df8fcc6af868b8431d35c06d97fbc2028de09d81918781633b18bb1c8ed3a4dc6ddfbdd9aa260
+EBUILD gdb-7.0.1.ebuild 2636 SHA256 3638efe8938916b6b2a3fa1d48463a5e47768aaffd4c9cbd28dc4e71675006af SHA512 d053a0ecfda7abc94e198ea45d6d7665a140640cb4fc4700971a05b2d4ee0a31cdc0f468c17bf121dbff12897c923996556b8c57c107d66264bd3d9f62a87045 WHIRLPOOL 11d3f8858f3a8db3b1f90cb4dadc3629f33cbef64a52cd1bb65cfac52abd51b8b13bdf6ef0e8f92ece9c6d9c5e306bc68f9b4402e27351675e94c508d6de52dd
+EBUILD gdb-7.1.ebuild 2594 SHA256 f248b9f0e0ff6447187ce06c53b6a4f0f831bad39fa51b6ff9c36e3228bff16c SHA512 c0f5798b441b2e72942ecaaec27739723b7b5b3918b425526250c12b01289b0be3e6112f3c85c972dd9bb6bb1ee8a5fa09b475ff151fba13faddbf13f4fe138e WHIRLPOOL 7fab0eaf6f20172e03c5245555f73d271deec6ca63f6afac7d4cf9a79c188baf6c04644b4d9b9de173acec9b9fdc5476b8ad66d3adf1137ee211cd0fb31f8248
+EBUILD gdb-7.2.50.20101117.4.15.ebuild 3045 SHA256 2899afa78fee63328b854ed8e824a0413a258bd28d284a23ff750b026fd02313 SHA512 56553202a2884b3a67a960631440067d089e3e561a9b74c3c4546ca314519b013ca0e472baebbf8a9fca20fc2f77bc21dcc08504a88864e710b2e99df483fd78 WHIRLPOOL 3cd0f119a3d96a1c85a02336f57b7ca18a27ee0a6ea323490fccfe92cca2b16e13a3d5674a80ccc8623e5bbc2c9eaabde26509a41344c9c175d1463e37ae3ca4
+EBUILD gdb-7.2.ebuild 3470 SHA256 98dc8db6003bc6038f7ace500cb268b14c698395e3351767c85c0c2ab650923c SHA512 80277a620acf47d54471c334b4e4b685bd4a9ff24295feecbec36673368c6ae15528f1bbc13747564f0b81a38e6fc29b10bf745ad37cb8bf1d0e09d8991ebe81 WHIRLPOOL cb4b56b84a3316c8679fe2f6dfc9ab24076ce532d780b2bb54319e10f61082bfcfdbc9e91e0b7a087a94c2d03274e5ab7f811f6df9886d1c05b658f06dc01c27
+EBUILD gdb-7.3.1-r1.ebuild 5120 SHA256 86870789e1a2a2dd2086066a9c58f34ba5ddc32334a31f2e497488c49fa72dc6 SHA512 100a65e1a8cd49e65cd41b7f2b1e1b292f64ec28294d2f2134da239602c18b40455b8de47d3195ba8fdd94f0fd3d9a8fc7bebfe125edfcd8b5e048069059b891 WHIRLPOOL 8211d0e946af056518b43517946f4cf3b6061c9197b1b4a13f6059e5217a4222678a16b16989f904a58b00e9b1f74d0001358b7da5d619a9308192d1a1fc56db
+EBUILD gdb-7.3.1.ebuild 3867 SHA256 dd7e7fa7202f22ea83046bd62cbeb27074621e099eae3c3805a079be985aa298 SHA512 7923993312ba791aa7db0665a0678b89625715cc779dd7a54e5b8d578d6aba0407d1e5da259d58e0a7a45eaf80ca2df5f6ec4ec313f1550c1f92214d7b0c04e2 WHIRLPOOL 3a2189d01143e3e912ea21cc2f03da3cceef9fc01c948f8681096fc751914d16b962f48957a848856a3234d9c764600fb6f340f8a5dab6804406da9e86d64d7e
+EBUILD gdb-7.3.ebuild 3783 SHA256 de065fe119a5bf113b0917842903a71cb9348c50acbaea8a82a96450de6ea6fe SHA512 ec0aedb1be7eadb08a2d07a59a5ad23b992d379527e2463b7a9647563efb1614062f8004b9d466b018a08f048e7b23755c09fa667aa88d9c7271a718027237f8 WHIRLPOOL 83d5a23cccb1c66b905bbc89213ecf90da7ab2ebcbc28cae23713ea8b34189f6adb8b35bb1319e482f142f24772ec5962bfe31e57fd2dd196eee9b235dca3bb0
+EBUILD gdb-7.4.1.ebuild 5221 SHA256 1fe0f789a1a4dcfe3452b3ff57f98f7c24bb054fe064ca4aa68b86b6afe58db8 SHA512 4b51ca14f1d6a8933c373e4dcaf67702378d64a84f084683db849b7b87a06429e9cd0de8ee668efa80b3cfa8d6ccdee312f03006eb82bc2192ec13040e0eb7d4 WHIRLPOOL add6be6926a54ea249305be13edf7576322596760ef0a1b4db1de7bf13bea5041ac3065739cfef4cf1647bd09b48d794f7fa9d4a0aeeba26ef160fb79e694139
+EBUILD gdb-7.4.ebuild 5207 SHA256 5469b7e7061fc266060acc5aa9e28e37d0e63b88c69bceb52c462c9735ccf338 SHA512 426be7d7519e7b9afc9a3a23bf038a1273eb7bc31cfb87da79d57ea7efaebb41d8961c83a9a92fac2fed1f665a81e8265838cf1f63406c522edfb01775e6259e WHIRLPOOL 17fa6569ff239df3677f466b02d5cc28cd10420303a0ce11dd6d1040a8de41b83900bca1450966894a1b5842216988a7e028b229c70572ca5bedad57d31e0ed6
+EBUILD gdb-7.5.1.ebuild 5228 SHA256 0beb95618c0ba45f5face62961d85997a79d0596353fab978df76e78e4b63d7f SHA512 6ce1415fef7faea18b07f39a7bc80dbf2cae49095e40c722c33ec8c69bcf46e3b639363c0ef575b444bbd2c92856a54c45946657682633ddb8aacf5e878abb22 WHIRLPOOL b27ed2406bdb210b1cda613840c7c8a792c04928fb40cbe0aa767408e798dfccde497e8f16eeb385402244bb3d7b15aa95ec02721c8df21e007ca5e3577809de
+EBUILD gdb-7.5.ebuild 5210 SHA256 07bed64a562e9a1865fb9f6309a5496606f0c901634ae849fcc8a513ce93f887 SHA512 9bbb7db567d8ee1552cc33aeeede91f3905acf96d46e288496a98511f3ed8f56dc49c26261f12a21261d82da3f0601691cfaa777e7303135808c1d950a05c7c1 WHIRLPOOL cf16cd6e0512a3ec11fe783c5ef248134fed2bb5e1c8b7223339ac664c4836977781c6dc28fae49a0a325f5772f18b0cc1d19ef8a7ff4b69ac00bce07822809a
+EBUILD gdb-7.6.1.ebuild 5750 SHA256 007cc7e1be2deb9ee26327d282be16007efb411aec92dbc601f9997d536290b8 SHA512 53afc07e9f5d02a003a065803d14396dfe31569f7b3ab17c057b2183ea11a76489b33364f24d718a148f586cd63209e2cf60136ab281add48dfb564aacecefc7 WHIRLPOOL 2d60fe5eaa5e2dad3f8627e2c86d364a7d24373560b46b443f6daa5ad5b7ccaa4fdf6e97274480e4bd2d632c595d478b958254a081bb9871fcced5b61d770fcf
+EBUILD gdb-7.6.2.ebuild 5746 SHA256 8da036ff1cb7e6a9dea33fe05535c676739365ad0aba6eb49b80307fe10f797b SHA512 08aa373d88e1510b2439fdf64a60530be2776716b568fe8dc79324e30fd30489e698e478587dfa6a209c5314d903ad5f5183b10886736ad8178c66a0e0342155 WHIRLPOOL 3b4ff811f2e9310a348a15b198ca16e3c4588141145803403b235542e91c49cfd76e4a61961ba7ccd3734c584d40cce4409bc11ea779ffe0653fbb7944938b8a
+EBUILD gdb-7.6.ebuild 5288 SHA256 15e5ab12515b07a5064108cee515c6a99fa50ec8dc0b2f56fd5344f4cd979fc6 SHA512 686c36bb47a30154be5a8c8d8c3de39baaf0289859dacfa1fc489efd1fe98353ad35ce20184f445d17e73fe94842b93a806dd47643eb62e5fa6bbd1fd9cff417 WHIRLPOOL 7d55abec2e2d837057838538a576ddb63251f42ef4d44f29f69fe16550cf7b9cd4904ad0f295a9f97f7bbc2d8c2d4cb3611f3c3c23b04bdc36128a957dc40f1b
+EBUILD gdb-7.7-r1.ebuild 5640 SHA256 ab1dd9a8fd3ffd977edfdfa795c4cb1caf578ede685f44856e3f1ae977d18593 SHA512 af044f6cbf0069926040aa3543cfcc397c95595b867367527dcdab514ed64e5634da05f56c20c5975abcf5a1819dcbad29abb3e7fdc8abbdae18511fe6844e83 WHIRLPOOL 5fdade71e9b69613936958d543ae3e21d39209965cce9cb62993620c7c54bfcd56186c6a9efdee009b92e5f1f0c028e3dfbed2efa5792685e4847e99c79b28de
+EBUILD gdb-7.7.1.ebuild 6063 SHA256 35995825b2598d6244cd40e38356b4c62f46dfd0bdecc0e6cdefe2f6ccc6afd5 SHA512 714e4b487b9298ba65ad7401227565dfe6d40d12b9c74337e028f9a6b807e4288acd2180ad07ad03e412f31baabb70217e7b41ca5a4f5f72f551dcbf7408b89a WHIRLPOOL 318b5aa126bfad77d12a4f16695a483774868cabf8c7e94327d961f3692dc8c7915f9c1f69bc2482e2504c517595388dd5c528934aa53e63d552f70d08aa4377
+EBUILD gdb-7.8.1.ebuild 5938 SHA256 17f1f699a517ea91d5903c736bed98cdee0c36868836d57f170da63f9982d936 SHA512 942b84583f5912dcf29c1bb17e672fa0dfdbc48d1510ce191d830de52e57f9821f961ca32bb5577a69143d636de930098a7a90c8cd24b44924a7cca3327e74bc WHIRLPOOL fe782ad71afdb0f1e5733a96ffa4ea3e3e71e4a47235c7bd16f01f4906b83da5204e873d84243185124bea8fc18a79db94a3547cdefb5f66f5a1fb8b1b274492
+EBUILD gdb-7.8.2.ebuild 5938 SHA256 219d73e44d0fa98ea8409b9aec5ffc18da296db9e0075f77fbd494f67a4a95bf SHA512 031ad6a1fbe3202225c1e24e9f998e9c31bbf4a57c6403a3654757ea528694a3af03d840de8c729e38b0a28854fdc7f1425a823f65d42475517bef70159db8d7 WHIRLPOOL 82cf1a732691d6573866899b313b658f155cd64e30f279b27e769d36b4e9863d3ebcb796bb9fd1969638d3791756279e8cdcb4dd052b7b594c8cfd585d5de879
+EBUILD gdb-7.8.ebuild 5862 SHA256 eeba7028da796e3d51d057a1f457bb6c854f3fe762165f155c337e1d51ea0b49 SHA512 f47fd965b0e31d13cc2b032d5ef1f66c09159e925c1d486439c919f56efc4518ddd1318ea396a19288c6297e5288558545ddec674740dbf764e6522124247e72 WHIRLPOOL caa4aa0790729c9276e750d6cc780d23ae807fce2162b31995a0d32752fb8bbb0df0dff9d7ecb3cf8b41bc3e6ee051e6b108a0ec6ff4b4776c7530bf40da4100
+EBUILD gdb-7.9.ebuild 5935 SHA256 0e4d09548445d79993de4de89efd7b6332c836a4aca9213543c50b3f2c5b23fa SHA512 71a3b3d1b14e494ff2fb8efc7b49ddc1ff1e6a73e84ca70a00e07673ac658f94a4b1c33b94239269aa85ef7bd467c63019d1387d19c09990514644e50c55474a WHIRLPOOL 45b5a7374bad4293dc78eadd100ae4001b45ed5b9f27d623bf38599cfcfd1a49aad02538f12ba60164bf6d94c470c9af3f6a7bea1ea4351616ee040103d0adb2
+EBUILD gdb-9999.ebuild 5937 SHA256 2a33e65afaac357212a112e44237101378eaa1319c1d7b97f5227b32866f88e3 SHA512 d7d58f8ecc40b854558915c527999b43bb4e3e209459e2d7a7b0607698a385e6b1d1af5189d87af93384a904c7b015d23086c181249b3c4f99ec9e87b5e41eee WHIRLPOOL 787f94f36d3e257059daf59a76478fc37a044a7eda4fbb8edadee5720756967d012636155517f209462f43ac17b82f2691ce9fd804f64946a5cab747c881fa5c
+MISC ChangeLog 39093 SHA256 27c4773ce59aa384b12e28a7c07ca45fcf5b5256266851505a404b2f18a6d222 SHA512 afc0ea0367851944eb5c30bcf7e6665189439df9544ef6c9a499377789f423fff23edbfd6653143d9867e84a11b92e32c70fe7aba133a4bb1705632fda5319c4 WHIRLPOOL c9f332a71aa3fd6187cba864894e5ee24084415df3cde039447867727961044bc78101aade20f46b532820df888138d6f7272efe6292a950b882051cbc37f344
 MISC metadata.xml 694 SHA256 32f59a7ff4c58911e613a5cafeb79fa23d4cced2be2553ddd0eb6395f2853d21 SHA512 521fa566e1dcaaf5c363edf0643e9bbd9374559d01be24875451163bf4b72ec44341b5c390730727950d3af38782850c203da55248e22153d713e34eeed1a07e WHIRLPOOL 76a4ae0a5fb0efa769fb676b21c13fae274775a0bee3f95281e0f9df46d67652e2afe2e3ed1da88e64d3f39d77fb89c7fcf3c19535b6ce90290ff8d01b06ec5f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU55FwAAoJEPGu1DbS6WIAydMP+wXKnTGiyAm0OB24AUO13F6b
-vlmhprr8p9JNF8zKaBtRhbjDqPLrhhNSzY3hrPbcpgVeGOsW/KqWI/ULmNvHnzYV
-ENthpTyGVyPThg33naF9Qqt7Nyi9b/gev2crF7zEYDhEY68o6kitdkfM+c2Uj8El
-dOf92FC54V0/PJqhlfB6ex0Le9G6rJdCL33ie8vznSh87EaxI/hwZQltNourEX7c
-LgEV8ejDHp9oB2uZiEny2Wu68ah18ajrnWPNxtuja3XVrN581ExIr5BuZF5hoTwg
-lyy8LiMAtU70Mb1RnEWNrfzsfLEuqGrVPRngbB75pbyZ5g0F2L8EF2t9W5z0SEku
-KOqCDMtRnSaAvzfOFz3P0cU4T220TTwuXKzcf8jatwLttx7efInybgmV27ZEbKXl
-wmSh7K8REEnsDLFJB0pbCDrm4cB88ypZKj5kqllwR0w+1bNzsqN+JKO44HraHKrk
-+WYrHctAlDNwyg+bxWBVYPTLyKXleYq4XaIhd9h5PvQ1e6wuuH03bpL05UkD6AAA
-ZGzx6nWmGLAQt4hwPSg1eikEijPrmf+s7gdaXmchmuP+4YRfb8+kF9rjQZl3es4v
-6Z3dpKE/YPXtnMg4+j+QiSYnQHRUlsKbYgcmOOnEyFTEiq12/OwYPbgz/dympGKl
-zmHz+wi0pyJQ29pG+ap1
-=0qPM
+iQIcBAEBCAAGBQJU8CdRAAoJEPGu1DbS6WIAUkUP/jloOLkmn2nlsX+RIaHcX1Qx
+exzrrmSkrRiXr1tjmjp/K3KdWY/kp+F0s8HHqvpZfOMYzqQPgljtWZNAloNYobWV
+TMNsVDRHWPptJvWNFZmjJQGdiGM3yCo2Nroo+urCsnpmrAcrLUU5FIX7aD0gzays
+E7d7Wc46CkSJ7RcLj+NtKGsmBg+iaUWOMBI2MbzXs32Zhu16pW+8HFym5bfVjw3+
+hhOkvaKwYuVDcIBWiHrANJ20pvh6dbrQopPXCNivBDTvH1q6LnJhkQEHDeKoVlbW
+EJaF3qZXxewgqQNuNroyvBbia5KKVH1hzs6wmfIobSFftN7cRoB9QlzF1kVpTZvT
+yr93di3zittBC7LggqDPhPtZ4FZGBIzpWJAjMrCMcLN2AutRLe2yRCGgBNPRmoEc
+ghQtX/21alL+PnLS+hm+BxBosHJg8Rdf5XP1b0US4mWMXHcVMiOgtuKrQIcVxOjv
+Bh/32DG2/cmh1/TXmlEupHm3mHAxx/9BdPG7itRkVevzqtiA6413VSjxsCDbk1SK
+CevuSq1FVLP8iilab/jp+DJpx5405wn65aGdvc37GflAFQovjMIaAyyCe8Dx4ywt
+5ZbfRH2L0KWOTJkFAByP8fclhkiO8nJtVf7q5lNINelZMuZDvpOYSTV/qHxIRFpS
+kLBnvPyGXPxhSqMvFHxh
+=+mle
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gdb/gdb-6.6-r2.ebuild b/sys-devel/gdb/gdb-6.6-r2.ebuild
index 3d0b58730b39..f72baed6c846 100644
--- a/sys-devel/gdb/gdb-6.6-r2.ebuild
+++ b/sys-devel/gdb/gdb-6.6-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.6-r2.ebuild,v 1.16 2015/02/20 15:42:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.6-r2.ebuild,v 1.17 2015/02/27 08:14:05 vapier Exp $
 
 inherit flag-o-matic eutils
 
 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/sys-devel/gdb/gdb-6.7.1-r3.ebuild b/sys-devel/gdb/gdb-6.7.1-r3.ebuild
index a74451ee9b49..c095bddcbdb5 100644
--- a/sys-devel/gdb/gdb-6.7.1-r3.ebuild
+++ b/sys-devel/gdb/gdb-6.7.1-r3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.7.1-r3.ebuild,v 1.12 2015/02/20 15:42:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.7.1-r3.ebuild,v 1.13 2015/02/27 08:14:05 vapier Exp $
 
 inherit flag-o-matic eutils
 
 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/sys-devel/gdb/gdb-6.8-r1.ebuild b/sys-devel/gdb/gdb-6.8-r1.ebuild
index 1647c8c946f3..7bd4b1f76f67 100644
--- a/sys-devel/gdb/gdb-6.8-r1.ebuild
+++ b/sys-devel/gdb/gdb-6.8-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.8-r1.ebuild,v 1.14 2015/02/20 15:42:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.8-r1.ebuild,v 1.15 2015/02/27 08:14:05 vapier Exp $
 
 inherit flag-o-matic eutils
 
 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/sys-devel/gdb/gdb-6.8-r2.ebuild b/sys-devel/gdb/gdb-6.8-r2.ebuild
index 72a08e0c5d90..8ad954fbc9aa 100644
--- a/sys-devel/gdb/gdb-6.8-r2.ebuild
+++ b/sys-devel/gdb/gdb-6.8-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.8-r2.ebuild,v 1.8 2015/02/20 15:42:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.8-r2.ebuild,v 1.9 2015/02/27 08:14:05 vapier Exp $
 
 inherit flag-o-matic eutils
 
 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/sys-devel/gdb/gdb-7.0.1.ebuild b/sys-devel/gdb/gdb-7.0.1.ebuild
index 06301e5357e4..83542e63f02a 100644
--- a/sys-devel/gdb/gdb-7.0.1.ebuild
+++ b/sys-devel/gdb/gdb-7.0.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.0.1.ebuild,v 1.11 2015/02/20 15:42:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.0.1.ebuild,v 1.12 2015/02/27 08:14:05 vapier Exp $
 
 inherit flag-o-matic eutils
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
diff --git a/sys-devel/gdb/gdb-7.1.ebuild b/sys-devel/gdb/gdb-7.1.ebuild
index b805c4596762..b9539548b799 100644
--- a/sys-devel/gdb/gdb-7.1.ebuild
+++ b/sys-devel/gdb/gdb-7.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.1.ebuild,v 1.5 2015/02/20 15:42:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.1.ebuild,v 1.6 2015/02/27 08:14:05 vapier Exp $
 
 inherit flag-o-matic eutils
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
diff --git a/sys-devel/gdb/gdb-7.2.50.20101117.4.15.ebuild b/sys-devel/gdb/gdb-7.2.50.20101117.4.15.ebuild
index af82d843141d..e8d6fa18abdf 100644
--- a/sys-devel/gdb/gdb-7.2.50.20101117.4.15.ebuild
+++ b/sys-devel/gdb/gdb-7.2.50.20101117.4.15.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/gdb/gdb-7.2.50.20101117.4.15.ebuild,v 1.4 2015/02/20 15:42:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.2.50.20101117.4.15.ebuild,v 1.5 2015/02/27 08:14:05 vapier Exp $
 
 EAPI="3"
 
@@ -8,8 +8,8 @@ inherit flag-o-matic eutils
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
diff --git a/sys-devel/gdb/gdb-7.2.ebuild b/sys-devel/gdb/gdb-7.2.ebuild
index b9b47474fa05..52ee83bbcf59 100644
--- a/sys-devel/gdb/gdb-7.2.ebuild
+++ b/sys-devel/gdb/gdb-7.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/gdb/gdb-7.2.ebuild,v 1.17 2015/02/20 15:42:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.2.ebuild,v 1.18 2015/02/27 08:14:05 vapier Exp $
 
 EAPI="3"
 
@@ -8,8 +8,8 @@ inherit flag-o-matic eutils
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
diff --git a/sys-devel/gdb/gdb-7.3.1-r1.ebuild b/sys-devel/gdb/gdb-7.3.1-r1.ebuild
index 5cbb75fdad38..930b05116249 100644
--- a/sys-devel/gdb/gdb-7.3.1-r1.ebuild
+++ b/sys-devel/gdb/gdb-7.3.1-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/gdb/gdb-7.3.1-r1.ebuild,v 1.10 2015/02/20 15:42:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.3.1-r1.ebuild,v 1.11 2015/02/27 08:14:05 vapier Exp $
 
 EAPI="3"
 
@@ -8,8 +8,8 @@ inherit flag-o-matic eutils
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
diff --git a/sys-devel/gdb/gdb-7.3.1.ebuild b/sys-devel/gdb/gdb-7.3.1.ebuild
index 8aaffefbf5ec..72715a04126a 100644
--- a/sys-devel/gdb/gdb-7.3.1.ebuild
+++ b/sys-devel/gdb/gdb-7.3.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/gdb/gdb-7.3.1.ebuild,v 1.16 2015/02/20 15:42:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.3.1.ebuild,v 1.17 2015/02/27 08:14:05 vapier Exp $
 
 EAPI="3"
 
@@ -8,8 +8,8 @@ inherit flag-o-matic eutils
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
diff --git a/sys-devel/gdb/gdb-7.3.ebuild b/sys-devel/gdb/gdb-7.3.ebuild
index 47c3939a8b3f..f9146de4d8f5 100644
--- a/sys-devel/gdb/gdb-7.3.ebuild
+++ b/sys-devel/gdb/gdb-7.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/gdb/gdb-7.3.ebuild,v 1.10 2015/02/20 15:42:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.3.ebuild,v 1.11 2015/02/27 08:14:05 vapier Exp $
 
 EAPI="3"
 
@@ -8,8 +8,8 @@ inherit flag-o-matic eutils
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
diff --git a/sys-devel/gdb/gdb-7.4.1.ebuild b/sys-devel/gdb/gdb-7.4.1.ebuild
index 259dcc67cd5e..face20d6a09b 100644
--- a/sys-devel/gdb/gdb-7.4.1.ebuild
+++ b/sys-devel/gdb/gdb-7.4.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/gdb/gdb-7.4.1.ebuild,v 1.7 2015/02/20 15:42:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.4.1.ebuild,v 1.8 2015/02/27 08:14:05 vapier Exp $
 
 EAPI="3"
 
@@ -8,8 +8,8 @@ inherit flag-o-matic eutils
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
diff --git a/sys-devel/gdb/gdb-7.4.ebuild b/sys-devel/gdb/gdb-7.4.ebuild
index 6f2652fe8e1e..a3431f0846b2 100644
--- a/sys-devel/gdb/gdb-7.4.ebuild
+++ b/sys-devel/gdb/gdb-7.4.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/gdb/gdb-7.4.ebuild,v 1.7 2015/02/20 15:42:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.4.ebuild,v 1.8 2015/02/27 08:14:05 vapier Exp $
 
 EAPI="3"
 
@@ -8,8 +8,8 @@ inherit flag-o-matic eutils
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
diff --git a/sys-devel/gdb/gdb-7.5.1.ebuild b/sys-devel/gdb/gdb-7.5.1.ebuild
index 7acdc18e7544..8109ca2c9fe9 100644
--- a/sys-devel/gdb/gdb-7.5.1.ebuild
+++ b/sys-devel/gdb/gdb-7.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/gdb/gdb-7.5.1.ebuild,v 1.17 2015/02/20 15:42:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.5.1.ebuild,v 1.18 2015/02/27 08:14:05 vapier Exp $
 
 EAPI="3"
 
@@ -8,8 +8,8 @@ inherit flag-o-matic eutils
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
diff --git a/sys-devel/gdb/gdb-7.5.ebuild b/sys-devel/gdb/gdb-7.5.ebuild
index 0f8f1d800fb6..4f526b425eb4 100644
--- a/sys-devel/gdb/gdb-7.5.ebuild
+++ b/sys-devel/gdb/gdb-7.5.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/gdb/gdb-7.5.ebuild,v 1.13 2015/02/20 15:42:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.5.ebuild,v 1.14 2015/02/27 08:14:05 vapier Exp $
 
 EAPI="3"
 
@@ -8,8 +8,8 @@ inherit flag-o-matic eutils
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
diff --git a/sys-devel/gdb/gdb-7.6.1.ebuild b/sys-devel/gdb/gdb-7.6.1.ebuild
index cc3826609de0..2e87f2d77f98 100644
--- a/sys-devel/gdb/gdb-7.6.1.ebuild
+++ b/sys-devel/gdb/gdb-7.6.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/gdb/gdb-7.6.1.ebuild,v 1.8 2015/02/20 15:42:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.6.1.ebuild,v 1.9 2015/02/27 08:14:05 vapier Exp $
 
 EAPI="3"
 
@@ -8,8 +8,8 @@ inherit flag-o-matic eutils
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
diff --git a/sys-devel/gdb/gdb-7.6.2.ebuild b/sys-devel/gdb/gdb-7.6.2.ebuild
index 1d1367707325..d3b51db097c4 100644
--- a/sys-devel/gdb/gdb-7.6.2.ebuild
+++ b/sys-devel/gdb/gdb-7.6.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/gdb/gdb-7.6.2.ebuild,v 1.13 2015/02/20 15:42:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.6.2.ebuild,v 1.14 2015/02/27 08:14:05 vapier Exp $
 
 EAPI="3"
 
@@ -8,8 +8,8 @@ inherit flag-o-matic eutils
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
diff --git a/sys-devel/gdb/gdb-7.6.ebuild b/sys-devel/gdb/gdb-7.6.ebuild
index 0fee5379afea..95025cc0a2b2 100644
--- a/sys-devel/gdb/gdb-7.6.ebuild
+++ b/sys-devel/gdb/gdb-7.6.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/gdb/gdb-7.6.ebuild,v 1.8 2015/02/20 15:42:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.6.ebuild,v 1.9 2015/02/27 08:14:05 vapier Exp $
 
 EAPI="3"
 
@@ -8,8 +8,8 @@ inherit flag-o-matic eutils
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
diff --git a/sys-devel/gdb/gdb-7.7-r1.ebuild b/sys-devel/gdb/gdb-7.7-r1.ebuild
index f47c4db9caaa..7234bb3d26a7 100644
--- a/sys-devel/gdb/gdb-7.7-r1.ebuild
+++ b/sys-devel/gdb/gdb-7.7-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/gdb/gdb-7.7-r1.ebuild,v 1.4 2015/02/20 15:42:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.7-r1.ebuild,v 1.5 2015/02/27 08:14:05 vapier Exp $
 
 EAPI="4"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -9,8 +9,8 @@ inherit flag-o-matic eutils python-single-r1
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
diff --git a/sys-devel/gdb/gdb-7.7.1.ebuild b/sys-devel/gdb/gdb-7.7.1.ebuild
index ed9d2f6280ad..d449d8c51cf7 100644
--- a/sys-devel/gdb/gdb-7.7.1.ebuild
+++ b/sys-devel/gdb/gdb-7.7.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/gdb/gdb-7.7.1.ebuild,v 1.12 2015/02/20 15:42:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.7.1.ebuild,v 1.13 2015/02/27 08:14:05 vapier Exp $
 
 EAPI="4"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -9,8 +9,8 @@ inherit flag-o-matic eutils python-single-r1
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
diff --git a/sys-devel/gdb/gdb-7.8.1.ebuild b/sys-devel/gdb/gdb-7.8.1.ebuild
index 27edf5ebe7e8..456481cc87be 100644
--- a/sys-devel/gdb/gdb-7.8.1.ebuild
+++ b/sys-devel/gdb/gdb-7.8.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/gdb/gdb-7.8.1.ebuild,v 1.4 2015/02/20 15:42:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.8.1.ebuild,v 1.5 2015/02/27 08:14:05 vapier Exp $
 
 EAPI="4"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -9,8 +9,8 @@ inherit flag-o-matic eutils python-single-r1
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
diff --git a/sys-devel/gdb/gdb-7.8.2.ebuild b/sys-devel/gdb/gdb-7.8.2.ebuild
index acbf39ad2a95..d655caf60836 100644
--- a/sys-devel/gdb/gdb-7.8.2.ebuild
+++ b/sys-devel/gdb/gdb-7.8.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/gdb/gdb-7.8.2.ebuild,v 1.2 2015/02/20 15:42:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.8.2.ebuild,v 1.3 2015/02/27 08:14:05 vapier Exp $
 
 EAPI="4"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -9,8 +9,8 @@ inherit flag-o-matic eutils python-single-r1
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
diff --git a/sys-devel/gdb/gdb-7.8.ebuild b/sys-devel/gdb/gdb-7.8.ebuild
index 6c20c1fef15e..05254046208a 100644
--- a/sys-devel/gdb/gdb-7.8.ebuild
+++ b/sys-devel/gdb/gdb-7.8.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/gdb/gdb-7.8.ebuild,v 1.3 2015/02/20 15:42:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.8.ebuild,v 1.4 2015/02/27 08:14:05 vapier Exp $
 
 EAPI="4"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -9,8 +9,8 @@ inherit flag-o-matic eutils python-single-r1
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
diff --git a/sys-devel/gdb/gdb-7.9.ebuild b/sys-devel/gdb/gdb-7.9.ebuild
index c9196e5b1998..ee2b7d74df2f 100644
--- a/sys-devel/gdb/gdb-7.9.ebuild
+++ b/sys-devel/gdb/gdb-7.9.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/gdb/gdb-7.9.ebuild,v 1.1 2015/02/20 19:53:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.9.ebuild,v 1.2 2015/02/27 08:14:05 vapier Exp $
 
 EAPI="4"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -9,8 +9,8 @@ inherit flag-o-matic eutils python-single-r1
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index 1a6fadb89d57..f7a3da9d6308 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.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/gdb/gdb-9999.ebuild,v 1.33 2015/02/20 15:42:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild,v 1.34 2015/02/27 08:14:05 vapier Exp $
 
 EAPI="4"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -9,8 +9,8 @@ inherit flag-o-matic eutils python-single-r1
 
 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
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }