commit: e1917ae08d6e355a448c236c3175e29e757582e8 Author: Gergely Nagy <ngg <AT> ngg <DOT> hu> AuthorDate: Tue Oct 13 14:33:40 2020 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Tue Oct 13 17:05:36 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1917ae0
dev-util/android-tools: fix broken SRC_URI Closes: https://github.com/gentoo/gentoo/pull/17913 Closes: https://bugs.gentoo.org/748492 Signed-off-by: Gergely Nagy <ngg <AT> ngg.hu> Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> dev-util/android-tools/Manifest | 1 + dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest index 2fe91c4dc74..40321351b6a 100644 --- a/dev-util/android-tools/Manifest +++ b/dev-util/android-tools/Manifest @@ -16,6 +16,7 @@ DIST android-tools-8.1.0_r1-selinux.tar.xz 3188060 BLAKE2B 8c513d858e8dcaed70597 DIST android-tools-8.1.0_r1.ninja.xz 2740 BLAKE2B 34473e33970cefdaf82bbe4524665fd50e6617cf867757ca07cdccc2e7356f43ef4bb455080ef4bac516ddba3c4e4120f0b27306e84725f8d5738a81800e3a53 SHA512 707e0e1c53832a42384e93d363f80007b76f18166b9f3f7d516431410b05319b1acc804daa1fddc218e11feb48de48683efb5203f4fa6d80646dcb1a2953139f DIST android-tools-9.0.0_p3-bug-706946-fno-common.patch.xz 2696 BLAKE2B de8083846d6cb24d2fcb12789b302f5df766753989e004154746d4402a5777bbabff2e9c67758e9185c0ea56dde7e647a8a15dd696671c28f2f708703bcad9f0 SHA512 e65818e9d06295f7de8f8bc52270054f9936659b2bf07f7abc15f2ea7b138536396a24c39bb6a260a931250396b04022170f2045336f0ba6444cd90fb0dfdbb0 DIST android-tools-9.0.0_p3-fix-build-with-glibc-2.30.patch 1262 BLAKE2B fa2d3cd31e82dd3b17bb840096c6158f1b117cb12b8b3c6f6c604efd85f880346c04e8e98b17bebd68d56e06cdc126677ad96dbd6214175544a9b93020292956 SHA512 21c2501fa24f59489e656ac5122c906476ad573e63f6dcc88605dafde9d4b8927ea904708caaababd12155153d969d2480aff591d98057859e8b885e94aa126a +DIST android-tools-9.0.0_r3-arch.tar.gz 8451 BLAKE2B b28649333aa0e5a6f4bc83f9e42e1749a4d138075d03559c5871a24f782bf8608bcf07a609bd791ee29afabcb4435ece2ed8f8abc171265ef9d67da231c8a29e SHA512 d3409f89d2c334b66e694fd77e068e2d863dc9a99b9ef332b0a08c9c186c26eb9d969ef5cde5aa6e28b866847b4a85a4d3a4c2b0951a37752510b2f3b41c5943 DIST android-tools-9.0.0_r3-arch.tar.xz 7628 BLAKE2B d0d7267d41ade2031d72236c18850ea329afbdd57a2b5bf25837e405d3e66d7aaef5b48996e7aafd4cf6e4543de03ba6549823845e5e8cb35c6d4bc900b8e275 SHA512 534d99fe15b3a3ba4f2a7331662fdb8645424830122cc4c1ff0b44d43059280610389147d4a916c55b3be71ac84d019223c90993cbdae2588f9e9737f0b5606d DIST android-tools-9.0.0_r3-core.tar.gz 27484684 BLAKE2B d071adacd5be0341a9114e57242fe51f623773683b9db2735eac9231a77cc22651f09e1c63682e729494aa6409939696a5635afcd5e8a40ec0f75d2784c00ffc SHA512 0edc8b02b57085ce88b39c987284af1c681870594b20ab9ecf4be98a0cfdff2905bc80f5d8eeb7fbc7f4604b800b6f95bc6b2b0321c900bf833313dfcbb2eefb DIST android-tools-9.0.0_r3-e2fsprogs.tar.xz 5255616 BLAKE2B 5fe62da70686148d755c60c1cef4b64d80f0c6a891d13a778d2a3209f950b0f9c5b19bf39ed28c5d38d01103ef1ea474133f57b7104a4fdf80eafd8edc17a3a5 SHA512 a9c3c180ddb96f10710a18794b20cfc641d40af3643a1133091127a40c27fa724b6e6f1af8e66fc1e1ca33053e33499b910880eab05979a2de95a0d3d7a79f93 diff --git a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild index 0a5d152abd2..b2b942ac225 100644 --- a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild +++ b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild @@ -18,7 +18,7 @@ BORINGSSL_SHA1="45210dd4e21ace9d28cb76b3f83303fcdd2efcce" GLIBC_GETTID_PATCH="${P}-fix-build-with-glibc-2.30.patch" # The ninja file was created by running the ruby script from archlinux by hand and fixing the build vars. # No point in depending on something large/uncommon like ruby just to generate a ninja file. -SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-0ffb7b41d599741d100a6a00a4bb20e162cd3f90.tar.xz -> ${MY_P}-arch.tar.xz +SRC_URI="https://github.com/archlinux/svntogit-community/archive/0ffb7b41d599741d100a6a00a4bb20e162cd3f90.tar.gz -> ${MY_P}-arch.tar.gz https://github.com/android/platform_system_core/archive/android-${MY_PV}.tar.gz -> ${MY_P}-core.tar.gz https://github.com/google/boringssl/archive/${BORINGSSL_SHA1}.tar.gz -> boringssl-${BORINGSSL_SHA1}.tar.gz mirror://gentoo/${MY_P}-e2fsprogs.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-e2fsprogs.tar.xz @@ -61,7 +61,7 @@ unpack_into() { } src_unpack() { - unpack_into "${MY_P}-arch.tar.xz" arch + unpack_into "${MY_P}-arch.tar.gz" arch unpack_into "${MY_P}-core.tar.gz" core unpack_into "${MY_P}-e2fsprogs.tar.xz" ./e2fsprogs unpack_into "${MY_P}-extras.tar.xz" extras
