Support multilib providers for deps. Bump to EAPI=5.

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

15 files changed, 254 insertions, 159 deletions

diff --git a/dev-util/android-sdk-update-manager/ChangeLog b/dev-util/android-sdk-update-manager/ChangeLog
index 1ea9f07945c2..f30ff31c37e9 100644
--- a/dev-util/android-sdk-update-manager/ChangeLog
+++ b/dev-util/android-sdk-update-manager/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-util/android-sdk-update-manager
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog,v 1.62 2014/07/07 16:48:40 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog,v 1.63 2014/10/15 20:22:19 pacho Exp $
+
+  15 Oct 2014; Pacho Ramos <pacho@gentoo.org>
+  android-sdk-update-manager-21.1.ebuild, android-sdk-update-manager-21.ebuild,
+  android-sdk-update-manager-22.0.1-r1.ebuild,
+  android-sdk-update-manager-22.0.1.ebuild,
+  android-sdk-update-manager-22.0.4.ebuild,
+  android-sdk-update-manager-22.0.5-r1.ebuild,
+  android-sdk-update-manager-22.0.5.ebuild,
+  android-sdk-update-manager-22.2.1.ebuild,
+  android-sdk-update-manager-22.3.ebuild,
+  android-sdk-update-manager-22.6.1.ebuild,
+  android-sdk-update-manager-22.6.ebuild, android-sdk-update-manager-22.ebuild,
+  android-sdk-update-manager-23.ebuild:
+  Support multilib providers for deps. Bump to EAPI=5.
 
 *android-sdk-update-manager-23 (07 Jul 2014)
 
diff --git a/dev-util/android-sdk-update-manager/Manifest b/dev-util/android-sdk-update-manager/Manifest
index 0ccb0508e2c3..cfa4edc92d36 100644
--- a/dev-util/android-sdk-update-manager/Manifest
+++ b/dev-util/android-sdk-update-manager/Manifest
@@ -14,25 +14,25 @@ DIST android-sdk_r22.3-linux.tgz 100968558 SHA256 4077575c98075480e0156c10e48a15
 DIST android-sdk_r22.6-linux.tgz 100992666 SHA256 da4c25536ba7f85cdd37be8636fcc563480410788df30c3fc5b5c876e6220e5f SHA512 2e632e31725a7c8c5e99cba70388c928d553d52177a2a0d49abfae125d1ccb57857171f10cd28da57664d0d9ab0f7b6ae409c943ad4d4433b05e0b8fb1bfe322 WHIRLPOOL 0d83ba871ea5ffd66d8543a563eac351b82f8597b7c8959848247e469c616fe52101c2d825648dbe6361dde3029bc4a8e06c097868eb3edcdeac1337beed9f03
 DIST android-sdk_r22.6.1-linux.tgz 101052129 SHA256 4ee7bb43fe6f20faf755b0988ecf818312392be52780db13ab4792a0b1627388 SHA512 5789a6b11a1a5c18145900042b15707f58afd6db82d345550c33e72cfbaf719c7c16667a7561e4c6ca624c2d2466430db7f8138bf0cd6449762639a63c6cf9ca WHIRLPOOL 09d6d11c08489d07b5b0da32734d70be8da65e949359b1155c9b59f3c07cbd21eed87c15f509e95604b7ed404f99b289700a10373268af132208b3e99178a113
 DIST android-sdk_r23-linux.tgz 137880977 SHA256 2eaab06852ac21b6c79df73c07a667c5da5be57f7ffcbd4f17aef7efeea22ac1 SHA512 c6d8de870e8697b31132b25db93d6b494b44240ca421cab6a48bbf53d142ba488d08ac77a9995ed06953e311dd14ea1ecf4d2039428ed31ab255f9aaaf94ad60 WHIRLPOOL f5fa2012fea5fa8f950626ad7281149c2a40b847514b61c22b8d3eaa0c92c3dfcdd1c7051e0bb990fd5c28babeadaf667228f630e7c19a69280aed06b6ba407b
-EBUILD android-sdk-update-manager-21.1.ebuild 3177 SHA256 d5a3252cdbac1f2f0a0808db97884bc321be50c2ddfc893b35ca895af45476dc SHA512 b5917569cb0a85360e03a320faf9156268d3534316e96940be74d7b8c670ecb94bf69c856b0071a7019e0e07be478d0299d738831ef831e1c2af1e384cd05a50 WHIRLPOOL 8da377fa2ccef98ebb97cd00edcf5b20066a46048f53e0469bc3ca92105c6b85e360a25abfc3776e7503498524522844fc505b285de56945ae6076e390abfb55
-EBUILD android-sdk-update-manager-21.ebuild 3175 SHA256 38d8c5f8b0aff7e5cb40d42980f81c2a5cbb1cb65ba8e2c185a89ddd46d48c59 SHA512 c0278c9a478af2a83b64b7cd328dd82e51863c6578b51ceaddace5b41471fb05eb6143fb0bf6b8c7f37d2909bb9c4230ed60440b4fd0daf67f6aed02350730fc WHIRLPOOL 7893ba373de5989cc2af4dd043ca37e8a4325d1b0c19871873da377459eed41650de6b6758004d78f002ab9a01b61a34e9f9f2058d4696c8da760681be676cfb
-EBUILD android-sdk-update-manager-22.0.1-r1.ebuild 3400 SHA256 823c11578914e57d6e353c3290c49ae7850e43474dcb9482d723b9baa1ccca8b SHA512 9b045b4698e2e76828aca163bcec3449c017f82b4ab479daa93b7331445ccd25dd63af7cd8f06509c479ea2951d85b8be92b66742699b173983569d40d9e4853 WHIRLPOOL 37f07e6a77101c515f5a6dafac433538f700e8499c9839390ed2f65efec87d05dbcaefe650943b1cf41a844597b7b02296453358305e7eb19626d06255078f36
-EBUILD android-sdk-update-manager-22.0.1.ebuild 3369 SHA256 ddb963dbb8d8809ded4cf368b19663774e461ec7f0da54ffec66917c3ef1a66e SHA512 7366b2ebf260bab4b40ad7fcd77d1cd467f8091e3380ec1583a55f4fb8006832c3901f57c3ce06eb0187878147346a44b5a67b9daccac71a60881ad21651d1b8 WHIRLPOOL 20513a283c9acc87949579aab3129bfbeee43c0560e50eb6624c017c38682e490683383ac0b74812bd1a504e8824c8f1c710be897c021738a10bf07bf3a88ab8
-EBUILD android-sdk-update-manager-22.0.4.ebuild 3397 SHA256 da69440b6735eca4f30957e90500a00b0c5c73db70932a59b45885dedac79dff SHA512 ccfb34191e91446d8ae4511ae0d8d206ed5837644855f7265b1c52af158ab94e2a333533bcad1425dfcb9fad20e949f73faae7e0fe44df117305accab9333187 WHIRLPOOL 95224b04057f7232a8b57ad059e945313527e3ebf9b8fa78e143ea5c06609de656c23ab103c6fb7f5a5810d390af81ce25343d444dcf4540df8ef2fbe1e2a830
-EBUILD android-sdk-update-manager-22.0.5-r1.ebuild 3479 SHA256 53f6b954976455f54db3974488b86b88b19ef556e102c09ad857f53b902469c9 SHA512 bc7ca51b1a4015cf72a6cf0c2e8f8eff5a7666b803677ce539717e9551a6c17d5fc942e5934df844301a99c8bca7b4bf148c95d8ff4f79a25f4d99ebeaae185c WHIRLPOOL 0ffd4ad6ad7c9bc482eff1c21b7e33ad1adc5f301a382992a4b31de9566606f81f4f63981156f2b291669617df1553ab5fa0519c9b3b8ba745aeda93dd6996c6
-EBUILD android-sdk-update-manager-22.0.5.ebuild 3397 SHA256 72392583628464aa0132800ed920239dd1068ec4ea06d6ae914ba944fee96a35 SHA512 c5a8e92524a3889182723a5c1218c95dce814799982c0e4ee8c1946ce77be8adda887a9f1f835479cf734791f3228e4df2b3db3ca67ea308d4cca53c323e55c2 WHIRLPOOL 515009157e79ee6e8b70f8cca85883dfb42e5656215053253c04b6c15a29db4cd6e897306d7ceff3a0f44fd1bd7d99d87566268e201864abf66d3b6d43c956f3
-EBUILD android-sdk-update-manager-22.2.1.ebuild 3476 SHA256 f1f083e4df41640268bf9a517d42777ff6d2bed5d2edc528ecbc96abcf6c7b0e SHA512 96baafc428e7eedf62b78db51cf925d19f139e597298d3647742ee95bead225756fec9187c3687bdca2ab5d9ca4b2a65d994b03cb969fa7cf33d826bcd3907d6 WHIRLPOOL 2673d2c28970433a8e26c9720efcf668cfb0308daf9923ad6149ac0fba9a74754a7e2e731fbbc831f58e2169df75644c7a14fa48ded4cb58faf01d7d2924e9aa
-EBUILD android-sdk-update-manager-22.3.ebuild 3595 SHA256 2a5db3d4e860ce7719f44783844851f1e92dd3e9ed39d686e7c586f3e03fbb27 SHA512 bbf710bc6e6e22be26df35f863481427079ad22eb3c4f9561e815ea6954de26918d93d7a4925fed9515b58fd3493c09ada073546ec590cb58a0db8645850b943 WHIRLPOOL 283beb6f2aa11b1f5fdc656e6f7b7b48e50fec7773b940b4dcda9fbb12cae3e11ec4e0121f90eb815c88882309898471dd0f386d12c11a7e4bb8e3db7c45388e
-EBUILD android-sdk-update-manager-22.6.1.ebuild 3664 SHA256 b6d91e00fee71dbe0703203e1cc0857f31d3a355a77de513f790616e2eab4403 SHA512 ede069277b9c0852d001a8bbe13f4c4b53f793b10e1e89bbff307c10eb822c997e0cfd59f380d806c266e8dbca2b4b8fdb2011d7b1d112bfac07b61b0047e482 WHIRLPOOL 226ab7fd6f42d4cc1a66a2c0994ab1051376e19a7a33eafa592d02eceb117f21028fdf4baa4c047910d920daa2c3e22387583e49d7349f0ff5462de562d44cd4
-EBUILD android-sdk-update-manager-22.6.ebuild 3595 SHA256 961d1eeb5c3fa9f706b44c5cc6eda53bf13ad59cf75c34766b447c893605d9ad SHA512 9cc9dfd50ee5b1423f1d0b963d53260e662619c924a7566a8ee7f673ce151ccf516de78129a7f37ed7020527295c4a2c45cb41db840915eed85939ead55b4346 WHIRLPOOL c5e842859555a87100a030a5c335c5cd1f9f6546e672781b3950b70522f67bd8153336e38da435fa731e82cd7cc7d8cdbf89c8a339ae023b45d89a247b0b7500
-EBUILD android-sdk-update-manager-22.ebuild 3365 SHA256 f86aaae14f90bbdecc7959ce02e60a87f4fcae0279a6ca491681e184bf6c3bf4 SHA512 b5c93a752f955b7a83b6458f3b49b8dc84d62a6a78c4bdc72348be0f8b09882b54a2781735ecdbbf98f0196762fdef2c7de114c13666b07c116306f80c387d44 WHIRLPOOL a1d0231a5b8ff0fee7b60fb28d59c3339f1e50955863658c7c65214da1123601f42fed21c2564438afe1c96e00215cc9d228ef738b036a87da2bca2b4557f659
-EBUILD android-sdk-update-manager-23.ebuild 3659 SHA256 64100fac44537cdac174b92d2b98b32c691d6af25cb382d9e2bfa34f1ed4b322 SHA512 1c984ccc8c8e1e570a061c46cdf249d2874ba3c36a4d3213422f51b5dc27c160a4827dd3708baa55d42b17660293a238a1c847ca7bf5d3b8f30e690152cc868c WHIRLPOOL bd4ec735f5d9bab663be3584a5a19b698d9deb4f8e7f8e86dd7c0d3b855e193bf99013746661e66af67507026380f19110cc82f073c913cb0c97c23ccbc1e52d
-MISC ChangeLog 11078 SHA256 c57a75890be572c7cd771a669f47147f4ff27e67bc39193955632be5358b304f SHA512 50ac018e919c55ae4a4ee2dd1914a34e3d64fc30be9c64ad6bc1e8877cbcbeacb54761f58f999bc916b4ba081a54391b6cb7c7db25b8a19b5ca60565c29f1255 WHIRLPOOL fd3eb950dc1a00103e863ac0a42efe483009ca7eeb6291b7738e1af4c0748235d40742161ec932b95e16822869651eed00b43ebd5d14daeb89005a8a6e12fd84
+EBUILD android-sdk-update-manager-21.1.ebuild 3176 SHA256 e88d97da12646d763d9e665d75121b37ef800959df2fb3e66078a798f692be06 SHA512 5efcfab3e60de6397906df2ba19022376d9a677d5ac4c93a297915a28ed58d1d0cc7e0d6a26cef45484acdde175f11b49eb9a96d21a87dc502cf4976eeea9ab5 WHIRLPOOL f28d6ff2cee62c9d37538a1bbe8ecbc6726a0f7ac640e90694298de2ea1713b0ab5e13da25bfd4c93b1619ea8ce50f2623cab39760870c00d543dcd8723fccd6
+EBUILD android-sdk-update-manager-21.ebuild 3189 SHA256 e4472581aff6f338e4a27b39c058c4a94e30fc243e50cdffdb806a562f34c1d5 SHA512 a84ba9987c77e9748ed312dfdccfd9fe567e0a3883f10e487dab068583593a578e192d356a589465c3a6ab91ec9f02a23a8c2258c36c1bcc301f40995065a632 WHIRLPOOL 5eb6a62f7eae1baf0d263124a6712abe32e5899498291eaa25c5b1698fe7d337f5f11153cf032b2603d988bb8a18222976cee0f9b0aa36217a0ba05eeede898e
+EBUILD android-sdk-update-manager-22.0.1-r1.ebuild 3398 SHA256 b8b47a2b4d85e54fff9454e1106994791749affb2b098ba9c7129539e6afe75a SHA512 e43f8bcdf9ad3b4c0a97f7693f9ce31c0a00575bb4fc845f662b8ba319068d25ad8d4b36b03415316524dd60307993771f77840e19b4043b0f69b801926351a1 WHIRLPOOL 865bedb0ec26168dc843f9e99949b106ea9d1b9c6d22fc225f4a28fdaa696ef8d5bc2c7524d39a72f0803dc03701c2bd514baa6046468d4bcb29ac74e40080d9
+EBUILD android-sdk-update-manager-22.0.1.ebuild 3368 SHA256 2b45e3469340e06ab926d90dd6c02dd2ffcc3bf1d2fd1907993629cc31ba463e SHA512 b41a07dd3d0c695b5bc3c21db5fa1b529be435f1d8195c6c5416b96c182d0a3ad44f4f948129688377728c5db490f0862b9e67c2062e4a20d8ed32a261fbf3f6 WHIRLPOOL db0bb285668c239ea0b52441ccefa73c5af29cb9dd4aa1d66f19d43a0ede2083bda85bb9b877b6be127e07a10f69e5cb77b32be1d462e9d1fa23f4d85f0a87e5
+EBUILD android-sdk-update-manager-22.0.4.ebuild 3395 SHA256 950f288b13b9e5ba5ad38ca3b5e93eece221d18fbe9a96f7f6b1670982ab000a SHA512 0b63cfeddfc8f6b86e3e1538e44fc54861ddeb494ef2f6b2edf962f918698f4b5ed6514821cfe1e94e508cad6531bfdeb80c6e9013b7a5dc061db6a93fde6dd3 WHIRLPOOL 6ba069aedf2455fd637a302871abf485fd0585f1d46986c53be429ffad746239fcd43a2227d09e34874650cf352c1a514ba5e1944eda11fec21e59578768ab25
+EBUILD android-sdk-update-manager-22.0.5-r1.ebuild 3477 SHA256 2609bb28487b28be1a61c0e07132378d8a32112953a2b0268648a0e60299605b SHA512 9dd0fcc636515dbed22f32c90b380358a1a0c1c8dc609ebcbba16531f912e3b4a2dba9f5726cb5608d08f2a2631df4e4edf6228b6a2cf6914b46979e33643908 WHIRLPOOL e75ee8ef038a193c16d18891a7ac531d591f7c8f80e2f91ca574295e554829c35fac8f5d7c9762c86dc1889b0179ba1dc2232eeef15ad853e50822a586361d8a
+EBUILD android-sdk-update-manager-22.0.5.ebuild 3395 SHA256 bab09d6e1ccad58a92f78aebd48bf5753393b407ff7a6169242997970d56d365 SHA512 f298444bdfbd7aa3af8efd3610f469111a86bca9bdddb0d313c238e9ee4dd0c872eab66a7680e594f237a4c29b3d74cce794b1c17c4aff22246032afce6a698f WHIRLPOOL 1a6f69bd2f65500909f4fdaa35b69f4af3ac30e27f1d94d5d8a8935988e3c7153c99a5f4f898ace5da6f68068d0ce50557fd8ad5f9cb03b793894a1e352690f4
+EBUILD android-sdk-update-manager-22.2.1.ebuild 3474 SHA256 69d1f6771e8796e7f9879aa5c73acf918d0da27709b68224ae11a4973a23318a SHA512 24dded552c21a42f701446d25dc46f161c3637623918f1f7554babbdcc9c0c80bde5702246ced71d6631203bfd11341bd27bcc9b2f677faacf2587f30319e86b WHIRLPOOL 5c74b29ed3bdab94b954780e6e62ed6025af7a8efa369b7a3dbf928207f3a30dac7b080581cd3cd891f0686b68a09b885571a0202a45916a1c311b643f677b47
+EBUILD android-sdk-update-manager-22.3.ebuild 3586 SHA256 a00b37322190d334c19ecba439ef22b3c50735c6f6f88258879e3e5c3c510d1c SHA512 de5eaf5fcdf584ae47925e9341ed15b67c9de09474b580140b1695175f0aaaf12cfee794e1667655ab2a93e231301e7d8d5697457c5e3b620393eae7bfd39a3e WHIRLPOOL d96b90907d55934cd9d47bd6635d8594968a7763c480b396a16e73340fd4b66d970607b3e8574e047fea24a9520944b6bb831b2256666a8b915944d6170e85d2
+EBUILD android-sdk-update-manager-22.6.1.ebuild 3588 SHA256 4e384c540400baf02d19f21e73f46cbbe5221615a3e9d74ec5656ab0a66602d6 SHA512 bb0e2d7fbcb1b2d39c82d227de55b4a31ca3f56b0fe5cdae508c63e795607ba6a462ef00e2a61852a88007e1511cd41b577975eb452ca77dea42aa7e6b6e1460 WHIRLPOOL c81e721dab731baca5f2eb9a3bb1807ebc414862b7a59a0c523284b20c5f36a518c98a6984beb0e7f2c13bfddb0b5ad9da5026c7ace8cc94212e4ea9b5991540
+EBUILD android-sdk-update-manager-22.6.ebuild 3586 SHA256 7de1fafbf4f7ab71dce2e687a21dc095e7b6b7fbe3ed9f35d40309ecdc8dcb42 SHA512 bc02b08c05cfbd327961607dd5ee8cb451cba1c75c0b58ba714cae1a6087c1d9927f0f174307894f83ac8944c8e93f353e68a2b13917ff589538ce3e03d1f58b WHIRLPOOL a3b0d5e361f7951b61b03b92f95b3aa5221c5a98e167c1d7c2cd9756d2faf75ec2d3023ee81c406b8f10f9f7e698a4164f3accef462fcdc2fc8a1c27782f8d00
+EBUILD android-sdk-update-manager-22.ebuild 3364 SHA256 ea11773f2187242155fa0fb4158cbb714db1b1a4fdb165625ae2215443bcaee6 SHA512 94a2b8cefbe9bc7e62fff0bd6dc73a64377047dff43e1e4582363963f4f7899eed01e27690763369f4dd55274db9887bdfefea640aa4f476c035066b7d90f20a WHIRLPOOL f03f0ded4d95f91c3ab3763ee0e8dcc763c0320ef82dd78ee29e5dee8a70b840c55b42a3a56ac8ed093480dda8b108f6a5f5718512f19b782a4bf4db89f47cdd
+EBUILD android-sdk-update-manager-23.ebuild 3584 SHA256 e414cf6441e5508b90242497ae14db78a8f64eea43e468e094f946fc1dc58d87 SHA512 0fee6c96a9f0ed537824973ea940861f4f705f722f2aa34e4dee2cf6928ba6cda9dabe8f6471bf8e76b0c77248990505470017071a0159c6b4a0a77d586d904c WHIRLPOOL 4de0dee870cce46a6b5ef2996a8122be3a8fd08126158b56152da14de9521fffb162e4938a2e6131a088648433d5cd09427a1764939b2fb24db9476818b615f1
+MISC ChangeLog 11736 SHA256 f84347040828d956e018ae354d1871156e52984a1696f076407b170a66fd9965 SHA512 fdd385057a333924d06d15a9f2a11e456e33369f3f95c1b1cc287e3b1130341c188fc27449fd747b114ffb5a014942cc538057b13a2ae5c6acb35940c4d45934 WHIRLPOOL e53b0f7858ca62678a001fd7e1ffa0624d04979d099f024f36d34dc81b2179fe3a94a7d1199343f412dd5cddeaf3d349514ee41cccaf4f19ef9acacc22e193cd
 MISC metadata.xml 200 SHA256 98e80d4c2848c87ef9f4b295ac60b27acca3a53380008166b7016a02d4e9526b SHA512 03a8813863af4f9620e6e5564604482e9664ffd576ff24f6ab667484d826482907ece3849b08af3db904d4de9397a8712ed2462773c42c66c59c645192fc9c48 WHIRLPOOL dab7569da9c0b95379db908ed69102239f42e80cab6c6106ac401eb5ef314a1e7056fe3e2a451c2a80dd878df328cdb3f385bfcf4254070e3a9eff6519f8fb81
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlO6z2kACgkQCMFw3lXsEjotRgD8CTy6nhXmeDp5QWHqJZR9P8WU
-sRkaxdzoOLjI+s5yvYgA/31P6a1LDITZoslg9yZu/3dQhGYvWTYgXZ+hua/PH4mq
-=V3y6
+iEYEAREIAAYFAlQ+130ACgkQCaWpQKGI+9R6JQCdH4nMZarKjxd2eYMD2Ghj0SmD
+yfkAn1UAmClV9odEOx4ZuEyO8ymVDbT4
+=sujg
 -----END PGP SIGNATURE-----
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild
index 1610e772ef6a..231f621f4948 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild,v 1.1 2013/03/03 21:41:23 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild,v 1.2 2014/10/15 20:22:19 pacho Exp $
 
-EAPI="3"
+EAPI=5
 
 inherit eutils user
 
@@ -23,8 +23,15 @@ DEPEND="app-arch/tar
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	>=dev-java/swt-3.5[cairo]
-	amd64? ( app-emulation/emul-linux-x86-gtklibs )
-	x86? ( x11-libs/gtk+:2 )"
+	|| (
+		(
+			>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+		)
+	)
+"
 
 ANDROID_SDK_DIR="/opt/${PN}"
 QA_FLAGS_IGNORED_x86="
@@ -51,17 +58,17 @@ src_prepare(){
 }
 
 src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt" || die
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
 	rm -f tools/NOTICE.txt "SDK Readme.txt"
 
 	dodir "${ANDROID_SDK_DIR}/tools"
 	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
 
 	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp} || die "failed to dodir"
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp}
 
-	fowners root:android "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools} || die
-	fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools} || die
+	fowners root:android "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools}
+	fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools}
 
 	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
 
@@ -79,11 +86,11 @@ src_install(){
 
 	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
 
-	doenvd "${T}/80${PN}" || die
+	doenvd "${T}/80${PN}"
 
 	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
 
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
 
 }
 
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild
index a2b3d7a25375..4a59ae42876f 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild,v 1.2 2013/01/20 00:14:14 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild,v 1.3 2014/10/15 20:22:19 pacho Exp $
 
-EAPI="3"
+EAPI=5
 
 inherit eutils user
 
@@ -20,11 +20,19 @@ KEYWORDS="~amd64 ~x86"
 
 DEPEND="app-arch/tar
 		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
+RDEPEND="
+	>=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	>=dev-java/swt-3.5[cairo]
-	amd64? ( app-emulation/emul-linux-x86-gtklibs )
-	x86? ( x11-libs/gtk+:2 )"
+	|| (
+		(
+			>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+		)
+	)
+"
 
 ANDROID_SDK_DIR="/opt/${PN}"
 QA_FLAGS_IGNORED_x86="
@@ -51,14 +59,14 @@ src_prepare(){
 }
 
 src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt" || die
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
 	rm -f tools/NOTICE.txt "SDK Readme.txt"
 
 	dodir "${ANDROID_SDK_DIR}/tools"
 	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
 
 	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp} || die "failed to dodir"
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp}
 
 	fowners root:android "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools} || die
 	fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools} || die
@@ -79,12 +87,11 @@ src_install(){
 
 	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
 
-	doenvd "${T}/80${PN}" || die
+	doenvd "${T}/80${PN}"
 
 	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
 
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" || die
-
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
 }
 
 pkg_postinst() {
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
index a07274b8cb43..21ed6f3156f9 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild,v 1.4 2013/06/13 14:57:47 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild,v 1.5 2014/10/15 20:22:19 pacho Exp $
 
 EAPI="5"
 
@@ -23,8 +23,15 @@ DEPEND="app-arch/tar
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	amd64? ( app-emulation/emul-linux-x86-gtklibs:= )
-	x86? ( x11-libs/gtk+:2= )"
+	|| (
+		(
+			>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+		)
+	)
+"
 
 ANDROID_SDK_DIR="/opt/${PN}"
 QA_FLAGS_IGNORED_x86="
@@ -51,17 +58,17 @@ src_prepare(){
 }
 
 src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt" || die
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
 	rm -f tools/NOTICE.txt "SDK Readme.txt"
 
 	dodir "${ANDROID_SDK_DIR}/tools"
 	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
 
 	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp} || die "failed to dodir"
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
 
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
+	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
 
 	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
 
@@ -79,11 +86,11 @@ src_install(){
 
 	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
 
-	doenvd "${T}/80${PN}" || die
+	doenvd "${T}/80${PN}"
 
 	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
 
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
 
 }
 
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild
index ec64ef1f3e68..e48026629252 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild,v 1.1 2013/06/01 12:43:15 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild,v 1.2 2014/10/15 20:22:19 pacho Exp $
 
-EAPI="3"
+EAPI=5
 
 inherit eutils user
 
@@ -23,8 +23,15 @@ DEPEND="app-arch/tar
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	>=dev-java/swt-3.5[cairo]
-	amd64? ( app-emulation/emul-linux-x86-gtklibs )
-	x86? ( x11-libs/gtk+:2 )"
+	|| (
+		(
+			>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+		)
+	)
+"
 
 ANDROID_SDK_DIR="/opt/${PN}"
 QA_FLAGS_IGNORED_x86="
@@ -51,17 +58,17 @@ src_prepare(){
 }
 
 src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt" || die
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
 	rm -f tools/NOTICE.txt "SDK Readme.txt"
 
 	dodir "${ANDROID_SDK_DIR}/tools"
 	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
 
 	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp} || die "failed to dodir"
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
 
-	fowners root:android "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
-	fperms 0775 "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
+	fowners root:android "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+	fperms 0775 "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
 
 	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
 
@@ -79,11 +86,11 @@ src_install(){
 
 	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
 
-	doenvd "${T}/80${PN}" || die
+	doenvd "${T}/80${PN}"
 
 	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
 
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
 
 }
 
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
index cab596ece72e..2b4436f1d784 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild,v 1.1 2013/07/24 01:23:39 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild,v 1.2 2014/10/15 20:22:19 pacho Exp $
 
 EAPI="5"
 
@@ -23,8 +23,15 @@ DEPEND="app-arch/tar
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	amd64? ( app-emulation/emul-linux-x86-gtklibs:= )
-	x86? ( x11-libs/gtk+:2= )"
+	|| (
+		(
+			>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+		)
+	)
+"
 
 ANDROID_SDK_DIR="/opt/${PN}"
 QA_FLAGS_IGNORED_x86="
@@ -51,17 +58,17 @@ src_prepare(){
 }
 
 src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt" || die
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
 	rm -f tools/NOTICE.txt "SDK Readme.txt"
 
 	dodir "${ANDROID_SDK_DIR}/tools"
 	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
 
 	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp} || die "failed to dodir"
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
 
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
+	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
 
 	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
 
@@ -79,11 +86,11 @@ src_install(){
 
 	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
 
-	doenvd "${T}/80${PN}" || die
+	doenvd "${T}/80${PN}"
 
 	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
 
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
 
 }
 
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
index 7dc709e60435..b56b959cf7da 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild,v 1.1 2013/09/16 13:13:59 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild,v 1.2 2014/10/15 20:22:19 pacho Exp $
 
 EAPI="5"
 
@@ -23,8 +23,15 @@ DEPEND="app-arch/tar
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	amd64? ( app-emulation/emul-linux-x86-gtklibs:= )
-	x86? ( x11-libs/gtk+:2= )"
+	|| (
+		(
+			>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+		)
+	)
+"
 
 ANDROID_SDK_DIR="/opt/${PN}"
 QA_FLAGS_IGNORED_x86="
@@ -51,17 +58,17 @@ src_prepare(){
 }
 
 src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt" || die
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
 	rm -f tools/NOTICE.txt "SDK Readme.txt"
 
 	dodir "${ANDROID_SDK_DIR}/tools"
 	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
 
 	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp} || die "failed to dodir"
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
 
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
+	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
 
 	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
 
@@ -80,11 +87,11 @@ src_install(){
 	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
 	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
 
-	doenvd "${T}/80${PN}" || die
+	doenvd "${T}/80${PN}"
 
 	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
 
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
 
 }
 
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
index 550524d4780f..52b57ce74e6d 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild,v 1.1 2013/08/14 14:40:57 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild,v 1.2 2014/10/15 20:22:19 pacho Exp $
 
 EAPI="5"
 
@@ -23,8 +23,15 @@ DEPEND="app-arch/tar
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	amd64? ( app-emulation/emul-linux-x86-gtklibs:= )
-	x86? ( x11-libs/gtk+:2= )"
+	|| (
+		(
+			>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+		)
+	)
+"
 
 ANDROID_SDK_DIR="/opt/${PN}"
 QA_FLAGS_IGNORED_x86="
@@ -51,17 +58,17 @@ src_prepare(){
 }
 
 src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt" || die
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
 	rm -f tools/NOTICE.txt "SDK Readme.txt"
 
 	dodir "${ANDROID_SDK_DIR}/tools"
 	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
 
 	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp} || die "failed to dodir"
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
 
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
+	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
 
 	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
 
@@ -79,11 +86,11 @@ src_install(){
 
 	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
 
-	doenvd "${T}/80${PN}" || die
+	doenvd "${T}/80${PN}"
 
 	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
 
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
 
 }
 
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
index 6a427e8e0fa4..90a7a9c3f36c 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild,v 1.1 2013/09/25 20:00:00 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild,v 1.2 2014/10/15 20:22:19 pacho Exp $
 
 EAPI="5"
 
@@ -23,8 +23,15 @@ DEPEND="app-arch/tar
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	amd64? ( app-emulation/emul-linux-x86-gtklibs:= )
-	x86? ( x11-libs/gtk+:2= )"
+	|| (
+		(
+			>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+		)
+	)
+"
 
 ANDROID_SDK_DIR="/opt/${PN}"
 QA_FLAGS_IGNORED_x86="
@@ -51,17 +58,17 @@ src_prepare(){
 }
 
 src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt" || die
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
 	rm -f tools/NOTICE.txt "SDK Readme.txt"
 
 	dodir "${ANDROID_SDK_DIR}/tools"
 	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
 
 	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp} || die "failed to dodir"
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
 
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
+	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
 
 	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
 
@@ -80,11 +87,11 @@ src_install(){
 	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
 	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
 
-	doenvd "${T}/80${PN}" || die
+	doenvd "${T}/80${PN}"
 
 	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
 
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
 
 }
 
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
index 02a7f87b8d2e..d7bdc37660e6 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild,v 1.2 2013/11/20 23:49:06 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild,v 1.3 2014/10/15 20:22:19 pacho Exp $
 
 EAPI="5"
 
@@ -23,8 +23,15 @@ DEPEND="app-arch/tar
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	amd64? ( app-emulation/emul-linux-x86-gtklibs:= )
-	x86? ( x11-libs/gtk+:2= )"
+	|| (
+		(
+			>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+		)
+	)
+"
 
 ANDROID_SDK_DIR="/opt/${PN}"
 QA_FLAGS_IGNORED_x86="
@@ -51,17 +58,17 @@ src_prepare(){
 }
 
 src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt" || die
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
 	rm -f tools/NOTICE.txt "SDK Readme.txt"
 
 	dodir "${ANDROID_SDK_DIR}/tools"
 	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
 
 	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp} || die "failed to dodir"
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
 
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
+	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
 
 	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
 
@@ -80,14 +87,14 @@ src_install(){
 	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
 	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
 
-	doenvd "${T}/80${PN}" || die
+	doenvd "${T}/80${PN}"
 
 	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
 
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
 
 	udev_dorules "${FILESDIR}"/80-android.rules || die
-	domenu "${FILESDIR}"/android-sdk-update-manager.desktop || die
+	domenu "${FILESDIR}"/android-sdk-update-manager.desktop
 }
 
 pkg_postinst() {
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
index 54010c6ce4ef..5e2dd0ae9727 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild,v 1.2 2014/06/25 12:47:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild,v 1.3 2014/10/15 20:22:19 pacho Exp $
 
 EAPI="5"
 
@@ -23,13 +23,15 @@ DEPEND="app-arch/tar
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	amd64? (
-		|| (
-			app-emulation/emul-linux-x86-gtklibs:=[-abi_x86_32(-)]
-			x11-libs/gtk+:2=[abi_x86_32(-)]
+	|| (
+		(
+			>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
 		)
 	)
-	x86? ( x11-libs/gtk+:2= )"
+"
 
 ANDROID_SDK_DIR="/opt/${PN}"
 QA_FLAGS_IGNORED_x86="
@@ -56,17 +58,17 @@ src_prepare(){
 }
 
 src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt" || die
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
 	rm -f tools/NOTICE.txt "SDK Readme.txt"
 
 	dodir "${ANDROID_SDK_DIR}/tools"
 	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
 
 	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp} || die "failed to dodir"
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
 
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
+	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
 
 	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
 
@@ -85,14 +87,14 @@ src_install(){
 	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
 	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
 
-	doenvd "${T}/80${PN}" || die
+	doenvd "${T}/80${PN}"
 
 	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
 
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
 
 	udev_dorules "${FILESDIR}"/80-android.rules || die
-	domenu "${FILESDIR}"/android-sdk-update-manager.desktop || die
+	domenu "${FILESDIR}"/android-sdk-update-manager.desktop
 }
 
 pkg_postinst() {
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
index 10c232fa6d49..50143f538539 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild,v 1.1 2014/03/19 01:53:22 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild,v 1.2 2014/10/15 20:22:19 pacho Exp $
 
 EAPI="5"
 
@@ -23,8 +23,15 @@ DEPEND="app-arch/tar
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	amd64? ( app-emulation/emul-linux-x86-gtklibs:= )
-	x86? ( x11-libs/gtk+:2= )"
+	|| (
+		(
+			>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+		)
+	)
+"
 
 ANDROID_SDK_DIR="/opt/${PN}"
 QA_FLAGS_IGNORED_x86="
@@ -51,17 +58,17 @@ src_prepare(){
 }
 
 src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt" || die
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
 	rm -f tools/NOTICE.txt "SDK Readme.txt"
 
 	dodir "${ANDROID_SDK_DIR}/tools"
 	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
 
 	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp} || die "failed to dodir"
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
 
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
+	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
 
 	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
 
@@ -80,14 +87,14 @@ src_install(){
 	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
 	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
 
-	doenvd "${T}/80${PN}" || die
+	doenvd "${T}/80${PN}"
 
 	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
 
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
 
 	udev_dorules "${FILESDIR}"/80-android.rules || die
-	domenu "${FILESDIR}"/android-sdk-update-manager.desktop || die
+	domenu "${FILESDIR}"/android-sdk-update-manager.desktop
 }
 
 pkg_postinst() {
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild
index 8f7fe8f067b8..f897c03d1b35 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild,v 1.2 2013/05/29 17:46:16 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild,v 1.3 2014/10/15 20:22:19 pacho Exp $
 
-EAPI="3"
+EAPI=5
 
 inherit eutils user
 
@@ -23,8 +23,15 @@ DEPEND="app-arch/tar
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	>=dev-java/swt-3.5[cairo]
-	amd64? ( app-emulation/emul-linux-x86-gtklibs )
-	x86? ( x11-libs/gtk+:2 )"
+	|| (
+		(
+			>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+		)
+	)
+"
 
 ANDROID_SDK_DIR="/opt/${PN}"
 QA_FLAGS_IGNORED_x86="
@@ -51,17 +58,17 @@ src_prepare(){
 }
 
 src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt" || die
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
 	rm -f tools/NOTICE.txt "SDK Readme.txt"
 
 	dodir "${ANDROID_SDK_DIR}/tools"
 	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
 
 	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp} || die "failed to dodir"
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
 
-	fowners root:android "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
-	fperms 0775 "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
+	fowners root:android "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+	fperms 0775 "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
 
 	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
 
@@ -79,11 +86,11 @@ src_install(){
 
 	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
 
-	doenvd "${T}/80${PN}" || die
+	doenvd "${T}/80${PN}"
 
 	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
 
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
 
 }
 
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
index 8e2d616fdb75..6951b1d04827 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild,v 1.1 2014/07/07 16:48:40 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild,v 1.2 2014/10/15 20:22:19 pacho Exp $
 
 EAPI="5"
 
@@ -23,13 +23,15 @@ DEPEND="app-arch/tar
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	amd64? (
-		|| (
-			app-emulation/emul-linux-x86-gtklibs:=[-abi_x86_32(-)]
-			x11-libs/gtk+:2=[abi_x86_32(-)]
+	|| (
+		(
+			>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
 		)
 	)
-	x86? ( x11-libs/gtk+:2= )"
+"
 
 ANDROID_SDK_DIR="/opt/${PN}"
 QA_FLAGS_IGNORED_x86="
@@ -56,17 +58,17 @@ src_prepare(){
 }
 
 src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt" || die
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
 	rm -f tools/NOTICE.txt "SDK Readme.txt"
 
 	dodir "${ANDROID_SDK_DIR}/tools"
 	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
 
 	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp} || die "failed to dodir"
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
 
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
+	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
 
 	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
 
@@ -85,14 +87,14 @@ src_install(){
 	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
 	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
 
-	doenvd "${T}/80${PN}" || die
+	doenvd "${T}/80${PN}"
 
 	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
 
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
 
 	udev_dorules "${FILESDIR}"/80-android.rules || die
-	domenu "${FILESDIR}"/android-sdk-update-manager.desktop || die
+	domenu "${FILESDIR}"/android-sdk-update-manager.desktop
 }
 
 pkg_postinst() {