| 1 |
commit: a8a0fd5e5ba2886d2f86548e1dda6b408cd921ff |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 1 00:57:19 2021 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 1 00:57:19 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8a0fd5e |
| 7 |
|
| 8 |
dev-util/android-tools: Remove old (py3.6) |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-util/android-tools/Manifest | 7 -- |
| 13 |
.../android-tools/android-tools-8.1.0_p1.ebuild | 125 --------------------- |
| 14 |
2 files changed, 132 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest |
| 17 |
index 0fd7758e457..12a108bf7cd 100644 |
| 18 |
--- a/dev-util/android-tools/Manifest |
| 19 |
+++ b/dev-util/android-tools/Manifest |
| 20 |
@@ -8,12 +8,6 @@ DIST android-tools-6.0.1_r79-core.tar.gz 1186562 BLAKE2B 473454d340e65f98201508c |
| 21 |
DIST android-tools-6.0.1_r79-extras.tar.gz 648657 BLAKE2B 4582ddd57b729492e08987e17304c62778504ffc316ab26df8c83fff1aed33226106474131d5ad0e3e302b577c83a2b78d0be04fef9711e39861a223580ab1b9 SHA512 e10694737c518f591eff4e808bb826c83bf45dc44c5c1ee8a4082a6e0653350ffe2986e299348cb4a1219203192d01546a05e9354ce05e29897f856c147de8c3 |
| 22 |
DIST android-tools-6.0.1_r79-f2fs-tools.tar.gz 70255 BLAKE2B ab9ce3efd33c28a1a0a9cb8a5415057498dd493e059183cc9d3fcc9de1b5ca4d7488c75695c94700fc6a4e5503beb8647576c7096fa50229f98485d2983ce152 SHA512 0871f99f78006028889b42668ec627b6515bb812ad3ec4a489f62187a79f64d2a74f66556698a5f05fc99932f75fefd8810dedceeab744b212beb764e97b82c8 |
| 23 |
DIST android-tools-6.0.1_r79-libselinux.tar.gz 50814 BLAKE2B f09f26c801be83bc97f4b18606f513ce0fae791126a30c90067e3b2066c991fa1390ab2d0fac2475f755f3245179718204d5014f47ece46801dc0f80caf9758b SHA512 686557271271c4d59fb968c5aa76b433955009733f3151c4c86faa996ce846088d6632b0969b23699822b7a6f09eae60abedba6abb0edc9d444159bbdb5c6f91 |
| 24 |
-DIST android-tools-8.1.0_r1-arch.tar.gz 6250 BLAKE2B 65447517a33438c8531a9d707c6107703eaccb558e505e51a88ef51e70f83488620f76eb0240dc0899211cf120e9e1ffbea041086f1d8133f30b56358aba76d6 SHA512 5746e0b2f6aae37ebe60b7b1e939699a11de2f44286497f77d700c3896e02559d55002f036ecdc1c412844bfce4ab245b9086193dc982e6be74bcaea61010c5c |
| 25 |
-DIST android-tools-8.1.0_r1-core.tar.gz 5227179 BLAKE2B afb280d67fe1b926e1f1ad68409584ad0209eb48921542e2bd490448c888cdf4bf6fb4c6f9552d580c7a396e79c2c85019e79a9a6c9881ea962c2f1064c33d82 SHA512 2c8e67232ca6348a4fd4b5d7077715491d2168c46fc8e336635a961bbbed156ef480718ee58393501196e9315c6c1bda807f8966944e3bc209dd5a0f7088642e |
| 26 |
-DIST android-tools-8.1.0_r1-extras.tar.xz 275952 BLAKE2B 0fd3c536fee6ffbe2cdd4321604d32dc3a2b48a1b3edcb9121e83ceea760e491b47b301c3d8126565efd6b11adabd4f89c79bbe8731585660ce395af9e643fe7 SHA512 bfe3af89eadf38ce6805637e41f3fb15feb85455902f6a43e52a2f95dd1595cc896a9f46ccc82ab8db433f56a05f2f4c0ba85b77f40b03d5d69c8fec4082a2da |
| 27 |
-DIST android-tools-8.1.0_r1-f2fs-tools.tar.xz 93924 BLAKE2B b8b6c7ba4c3f5309bfcfc91bd57d018d7af66f8dd25590207fd545f0dba02961826bf9963a56c7994feea5db8f9caedfe4fe62870420d9544283f87ec337cfb8 SHA512 de726be0691c58a5093098bd30cfc06c4312c44bec040cbecd594694cb7b38742dafd1f00b08c18f1b70abf56571738eb3e85e612f082e09e51a98980444e069 |
| 28 |
-DIST android-tools-8.1.0_r1-selinux.tar.xz 3188060 BLAKE2B 8c513d858e8dcaed705975ad61f362d7b1c2252685a63a1ad6035f36b0b402f1857ac5d2635d35ffa10f05b4a2605f30f27dcc5e9d91930eb0656f3ce2da036d SHA512 8799f10b4dba840ecea8f6abb8166c2e137eb3f0d9c5cfb132c661cf17800f2eeaafb1b4ec9e8974fc3324fae99e3654e52397c987faf1d48ab6148152d84f11 |
| 29 |
-DIST android-tools-8.1.0_r1.ninja.xz 2740 BLAKE2B 34473e33970cefdaf82bbe4524665fd50e6617cf867757ca07cdccc2e7356f43ef4bb455080ef4bac516ddba3c4e4120f0b27306e84725f8d5738a81800e3a53 SHA512 707e0e1c53832a42384e93d363f80007b76f18166b9f3f7d516431410b05319b1acc804daa1fddc218e11feb48de48683efb5203f4fa6d80646dcb1a2953139f |
| 30 |
DIST android-tools-9.0.0_p3-bug-706946-fno-common.patch.xz 2696 BLAKE2B de8083846d6cb24d2fcb12789b302f5df766753989e004154746d4402a5777bbabff2e9c67758e9185c0ea56dde7e647a8a15dd696671c28f2f708703bcad9f0 SHA512 e65818e9d06295f7de8f8bc52270054f9936659b2bf07f7abc15f2ea7b138536396a24c39bb6a260a931250396b04022170f2045336f0ba6444cd90fb0dfdbb0 |
| 31 |
DIST android-tools-9.0.0_p3-fix-build-with-glibc-2.30.patch 1262 BLAKE2B fa2d3cd31e82dd3b17bb840096c6158f1b117cb12b8b3c6f6c604efd85f880346c04e8e98b17bebd68d56e06cdc126677ad96dbd6214175544a9b93020292956 SHA512 21c2501fa24f59489e656ac5122c906476ad573e63f6dcc88605dafde9d4b8927ea904708caaababd12155153d969d2480aff591d98057859e8b885e94aa126a |
| 32 |
DIST android-tools-9.0.0_r3-arch.tar.gz 8451 BLAKE2B b28649333aa0e5a6f4bc83f9e42e1749a4d138075d03559c5871a24f782bf8608bcf07a609bd791ee29afabcb4435ece2ed8f8abc171265ef9d67da231c8a29e SHA512 d3409f89d2c334b66e694fd77e068e2d863dc9a99b9ef332b0a08c9c186c26eb9d969ef5cde5aa6e28b866847b4a85a4d3a4c2b0951a37752510b2f3b41c5943 |
| 33 |
@@ -23,5 +17,4 @@ DIST android-tools-9.0.0_r3-extras.tar.xz 1653548 BLAKE2B 1a8c2ee2e564adc04d646a |
| 34 |
DIST android-tools-9.0.0_r3-f2fs-tools.tar.xz 212092 BLAKE2B 32775e5b049bd2ff2ce7c9ea3362a602dcda6328e39036902020bd372a812898d84912f686cf347b225af630c2dea81ce30b601ac968b1168e2851b94ac2da2e SHA512 4fac8f18533c5c2270aed6e60b21721c643a44a27b37482ff8fd8fa4d7c875eb8a626d544ec4e6efb89c7408ae97e66ffd123588e90b98312e5291575ca8baa6 |
| 35 |
DIST android-tools-9.0.0_r3-selinux.tar.xz 3202332 BLAKE2B 60a884eb1bd34fe5796f8fb33e5aefd7f9ffc85ac91784e0a8f0ca663010cf2222c80f4c419019b5817f9cbd8037ab78914e42417193e1b802a2682bb82c0097 SHA512 f0a77dc0ac91d434573370110c70529caabfd5f036c02ae5f1a4b2097e48324198d03ecdc92a622e1590012dd3f20f103384fed468f5e27aebcaf9315bb87078 |
| 36 |
DIST android-tools-9.0.0_r3.ninja.xz 4244 BLAKE2B 14cea7523f22a7f4e02e93c32e4d4684e057abbe8e2b537b7e942cc27c13ea2aa13bcdb5c3ccafc261b8d7fc4b4cd4b9394e0970734b36111ccffbacecc5cfb9 SHA512 46956a608d6a9b93f1a035d6b0e153c476b55d4f8a2db4915b18ac9904a6d07befcbceb8e2e50054e7dbe2970be8539243134cd9722d2f2ec8a36a3153e03c56 |
| 37 |
-DIST boringssl-14308731e5446a73ac2258688a9688b524483cb6.tar.gz 13030361 BLAKE2B 6982416b6e193e7faccd41fff3bd35f80b11d7495251d876e6b081bd94a887ec3c6bf5b7852d9595594fc2bdc57353f268272ef01fb79f7c93b52d46cbda69ac SHA512 171b524b0452a48853b2c8010ff5e14d5d720e69eeaf1d3b79f675838f3afa94aee9de2f47b37303feb2d92cbf77639efe585786625b7b37b8cc2ba727c37fdc |
| 38 |
DIST boringssl-45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz 13581532 BLAKE2B ca2f6757807adc265314a7444605c6199a19847fb426384bafa201bf63f4e3c7c567fb8094b740b8a00caf0d106bb1efea2893b00d45c9772740a81dc0a186f3 SHA512 c6695d078ee7b3694898dfdc0ee3382d01f9bb592ea46eb64026c73565735fd7251bbb0fd3e8c8552394bcdad5717de7ee5106cf1ed91aacec05d779ad693f6a |
| 39 |
|
| 40 |
diff --git a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild |
| 41 |
deleted file mode 100644 |
| 42 |
index 86a31b64479..00000000000 |
| 43 |
--- a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild |
| 44 |
+++ /dev/null |
| 45 |
@@ -1,125 +0,0 @@ |
| 46 |
-# Copyright 1999-2020 Gentoo Authors |
| 47 |
-# Distributed under the terms of the GNU General Public License v2 |
| 48 |
- |
| 49 |
-EAPI="6" |
| 50 |
- |
| 51 |
-PYTHON_COMPAT=( python3_6 ) |
| 52 |
-CMAKE_MAKEFILE_GENERATOR="ninja" |
| 53 |
- |
| 54 |
-inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1 |
| 55 |
- |
| 56 |
-MY_PV="${PV/_p/_r}" |
| 57 |
-MY_P=${PN}-${MY_PV} |
| 58 |
- |
| 59 |
-DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)" |
| 60 |
-HOMEPAGE="https://android.googlesource.com/platform/system/core.git/" |
| 61 |
-# See helper scripts in files/ for creating these tarballs and getting this hash. |
| 62 |
-BORINGSSL_SHA1="14308731e5446a73ac2258688a9688b524483cb6" |
| 63 |
-# The ninja file was created by running the ruby script from archlinux by hand and fixing the build vars. |
| 64 |
-# No point in depending on something large/uncommon like ruby just to generate a ninja file. |
| 65 |
-SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-2b7f9774cc468205fec145e64e9103aee8e5c6f9.tar.gz -> ${MY_P}-arch.tar.gz |
| 66 |
- https://github.com/android/platform_system_core/archive/android-${MY_PV}.tar.gz -> ${MY_P}-core.tar.gz |
| 67 |
- https://github.com/google/boringssl/archive/${BORINGSSL_SHA1}.tar.gz -> boringssl-${BORINGSSL_SHA1}.tar.gz |
| 68 |
- mirror://gentoo/${MY_P}-extras.tar.xz https://dev.gentoo.org/~vapier/dist/${MY_P}-extras.tar.xz |
| 69 |
- mirror://gentoo/${MY_P}-selinux.tar.xz https://dev.gentoo.org/~vapier/dist/${MY_P}-selinux.tar.xz |
| 70 |
- mirror://gentoo/${MY_P}-f2fs-tools.tar.xz https://dev.gentoo.org/~vapier/dist/${MY_P}-f2fs-tools.tar.xz |
| 71 |
- mirror://gentoo/${MY_P}.ninja.xz https://dev.gentoo.org/~vapier/dist/${MY_P}.ninja.xz" |
| 72 |
- |
| 73 |
-# The entire source code is Apache-2.0, except for fastboot which is BSD-2. |
| 74 |
-LICENSE="Apache-2.0 BSD-2" |
| 75 |
-SLOT="0" |
| 76 |
-KEYWORDS="amd64 ~arm x86 ~x86-linux" |
| 77 |
-IUSE="python" |
| 78 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 79 |
- |
| 80 |
-DEPEND="sys-libs/zlib:= |
| 81 |
- dev-libs/libpcre2:= |
| 82 |
- virtual/libusb:1=" |
| 83 |
-RDEPEND="${DEPEND} |
| 84 |
- python? ( ${PYTHON_DEPS} )" |
| 85 |
-DEPEND+=" |
| 86 |
- dev-lang/go" |
| 87 |
- |
| 88 |
-S=${WORKDIR} |
| 89 |
-CMAKE_USE_DIR="${S}/boringssl" |
| 90 |
- |
| 91 |
-unpack_into() { |
| 92 |
- local archive="$1" |
| 93 |
- local dir="$2" |
| 94 |
- |
| 95 |
- mkdir -p "${dir}" |
| 96 |
- pushd "${dir}" >/dev/null || die |
| 97 |
- unpack "${archive}" |
| 98 |
- if [[ ${dir} != ./* ]] ; then |
| 99 |
- mv */* ./ || die |
| 100 |
- fi |
| 101 |
- popd >/dev/null |
| 102 |
-} |
| 103 |
- |
| 104 |
-src_unpack() { |
| 105 |
- unpack_into "${MY_P}-arch.tar.gz" arch |
| 106 |
- unpack_into "${MY_P}-core.tar.gz" core |
| 107 |
- unpack_into "${MY_P}-extras.tar.xz" extras |
| 108 |
- unpack_into "${MY_P}-f2fs-tools.tar.xz" ./f2fs-tools |
| 109 |
- unpack_into "${MY_P}-selinux.tar.xz" ./selinux |
| 110 |
- unpack_into boringssl-${BORINGSSL_SHA1}.tar.gz boringssl |
| 111 |
- |
| 112 |
- unpack "${MY_P}.ninja.xz" |
| 113 |
- mv "${MY_P}.ninja" "build.ninja" || die |
| 114 |
- |
| 115 |
- # Avoid depending on gtest just for its prod headers when boringssl bundles it. |
| 116 |
- ln -s ../../boringssl/third_party/googletest/include/gtest core/include/ || die |
| 117 |
-} |
| 118 |
- |
| 119 |
-src_prepare() { |
| 120 |
- cd "${S}"/core |
| 121 |
- eapply "${WORKDIR}"/arch/trunk/fix_build_core.patch |
| 122 |
- eapply "${FILESDIR}"/${P}-build.patch |
| 123 |
- sed -i '1i#include <sys/sysmacros.h>' adb/client/usb_linux.cpp || die #616508 |
| 124 |
- |
| 125 |
- cd "${S}"/selinux |
| 126 |
- eapply "${WORKDIR}"/arch/trunk/fix_build_selinux.patch |
| 127 |
- |
| 128 |
- cd "${S}"/extras |
| 129 |
- sed -e 's|^#include <sys/cdefs.h>$|/*\0*/|' \ |
| 130 |
- -e 's|^__BEGIN_DECLS$|#ifdef __cplusplus\nextern "C" {\n#endif|' \ |
| 131 |
- -e 's|^__END_DECLS$|#ifdef __cplusplus\n}\n#endif|' \ |
| 132 |
- -i ext4_utils/sha1.{c,h} || die #580686 |
| 133 |
- |
| 134 |
- cd "${S}" |
| 135 |
- default |
| 136 |
- |
| 137 |
- # The pregenerated ninja file expects the build/ dir. |
| 138 |
- BUILD_DIR="${CMAKE_USE_DIR}/build" |
| 139 |
- cmake-utils_src_prepare |
| 140 |
-} |
| 141 |
- |
| 142 |
-src_configure() { |
| 143 |
- append-lfs-flags |
| 144 |
- |
| 145 |
- cmake-utils_src_configure |
| 146 |
- |
| 147 |
- sed -i \ |
| 148 |
- -e "s|@CC@|$(tc-getCC)|g" \ |
| 149 |
- -e "s|@CXX@|$(tc-getCXX)|g" \ |
| 150 |
- -e "s|@CFLAGS@|${CFLAGS}|g" \ |
| 151 |
- -e "s|@CPPFLAGS@|${CPPFLAGS}|g" \ |
| 152 |
- -e "s|@CXXFLAGS@|${CXXFLAGS}|g" \ |
| 153 |
- -e "s|@LDFLAGS@|${LDFLAGS}|g" \ |
| 154 |
- -e "s|@PV@|${PV}|g" \ |
| 155 |
- build.ninja || die |
| 156 |
-} |
| 157 |
- |
| 158 |
-src_compile() { |
| 159 |
- # We only need a few libs from boringssl. |
| 160 |
- cmake-utils_src_compile libcrypto.a libssl.a |
| 161 |
- |
| 162 |
- eninja |
| 163 |
-} |
| 164 |
- |
| 165 |
-src_install() { |
| 166 |
- dobin adb fastboot |
| 167 |
- dodoc core/adb/*.{txt,TXT} core/fastboot/README.md |
| 168 |
- use python && python_foreach_impl python_doexe core/mkbootimg/mkbootimg |
| 169 |
- newbashcomp arch/trunk/bash_completion.fastboot fastboot |
| 170 |
-} |
Archives