commit: 8289fe4f21492499dc7164640077fcd5ff82ee7f
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 16:56:00 2020 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 17:05:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8289fe4f
dev-util/android-tools: Remove old version 9.0.0_p3
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
dev-util/android-tools/Manifest | 1 -
.../android-tools/android-tools-9.0.0_p3.ebuild | 132 ---------------------
2 files changed, 133 deletions(-)
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 40321351b6a..0fd7758e457 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -17,7 +17,6 @@ DIST android-tools-8.1.0_r1.ninja.xz 2740 BLAKE2B
34473e33970cefdaf82bbe4524665f
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-arch.tar.xz 7628 BLAKE2B
d0d7267d41ade2031d72236c18850ea329afbdd57a2b5bf25837e405d3e66d7aaef5b48996e7aafd4cf6e4543de03ba6549823845e5e8cb35c6d4bc900b8e275
SHA512
534d99fe15b3a3ba4f2a7331662fdb8645424830122cc4c1ff0b44d43059280610389147d4a916c55b3be71ac84d019223c90993cbdae2588f9e9737f0b5606d
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
diff --git a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
deleted file mode 100644
index 36c89fee7e7..00000000000
--- a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7} )
-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"
-# 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://git.archlinux.org/svntogit/community.git/snapshot/community-0ffb7b41d599741d100a6a00a4bb20e162cd3f90.tar.xz
-> ${MY_P}-arch.tar.xz
-
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";
-
-# 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 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"
-
-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.xz" 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
-
- # 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
-
- 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
- default
-
- 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
-
- # 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
-}
