commit: 85fdec6a3f2d4acfc6a3ff9184953cba2f62b7af
Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com>
AuthorDate: Thu Aug 11 22:46:50 2022 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Aug 12 16:38:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85fdec6a
dev-util/android-tools: Drop old
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 | 7 --
.../android-tools/android-tools-31.0.0_p1.ebuild | 95 ---------------
.../android-tools/android-tools-31.0.3_p1.ebuild | 93 ---------------
.../files/android-tools-31.0.3_p1-gcc12.patch | 15 ---
dev-util/android-tools/files/make-tarballs.sh | 128 ---------------------
5 files changed, 338 deletions(-)
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 4894b5c017a7..bd676ad4e3bf 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -1,12 +1,5 @@
-DIST android-tools-31.0.0p1.tar.xz 25135336 BLAKE2B
abef4fa611541370d6c745c3f6df8f0326074ef23d4e656ab19443484b5459531fab0544936177397dece12b79ff37189003e818e49bfc4bb3d47e98955b917f
SHA512
40bded59614a6d0543e5011038b7f1c6abcb64f0daa71a13175ecb75fe42cb9985ed3a6301d73ee8d4ea20e2c98e3ed8130824ee74dcebe75bc0d7f3052c9d3b
DIST android-tools-31.0.3-disable-werror-boringssl.patch 1815 BLAKE2B
63e911ba27e2995a11b27e2e1501c5e881d694c5477a216cb910bf1c9c1bf9f9fedffa864748ea4df668a1008124501f7815997304bc355e4ee105bf9b61f75f
SHA512
db626d3680ec9f18be394bb2720c8bc7e380aac227ae6f1058476edb83784343f653afc583b06e7a2acd3f2ff500fa37d613d5efca4a9a24daedbf61b5b84015
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-31.0.3p2.tar.xz 22458776 BLAKE2B
a51f839ac44e6e998092d802eb182566f4dc2a7f47a5687e0c877fa4fa6d419b16054f75066a6afe8e458e44f8bc5750ca88a2517619379d1044202d64b2ec80
SHA512
367a502c11a136ff15a060df44df14ceec46eb5eb386babb4d38783622e363421d2ec9a65a5810fb8f2b308912c2bdb980e6fce24ba532a111e413647efe67d5
-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
diff --git a/dev-util/android-tools/android-tools-31.0.0_p1.ebuild
b/dev-util/android-tools/android-tools-31.0.0_p1.ebuild
deleted file mode 100644
index b322fd0f0ba5..000000000000
--- a/dev-util/android-tools/android-tools-31.0.0_p1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-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/android-tools-31.0.0_p1-no-gtest.patch ->
${PN}-no-gtest.patch
-
https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.0_p1-fix-gcc11.patch ->
${PN}-fix-gcc11.patch
-
https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.0_p1-dont-install-license.patch
-> ${PN}-dont-install-license.patch
-
https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.0_p1-install-e2fsdroid-ext2simg.patch
-> ${PN}-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}-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}-fix-gcc11.patch"
- cd "${S}/vendor/boringssl" || die
- eapply
"${S}/patches/boringssl/0001-Fix-mismatch-between-header-and-implementation-of-bn_sqr_comba8.patch"
- eapply
"${S}/patches/boringssl/0002-Use-an-unsized-helper-for-truncated-SHA-512-variants.patch"
- eapply
"${S}/patches/boringssl/0003-Fix-unnecessarily-direction-specific-tests-in-cipher_tests.txt.patch"
- eapply
"${S}/patches/boringssl/0004-Test-empty-EVP_CIPHER-inputs-and-fix-exact-memcpy-overlap.patch"
- eapply
"${S}/patches/boringssl/0005-Make-words-in-crypto-fipsmodule-modes-actually-words.patch"
- eapply
"${S}/patches/boringssl/0006-Move-load-store-helpers-to-crypto-internal.h.patch"
- eapply
"${S}/patches/boringssl/0007-Fold-ripemd-internal.h-into-ripemd.c.patch"
- eapply
"${S}/patches/boringssl/0008-Pull-HASH_TRANSFORM-out-of-md32_common.h.patch"
- eapply
"${S}/patches/boringssl/0009-Make-md32_common.h-single-included-and-use-an-unsized-helper-for-SHA-256.patch"
- eapply "${S}/patches/boringssl/0010-Fix-array-parametes-warnings.patch"
- cd "${S}"
- eapply "${DISTDIR}/${PN}-dont-install-license.patch"
- eapply "${DISTDIR}/${PN}-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
- use python && python_foreach_impl python_newexe
vendor/mkbootimg/mkbootimg.py mkbootimg
- docinto adb
- dodoc vendor/adb/*.{txt,TXT}
- docinto fastboot
- dodoc vendor/core/fastboot/README.md
-}
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
deleted file mode 100644
index 0f1abac32b14..000000000000
--- a/dev-util/android-tools/android-tools-31.0.3_p1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 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}/vendor/adb" || die
- eapply "${FILESDIR}/${PN}-31.0.3_p1-gcc12.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
-}
diff --git a/dev-util/android-tools/files/android-tools-31.0.3_p1-gcc12.patch
b/dev-util/android-tools/files/android-tools-31.0.3_p1-gcc12.patch
deleted file mode 100644
index aa313daf9042..000000000000
--- a/dev-util/android-tools/files/android-tools-31.0.3_p1-gcc12.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From 752fc3bd9a971858dbb7b51a0ef0289232e67e58 Mon Sep 17 00:00:00 2001
-From: Mike Lothian <m...@fireburn.co.uk>
-Date: Sat, 14 May 2022 02:01:18 +0100
-Subject: [PATCH] Add functional include
-
---- a/tls/include/adb/tls/tls_connection.h
-+++ b/tls/include/adb/tls/tls_connection.h
-@@ -19,6 +19,7 @@
- #include <stddef.h>
- #include <stdint.h>
-
-+#include <functional>
- #include <string_view>
- #include <vector>
-
diff --git a/dev-util/android-tools/files/make-tarballs.sh
b/dev-util/android-tools/files/make-tarballs.sh
deleted file mode 100755
index 5a0a775c1290..000000000000
--- a/dev-util/android-tools/files/make-tarballs.sh
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Create the various tarballs we need. GoB does not provide stable archives
(unlike github),
-# and some repos are uselessly fat, so we have to create things by hand. Fun
times.
-
-set -e
-
-die() {
- echo "error: $*" >&2
- exit 1
-}
-
-fetch_boringssl() {
- local ver=$1 tag=$2
- local content hash
-
- echo "checking boringssl in ${tag}"
- content=$(wget -nv
"https://android.googlesource.com/platform/external/boringssl/+/${tag}/BORINGSSL_REVISION?format=TEXT";
-O -)
- hash=$(echo "${content}" | base64 -d)
- echo "using boringssl ${hash}"
-
- local tar="${DISTDIR}/boringssl-${hash}.tar.gz"
- if [[ ! -e ${tar} ]] ; then
- # We use github as it provides stable tarballs. GoB does not
(includes timestamps).
- #
https://boringssl.googlesource.com/boringssl/+archive/${hash}.tar.gz
- wget -c
"https://github.com/google/boringssl/archive/${hash}.tar.gz"; -O "${tar}"
- fi
-
- du -h "${tar}"
-}
-
-# The extras repo has ballooned to ~200MB, so we have to strip the large
useless
-# files and random binaries.
-fetch_extras() {
- local ver=$1 tag=$2
- local tar="${DISTDIR}/android-tools-${ver}-extras.tar.xz"
-
- if [[ ! -e ${tar} ]] ; then
- local prune=(
- ioshark
- memory_replay
- perfprofd
- simpleperf
- )
- local dir="${tag}-extras"
- rm -rf "${dir}"
- mkdir "${dir}"
- cd "${dir}"
-
- wget
"https://android.googlesource.com/platform/system/extras/+archive/${tag}.tar.gz";
-O extras.tar.gz
- tar xf extras.tar.gz
- rm -rf "${prune[@]}" extras.tar.gz
-
- cd ..
- tar cf - "${dir}" | xz -9 > "${dir}.tar.xz"
- rm -rf "${dir}"
-
- mv "${dir}.tar.xz" "${tar}"
- fi
-
- du -h "${tar}"
-}
-
-# Since the GoB archive is unstable, we might as well rewrite it into xz to
shrink.
-fetch_selinux() {
- local ver=$1 tag=$2
- local tar="${DISTDIR}/android-tools-${ver}-selinux.tar.xz"
-
- if [[ ! -e ${tar} ]] ; then
- wget
"https://android.googlesource.com/platform/external/selinux/+archive/${tag}.tar.gz";
-O - | zcat | xz > "${tar}"
- fi
-
- du -h "${tar}"
-}
-
-# Since the GoB archive is unstable, we might as well rewrite it into xz to
shrink.
-fetch_f2fs() {
- local ver=$1 tag=$2
- local tar="${DISTDIR}/android-tools-${ver}-f2fs-tools.tar.xz"
-
- if [[ ! -e ${tar} ]] ; then
- wget
"https://android.googlesource.com/platform/external/f2fs-tools/+archive/${tag}.tar.gz";
-O - | zcat | xz > "${tar}"
- fi
-
- du -h "${tar}"
-}
-
-usage() {
- local status=$1
-
- [[ ${status} -eq 1 ]] && exec 1>&2
-
- cat <<-EOF
- Usage: $0 <android version>
-
- To find the next available version, consult:
-
https://git.archlinux.org/svntogit/community.git/log/trunk?h=packages/android-tools
-
- They have some helper scripts for building the files directly.
-
- Example:
- $0 android-8.1.0_r1
- EOF
-
- exit ${status}
-}
-
-main() {
- [[ $# -ne 1 ]] && usage 1
- [[ $1 == "-h" || $1 == "--help" ]] && usage 0
-
- if [[ -z ${DISTDIR} ]] ; then
- eval $(portageq -v envvar DISTDIR)
- fi
- if [[ -z ${DISTDIR} ]] ; then
- die "Please set \$DISTDIR first"
- fi
-
- local ver="${1#android-}"
- local tag="android-${ver}"
- fetch_boringssl "${ver}" "${tag}"
- fetch_extras "${ver}" "${tag}"
- fetch_selinux "${ver}" "${tag}"
- fetch_f2fs "${ver}" "${tag}"
-}
-main "$@"
