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

[Andreas Sturmlechner]

commit:     dc8d15630c7327ec09b9aa5dab666d6733cec01e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  4 08:33:52 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct  8 08:33:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc8d1563

dev-util/android-tools: Drop 9.0.0_p3-r1, EAPI6--

Bug: https://bugs.gentoo.org/707568
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-util/android-tools/Manifest                    |  10 --
 .../android-tools/android-tools-9.0.0_p3-r1.ebuild | 143 ---------------------
 .../files/android-tools-8.1.0_p1-build.patch       |  30 -----
 .../files/android-tools-9.0.0-limits-gcc11.patch   |  11 --
 4 files changed, 194 deletions(-)

diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index a3fcbecfb6d..8f9d98bc04d 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -1,15 +1,5 @@
 DIST android-tools-31.0.0p1.tar.xz 25135336 BLAKE2B abef4fa611541370d6c745c3f6df8f0326074ef23d4e656ab19443484b5459531fab0544936177397dece12b79ff37189003e818e49bfc4bb3d47e98955b917f SHA512 40bded59614a6d0543e5011038b7f1c6abcb64f0daa71a13175ecb75fe42cb9985ed3a6301d73ee8d4ea20e2c98e3ed8130824ee74dcebe75bc0d7f3052c9d3b
-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-core.tar.gz 27484684 BLAKE2B d071adacd5be0341a9114e57242fe51f623773683b9db2735eac9231a77cc22651f09e1c63682e729494aa6409939696a5635afcd5e8a40ec0f75d2784c00ffc SHA512 0edc8b02b57085ce88b39c987284af1c681870594b20ab9ecf4be98a0cfdff2905bc80f5d8eeb7fbc7f4604b800b6f95bc6b2b0321c900bf833313dfcbb2eefb
-DIST android-tools-9.0.0_r3-e2fsprogs.tar.xz 5255616 BLAKE2B 5fe62da70686148d755c60c1cef4b64d80f0c6a891d13a778d2a3209f950b0f9c5b19bf39ed28c5d38d01103ef1ea474133f57b7104a4fdf80eafd8edc17a3a5 SHA512 a9c3c180ddb96f10710a18794b20cfc641d40af3643a1133091127a40c27fa724b6e6f1af8e66fc1e1ca33053e33499b910880eab05979a2de95a0d3d7a79f93
-DIST android-tools-9.0.0_r3-extras.tar.xz 1653548 BLAKE2B 1a8c2ee2e564adc04d646ab54e1913d17e9ed0fb0ef3872bd8a459ecad5fbf7324830c1120c367d9515607ecc659fb0f27c4f7db740fda318fd13be1300a6a51 SHA512 13dc145faf919c1f7cc183f823ca46330568daff19ffb110af383876cdb6b0e9f0a83690a4e22633b572c1e6c2aba14ef0181c01720095173d258320229e9108
-DIST android-tools-9.0.0_r3-f2fs-tools.tar.xz 212092 BLAKE2B 32775e5b049bd2ff2ce7c9ea3362a602dcda6328e39036902020bd372a812898d84912f686cf347b225af630c2dea81ce30b601ac968b1168e2851b94ac2da2e SHA512 4fac8f18533c5c2270aed6e60b21721c643a44a27b37482ff8fd8fa4d7c875eb8a626d544ec4e6efb89c7408ae97e66ffd123588e90b98312e5291575ca8baa6
-DIST android-tools-9.0.0_r3-selinux.tar.xz 3202332 BLAKE2B 60a884eb1bd34fe5796f8fb33e5aefd7f9ffc85ac91784e0a8f0ca663010cf2222c80f4c419019b5817f9cbd8037ab78914e42417193e1b802a2682bb82c0097 SHA512 f0a77dc0ac91d434573370110c70529caabfd5f036c02ae5f1a4b2097e48324198d03ecdc92a622e1590012dd3f20f103384fed468f5e27aebcaf9315bb87078
-DIST android-tools-9.0.0_r3.ninja.xz 4244 BLAKE2B 14cea7523f22a7f4e02e93c32e4d4684e057abbe8e2b537b7e942cc27c13ea2aa13bcdb5c3ccafc261b8d7fc4b4cd4b9394e0970734b36111ccffbacecc5cfb9 SHA512 46956a608d6a9b93f1a035d6b0e153c476b55d4f8a2db4915b18ac9904a6d07befcbceb8e2e50054e7dbe2970be8539243134cd9722d2f2ec8a36a3153e03c56
 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
 DIST android-tools-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a06d7e269faabd173233363b757cd2191c051f8d3281f591117d4551d7acc029d6e2d421f702f9f836dfe0dec6c676aa39a2d9fe SHA512 a28d2264bf40c420a279acf1f4c3b4588d96ce2d6e2d6d322abbde62d773804bef10dc33f13dd52c7de80ace6c58f91ae28f5d4e8e97dfae4d2a8473d8537423
-DIST boringssl-45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz 13581532 BLAKE2B ca2f6757807adc265314a7444605c6199a19847fb426384bafa201bf63f4e3c7c567fb8094b740b8a00caf0d106bb1efea2893b00d45c9772740a81dc0a186f3 SHA512 c6695d078ee7b3694898dfdc0ee3382d01f9bb592ea46eb64026c73565735fd7251bbb0fd3e8c8552394bcdad5717de7ee5106cf1ed91aacec05d779ad693f6a

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
deleted file mode 100644
index d5ba3b86332..00000000000
--- a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{7..9} )
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1
-
-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/"
-# See helper scripts in files/ for creating these tarballs and getting this hash.
-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://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
-	mirror://gentoo/${MY_P}-extras.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-extras.tar.xz
-	mirror://gentoo/${MY_P}-selinux.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-selinux.tar.xz
-	mirror://gentoo/${MY_P}-f2fs-tools.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-f2fs-tools.tar.xz
-	mirror://gentoo/${MY_P}.ninja.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}.ninja.xz
-	https://raw.githubusercontent.com/nmeum/android-tools/8a30dba5768304176fd78aaa131242f6b880f828/patches/core/0022-Use-glibc-s-gettid-when-using-glibc-2.30.patch -> ${GLIBC_GETTID_PATCH}
-	https://dev.gentoo.org/~zmedico/dist/${P}-bug-706946-fno-common.patch.xz"
-
-# 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} )"
-
-DEPEND="sys-libs/zlib:=
-	dev-libs/libpcre2:=
-	virtual/libusb:1="
-RDEPEND="${DEPEND}
-	python? ( ${PYTHON_DEPS} )"
-DEPEND+="
-	dev-lang/go"
-
-PATCHES=("${FILESDIR}"/${PN}-9.0.0-limits-gcc11.patch)
-
-S=${WORKDIR}
-CMAKE_USE_DIR="${S}/boringssl"
-
-unpack_into() {
-	local archive="$1"
-	local dir="$2"
-
-	mkdir -p "${dir}"
-	pushd "${dir}" >/dev/null || die
-	unpack "${archive}"
-	if [[ ${dir} != ./* ]] ; then
-		mv */* ./ || die
-	fi
-	popd >/dev/null
-}
-
-src_unpack() {
-	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
-	unpack_into "${MY_P}-f2fs-tools.tar.xz" ./f2fs-tools
-	unpack_into "${MY_P}-selinux.tar.xz" ./selinux
-	unpack_into boringssl-${BORINGSSL_SHA1}.tar.gz boringssl
-
-	unpack "${MY_P}.ninja.xz"
-	mv "${MY_P}.ninja" "build.ninja" || die
-
-	unpack "${P}-bug-706946-fno-common.patch.xz"
-
-	# Avoid depending on gtest just for its prod headers when boringssl bundles it.
-	ln -s ../../boringssl/third_party/googletest/include/gtest core/include/ || die
-}
-
-src_prepare() {
-	sed -e 's:elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386"):\0\n  set(ARCH "x86")\nelseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i586"):' \
-		-i "${S}"/boringssl/CMakeLists.txt || die #668792
-
-	cd "${S}"/core || die
-	eapply "${WORKDIR}"/arch/trunk/fix_build_core.patch
-	eapply "${FILESDIR}"/android-tools-8.1.0_p1-build.patch
-	eapply "${DISTDIR}/${GLIBC_GETTID_PATCH}"
-
-	cd "${S}"/selinux || die
-	eapply "${WORKDIR}"/arch/trunk/fix_build_selinux.patch
-
-	cd "${S}"/e2fsprogs || die
-	eapply "${WORKDIR}"/arch/trunk/fix_build_e2fsprogs.patch
-
-	cd "${S}"/extras
-	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 ext4_utils/include/ext4_utils/ext4_crypt{,_init_extensions}.h || die #580686
-
-	cd "${S}" || die
-
-	eapply "${WORKDIR}/${P}-bug-706946-fno-common.patch"
-
-	sed -E \
-		-e "s|^(CC =).*|\\1 $(tc-getCC)|g" \
-		-e "s|^(CXX =).*|\\1 $(tc-getCXX)|g" \
-		-e "s|^(CFLAGS =).*|\\1 ${CFLAGS}|g" \
-		-e "s|^(CPPFLAGS =).*|\\1 ${CPPFLAGS}|g" \
-		-e "s|^(CXXFLAGS =).*|\\1 ${CXXFLAGS}|g" \
-		-e "s|^(LDFLAGS =).*|\\1 ${LDFLAGS}|g" \
-		-e "s|^(PKGVER =).*|\\1 ${MY_PV}|g" \
-		-i build.ninja || die
-
-	grep -rlZ -- -Werror . | xargs -0 sed -e 's:-Werror ::g' -e 's: -Werror::g' -i || die #706946
-
-	# The pregenerated ninja file expects the build/ dir.
-	BUILD_DIR="${CMAKE_USE_DIR}/build"
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	append-lfs-flags
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# We only need a few libs from boringssl.
-	cmake-utils_src_compile libcrypto.a libssl.a
-
-	eninja
-}
-
-src_install() {
-	dobin adb e2fsdroid ext2simg fastboot mke2fs.android
-	dodoc core/adb/*.{txt,TXT} core/fastboot/README.md
-	use python && python_foreach_impl python_doexe core/mkbootimg/mkbootimg
-	newbashcomp arch/trunk/bash_completion.fastboot fastboot
-}

diff --git a/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch b/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch
deleted file mode 100644
index f3d664ef70a..00000000000
--- a/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/adb/sysdeps.h
-+++ b/adb/sysdeps.h
-@@ -66,6 +66,11 @@
- #endif
- #endif
- 
-+#ifndef __clang__
-+#define _Nonnull
-+#define _Nullable
-+#endif
-+
- #ifdef _WIN32
- 
- // Clang-only nullability specifiers
---- a/libcutils/include/cutils/trace.h
-+++ b/libcutils/include/cutils/trace.h
-@@ -18,7 +18,13 @@
- #define _LIBS_CUTILS_TRACE_H
- 
- #include <inttypes.h>
-+// https://gcc.gnu.org/PR60932
-+#ifdef __cplusplus
-+#include <atomic>
-+using namespace std;
-+#else
- #include <stdatomic.h>
-+#endif
- #include <stdbool.h>
- #include <stdint.h>
- #include <stdio.h>

diff --git a/dev-util/android-tools/files/android-tools-9.0.0-limits-gcc11.patch b/dev-util/android-tools/files/android-tools-9.0.0-limits-gcc11.patch
deleted file mode 100644
index ced85fc8306..00000000000
--- a/dev-util/android-tools/files/android-tools-9.0.0-limits-gcc11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://bugs.gentoo.org/764071
---- a/core/fastboot/protocol.cpp	2018-06-21 02:58:42.000000000 +0200
-+++ b/core/fastboot/protocol.cpp	2021-01-06 10:11:52.806586912 +0100
-@@ -37,6 +37,7 @@
- 
- #include <algorithm>
- #include <vector>
-+#include <limits>
- 
- #include <android-base/file.h>
- #include <android-base/stringprintf.h>