From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2F541159C9B for ; Sat, 10 Aug 2024 19:38:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6FC83E2C03; Sat, 10 Aug 2024 19:38:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4F30FE2C03 for ; Sat, 10 Aug 2024 19:38:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5694B343053 for ; Sat, 10 Aug 2024 19:38:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4C9DD1ED0 for ; Sat, 10 Aug 2024 19:38:27 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1723318488.e987962a39893738df90b693c49508a18cd13cea.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/files/, dev-util/android-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/android-tools/Manifest dev-util/android-tools/android-tools-34.0.0.ebuild dev-util/android-tools/android-tools-34.0.1.ebuild dev-util/android-tools/files/android-tools-34.0.0-protobuf.patch dev-util/android-tools/files/android-tools-34.0.1-include-algorithm.patch X-VCS-Directories: dev-util/android-tools/files/ dev-util/android-tools/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: e987962a39893738df90b693c49508a18cd13cea X-VCS-Branch: master Date: Sat, 10 Aug 2024 19:38:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 11bd67c6-55af-4a6d-8a32-10b09c9e36d5 X-Archives-Hash: 5e32822b1105fc8d0db67529758f90ca commit: e987962a39893738df90b693c49508a18cd13cea Author: Zac Medico gentoo org> AuthorDate: Sat Aug 10 19:34:38 2024 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Aug 10 19:34:48 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e987962a dev-util/android-tools: drop 34.0.0, 34.0.1 Signed-off-by: Zac Medico gentoo.org> dev-util/android-tools/Manifest | 2 - dev-util/android-tools/android-tools-34.0.0.ebuild | 94 -------------------- dev-util/android-tools/android-tools-34.0.1.ebuild | 99 ---------------------- .../files/android-tools-34.0.0-protobuf.patch | 41 --------- .../android-tools-34.0.1-include-algorithm.patch | 45 ---------- 5 files changed, 281 deletions(-) diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest index d4dcccbb0515..7e060f5bdad4 100644 --- a/dev-util/android-tools/Manifest +++ b/dev-util/android-tools/Manifest @@ -1,6 +1,4 @@ DIST android-tools-31.0.3-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a06d7e269faabd173233363b757cd2191c051f8d3281f591117d4551d7acc029d6e2d421f702f9f836dfe0dec6c676aa39a2d9fe SHA512 a28d2264bf40c420a279acf1f4c3b4588d96ce2d6e2d6d322abbde62d773804bef10dc33f13dd52c7de80ace6c58f91ae28f5d4e8e97dfae4d2a8473d8537423 DIST android-tools-33.0.3.tar.xz 25300756 BLAKE2B 4254f0ab8657966cf56e2a7c3e9a3d889dfa9f26e61d8b46480bb74c5a8be33494f450827e3b2db4087006b3160892e6a846ef33719870cbbd032647cfc3ce78 SHA512 78c8141f5f13f1c0e5da474e1d79760a612e911519af4e9f21c0e5005f2ce99f3aeacf16f3fcdfe1250fc795a88190fa243592e1066a2156e1fd8d2b9c3d7f71 -DIST android-tools-34.0.0.tar.xz 37882448 BLAKE2B 19698c08dd650abba61e5cad9f7474ee3993f5b1fd2f173221560e5ccfc1677093758c325833993a68058c1427e132986b009f9e69a1eae9c4447053920b6feb SHA512 2d24cd95df7da1efa902fab3c848e2ebf09d3335fac61e667b19e1892e95c30a850413d354ceda72a402014623bbda4154cc33fb93a62c31fece8857efbbd596 -DIST android-tools-34.0.1.tar.xz 37904276 BLAKE2B 6b4d31dadbc646d52c8abd65602264dc16127eb36286d23be447539b0d9b46154592a04af37b3e7617933e62529e953b958db8cb77622e72cfe5ab176f822437 SHA512 413ddcca9a461d1c0a12d7fd19b9d8955619b281e1153318ed961bec17ad92bec103671abc8d63525bc83669376f37c11c887cc4cada85719120dff6c3951274 DIST android-tools-34.0.5.tar.xz 19389824 BLAKE2B a86ad9d22c356d2b3d0d85dd17e5540b5d105a286dd07946659dac4ab6d1e8285eecbbf0377c542ac6ca78e0af8df320a97e24ea2b735bbec66a2d2b23d2099c SHA512 2edea0c7a4c2f63531a8b5f518ed4dc9c315d08d8b23d3fac3b7024e2297860465f6df9fad43c9925fb80b5a50f5f3f4744886b552818bf3e961ba0372212496 DIST android-tools-35.0.1.tar.xz 21460424 BLAKE2B e87a4ad13e5b8030069c87cbbe47f3698888e797e319aa3a054a668ad55f4cdd7445e5ef7825f2d185f6891958fd52f815ee0cb3909649ee3ea703061d72d0ab SHA512 2dc3831f29a2c5ffc57978e4a6fa6d1469bcb0740750779b3e4f8239eaec87864f3474254a2d649ab630062be091d8b44a4e45c7e7b7e033f3b4481f81d76296 diff --git a/dev-util/android-tools/android-tools-34.0.0.ebuild b/dev-util/android-tools/android-tools-34.0.0.ebuild deleted file mode 100644 index d8ca6ca82456..000000000000 --- a/dev-util/android-tools/android-tools-34.0.0.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -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 -" -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" -IUSE="python udev" -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} - udev? ( dev-util/android-udev-rules ) - python? ( ${PYTHON_DEPS} ) -" -BDEPEND=" - dev-lang/go - dev-lang/perl -" - -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}" || die - 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 - rm "${ED}/usr/bin/mkdtboimg" || die - rm "${ED}/usr/bin/avbtool" || 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 - python_foreach_impl python_newexe vendor/libufdt/utils/src/mkdtboimg.py mkdtboimg - python_foreach_impl python_newexe vendor/avb/avbtool.py avbtool - fi - docinto adb - dodoc vendor/adb/*.{txt,TXT} - docinto fastboot - dodoc vendor/core/fastboot/README.md -} diff --git a/dev-util/android-tools/android-tools-34.0.1.ebuild b/dev-util/android-tools/android-tools-34.0.1.ebuild deleted file mode 100644 index 022d6d2fc5be..000000000000 --- a/dev-util/android-tools/android-tools-34.0.1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) - -inherit flag-o-matic 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 -" -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" -IUSE="python udev" -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} - udev? ( dev-util/android-udev-rules ) - python? ( ${PYTHON_DEPS} ) -" -BDEPEND=" - dev-lang/go - dev-lang/perl -" - -DOCS=() - -src_prepare() { - eapply "${DISTDIR}/${PN}-31.0.3-no-gtest.patch" - eapply "${FILESDIR}/${PN}-34.0.0-protobuf.patch" - eapply "${FILESDIR}/${PN}-34.0.1-include-algorithm.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}" || die - rm -r patches || die - cmake_src_prepare -} - -src_configure() { - # bug 905713 - use elibc_musl && append-flags -D_LARGEFILE64_SOURCE - - 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 - rm "${ED}/usr/bin/mkdtboimg" || die - rm "${ED}/usr/bin/avbtool" || 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 - python_foreach_impl python_newexe vendor/libufdt/utils/src/mkdtboimg.py mkdtboimg - python_foreach_impl python_newexe vendor/avb/avbtool.py avbtool - 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-34.0.0-protobuf.patch b/dev-util/android-tools/files/android-tools-34.0.0-protobuf.patch deleted file mode 100644 index d7aa309410a4..000000000000 --- a/dev-util/android-tools/files/android-tools-34.0.0-protobuf.patch +++ /dev/null @@ -1,41 +0,0 @@ -https://bugs.gentoo.org/912789 -https://github.com/nmeum/android-tools/commit/c5eae90a06072c6982e483f8154e490b47e620f7 -https://github.com/nmeum/android-tools/pull/120#issuecomment-1621066529 - ---- a/vendor/CMakeLists.txt -+++ b/vendor/CMakeLists.txt -@@ -73,6 +73,8 @@ - pkg_check_modules(libzstd REQUIRED IMPORTED_TARGET libzstd) - -+find_package(Protobuf CONFIG) - find_package(Protobuf REQUIRED) -+set(PROTOBUF_LIBRARIES protobuf::libprotobuf) - set(THREADS_PREFER_PTHREAD_FLAG ON) - find_package(Threads REQUIRED) - ---- a/vendor/extras/libjsonpb/parse/jsonpb.cpp -+++ b/vendor/extras/libjsonpb/parse/jsonpb.cpp -@@ -50,8 +50,10 @@ - if (!status.ok()) { - #if GOOGLE_PROTOBUF_VERSION < 3016000 - return MakeError(status.error_message().as_string()); --#else -+#elif GOOGLE_PROTOBUF_VERSION < 4022000 - return MakeError(status.message().as_string()); -+#else -+ return MakeError(std::string(status.message())); - #endif - } - return ErrorOr(std::move(json)); -@@ -67,8 +69,10 @@ - if (!status.ok()) { - #if GOOGLE_PROTOBUF_VERSION < 3016000 - return MakeError(status.error_message().as_string()); --#else -+#elif GOOGLE_PROTOBUF_VERSION < 4022000 - return MakeError(status.message().as_string()); -+#else -+ return MakeError(std::string(status.message())); - #endif - } - if (!message->ParseFromString(binary)) { diff --git a/dev-util/android-tools/files/android-tools-34.0.1-include-algorithm.patch b/dev-util/android-tools/files/android-tools-34.0.1-include-algorithm.patch deleted file mode 100644 index 79bd52c4c634..000000000000 --- a/dev-util/android-tools/files/android-tools-34.0.1-include-algorithm.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 805c7e385123c6c142c8fec941406fea62af4459 Mon Sep 17 00:00:00 2001 -From: Christopher Fore -Date: Sat, 9 Dec 2023 15:07:12 -0500 -Subject: [PATCH] dev-util/android-tools: Add patch to fix compilation on GCC 14 - -https://github.com/gentoo/gentoo/pull/34201 ---- - -diff --git a/vendor/adb/client/incremental_utils.cpp b/vendor/adb/client/incremental_utils.cpp -index 2f6958b..67f21a1 100644 ---- a/vendor/adb/client/incremental_utils.cpp -+++ b/vendor/adb/client/incremental_utils.cpp -@@ -24,6 +24,7 @@ - #include - #include - -+#include - #include - #include - #include -diff --git a/vendor/core/fs_mgr/liblp/super_layout_builder.cpp b/vendor/core/fs_mgr/liblp/super_layout_builder.cpp -index 37f28e1..0db82e5 100644 ---- a/vendor/core/fs_mgr/liblp/super_layout_builder.cpp -+++ b/vendor/core/fs_mgr/liblp/super_layout_builder.cpp -@@ -17,6 +17,8 @@ - - #include - -+#include -+ - #include "images.h" - #include "utility.h" - #include "writer.h" -diff --git a/vendor/core/fs_mgr/liblp/utility.cpp b/vendor/core/fs_mgr/liblp/utility.cpp -index d8e171b..70c7b79 100644 ---- a/vendor/core/fs_mgr/liblp/utility.cpp -+++ b/vendor/core/fs_mgr/liblp/utility.cpp -@@ -25,6 +25,7 @@ - #include - #endif - -+#include - #include - #include - #include