commit: bf8a53572b7c540dea7715ce81d6192604ad8025 Author: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Mon Jan 4 22:00:47 2021 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Tue Jan 5 15:46:38 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf8a5357
dev-util/android-tools: Remove old Bug: https://bugs.gentoo.org/706946 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andreas K. Huettel <dilfridge <AT> gentoo.org> dev-util/android-tools/Manifest | 10 --- .../android-tools/android-tools-5.1.1_p13.ebuild | 65 ---------------- .../android-tools/android-tools-6.0.1_p79.ebuild | 87 ---------------------- 3 files changed, 162 deletions(-) diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest index 12a108bf7cd..2975ba07170 100644 --- a/dev-util/android-tools/Manifest +++ b/dev-util/android-tools/Manifest @@ -1,13 +1,3 @@ -DIST android-tools-5.1.1_r13-arch.tar.gz 4078 BLAKE2B 718f94b0854189533f11545a8962c2cc85bc01797057a77525babd7f5e01c76f12764cab0da30cf8abe364c0ec757193cc8c49bef3278925076efd3633fc5fcf SHA512 e38e0d1c966b569defc6df185c0e2b35b3766a7f89bcc3f60cea9b536f37b5b6b76f40457735b509d806c4c5b24f6b3805b51b85ffeb4d04fc14a731f81414c3 -DIST android-tools-5.1.1_r13-core.tar.gz 1210720 BLAKE2B 0ec56b07c206ab122d1286dfa55424c3ffa4382cbe3f55f6ca351ca9e4555537e9404a5ee239adb90667d91c9212de85c8c264662489b69d3b7846c4b4bcd80d SHA512 2ce2f03193840bd894cb4638bd23a321e53c6185e9816729193714b9e2d068f5ca4ebcee4edc7febaa4ea1ee3621aa6977217a5a84d2f116f35b000969a4af15 -DIST android-tools-5.1.1_r13-extras.tar.gz 282690 BLAKE2B b0be4168ca4cdf6c7ed359f01104b2b20cf36678153bae00ffb8cdc9d79e0518f850d9f1ad3eb3a2f998418a6fcd1c54cf4199a2ae37c696e5f657bbed8c778c SHA512 322d45be02d3d5a5bf677e3a38a44085258ee7b9a8c0a7bc08ddb4104168170d5969699ee54e19009a2bd0d7e0ac6ad7971ccc67e2a0311c6f1ba7fb76cfce83 -DIST android-tools-5.1.1_r13-f2fs-tools.tar.gz 65931 BLAKE2B 658bae1a0d713887522eba2264971ae1f68093d9f3cf8ac1c2de96600219fc9f3624595de273ca3af76a69edf3a36b8136d9bb6b75a147beb2fc804864fd7b82 SHA512 66f4be04164df8bb5138105db4e9d5b79c09cd8c28a0d30a6d1e6dead77961614172c96fa680953bf445b934f14b4dbbc21ce89a909d9f278f2eca1ca2e1e656 -DIST android-tools-5.1.1_r13-libselinux.tar.gz 49085 BLAKE2B 50136b205fd6a6b055f82b16fe4e234bf060d40400e62e2a53c9943f67181d35564b000ec27fa060c2e01f7e4dea441079c5b06d1b5de21a9bcd15e8fa271a9b SHA512 b1a8960b98206118a07f11e7e67429c0d4b8f89c4f65919bcd02a6ba1c7f30e5b73a9431ce8d10fc6ffa6e487b79061b84a969490bf22a49188dc5cd9dd46a2f -DIST android-tools-6.0.1_r79-arch.tar.gz 13466 BLAKE2B ddb064303659468b648a46ea24aae648968088de4aaea2b64e7b9d946d867daaf6ed1f4094cb7b29beb803387d2253580c85a46e9392bc1ccb2461186f2e52ef SHA512 90b8638d247897da33f6e861492c58df0e9877738650083c3307bd787d234d728e6c9097ac1401c254eb3daf4c6b18da4ee84dd16749acf6359fcb42781862fc -DIST android-tools-6.0.1_r79-core.tar.gz 1186562 BLAKE2B 473454d340e65f98201508cb04293118d6e2ecc06e33d0d76ca81c536ea00a7818ebe4c4ccd30efef36aaaa1a9ec6ee3a57c00e2a82af28cbc49f4c973ab46be SHA512 a48f8c562305cbc951e008979920d9efe02e232c41997423457ff1e2f115e526b295c260a501d4050ce280ca7155793b95f7a60bad5cbc165ba80d6a225152f0 -DIST android-tools-6.0.1_r79-extras.tar.gz 648657 BLAKE2B 4582ddd57b729492e08987e17304c62778504ffc316ab26df8c83fff1aed33226106474131d5ad0e3e302b577c83a2b78d0be04fef9711e39861a223580ab1b9 SHA512 e10694737c518f591eff4e808bb826c83bf45dc44c5c1ee8a4082a6e0653350ffe2986e299348cb4a1219203192d01546a05e9354ce05e29897f856c147de8c3 -DIST android-tools-6.0.1_r79-f2fs-tools.tar.gz 70255 BLAKE2B ab9ce3efd33c28a1a0a9cb8a5415057498dd493e059183cc9d3fcc9de1b5ca4d7488c75695c94700fc6a4e5503beb8647576c7096fa50229f98485d2983ce152 SHA512 0871f99f78006028889b42668ec627b6515bb812ad3ec4a489f62187a79f64d2a74f66556698a5f05fc99932f75fefd8810dedceeab744b212beb764e97b82c8 -DIST android-tools-6.0.1_r79-libselinux.tar.gz 50814 BLAKE2B f09f26c801be83bc97f4b18606f513ce0fae791126a30c90067e3b2066c991fa1390ab2d0fac2475f755f3245179718204d5014f47ece46801dc0f80caf9758b SHA512 686557271271c4d59fb968c5aa76b433955009733f3151c4c86faa996ce846088d6632b0969b23699822b7a6f09eae60abedba6abb0edc9d444159bbdb5c6f91 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 diff --git a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild deleted file mode 100644 index 62e4096698a..00000000000 --- a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit bash-completion-r1 eutils toolchain-funcs - -MY_PV="${PV/_p/_r}" -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)" -HOMEPAGE="https://android.googlesource.com/platform/system/core.git/"; -# For stable digests, git tarballs generated by android.googlesource.com -# are fetched from mirror://gentoo/. -SRC_URI="https://projects.archlinux.org/svntogit/community.git/snapshot/community-caa300cf262afcf5bdb4dcc923dee54e3715fd5c.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 -mirror://gentoo/${MY_P}-extras.tar.gz -mirror://gentoo/${MY_P}-libselinux.tar.gz -mirror://gentoo/${MY_P}-f2fs-tools.tar.gz" - -# The entire source code is Apache-2.0, except for fastboot which is BSD-2. -LICENSE="Apache-2.0 BSD-2" -SLOT="0" -KEYWORDS="amd64 x86 ~x86-linux" -IUSE="libressl" - -RDEPEND="sys-libs/zlib:= - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - dev-libs/libpcre" -DEPEND="${RDEPEND}" - -S=${WORKDIR} - -src_unpack() { - local dir filename - for filename in ${A}; do - if [[ ${filename} =~ ^${MY_P}-(.*)\.tar\.gz$ ]]; then - dir=${BASH_REMATCH[1]} - mkdir -p "${dir}" || die - pushd "${dir}" >/dev/null - unpack "${filename}" - popd > /dev/null - else - die "unrecognized file in \${A}: ${filename}" - fi - done -} - -src_prepare() { - mv core/*/* core/ || die - sed -e 's|#include <dlfcn.h>|\0\n#include <stddef.h>\n#include <string.h>\n|' \ - -i extras/f2fs_utils/f2fs_utils.c || die - mv arch/*/trunk/Makefile ./ || die - sed -i '1i#include <sys/sysmacros.h>' core/adb/usb_linux.c || die #580058 - sed -e 's|^#include <sys/cdefs.h>$|/*\0*/|' \ - -e 's|^__BEGIN_DECLS$|#ifdef __cplusplus\nextern "C" {\n#endif|' \ - -e 's|^__END_DECLS$|#ifdef __cplusplus\n}\n#endif|' \ - -i extras/ext4_utils/sha1.{c,h} || die #580686 - tc-export CC -} - -src_install() { - emake DESTDIR="${ED}" install - newbashcomp arch/*/trunk/bash_completion fastboot -} diff --git a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild b/dev-util/android-tools/android-tools-6.0.1_p79.ebuild deleted file mode 100644 index 6ad2b514792..00000000000 --- a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit bash-completion-r1 eutils toolchain-funcs - -MY_PV="${PV/_p/_r}" -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)" -HOMEPAGE="https://android.googlesource.com/platform/system/core.git/"; -# Downloading git tarballs generated by android.googlesource.com -# Archlinux package contains patches and build script generation mechanism. -SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-6a03c4736c9734f5ac3d6b5b912605690a6eaa5f.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 -mirror://gentoo/${MY_P}-extras.tar.gz -mirror://gentoo/${MY_P}-libselinux.tar.gz -mirror://gentoo/${MY_P}-f2fs-tools.tar.gz" - -# The entire source code is Apache-2.0, except for fastboot which is BSD-2. -LICENSE="Apache-2.0 BSD-2" -SLOT="0" -KEYWORDS="amd64 x86 ~x86-linux" -IUSE="libressl" - -RDEPEND="sys-libs/zlib:= - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - dev-libs/libpcre" -# dev-lang/ruby is necessary for build script generation. -DEPEND="${RDEPEND} - virtual/rubygems" - -S=${WORKDIR} - -src_unpack() { - local dir filename - for filename in ${A}; do - if [[ ${filename} =~ ^${MY_P}-(.*)\.tar\.gz$ ]]; then - dir=${BASH_REMATCH[1]} - mkdir -p "${dir}" || die - pushd "${dir}" >/dev/null - unpack "${filename}" - popd > /dev/null - else - die "unrecognized file in \${A}: ${filename}" - fi - done -} - -src_prepare() { - mv core/*/* core/ || die - epatch arch/*/trunk/fix_build.patch - cp arch/*/trunk/generate_build.rb ./ || die - sed -i '1i#include <sys/sysmacros.h>' core/adb/usb_linux.cpp || die #616508 - sed -e 's|^#include <sys/cdefs.h>$|/*\0*/|' \ - -e 's|^__BEGIN_DECLS$|#ifdef __cplusplus\nextern "C" {\n#endif|' \ - -e 's|^__END_DECLS$|#ifdef __cplusplus\n}\n#endif|' \ - -i extras/ext4_utils/sha1.{c,h} || die #580686 - default -} - -src_compile() { - # Dynamically detect rubygems interpreter (bug 631398). - local ruby_bin=$(type -P ruby) ruby_error_log=${T}/generate_build.rb.log success= - for ruby_bin in "${ruby_bin}" "${ruby_bin}"[[:digit:]][[:digit:]]; do - "${ruby_bin}" ./generate_build.rb 1> build.sh 2> "${ruby_error_log}" && \ - { success=1; break; } - done - if [[ -z ${success} ]]; then - cat "${ruby_error_log}" >&2 - die "${ruby_bin} ./generate_build.rb failed" - fi - sed -e 's:^gcc:${CC}:' -e 's:^g++:${CXX}:' -i build.sh || die - chmod +x build.sh || die - tc-export CC CXX - bash -e ./build.sh || die -} - -src_install() { - dobin adb - dobin fastboot - dobin mkbootimg - # Omitting, app-shells/bash-completion contains completion for adb - #newbashcomp arch/*/trunk/bash_completion.adb adb - newbashcomp arch/*/trunk/bash_completion.fastboot fastboot -}
