summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2018-12-30 21:05:49 -0800
committerZac Medico <zmedico@gentoo.org>2018-12-30 21:10:42 -0800
commit97efbbf30d14f2b2206c7382c01dc5eac6c3dccc (patch)
tree8010e97fbfe451738f90dddd8fb061fd7548d2f3 /dev-util
parentwww-client/google-chrome: drop obsolete plugins USE flag (diff)
downloadgentoo-97efbbf30d14f2b2206c7382c01dc5eac6c3dccc.tar.gz
gentoo-97efbbf30d14f2b2206c7382c01dc5eac6c3dccc.tar.bz2
gentoo-97efbbf30d14f2b2206c7382c01dc5eac6c3dccc.zip
dev-util/android-tools: version bump to 9.0.0_p3
Closes: https://bugs.gentoo.org/674146 Closes: https://bugs.gentoo.org/668792 Package-Manager: Portage-2.3.53, Repoman-2.3.12 Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/android-tools/Manifest8
-rw-r--r--dev-util/android-tools/android-tools-9.0.0_p3.ebuild131
2 files changed, 139 insertions, 0 deletions
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 15a69b3f57d..fb65eeeaa15 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -14,4 +14,12 @@ DIST android-tools-8.1.0_r1-extras.tar.xz 275952 BLAKE2B 0fd3c536fee6ffbe2cdd432
DIST android-tools-8.1.0_r1-f2fs-tools.tar.xz 93924 BLAKE2B b8b6c7ba4c3f5309bfcfc91bd57d018d7af66f8dd25590207fd545f0dba02961826bf9963a56c7994feea5db8f9caedfe4fe62870420d9544283f87ec337cfb8 SHA512 de726be0691c58a5093098bd30cfc06c4312c44bec040cbecd594694cb7b38742dafd1f00b08c18f1b70abf56571738eb3e85e612f082e09e51a98980444e069
DIST android-tools-8.1.0_r1-selinux.tar.xz 3188060 BLAKE2B 8c513d858e8dcaed705975ad61f362d7b1c2252685a63a1ad6035f36b0b402f1857ac5d2635d35ffa10f05b4a2605f30f27dcc5e9d91930eb0656f3ce2da036d SHA512 8799f10b4dba840ecea8f6abb8166c2e137eb3f0d9c5cfb132c661cf17800f2eeaafb1b4ec9e8974fc3324fae99e3654e52397c987faf1d48ab6148152d84f11
DIST android-tools-8.1.0_r1.ninja.xz 2740 BLAKE2B 34473e33970cefdaf82bbe4524665fd50e6617cf867757ca07cdccc2e7356f43ef4bb455080ef4bac516ddba3c4e4120f0b27306e84725f8d5738a81800e3a53 SHA512 707e0e1c53832a42384e93d363f80007b76f18166b9f3f7d516431410b05319b1acc804daa1fddc218e11feb48de48683efb5203f4fa6d80646dcb1a2953139f
+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
+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 boringssl-14308731e5446a73ac2258688a9688b524483cb6.tar.gz 13030361 BLAKE2B 6982416b6e193e7faccd41fff3bd35f80b11d7495251d876e6b081bd94a887ec3c6bf5b7852d9595594fc2bdc57353f268272ef01fb79f7c93b52d46cbda69ac SHA512 171b524b0452a48853b2c8010ff5e14d5d720e69eeaf1d3b79f675838f3afa94aee9de2f47b37303feb2d92cbf77639efe585786625b7b37b8cc2ba727c37fdc
+DIST boringssl-45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz 13581532 BLAKE2B ca2f6757807adc265314a7444605c6199a19847fb426384bafa201bf63f4e3c7c567fb8094b740b8a00caf0d106bb1efea2893b00d45c9772740a81dc0a186f3 SHA512 c6695d078ee7b3694898dfdc0ee3382d01f9bb592ea46eb64026c73565735fd7251bbb0fd3e8c8552394bcdad5717de7ee5106cf1ed91aacec05d779ad693f6a
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
new file mode 100644
index 00000000000..6399a1eb13c
--- /dev/null
+++ b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1 python-utils-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"
+
+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
+
+ # 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
+
+ sed -i \
+ -e "s:@CC@:$(tc-getCC):g" \
+ -e "s:@CXX@:$(tc-getCXX):g" \
+ -e "s:@CFLAGS@:${CFLAGS}:g" \
+ -e "s:@CPPFLAGS@:${CPPFLAGS}:g" \
+ -e "s:@CXXFLAGS@:${CXXFLAGS}:g" \
+ -e "s:@LDFLAGS@:${LDFLAGS}:g" \
+ -e "s:@PV@:${PV}:g" \
+ build.ninja || die
+}
+
+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
+}