| 1 |
commit: 5b11bde57598fb67000978bfcfa442ad1de79bc9 |
| 2 |
Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Jul 20 11:57:47 2021 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 1 03:09:17 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b11bde5 |
| 7 |
|
| 8 |
dev-util/android-tools: Bump to 31.0.3 |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/21723 |
| 11 |
Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com> |
| 12 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-util/android-tools/Manifest | 4 ++ |
| 15 |
dev-util/android-tools/android-tools-31.0.3.ebuild | 84 ++++++++++++++++++++++ |
| 16 |
2 files changed, 88 insertions(+) |
| 17 |
|
| 18 |
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest |
| 19 |
index 8f9d98bc04d..7bdc215ec31 100644 |
| 20 |
--- a/dev-util/android-tools/Manifest |
| 21 |
+++ b/dev-util/android-tools/Manifest |
| 22 |
@@ -1,4 +1,8 @@ |
| 23 |
DIST android-tools-31.0.0p1.tar.xz 25135336 BLAKE2B abef4fa611541370d6c745c3f6df8f0326074ef23d4e656ab19443484b5459531fab0544936177397dece12b79ff37189003e818e49bfc4bb3d47e98955b917f SHA512 40bded59614a6d0543e5011038b7f1c6abcb64f0daa71a13175ecb75fe42cb9985ed3a6301d73ee8d4ea20e2c98e3ed8130824ee74dcebe75bc0d7f3052c9d3b |
| 24 |
+DIST android-tools-31.0.3-disable-werror-boringssl.patch 1815 BLAKE2B 63e911ba27e2995a11b27e2e1501c5e881d694c5477a216cb910bf1c9c1bf9f9fedffa864748ea4df668a1008124501f7815997304bc355e4ee105bf9b61f75f SHA512 db626d3680ec9f18be394bb2720c8bc7e380aac227ae6f1058476edb83784343f653afc583b06e7a2acd3f2ff500fa37d613d5efca4a9a24daedbf61b5b84015 |
| 25 |
+DIST android-tools-31.0.3-install-e2fsdroid-ext2simg.patch 2164 BLAKE2B 7f0b43ff5ae820101628399540f3e5b87bf69224f4a61a6b76b8b6b3b06f8e7162a6c1e7ee43eee928cfa96824f5efff72317b4bbfe160d8e72d96aa84e0a1d6 SHA512 d5fd63c108ca6b880b1b79cf362468335f19fad7bf2042fb667b56e34dc95acc47e1bf9c9e72be1d2bd8252a529cd49eb030d141bf735524bdaeb85482d544a9 |
| 26 |
+DIST android-tools-31.0.3-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a06d7e269faabd173233363b757cd2191c051f8d3281f591117d4551d7acc029d6e2d421f702f9f836dfe0dec6c676aa39a2d9fe SHA512 a28d2264bf40c420a279acf1f4c3b4588d96ce2d6e2d6d322abbde62d773804bef10dc33f13dd52c7de80ace6c58f91ae28f5d4e8e97dfae4d2a8473d8537423 |
| 27 |
+DIST android-tools-31.0.3.tar.xz 25768908 BLAKE2B e8ca8ff93fcd3936f447926769d7b45194dd96ad99cddd570183a1cbae34dbf49a23e0c53d9eb8f5c25dd09717e1f160829752dc7ebc9404c804b48de8de9889 SHA512 d2c16325b190f77a8ffa38de18ae1aea4bf6848926620f25d14873dc4a3fda3fe2b13349fa2eee197b960ca65738a4a1d2c1f28cf8286ab79e73502e7a8e6357 |
| 28 |
DIST android-tools-dont-install-license.patch 1016 BLAKE2B da65a414d046995358e91a0ca037951bc9c5a3e790b3b2151716b234c2943301ecef4ed248914235736ddd949f772311bf823e9b3b3f1980b7a5c4b72e5bcd47 SHA512 747728723941091caa17c66e68e88d2145a2ff037e6f5724f89f680d2ce6f4031efebcda7dbcc5b459ca4f5f9ddbf4ba04b0451b9939d19eaf2fa9d9ab727284 |
| 29 |
DIST android-tools-fix-gcc11.patch 137252 BLAKE2B 0e80aab92cb69e3223f81834d53c1d84aef866787261305fd539cb8cb75a21361c65f091b2f7d83f6f8236816f43510f4f0f8b51dee4b03d99af31c78dc53a79 SHA512 fb4d8d13f9022f0472c81fe6b9252000d93ba5f77b84d7ac7d6846753078b6fdac0687fcb7157e445bba02cbf008ea3744d84e8fc5d534ee3807f61674e3238c |
| 30 |
DIST android-tools-install-e2fsdroid-ext2simg.patch 2164 BLAKE2B 7f0b43ff5ae820101628399540f3e5b87bf69224f4a61a6b76b8b6b3b06f8e7162a6c1e7ee43eee928cfa96824f5efff72317b4bbfe160d8e72d96aa84e0a1d6 SHA512 d5fd63c108ca6b880b1b79cf362468335f19fad7bf2042fb667b56e34dc95acc47e1bf9c9e72be1d2bd8252a529cd49eb030d141bf735524bdaeb85482d544a9 |
| 31 |
|
| 32 |
diff --git a/dev-util/android-tools/android-tools-31.0.3.ebuild b/dev-util/android-tools/android-tools-31.0.3.ebuild |
| 33 |
new file mode 100644 |
| 34 |
index 00000000000..9db1b736041 |
| 35 |
--- /dev/null |
| 36 |
+++ b/dev-util/android-tools/android-tools-31.0.3.ebuild |
| 37 |
@@ -0,0 +1,84 @@ |
| 38 |
+# Copyright 1999-2021 Gentoo Authors |
| 39 |
+# Distributed under the terms of the GNU General Public License v2 |
| 40 |
+ |
| 41 |
+EAPI=7 |
| 42 |
+ |
| 43 |
+PYTHON_COMPAT=( python3_{7..10} ) |
| 44 |
+ |
| 45 |
+inherit cmake python-r1 |
| 46 |
+ |
| 47 |
+DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)" |
| 48 |
+HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/" |
| 49 |
+ |
| 50 |
+MY_PV="${PV//_/}" |
| 51 |
+SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz |
| 52 |
+ https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.3-no-gtest.patch -> ${P}-no-gtest.patch |
| 53 |
+ https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.3-install-e2fsdroid-ext2simg.patch -> ${P}-install-e2fsdroid-ext2simg.patch |
| 54 |
+ https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.3-disable-werror-boringssl.patch -> ${P}-disable-werror-boringssl.patch |
| 55 |
+" |
| 56 |
+S="${WORKDIR}/${PN}-${MY_PV}" |
| 57 |
+ |
| 58 |
+# The entire source code is Apache-2.0, except for fastboot which is BSD-2. |
| 59 |
+LICENSE="Apache-2.0 BSD-2" |
| 60 |
+SLOT="0" |
| 61 |
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x86-linux" |
| 62 |
+IUSE="python" |
| 63 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 64 |
+ |
| 65 |
+# dev-libs/libpcre only required for e2fsdroid |
| 66 |
+DEPEND=" |
| 67 |
+ app-arch/brotli:= |
| 68 |
+ app-arch/lz4:= |
| 69 |
+ app-arch/zstd:= |
| 70 |
+ dev-libs/libpcre2:= |
| 71 |
+ >=dev-libs/protobuf-3.0.0:= |
| 72 |
+ sys-libs/zlib:= |
| 73 |
+ virtual/libusb:1= |
| 74 |
+" |
| 75 |
+RDEPEND="${DEPEND} |
| 76 |
+ python? ( ${PYTHON_DEPS} ) |
| 77 |
+" |
| 78 |
+BDEPEND=" |
| 79 |
+ dev-lang/go |
| 80 |
+" |
| 81 |
+ |
| 82 |
+DOCS=() |
| 83 |
+ |
| 84 |
+src_prepare() { |
| 85 |
+ eapply "${DISTDIR}/${P}-no-gtest.patch" |
| 86 |
+ cd "${S}/vendor/core" || die |
| 87 |
+ eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch" |
| 88 |
+ cd "${S}/vendor/libziparchive" || die |
| 89 |
+ eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch" |
| 90 |
+ cd "${S}" |
| 91 |
+ eapply "${DISTDIR}/${P}-install-e2fsdroid-ext2simg.patch" |
| 92 |
+ eapply "${DISTDIR}/${P}-disable-werror-boringssl.patch" |
| 93 |
+ cd "${S}/vendor/boringssl" || die |
| 94 |
+ eapply "${S}/patches/boringssl/0011-Disable-Werror.patch" |
| 95 |
+ cd "${S}" |
| 96 |
+ rm -r patches || die |
| 97 |
+ cmake_src_prepare |
| 98 |
+} |
| 99 |
+ |
| 100 |
+src_configure() { |
| 101 |
+ local mycmakeargs=( |
| 102 |
+ # Statically link the bundled boringssl |
| 103 |
+ -DBUILD_SHARED_LIBS=OFF |
| 104 |
+ ) |
| 105 |
+ cmake_src_configure |
| 106 |
+} |
| 107 |
+ |
| 108 |
+src_compile() { |
| 109 |
+ export GOCACHE="${T}/go-build" |
| 110 |
+ export GOFLAGS="-mod=vendor" |
| 111 |
+ cmake_src_compile |
| 112 |
+} |
| 113 |
+ |
| 114 |
+src_install() { |
| 115 |
+ cmake_src_install |
| 116 |
+ use python && python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg |
| 117 |
+ docinto adb |
| 118 |
+ dodoc vendor/adb/*.{txt,TXT} |
| 119 |
+ docinto fastboot |
| 120 |
+ dodoc vendor/core/fastboot/README.md |
| 121 |
+} |
Archives