Tweak CATEGORY processing to make it easier to understand.

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

16 files changed, 93 insertions, 85 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index d1667b4adeb2..5c9cdff5b2af 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,5 +1,13 @@
 # ChangeLog for sys-libs/glibc
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.878 2012/08/13 15:08:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.879 2012/08/13 22:48:53 vapier Exp $
+
+  13 Aug 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.10.1-r1.ebuild,
+  glibc-2.11.3.ebuild, glibc-2.12.1-r3.ebuild, glibc-2.12.2.ebuild,
+  glibc-2.13-r2.ebuild, glibc-2.13-r4.ebuild, glibc-2.14.1-r2.ebuild,
+  glibc-2.14.1-r3.ebuild, glibc-2.14.ebuild, glibc-2.15-r1.ebuild,
+  glibc-2.15-r2.ebuild, glibc-2.16.0.ebuild, glibc-2.9_p20081201-r3.ebuild,
+  glibc-9999.ebuild:
+  Tweak CATEGORY processing to make it easier to understand.
 
   13 Aug 2012; Mike Frysinger <vapier@gentoo.org> metadata.xml:
   Document what USE=gd does.
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 0477a39a0120..d498a090b8e4 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -58,37 +58,37 @@ DIST glibc-ports-2.14.1.tar.bz2 630641 SHA256 1c830afb6d4aa166edaa09ec539580377e
 DIST glibc-ports-2.14.tar.bz2 631253 SHA256 580a656a55a17ba3db80ab0a9321332cd1f0aaddd7fad76004b524303fb6632d SHA512 843a8daee3210fca86956718bff71f21f6532b7ca3077b4a1964f6d797df0a3dba42a29108715410ae232a48809f166cb051303a567fe16b0c05b9f71aef6225 WHIRLPOOL 156c43e90bb47d939e0852c583d6382021440c5b4c0b3705f60d4ad953866ab92ba1d502e010e7ff2b3a031795393f776dea3cfed317daf426d0360346ff9064
 DIST glibc-ports-2.15.tar.xz 421820 SHA256 fcc271fcc3a808bf0f3aa1d144bc39b8d0d5f730aed6e206b883961515f0d1b9 SHA512 fc3c80a9a7ede0f35054e5be043fff4b967e6ef6678f42e617dd1dd498920edb4e4c785cf8e3cd97fc2914a35a892e0fd7e1aab24f0c3c8d207765a131bf3744 WHIRLPOOL a8a617eacb326615265832f86a7ef39678364b5b65d5c16d58680ec0debfbca6780018b7da9c1a86bdfffcde58aa1258b96ea4bd50b114901b522e62d48ae4a5
 DIST glibc-ports-2.16.0.tar.xz 925916 SHA256 93a10ac3b9ab70ccc59dfe50a4747d48a7e92f9481656f8a37558a2767ac02f3 SHA512 8653ad9f5cf239a55eb2e236f9510ba227e910168efefd74df8e4951f2e1e4bca69598bc23daa6581e0ba94fe334ac625524fb22f0d38c2a07e373eda1db821b WHIRLPOOL 60b0cb559e28bcab9c6625ccd24a13ecfc301cc055d7e18d1324627912b528ca8cc7c2f999e1e979d2685e407879b1bfffdb61f1536d91fa143cffb7ded72a8a
-EBUILD glibc-2.10.1-r1.ebuild 7877 SHA256 ebabdda3207af4fafa47cd8ce907ee0e1ad0171ebebc092c682805376ddf1b60 SHA512 dd016205d3f579f55dedac9a182e63971f994578c91ef6de2c5b4d2954dfc9232489c9dcddf8a00f399ace49bfbbdec519353322d3695fcceb01557ee4a61639 WHIRLPOOL ad9e6bfd1ea6c0983206117143bc913fb05bf4f87d54eb56de6ec3e5e79c15d868f745b211d8a632f034692661c76a3dc8e1c65f22c49a458c8892b9a9ce2dfb
-EBUILD glibc-2.11.3.ebuild 8091 SHA256 7d6d0938dc30b6eb9cc56c6e2ad45a8147350e9557f9098ad32401e82f80f362 SHA512 833d0c849850b68684038e39900301e0bf755ab08009dacfaefb49b32dd88b2f1927236ccd0eab9fee3b188e269bb8f0c8116f5f0fd433afac258ae6b568e4ab WHIRLPOOL bb2878e34e0bb70a955ec0ddb5df71f40ea15d2cb983a472d5bb5f379152c68fcdf42cf9579edcf4ea0f14f8a052550bda37ccb0bd3e9a83d4c9ac253df04923
-EBUILD glibc-2.12.1-r3.ebuild 8463 SHA256 e81371638c04587ff6610aa9d7c1bd3009f31361f0edce33ccfaf109332205a1 SHA512 1552bb931d64ce1a62c4b61c871d55dd06add27eca8fd9e8e31296fe514f4a5516938da24e6180cfb7d9352f1b16877ed39584f1d1ab57c094687ddae2c64ac8 WHIRLPOOL c3d4a2716db82a6924c80f4e42ac6df88c09c4e4beeb491c482869b26cbbca1833f9ac0dbf5a4894709102f67251d6eaa08f3c271aa7596fc7a58cb0f5e80e8e
-EBUILD glibc-2.12.2.ebuild 8462 SHA256 23ab720aed42f064dc30f7950dcd91a9968e3fa2e5ae869cdb3884585ef1f781 SHA512 f26db6469f0ddd69021a4432bada0e374485bde8e9b981ca00e36f366f6a1e39de285ca66d8107c05f934f00555bab57f1340fb13cb72c37250aca485dbe00be WHIRLPOOL 56635f75ad962b9a67076e0c3cef40ad0bcc7781fd1a561bd1dda3851e704ee308b5df9f4d9b7919b99781ca086d4ced46fc3186ae2b42bc4cf9fcdcb7225f1a
-EBUILD glibc-2.13-r2.ebuild 8388 SHA256 ef27d1e3ff66b3ab03d17d2c15f3c3e81e0a3a94c93b62a87d0590ab60c06503 SHA512 bdec1cdae8b25d32a843fecb169835e303ea4aecbf78158c861f61cf827695029b060b0b8bc2e1103f2056f1a8d44667163a1cfc676e60b84d10bc645c049c46 WHIRLPOOL 8cdd8ae69c0da654e92b329a11b46b7d2f1f2fa869929937ba6d1c19d1bb89ea9ca31295d3b5158f68567f8047f80d799c401ab04a54eacb45ed8a72dc718763
-EBUILD glibc-2.13-r4.ebuild 8378 SHA256 3526d68877124bc4e563eb27e3a0b23266054c92466ffa503a34ca312e6b5f5f SHA512 33ca9442985da25519a06d307aea29144d622d718c5dbef384a2db9f1ee2c89e6a6b16ea8b5fc3b1315033456581a0b8aa8409b580d1fd8e6459a133aa8fcd66 WHIRLPOOL 61112138b413eac8e362f4a36b7d2ce91492645d798f17116d30c1485eec08a53ffc56245d0615b49e43349ad8ccd9cfb5828023c7cdcf391a642c857146b849
-EBUILD glibc-2.14.1-r2.ebuild 9262 SHA256 c86ecf67b2656b67a844a59c203b7fa46f9e7152dfdbdca295e263da2c105748 SHA512 bcde9d5f92712859f5349cc00bab091e5529aaceb5fa9ba4f7b4e0492bf6971c07b0c3b4cc30955d733186176fce11fbd29699a795779858a8082a10f038a35b WHIRLPOOL 6deca98784084776af5b60fdeb33df23ac6b24003708fb81f0aab5752cd412a2cdf2b1e46f5149e2c74ac773c07e435b7a3515de1d385d2f345ba0d307d7b5de
-EBUILD glibc-2.14.1-r3.ebuild 9258 SHA256 885edd1a93e6df43243ca20e7494a537d4bd1c1b2da987a4a9e2acb222535903 SHA512 f99ed94fb3761361f681afe00447d8ad3bcfbdee32e6df6fcfaa06c901020b856f437a1f31828aaad813c1629d5faa769db0d37d4373c6807fbfffc696f1512a WHIRLPOOL 037ccd94fe3691932e68c138954f9029fb189d8c9fe55e42eaed6e997353d74b0875b47d1338aaf707ad75fcd13bded9642d096fa5d35f358f8b720d9adc83a5
-EBUILD glibc-2.14.ebuild 9155 SHA256 2b518e375bbb0ce54764458c1ec91d1557a511946dfe1e3027a5fe1f608002d9 SHA512 f73a9c75f2300adae9b24fc54f53b8b92fff2dec2b2b6955b292fc5d9b35982740e502f1e822172a06b44ba1b42c95e36d6ad264f1ee7ca5e3584e9cf82d33a2 WHIRLPOOL 2ae3f53f3e01d6551bc0d8e0bfe567b6976fd3f679e2fc4ff3ead0b5804f6ae9d833f483038b9607ffac4b2ebce01863cb4c6b6b6894d4471a19534209d74425
-EBUILD glibc-2.15-r1.ebuild 8890 SHA256 9c357f2e1ddd8b54688f81987add167193cd0ac6d23a719a5961579b392eb4a3 SHA512 ee821eb7683aa7e51655a1c7295b08d1c65a9fff6116a85f83985db92db475b2f38edce4fde3736b39d574e8ceb4913e156efddd3d92ae8f3018aa3962a32cdf WHIRLPOOL 5d990e21420a771014c4e12561c39edd2f4be66e07a144fc1e65016245443b0f72c004d2d4d3720b83161484545d5e87266858d17e7e7bb3ed38397c78a22e9a
-EBUILD glibc-2.15-r2.ebuild 8444 SHA256 02b0c2dc9aaf85c74f0e5a1b5866c24dc17301c839df8db6653bc19ee96d93ed SHA512 99821a086b44bb160d0549dd96c9a815b47009cdbe8c069753f6b44cfd8f8e76d6101afb24c2ecce32940af263c503e2843d7fed14da8a8a04728d772d926191 WHIRLPOOL 3514420e5b24b254a0d4b3d11e7d3b9fb2b091f73915c5bcb0f7555b0ce58ca4eac9ecbb328f01513bfe630fcd013db9d5c281f7dde0aae5296ee87510151a00
-EBUILD glibc-2.16.0.ebuild 8429 SHA256 1f9b21432227e332e1787cde67f39103bc81bc4443c1f54a033cfcce9310ea91 SHA512 08fb8d374f6eac7904a9bf68c8b42a55e27fd54607a03ab2823153fb8b8926f1d819d2ce8f4eaf4b8806c1fcfaf94dcdc76549a6be270bd9c601df628fe5bfab WHIRLPOOL 71516977bca92b3cd80f3aebc425b80434a1e8bd07a715f86110705407c5b254ffcfb7eb2cf7658d12dfd5790ebb29c9c7ea56e2c3db141ce1bafb89d3aa8aea
-EBUILD glibc-2.9_p20081201-r3.ebuild 7523 SHA256 11c36a4100ed536bc8573eafcce69cded11e2f5c93b9d88fcb6371049101ffee SHA512 202308ab12a473db43acf4c7e7ee67282ffadceaf6cd788b12607b00dbaa7e8c859702726291526201680d014954c1de6da8772b5d8a6cc391fbbef5527a9950 WHIRLPOOL f5cb87b4203ba73569478be9a1cf8433c03fc9c30e9809f9de04640a9eba11ced9dc10d5e49fa5ec59a3465709b28b0125c1619bd441bc6135fee62d72368bea
-EBUILD glibc-9999.ebuild 8352 SHA256 792f08cab690464f173bbaf3727cc6277dbde0906f5e437c982310df11a26d3e SHA512 f400f2fa4650370bf1758d74defdd37a1f01a1d32e167412c4048de9eb53b4e47c2170fd860b469ae7a70387a3ea0d0e8df1b5b9e8d997e68d9d2f946ce47fd2 WHIRLPOOL e813551d0314d5fc5bb03cef1542beaa67f7bfe5c641786fc5b8abb620d4e7d2c012a96fda38c19a62bf04439b5e0350107d4dd745c3ff4fb11af9896094bf49
-MISC ChangeLog 47683 SHA256 3f3edbd640570990a33ca04299cae3ca717fc49286b9e3080d5d4bf393f6c846 SHA512 bf1c1d9032cd6da3a5c869a12933c7fdbcbb4fbe9241f2bfaa79d1268b91be13ed11c7a69d714495aaeace142a5c7dd2b289da3f20c21d72074e268464dc6472 WHIRLPOOL a63fab8056e563c17a1ca37f9f3888f5ca5ddd69968c58822f07dc6c460aa61d44969afa8a90c8e664ee9a8b5312fff0162ed6e1de46076d465182fa8f116290
+EBUILD glibc-2.10.1-r1.ebuild 7855 SHA256 a52744c91da2c509678c350f522eb32491d2ee50ce1a3e70a51ce5a1dfcda252 SHA512 ac5dbd851aef9a8e1c662ed35ee6fe8296f164d7374c641df3a7ce5244f2adc166c1a546983879447ba799bf34e2b3bf870979fa7df07b7d3fdb3e100077dd10 WHIRLPOOL 6668427fac590125bee383ee102a38a40676a5346c081762b19d2fd50887fc940f8068a203dc55db34afae04575523d491e01484115cba5f6c1ea75935b9864a
+EBUILD glibc-2.11.3.ebuild 8069 SHA256 c0594b0268e7b1c7e674077b0f215b900b321e8fd03db3a3eadc92ad10839fab SHA512 12f420db281b1d64fb9c3694141c15efe39536ea8ff472ed64b34c10d8df63d815a8513bf61cef61ba2d7ed41a7d5b24163a22f4bb152a1ac574cbcdfd561dd5 WHIRLPOOL 33b5137a74fba2a7f7ec1f1fd800e8ebfdc2df52928c06ef84e08cf6e77ee7dccae4da04d140e2be0be86a09d4a38012f9b9569c9f506ed49da71976f6b85e86
+EBUILD glibc-2.12.1-r3.ebuild 8441 SHA256 e32f840114d544c4172d88a62cd22783031b6e7f698e61a508787f2266f7e3f3 SHA512 0fc2c8abae35bdc93b796e59980f27cfe3eebac1ea0dfa7a005a9ba71090e72132f3da6e317556a356d8c7f8d9d210bcaa203df0060dee57ef92c70cfa80a127 WHIRLPOOL 7f231902cc8275ade6f1ca97ee870844850046939fdb0c9e3b5bd905d9706618e92696d2be234fcfeaea39f8d9f772471a5abeb3b79834fa9b2019dc8620a444
+EBUILD glibc-2.12.2.ebuild 8440 SHA256 8d06a0c79a4a478086121400d04b0775ec92eb6b2a00b8b105ef3e448dae1aed SHA512 a46313b75da94eb13e7d31757d617f93788cdbe5115492014006d66ea0eb5dce461e37b8ba80bde18fcfe5b89d40f238f96d979e1d7dba91354c710442ab4e22 WHIRLPOOL bb40f001efbf81a2eee70c7b1a528ce94d5655a2780233955113192798aca1d5c4b75e2d149e3104e3bcd41f52401d67bb348e3f0372342854596cadc9b5af40
+EBUILD glibc-2.13-r2.ebuild 8366 SHA256 803eed28b5ca5e05be0c3986112a7d8bde541a9c4894dce20888fb92748b8ea0 SHA512 ce64eb50106d51221b98a6fe4a609be08984b90b9dc6202463f2e94ece3f323cc0a09bece8c8f0d3a32b13df8af09c2e4c835888aca6637c72210b8b301c4b8e WHIRLPOOL 6c6f60baf170f155cd3ec05c8bf00a44ababfeaa7b22c64f7f7c5d87d2ffbccffcf1f4a82b98e9f0675baadb6ccba6eb9010ae900fb671b6b3cc57c1a6d75474
+EBUILD glibc-2.13-r4.ebuild 8356 SHA256 6e1dbdffb935f249f6f299d75e0fa0f843de68f60a0a6fbfd9e67edf66216454 SHA512 a6c82cdad860864e453095f47a875b6873236639337371a4d1cc642f716debc55ceb970e367fc74c6f7ebf7022651664b33c6961d2673419d8a847a33de91a04 WHIRLPOOL e9431134b99e2b027f735f3b2e15b77a8d505698c90aff94071749efe5f2f7a7a42372a90755405abaedc72170d0191dfc940b28e0d3f93302b30107891d9214
+EBUILD glibc-2.14.1-r2.ebuild 9240 SHA256 8fa000c78814e3a3a4be89b407a0b15205b7ae1defbcd08f79fe922bb90dc954 SHA512 d1d76fb4a904981f79cb60e026b95fea996e7aa5bbe5e0a183cda7c52cc1c9f09772ee7ea571819bc9fc64bd2331d183421258945e2b177527e66b2dbb38bd5e WHIRLPOOL 9059853abceff575751c3133da008cbff0d958db7d787b861920983de3b9636be2ddb91301c82b919035b7efd3287baef341e7fc5251cde1d90b135efca1c391
+EBUILD glibc-2.14.1-r3.ebuild 9236 SHA256 8fde5d10c272410de322c5b5c0584c848bb9c639dbbf8cea3f153cfbfe7d61ff SHA512 399d51025ca7d60d419fd5f11624ca76228f2dd6f11b5ad017a33199fa5d26983312776c967c532e3dbb901e7aef6076ed76614671e1fb7ca41a5da2ee27ef84 WHIRLPOOL c25a21261f51dc2ba44cbec911c3360610a2a0b5a7f9a20458bed5b64a5cd16365ca249054e568deb6afaf175d9229c3b7e93201d4dda86aa12d040e79ee5f85
+EBUILD glibc-2.14.ebuild 9133 SHA256 34b2dfe2284e5e7e93c8d8fb1e96b76c362d896dda57739e013c3768c317f009 SHA512 b4283b88f9bdee04c8d73195c5623dfde4814b5bf8eade03d15d4fcfda204e8d79b10f6e390c2267d43fd0805cad2ebe68967f0ee73faf27620b57280e780a5d WHIRLPOOL de92b754a8a16b6cccca183c94a2c7c714d6faa7acc23621c9a95ec600360c2f80505c636671396ad3cb3e678d84a8bf1dc02ea103c89c96e72f16b21a52c12c
+EBUILD glibc-2.15-r1.ebuild 8868 SHA256 cfdca1617c499a8aa6a2ebfef1459e6944d5ffbd4615c4feaf932f7566bf0744 SHA512 cc91aefd221685e2ed3fd017486417b628d52ea18b458c3503e77c9f87c8bb8beeb36d156f357c97a08d105ef6d387a3cd1cfb5be65a8d8a53892abab6d819e9 WHIRLPOOL 0f35e0477d927382d0bc5be6b75dad324335c1ed9196a87436b7adedce5960ae35b955aa7ba01f6b1bb974e41a4665efae414f60bbbf863be753cb75005217f0
+EBUILD glibc-2.15-r2.ebuild 8422 SHA256 8b9d47e1fd0bc81b8667960ce49e9473401473984eed58356cb939379c7dbd9c SHA512 962d8ec99edd7456e94eb6390d1b9c0ace6c38bb513d928ec4ba83f35e530f35e5fe5cdd8c4260fc4dc4915a526411d68204e6ffce44a6ca082cae48044e3c12 WHIRLPOOL 9aa28d46f4c5a091e12e7ef1ddf99c91eabe7e8402c5fd88a0f2cddcb595efcd2c3c0a27656f5df5c1e207a80927bec3e52dc783af3fad7c1538d13abdeb8b28
+EBUILD glibc-2.16.0.ebuild 8407 SHA256 f1dfa8d88b37d7ccbd26921f7df9cb74c2336b71de06cad9579c7b927cd8e555 SHA512 d3ec58498842b4939f72454101c2e20399748dd6af55df6095a07b6f6cbf1e6fad000af071e4e7dc0f411966c30946090dac118416ec24273e50d2cdfb5c29aa WHIRLPOOL da40cf2405259f412b44a716637580faae053e9c5c0c9517ffa491a15899dd25481c24ca038246168e873cd4089b3c75b87b585a1bea2e0d4d87b525c8525021
+EBUILD glibc-2.9_p20081201-r3.ebuild 7501 SHA256 2c1456201280ec5098c8e4e733d8ceaef027b5a39ed9e641651a4f8ba1a1f2c4 SHA512 f75cf0abe31cd3c3fa44337e4bb3230aeb7176b6c2600e42b037c4487559e21a8a140e6c60af31da4f72d3613a009bfc441ed7b81ee8fe8d5e814c4db4acf9f6 WHIRLPOOL e7e07b8feec41113be60d0023f9a6126ba420314859221d6544a00b33e3d29d5bbb49501d7da7bb100d8cf147128d4875085a31ffe83a66fb19fd9f6ee3a3fc7
+EBUILD glibc-9999.ebuild 8330 SHA256 5f604ccd07df5378b670a3a85c8b5af0bd901e9c264a67ae524b895cbf2d353b SHA512 90c04f2eec816abbad19e2dfb45f81160bd449e3fff1a82b9fddae6cde2b51883956e320bd9cc3b4cd9a4fac04bf75ff8ce49ccc4e0455e9142bd5d26242d18d WHIRLPOOL 95ab339a91c45072f97e2e668ff51d12cd5983e6ce9e33f27978bee904ad77d3dc2a0268dce4d2f33fe98be61f106fd16e7e0f67d6cc4e13b0d109d0c226a80f
+MISC ChangeLog 48121 SHA256 979d983fbef2e680695e5c47802c4011a7376fa4d01fe2a001a7eed883a2f5ff SHA512 6c2b938b0721bd333e61afd20dc35966c7f04e55aaae84e6851ca9848b51770b5d80954e06b3c347dba729292a73a0a6419d899ab302720d05b4a88c6594215c WHIRLPOOL aa3aeaf837fdc118027b97c3c1bb57688b3924c437fccda286dfb8cea2eb46585af449f49185bb75e6be9e5fd85dceb7442a46931378a8e70a7a3f5fb4aadb41
 MISC ChangeLog-2007 108587 SHA256 bd7e842bcda0f9e8375963d71dbb1604e1e8ef89484f3e205afde631eeec2c17 SHA512 405c93cd08d102ad1a9e40975563e645e982b5baa238280c38118b46b7c828ca924c73766c254cf24eaff255b16b3f4c8133d2e174cf3e47b704ff49d754640e WHIRLPOOL 4ab79bcd243bd4281898e93987b49a2dc44fb7ef2df9073708dd12223bd01f595dab8f08f342bd5dd8d0fc955ee031b11ce70e1cdc118f7dcc5b63f90d785e9b
 MISC metadata.xml 406 SHA256 e6cbc11651d304035d704081701900a8b373ee3a0ed2f3f4a7e3f3a8d926a731 SHA512 3afe4ea0be7d1707571c23a7aae8490620a83d748ad672a18ce602503f37179cfc12d3bed0c18398c2cc8e74005d2c51ac320fd1722364e5df2cb3599488c164 WHIRLPOOL 1c3f5e0cc851c976259c6749f6a611d6cf415a063b2229e65ae9dea80e623a52514acbf977b3e439009379c4ea9aa491e6c423c7aac70a1c8fd573c4f40816dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQKRhyAAoJELEHsLL7fEFWahMP/1HK7TuRCaM8D4jFZGIuIdbF
-aWh/R2yLlscBc2zu6rQ/ABBQAnmmAvZ+KlVCnyST1jloJDDJAVhbol0sb13zwH2P
-zgybPvfT3JsZWKwuqbZxKM7v/8jg+e7yACTxbNpjIgOzIjv44fx1xfLK1CYECQQk
-+/J7eH72ZUifmhkb4K4Mp60NYMJSCVy4DtOSy7/vqAuzOyrpDRO64+4+TOCMNMhv
-lSFNwg2PBOk7LGjcYsMFL//PtgNUzG0UfgRxBtkk+QQVBSF9IOxzXu6yD2+jpE2k
-aUvO5PW3ZxedxaoNSonlbaBgPcw2/RawatPccTw27D7EWRBjgPw4PlcavGZpMd0x
-pez8KlQWFdLhmKIc+yfZSsxBFzcntcw3DRhnHz5XkOaflJDLAZjsnxDG6H0cL/K7
-O7SKWRW1Uvva+69H+0DSzMUK9sBlHGLwlNlhvPa5sJAnD5q2UTFB4xc5OoidUIOK
-osNDMzgVd968fAMLvTTEVbxvkeuRSfrt+WGJAVOobDMBulk/9iFmEI2Q0kt/x/f7
-+GXd2/KRbjsPl3BPqNY8zqZdX3aLzDiq6MhKlzs6hc1kI2E9wBORPn5Qc5S5vMQ9
-w+jGFKT7+uu1bTtvEkhLuEn5qmWDl5/u5ec0vb6fj4PsQCpia3CFz4JU4pWo+45D
-gqYBrUGg+GMtUzYYV6Xa
-=gfw8
+iQIcBAEBCAAGBQJQKYRkAAoJELEHsLL7fEFWvHYQAIc14pNAH+i9tJ0yHW9x9GJZ
+Gzz8BzAXzEIJn302fhQQnUVH/WKMwMvO1iBt5IYLBrWUfzI+sIeaYsMs+QxFYtgb
+JC4xkHLauAl4DawAFgbBejBzkLnp8BaFNfOhIcPn9lxSzlwAhZhVlVk9xlVQ/j+n
+4vExur/2IXdWRhqzE4XH34XoDVX8QdrS6i8y2zIpzNhKeEVYjM37smdsB6Eza2w9
+aWhQbCqAZmf8WH4a22Ne8/tNTt3id42A0V/PSqX6orwIIhSfekA0DiaLJd3BzNdq
+4qKZxVCB0yy3mo39Az0PWN9JAA07AYpR3/LeOQpeaSu9P9A1eK6T6YBL2XSl6zIh
+4mjvatKVjop0KUILUAbncv8wjr3zWo3TYrciyyvqh58j2YOnKPZ8lILGF277QZ8R
+mMjrTIqw/e+HyiPEWDa2s+ToaY1O6QwPVpd/uI6VC0fY22qDny/4cSbMjIwgsffG
+bYTQFJvna/f6gWYLVeyp0driBb9hFML6skbq1WKghvrPbX3eS17XZ9IyUMDA6/9Z
+gxfb9uZyisRR0c7Z82qHZZ11zaBL526HVQbzwqJ7vy3Oc4W9MTeRLdBQwbgv937N
+bJ255PpZyU6hDvfpCLEhQbS7nUMDChNBBBoPq2/H69aq/vYphGz6ERuhMtodIncY
+cardgGBFnMnxdbo0wAqa
+=opl9
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.10.1-r1.ebuild b/sys-libs/glibc/glibc-2.10.1-r1.ebuild
index 8ea6deece198..6d56ceb7875c 100644
--- a/sys-libs/glibc/glibc-2.10.1-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.10.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.10.1-r1.ebuild,v 1.23 2012/06/08 22:06:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.10.1-r1.ebuild,v 1.24 2012/08/13 22:48:53 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib multiprocessing
 
@@ -52,8 +52,8 @@ S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
 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
 
@@ -83,7 +83,7 @@ DEPEND=">=sys-devel/gcc-3.4.4
 RDEPEND="!sys-kernel/ps3-sources
 	selinux? ( sys-libs/libselinux )"
 
-if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+if [[ ${CATEGORY} == cross-* ]] ; then
 	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
 	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
 else
diff --git a/sys-libs/glibc/glibc-2.11.3.ebuild b/sys-libs/glibc/glibc-2.11.3.ebuild
index 58d57f28f420..e18929763c1d 100644
--- a/sys-libs/glibc/glibc-2.11.3.ebuild
+++ b/sys-libs/glibc/glibc-2.11.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.11.3.ebuild,v 1.15 2012/06/08 22:06:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.11.3.ebuild,v 1.16 2012/08/13 22:48:53 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib multiprocessing
 
@@ -51,8 +51,8 @@ S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
 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
 
@@ -84,7 +84,7 @@ DEPEND=">=sys-devel/gcc-3.4.4
 RDEPEND="!sys-kernel/ps3-sources
 	selinux? ( sys-libs/libselinux )"
 
-if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+if [[ ${CATEGORY} == cross-* ]] ; then
 	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
 	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
 else
diff --git a/sys-libs/glibc/glibc-2.12.1-r3.ebuild b/sys-libs/glibc/glibc-2.12.1-r3.ebuild
index 1e9cd5b10ae8..99fd309dd064 100644
--- a/sys-libs/glibc/glibc-2.12.1-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.12.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.12.1-r3.ebuild,v 1.12 2012/06/08 22:06:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.12.1-r3.ebuild,v 1.13 2012/08/13 22:48:53 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib multiprocessing
 
@@ -51,8 +51,8 @@ S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
 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
 
@@ -84,7 +84,7 @@ DEPEND=">=sys-devel/gcc-3.4.4
 RDEPEND="!sys-kernel/ps3-sources
 	selinux? ( sys-libs/libselinux )"
 
-if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+if [[ ${CATEGORY} == cross-* ]] ; then
 	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
 	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
 else
diff --git a/sys-libs/glibc/glibc-2.12.2.ebuild b/sys-libs/glibc/glibc-2.12.2.ebuild
index 132d97a1b299..69251631e647 100644
--- a/sys-libs/glibc/glibc-2.12.2.ebuild
+++ b/sys-libs/glibc/glibc-2.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.12.2.ebuild,v 1.18 2012/06/08 22:06:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.12.2.ebuild,v 1.19 2012/08/13 22:48:53 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib multiprocessing
 
@@ -51,8 +51,8 @@ S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
 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
 
@@ -84,7 +84,7 @@ DEPEND=">=sys-devel/gcc-3.4.4
 RDEPEND="!sys-kernel/ps3-sources
 	selinux? ( sys-libs/libselinux )"
 
-if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+if [[ ${CATEGORY} == cross-* ]] ; then
 	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
 	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
 else
diff --git a/sys-libs/glibc/glibc-2.13-r2.ebuild b/sys-libs/glibc/glibc-2.13-r2.ebuild
index 31a99fa79d37..6ce8ff55e9f7 100644
--- a/sys-libs/glibc/glibc-2.13-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.13-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13-r2.ebuild,v 1.13 2012/06/08 22:06:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13-r2.ebuild,v 1.14 2012/08/13 22:48:53 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib multiprocessing
 
@@ -51,8 +51,8 @@ S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
 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
 
@@ -85,7 +85,7 @@ DEPEND=">=sys-devel/gcc-3.4.4
 RDEPEND="!sys-kernel/ps3-sources
 	selinux? ( sys-libs/libselinux )"
 
-if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+if [[ ${CATEGORY} == cross-* ]] ; then
 	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
 	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
 else
diff --git a/sys-libs/glibc/glibc-2.13-r4.ebuild b/sys-libs/glibc/glibc-2.13-r4.ebuild
index a2903c2f359f..35150ff37f0e 100644
--- a/sys-libs/glibc/glibc-2.13-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.13-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13-r4.ebuild,v 1.18 2012/06/08 22:06:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13-r4.ebuild,v 1.19 2012/08/13 22:48:53 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib multiprocessing
 
@@ -51,8 +51,8 @@ S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
 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
 
@@ -85,7 +85,7 @@ DEPEND=">=sys-devel/gcc-3.4.4
 RDEPEND="!sys-kernel/ps3-sources
 	selinux? ( sys-libs/libselinux )"
 
-if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+if [[ ${CATEGORY} == cross-* ]] ; then
 	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
 	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
 else
diff --git a/sys-libs/glibc/glibc-2.14.1-r2.ebuild b/sys-libs/glibc/glibc-2.14.1-r2.ebuild
index d672565964c3..16373618857f 100644
--- a/sys-libs/glibc/glibc-2.14.1-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.14.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1-r2.ebuild,v 1.11 2012/06/08 22:06:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1-r2.ebuild,v 1.12 2012/08/13 22:48:53 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib multiprocessing
 
@@ -59,8 +59,8 @@ IUSE="debug gd hardened multilib selinux profile vanilla crosscompile_opts_heade
 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
 
@@ -93,7 +93,7 @@ DEPEND=">=sys-devel/gcc-3.4.4
 RDEPEND="!sys-kernel/ps3-sources
 	selinux? ( sys-libs/libselinux )"
 
-if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+if [[ ${CATEGORY} == cross-* ]] ; then
 	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
 	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
 else
diff --git a/sys-libs/glibc/glibc-2.14.1-r3.ebuild b/sys-libs/glibc/glibc-2.14.1-r3.ebuild
index 5ab0ffd15ef9..bd140ed56221 100644
--- a/sys-libs/glibc/glibc-2.14.1-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.14.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1-r3.ebuild,v 1.19 2012/06/08 22:06:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1-r3.ebuild,v 1.20 2012/08/13 22:48:53 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib multiprocessing
 
@@ -59,8 +59,8 @@ IUSE="debug gd hardened multilib selinux profile vanilla crosscompile_opts_heade
 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
 
@@ -93,7 +93,7 @@ DEPEND=">=sys-devel/gcc-3.4.4
 RDEPEND="!sys-kernel/ps3-sources
 	selinux? ( sys-libs/libselinux )"
 
-if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+if [[ ${CATEGORY} == cross-* ]] ; then
 	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
 	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
 else
diff --git a/sys-libs/glibc/glibc-2.14.ebuild b/sys-libs/glibc/glibc-2.14.ebuild
index 27a95a25140a..544971b87b30 100644
--- a/sys-libs/glibc/glibc-2.14.ebuild
+++ b/sys-libs/glibc/glibc-2.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.ebuild,v 1.18 2012/06/08 22:06:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.ebuild,v 1.19 2012/08/13 22:48:53 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib multiprocessing
 
@@ -59,8 +59,8 @@ IUSE="debug gd hardened multilib selinux profile vanilla crosscompile_opts_heade
 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
 
@@ -93,7 +93,7 @@ DEPEND=">=sys-devel/gcc-3.4.4
 RDEPEND="!sys-kernel/ps3-sources
 	selinux? ( sys-libs/libselinux )"
 
-if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+if [[ ${CATEGORY} == cross-* ]] ; then
 	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
 	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
 else
diff --git a/sys-libs/glibc/glibc-2.15-r1.ebuild b/sys-libs/glibc/glibc-2.15-r1.ebuild
index 380b338f69aa..db4e6cba5bff 100644
--- a/sys-libs/glibc/glibc-2.15-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r1.ebuild,v 1.10 2012/06/08 22:06:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r1.ebuild,v 1.11 2012/08/13 22:48:53 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing
 
@@ -59,8 +59,8 @@ IUSE="debug gd hardened multilib selinux profile vanilla crosscompile_opts_heade
 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
 
@@ -94,7 +94,7 @@ RDEPEND="!sys-kernel/ps3-sources
 	selinux? ( sys-libs/libselinux )
 	!sys-libs/nss-db"
 
-if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+if [[ ${CATEGORY} == cross-* ]] ; then
 	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
 	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
 else
diff --git a/sys-libs/glibc/glibc-2.15-r2.ebuild b/sys-libs/glibc/glibc-2.15-r2.ebuild
index 378dcfbe4233..329ae3031525 100644
--- a/sys-libs/glibc/glibc-2.15-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.15-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r2.ebuild,v 1.18 2012/08/12 03:11:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r2.ebuild,v 1.19 2012/08/13 22:48:53 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing
 
@@ -57,8 +57,8 @@ IUSE="debug gd hardened multilib selinux profile vanilla crosscompile_opts_heade
 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
 
@@ -91,7 +91,7 @@ RDEPEND="!sys-kernel/ps3-sources
 	selinux? ( sys-libs/libselinux )
 	!sys-libs/nss-db"
 
-if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+if [[ ${CATEGORY} == cross-* ]] ; then
 	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
 	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
 else
diff --git a/sys-libs/glibc/glibc-2.16.0.ebuild b/sys-libs/glibc/glibc-2.16.0.ebuild
index 484c25739dc9..d4325bdf889d 100644
--- a/sys-libs/glibc/glibc-2.16.0.ebuild
+++ b/sys-libs/glibc/glibc-2.16.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.16.0.ebuild,v 1.4 2012/08/12 04:45:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.16.0.ebuild,v 1.5 2012/08/13 22:48:53 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing
 
@@ -57,8 +57,8 @@ IUSE="debug gd hardened multilib selinux systemtap profile vanilla crosscompile_
 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
 
@@ -90,7 +90,7 @@ RDEPEND="!sys-kernel/ps3-sources
 	selinux? ( sys-libs/libselinux )
 	!sys-libs/nss-db"
 
-if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+if [[ ${CATEGORY} == cross-* ]] ; then
 	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
 	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
 else
diff --git a/sys-libs/glibc/glibc-2.9_p20081201-r3.ebuild b/sys-libs/glibc/glibc-2.9_p20081201-r3.ebuild
index b05381287488..138ff3242523 100644
--- a/sys-libs/glibc/glibc-2.9_p20081201-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.9_p20081201-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.9_p20081201-r3.ebuild,v 1.16 2012/06/08 22:06:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.9_p20081201-r3.ebuild,v 1.17 2012/08/13 22:48:53 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib multiprocessing
 
@@ -51,8 +51,8 @@ S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER+-${SNAP_VER}}
 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
 
@@ -82,7 +82,7 @@ DEPEND=">=sys-devel/gcc-3.4.4
 RDEPEND="!sys-kernel/ps3-sources
 	selinux? ( sys-libs/libselinux )"
 
-if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+if [[ ${CATEGORY} == cross-* ]] ; then
 	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
 	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
 else
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 6de1757aaa79..7039f7ac8c4c 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.12 2012/08/11 16:29:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.13 2012/08/13 22:48:53 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing
 
@@ -57,8 +57,8 @@ IUSE="debug gd hardened multilib selinux systemtap profile vanilla crosscompile_
 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
 
@@ -90,7 +90,7 @@ RDEPEND="!sys-kernel/ps3-sources
 	selinux? ( sys-libs/libselinux )
 	!sys-libs/nss-db"
 
-if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+if [[ ${CATEGORY} == cross-* ]] ; then
 	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
 	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
 else