[gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/

[Zac Medico]

commit:     8d80b8972747cdc46808c75f5b781e9dc47db63d
Author:     Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com>
AuthorDate: Thu Jan  6 14:48:20 2022 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Jan  6 16:38:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d80b897

dev-utils/android-tools: Bump to 31.0.3_p1, EAPI 8

Also updated e2fsdroid patch to build on musl

Closes: https://github.com/gentoo/gentoo/pull/23673
Closes: https://bugs.gentoo.org/829152
Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/android-tools/Manifest                    |  2 +
 .../android-tools/android-tools-31.0.3_p1.ebuild   | 91 ++++++++++++++++++++++
 2 files changed, 93 insertions(+)

diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 7bdc215ec31b..551510bf1aad 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -3,6 +3,8 @@ DIST android-tools-31.0.3-disable-werror-boringssl.patch 1815 BLAKE2B 63e911ba27
 DIST android-tools-31.0.3-install-e2fsdroid-ext2simg.patch 2164 BLAKE2B 7f0b43ff5ae820101628399540f3e5b87bf69224f4a61a6b76b8b6b3b06f8e7162a6c1e7ee43eee928cfa96824f5efff72317b4bbfe160d8e72d96aa84e0a1d6 SHA512 d5fd63c108ca6b880b1b79cf362468335f19fad7bf2042fb667b56e34dc95acc47e1bf9c9e72be1d2bd8252a529cd49eb030d141bf735524bdaeb85482d544a9
 DIST android-tools-31.0.3-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a06d7e269faabd173233363b757cd2191c051f8d3281f591117d4551d7acc029d6e2d421f702f9f836dfe0dec6c676aa39a2d9fe SHA512 a28d2264bf40c420a279acf1f4c3b4588d96ce2d6e2d6d322abbde62d773804bef10dc33f13dd52c7de80ace6c58f91ae28f5d4e8e97dfae4d2a8473d8537423
 DIST android-tools-31.0.3.tar.xz 25768908 BLAKE2B e8ca8ff93fcd3936f447926769d7b45194dd96ad99cddd570183a1cbae34dbf49a23e0c53d9eb8f5c25dd09717e1f160829752dc7ebc9404c804b48de8de9889 SHA512 d2c16325b190f77a8ffa38de18ae1aea4bf6848926620f25d14873dc4a3fda3fe2b13349fa2eee197b960ca65738a4a1d2c1f28cf8286ab79e73502e7a8e6357
+DIST android-tools-31.0.3_p1-install-e2fsdroid-ext2simg.patch 2075 BLAKE2B f30c99f2b60acac239f6c604d1cfe36ca49a74884f54fce85dba3bf9aae0f73abc5c8ba6b5232772e73aefe75813170c3427cf769e3f0f5e1b962b4ec606d4e4 SHA512 2f706384e1709fc6cc7b5e9183051fb15aaf9d188d23c072d449052ed2297d0e47222e53aaee3709e8bdc3e1b88481307b4b0c0e904bafe444f3fc0c3ad3e0e7
+DIST android-tools-31.0.3p1.tar.xz 25760004 BLAKE2B 1ae58daed61b82180a5a40efa6a67b64b2ce12f4397442663700a4b970f3493576e468dcf8a4c0351c6d7d8c13def1fb0621f9c680d1c41461cbf458e862ccec SHA512 a811eb1d7682b8807f7c110beb83ff234e65fe0f20127466dbd173ea13e68260def8891b4598d5776489af9ff8aeb9f0a19086f49b6df27f68ba63096688afa1
 DIST android-tools-dont-install-license.patch 1016 BLAKE2B da65a414d046995358e91a0ca037951bc9c5a3e790b3b2151716b234c2943301ecef4ed248914235736ddd949f772311bf823e9b3b3f1980b7a5c4b72e5bcd47 SHA512 747728723941091caa17c66e68e88d2145a2ff037e6f5724f89f680d2ce6f4031efebcda7dbcc5b459ca4f5f9ddbf4ba04b0451b9939d19eaf2fa9d9ab727284
 DIST android-tools-fix-gcc11.patch 137252 BLAKE2B 0e80aab92cb69e3223f81834d53c1d84aef866787261305fd539cb8cb75a21361c65f091b2f7d83f6f8236816f43510f4f0f8b51dee4b03d99af31c78dc53a79 SHA512 fb4d8d13f9022f0472c81fe6b9252000d93ba5f77b84d7ac7d6846753078b6fdac0687fcb7157e445bba02cbf008ea3744d84e8fc5d534ee3807f61674e3238c
 DIST android-tools-install-e2fsdroid-ext2simg.patch 2164 BLAKE2B 7f0b43ff5ae820101628399540f3e5b87bf69224f4a61a6b76b8b6b3b06f8e7162a6c1e7ee43eee928cfa96824f5efff72317b4bbfe160d8e72d96aa84e0a1d6 SHA512 d5fd63c108ca6b880b1b79cf362468335f19fad7bf2042fb667b56e34dc95acc47e1bf9c9e72be1d2bd8252a529cd49eb030d141bf735524bdaeb85482d544a9

diff --git a/dev-util/android-tools/android-tools-31.0.3_p1.ebuild b/dev-util/android-tools/android-tools-31.0.3_p1.ebuild
new file mode 100644
index 000000000000..ba179d04c56f
--- /dev/null
+++ b/dev-util/android-tools/android-tools-31.0.3_p1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit cmake python-r1
+
+DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
+HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
+
+MY_PV="${PV//_/}"
+SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
+	https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-no-gtest.patch
+	https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-disable-werror-boringssl.patch
+	https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3_p1-install-e2fsdroid-ext2simg.patch
+"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# 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 ~arm ~arm64 ~x86 ~x86-linux"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# dev-libs/libpcre only required for e2fsdroid
+DEPEND="
+	app-arch/brotli:=
+	app-arch/lz4:=
+	app-arch/zstd:=
+	dev-libs/libpcre2:=
+	>=dev-libs/protobuf-3.0.0:=
+	sys-libs/zlib:=
+	virtual/libusb:1=
+"
+RDEPEND="${DEPEND}
+	python? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-lang/go
+"
+
+DOCS=()
+
+src_prepare() {
+	eapply "${DISTDIR}/${PN}-31.0.3-no-gtest.patch"
+	cd "${S}/vendor/core" || die
+	eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
+	cd "${S}/vendor/libziparchive" || die
+	eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
+	cd "${S}"
+	eapply "${DISTDIR}/${PN}-31.0.3-disable-werror-boringssl.patch"
+	cd "${S}/vendor/boringssl" || die
+	eapply "${S}/patches/boringssl/0011-Disable-Werror.patch"
+	cd "${S}"
+	eapply "${DISTDIR}/${PN}-31.0.3_p1-install-e2fsdroid-ext2simg.patch"
+	rm -r patches || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Statically link the bundled boringssl
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	export GOCACHE="${T}/go-build"
+	export GOFLAGS="-mod=vendor"
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+	rm "${ED}/usr/bin/mkbootimg" || die
+	rm "${ED}/usr/bin/unpack_bootimg" || die
+	rm "${ED}/usr/bin/repack_bootimg" || die
+	if use python; then
+		python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg
+		python_foreach_impl python_newexe vendor/mkbootimg/unpack_bootimg.py unpack_bootimg
+		python_foreach_impl python_newexe vendor/mkbootimg/repack_bootimg.py repack_bootimg
+	fi
+	docinto adb
+	dodoc vendor/adb/*.{txt,TXT}
+	docinto fastboot
+	dodoc vendor/core/fastboot/README.md
+}