gentoo auto-resync : 11:08:2024 - 11:06:01

5 files changed, 10 insertions, 194 deletions

diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 0378239c25fe..02fe6044dbfb 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -1,14 +1,10 @@
 AUX android-tools-33.0.3-adb-0023-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch 5109 BLAKE2B 4deee34669ce000050d04cf01040920a22ca0caafca006ff2651198a60936dce9e8f783263b05beb91bef8c015e14362725aa4dc23c32be30c6796ad20e69ad7 SHA512 4b8afcf5290be113d98572a9a1ad5309c8bf75f0c17aed2f698d3302f796f8fb7ead3422d649c4909019cf766ae16fc0d75401fb15eb42130e58b451d628af21
 AUX android-tools-33.0.3-adb-gcc-13.patch 798 BLAKE2B dea7b3086b4e879224625dbc50de045d4c3f05fed4fa5254b041d3c4526cfa04bd764b9f67f17ed332efe66a6b43637c71b3fe0db4a276ae133c5be74cb50ab9 SHA512 55444dcb7d4266f412ca54a018783fe10abe751e9aca3ef8494245a0b358bece07743c3773659d891822acfef0fa2edafec7857a0f4b522177b670f2a2489b96
-AUX android-tools-34.0.0-protobuf.patch 1414 BLAKE2B 599881bcf7b0b44592f3779abe54f1e727a6726ff758d51c5a7cdf3d2a08439dcf4ec6e9cae5ad36f7f64bb7d57d40c8c629752469925e6372371449e0a3d6fb SHA512 14a9bbeef4de9f6c6d13af2b0797fa448670be0c4e3ae6453dae90674a5ac685b18361a12619a3ce7900f511b3cea2e1508bf35b127fb18aa6e2942eb52c36ef
-AUX android-tools-34.0.1-include-algorithm.patch 1399 BLAKE2B 91f52906183e32a910b19e7461d2a0d8cbaab982a8ca9fc2a7130f6783b0e04506914344b1736da15da3c255905ec3602e8d119f98cda5b09e869f66afc2f117 SHA512 ae8594354513cb36b5426cc884fb07c467c411526bcc4cf9e791498548c3f272c5d635e63cddb4982f0989adbfea6b05d4881b0b963d5ed533df234d906ede78
 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
 EBUILD android-tools-33.0.3-r1.ebuild 2384 BLAKE2B 5254d2332524ba5f45b697a4a629092847d4500f46aeb63cd3a87a098803eace1e1f8fa23bc00f3c6e26a2a9383fd6c165a30c89071ba44a11da7296ee3c1e3c SHA512 9191f11cf7cca821db90a877f5d2b9763b983f5d8553ab2ea19062ffa1c967158fab0e2f936672cae3440c2451d691905e1a776002468f6300d5d06e959ef988
-EBUILD android-tools-34.0.0.ebuild 2438 BLAKE2B 59b54a35075efb311afad6b54a70d3091a16bd16fe7d99e23d189784ab40481b89e36d836c076aeb5f134d320051375d7cabc8ff8bd5fa834b95cfa7de5fafae SHA512 019fc5ca93170e7a4441a806940621a2b03cc2e50443a8fe26a458aef1150605bbb5c12fecc45687aed2b64a51cb48369d341deaf325e92c98d15398493974a6
-EBUILD android-tools-34.0.1.ebuild 2629 BLAKE2B e276806cb3c07c8123056839ffcb1ab0dda81b0abbd048e6305a504f5e12545304c8eb920a5902b082576e41f3eb9f68c1ceaf702df11950c51061de589b2557 SHA512 12512889b2f79c8e7ed64df366b3b51b4ff6a409a87f4249d5055b137c042f6c7a339d852d6ff95bd30954268e56a35ec668d4f63cb0aaad9624c663c0c86346
 EBUILD android-tools-34.0.5.ebuild 3043 BLAKE2B d33a71e288ee587b001b7c027011a6cea28e7e8bae099c49a3ca83a3f167847dab81f4e424099b654bd4aa66ad4b4d6d807de6e4df33b7c58965960c3f930510 SHA512 f4b0fb5a1d5f5961888f7a23e4f8f20602923e9e1a6b027d04093ea972df02b6cf1561dfdb698cb6991bb0852879009ff4614997d035521eb36ed004c5ad2701
+EBUILD android-tools-35.0.1.ebuild 2612 BLAKE2B 5aac169b97f527c1c44b17b20bb49e98f88d0680bf37c64ed7da8669a714b3b408e6596cdbb9e63874c6f700a2567f1576d4492c2aa1a24a962f96897f52ead0 SHA512 1d38afc6e3829cc44ea551dc0afb026a45a0841f50afedbb86b87d51060739862e6064da0a71785d8195c330dda65711b4343270af7616428e52d105d4ef8a10
 MISC metadata.xml 666 BLAKE2B 826f37b3e3c762165b6dce866f9e244ff6c6312a7d7f061f55bedf6a53ec08276afcce53ebd0a3d8d7e5ab95065436c3ab559d0d1cc40ee5d66d958bb7bd36b0 SHA512 aa6da78d3bd0a5efa99629c20ecdd407235f9055af8d1891ef606d3fbc14e1054987239a50edc2ba1a74c97cbf81ce044ca6ab89a1c11a36500979103fe74437
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/android-tools-34.0.0.ebuild b/dev-util/android-tools/android-tools-35.0.1.ebuild
index d8ca6ca82456..0ff6f3bbb94f 100644
--- a/dev-util/android-tools/android-tools-34.0.0.ebuild
+++ b/dev-util/android-tools/android-tools-35.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit cmake python-r1
 
@@ -19,7 +19,7 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="python udev"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -61,6 +61,11 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		# Statically link the bundled boringssl
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+		-DCMAKE_C_FLAGS="$CFLAGS" \
+		-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON \
+		-Dprotobuf_MODULE_COMPATIBLE=ON
 		-DBUILD_SHARED_LIBS=OFF
 	)
 	cmake_src_configure
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<std::string>(status.error_message().as_string());
--#else
-+#elif GOOGLE_PROTOBUF_VERSION < 4022000
-     return MakeError<std::string>(status.message().as_string());
-+#else
-+    return MakeError<std::string>(std::string(status.message()));
- #endif
-   }
-   return ErrorOr<std::string>(std::move(json));
-@@ -67,8 +69,10 @@
-   if (!status.ok()) {
- #if GOOGLE_PROTOBUF_VERSION < 3016000
-     return MakeError<std::monostate>(status.error_message().as_string());
--#else
-+#elif GOOGLE_PROTOBUF_VERSION < 4022000
-     return MakeError<std::monostate>(status.message().as_string());
-+#else
-+    return MakeError<std::monostate>(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 <csfore@posteo.net>
-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 <ziparchive/zip_archive.h>
- #include <ziparchive/zip_writer.h>
- 
-+#include <algorithm>
- #include <array>
- #include <cinttypes>
- #include <numeric>
-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 <liblp/liblp.h>
- 
-+#include <algorithm>
-+
- #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 <sys/ioctl.h>
- #endif
- 
-+#include <algorithm>
- #include <map>
- #include <string>
- #include <vector>