summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-06-25 12:47:52 +0000
committerMichał Górny <mgorny@gentoo.org>2014-06-25 12:47:52 +0000
commitb4ac4fff4273acdd084e6b81e64eeb8d0afbb62a (patch)
treed9f36b2d069c287431d7a5f7b016f0d6a6666f4d /dev-util/android-sdk-update-manager
parentVersion bump (diff)
downloadhistorical-b4ac4fff4273acdd084e6b81e64eeb8d0afbb62a.tar.gz
historical-b4ac4fff4273acdd084e6b81e64eeb8d0afbb62a.tar.bz2
historical-b4ac4fff4273acdd084e6b81e64eeb8d0afbb62a.zip
Support multilib dependencies aside to emul-linux-x86.
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E!
Diffstat (limited to 'dev-util/android-sdk-update-manager')
-rw-r--r--dev-util/android-sdk-update-manager/ChangeLog6
-rw-r--r--dev-util/android-sdk-update-manager/Manifest24
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild9
3 files changed, 30 insertions, 9 deletions
diff --git a/dev-util/android-sdk-update-manager/ChangeLog b/dev-util/android-sdk-update-manager/ChangeLog
index 03ac6b154b3b..c46a7aa9a279 100644
--- a/dev-util/android-sdk-update-manager/ChangeLog
+++ b/dev-util/android-sdk-update-manager/ChangeLog
@@ -1,6 +1,10 @@
# 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.60 2014/03/19 17:25:31 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog,v 1.61 2014/06/25 12:47:50 mgorny Exp $
+
+ 25 Jun 2014; Michał Górny <mgorny@gentoo.org>
+ android-sdk-update-manager-22.6.1.ebuild:
+ Support multilib dependencies aside to emul-linux-x86.
*android-sdk-update-manager-22.6.1 (19 Mar 2014)
diff --git a/dev-util/android-sdk-update-manager/Manifest b/dev-util/android-sdk-update-manager/Manifest
index 2f6d1c3ec140..a697139b882c 100644
--- a/dev-util/android-sdk-update-manager/Manifest
+++ b/dev-util/android-sdk-update-manager/Manifest
@@ -22,15 +22,27 @@ EBUILD android-sdk-update-manager-22.0.5-r1.ebuild 3479 SHA256 53f6b954976455f54
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 3597 SHA256 b30d5c58660365ca34608b2f60b937307121c46a6e9c1ffd53f43b76a9650914 SHA512 bc67f592c1e1b38b58cbaf18e86c3cf3505fc256fb979f2f94dd0bf4751208b78a32324bb8c92eb1c24f60d8ae05de914094b04e76e14bcf457464ba4216234b WHIRLPOOL 207310952563bb487c5e0df22944a9f0c9c3749eeb88065f9a1f1e293c9fee804707f71a5f397010540008c0458d7fcc29a8e33dd9d6df42d3a1ad65b9804811
+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
-MISC ChangeLog 10772 SHA256 e596c5171b770abe543d2ae1cd09dbf11eba5d675dff1dbaead28896ca4cf74d SHA512 763293fd203ed909d761039197158d8ed1f9ba3b7cbe0e5e5237a0411e351c6f3e6dbff4f3550bea35e60be9d5a5996b7cb418f4651165113211b789c2eda288 WHIRLPOOL 747469f5f475a04314c91819c26b7e37d4ac9237b263a1dd4b9ea67603170a906931b8ade4c0c8f71f1134c331fbd6155e6abad57fab60f2fb34b649437495d7
+MISC ChangeLog 10925 SHA256 e0d53a5ad1a473881cd75e651f29ab384d392c4d18daff5e03a81082d655c5c6 SHA512 0f9ab099f3bdff8ffd71c8067bbf4e348667aae37f8dd361a4cbe565d2cba5778dcc5d4181ba5b8b4c1a15137bbdd8fd76bb59a76d2a26374f27969ed83c3e5c WHIRLPOOL 1474697633d4f76e5bff7e6e875ee2af4ef3ad4e9b202727e840d035359135d0b141d6a1a78461093c415eef1b3f54df4c44e78c03c604d6a0c8e7f67f79b321
MISC metadata.xml 200 SHA256 98e80d4c2848c87ef9f4b295ac60b27acca3a53380008166b7016a02d4e9526b SHA512 03a8813863af4f9620e6e5564604482e9664ffd576ff24f6ab667484d826482907ece3849b08af3db904d4de9397a8712ed2462773c42c66c59c645192fc9c48 WHIRLPOOL dab7569da9c0b95379db908ed69102239f42e80cab6c6106ac401eb5ef314a1e7056fe3e2a451c2a80dd878df328cdb3f385bfcf4254070e3a9eff6519f8fb81
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
-iF4EAREIAAYFAlMp0w8ACgkQCMFw3lXsEjrWpgD/Wj6jpZDVwwaWoZtlF4KBH1dA
-609l6RbaTZFE8ppKMSMA/0eD2OIhwxy4P2V5HZQVfE4Dp+mbl9fJSqxPjopSzUyz
-=SMFJ
+iQJ8BAEBCABmBQJTqsT3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO6K4P/3zz310BsW1M4wo4leooxWkd
+gpMFBXxD+C8Ksi6jcWQhimN6hoHMx/y+ktX5nt1DcyIUiKB7q2j/C6pcxQE0fXxU
+Mb8Rof6AMEpDO9UBpPs6ZCMR2k7xY65dFjAE4eao+KpXb+Hyyrj3JTC15NTABiAU
+Li5GGJkJY20BynJH08bA+EsNEcF5Sy6oU7/NB6nW2y+QarGpC0OncjmHryfrsRHb
+G5U9gwbMyYyni3J5umJlJEwpJ6l77eVNJPGayGuKueLSL+DOkazuTMQmUiNeSW7M
+yp/qs3Zp7NzW8SH4UOrKBoZ6V8bxTI0pBkAiYM61KCAWTOjUOT3kThhbRMzsipNh
+lPfuAyOgfPio/9b/OFRpXlEVHkErm13Z3URHSG5VYWAPyq9zWSLqLXg+BUd7Rnog
+3eNfztL/lfoSRyKse3W7H9AYs2Qm25G44VTepFyEJQUQw/2Hycg4lM23DQwdDHQG
+g0wtU2eKxJBiTUWMGWC8xXK0xWk9m8NV7qrsjSlT1IpnvjPCj2+13c3XwEyXnRmb
+vXdmbGudJjYVZh8JAf62RY0Ry4iE/VpSEZJB1jE/kN9NwAnefbuWWpc5wJnzGzM3
+WHPIPF+CM0GMR780hCc1b9r1k86poG/5dNL2VzChMdUcldGmZSGAid5U6gaMNArc
+LSnPfKiwg6tyOaH2ImIq
+=gzrs
-----END PGP SIGNATURE-----
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 fdc2b79b3990..54010c6ce4ef 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.1 2014/03/19 17:25:31 rich0 Exp $
+# $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 $
EAPI="5"
@@ -23,7 +23,12 @@ 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:= )
+ amd64? (
+ || (
+ app-emulation/emul-linux-x86-gtklibs:=[-abi_x86_32(-)]
+ x11-libs/gtk+:2=[abi_x86_32(-)]
+ )
+ )
x86? ( x11-libs/gtk+:2= )"
ANDROID_SDK_DIR="/opt/${PN}"