gentoo auto-resync : 25:03:2024 - 07:01:01

7 files changed, 110 insertions, 36 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 63ab532ff1ac..96b8709f61d0 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 5eb3ddc071e0..53ad65ba8926 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -6,7 +6,9 @@ DIST android-tools-31.0.3-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a0
 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
 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
-MISC metadata.xml 724 BLAKE2B 7ef6e07d806dff51946236dfee2f5eaf207fd7c9cde6e73cb7f372fea5cd8b2b559e4f1fe81a315c41beed5beba92603cc93a16183d63953fbed4ba0d2941116 SHA512 d47cf87259ad2b2a8d6f8edf6b2c2084d0046773447ed9647cc232437ec8f3e8c452cb26ac7e0a619b220e073518903b77c55ba7c2e9f7663069fea2e7096e75
+EBUILD android-tools-34.0.5.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.5.ebuild b/dev-util/android-tools/android-tools-34.0.5.ebuild
new file mode 100644
index 000000000000..0ff6f3bbb94f
--- /dev/null
+++ b/dev-util/android-tools/android-tools-34.0.5.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+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
+		-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
+}
+
+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/metadata.xml b/dev-util/android-tools/metadata.xml
index 3eaea76d509f..e9527752ee29 100644
--- a/dev-util/android-tools/metadata.xml
+++ b/dev-util/android-tools/metadata.xml
@@ -6,8 +6,7 @@
 		<changelog>https://android.googlesource.com/platform/packages/modules/adb/+log</changelog>
 		<doc>https://android.googlesource.com/platform/packages/modules/adb/+/HEAD/OVERVIEW.TXT</doc>
 		<remote-id type="cpe">cpe:/a:google:android_debug_bridge</remote-id>
-		<remote-id type="github">android/platform_system_core</remote-id>
-		<remote-id type="launchpad">ubuntu</remote-id>
+		<remote-id type="github">nmeum/android-tools</remote-id>
 	</upstream>
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
diff --git a/dev-util/jfrog-cli/Manifest b/dev-util/jfrog-cli/Manifest
index 386c7cecba57..9777c9191b2c 100644
--- a/dev-util/jfrog-cli/Manifest
+++ b/dev-util/jfrog-cli/Manifest
@@ -1,10 +1,7 @@
-DIST jfrog-cli-1.35.3-deps.tar.xz 115342932 BLAKE2B 053c718ca61ba03454b068e5fd34ddf81cc95d41dfa8f445bfff18ad40650704cbb248af54e64429eae6d9053967ee7013dd0151858d3824925ecf834a6c044f SHA512 626f79cdfb393bca4fbb44a925e9263d2f384a6c1e68819a15f94b526be3054a4666dfcc7520796b54f0d202c808082dc6112f602ce2b7ab81f53b74ee23aac0
-DIST jfrog-cli-1.35.3.tar.gz 346736 BLAKE2B 5b88a54c328ae6cf83b72e420a8d6d7224a67226465c7101b817bccb2d6024b283a84a118516c85f8056b5e0b9f2f74cde3322a44b2c8b40ba8fb36932437d06 SHA512 1a0a088611df84dbace620c90e2a51372c7b3b19cf55b0616d5629bd61da190300f38ce2c9db96785bfe871e83cc03bdace9e0fd4161380acda7a2a3dc24df1b
-DIST jfrog-cli-2.46.3-deps.tar.xz 278330876 BLAKE2B 05ca6dcbaff85477ba88f2ec3d1e5f91bd99161a53433d64ffaf14eeb42d06af23c349a0c033432a84011326b1fe0937f637ec2a7e98f902e27d130f6d525bd1 SHA512 99e29fde818e9aeb5079086816c5c234141068cace555f34232eba80f7e24d19ee0124ffa82332e785aee961fe41b8890f8bd5fe9c4e1b97b696e91b983f3ced
-DIST jfrog-cli-2.46.3.tar.gz 14017612 BLAKE2B e3dca255163c6b780e0c04dd17460634197d59612e8f3d9e31607dbf67381674e1760bd611a2e7946f58590da3fdd6d8eb9185dcb67073c4b82431f9c2445141 SHA512 5a9e1f2889f0d605d0bf32dab1c29c83389f6328be486d0ce2624fc8d9dcf504228b564af8fc866e0f7e1cc5db83e6d0471efd6898010fa3892350758832ee80
+DIST jfrog-cli-1.54.1-deps.tar.xz 2457600 BLAKE2B 575b5a625008319cd2ea87e9bdd4cd540825e67624c8a26ed40eaa5088fe8ec11fd38ae3a82fb3a1d41e96eb3ff209202e93b91ef580770582b0316f1447ae64 SHA512 809ac6e9c9d49880b5ac33b1ec8ccbb01c34ebb0673cfe292df5422940919beabc2e32c107b93893ad922a33ce0d8bcd0d067f2702237d6cf68939c053384519
+DIST jfrog-cli-1.54.1.tar.gz 904073 BLAKE2B a5ed099927f5a17e7eacf7f06f3d37424b90e95652b66433ca7f91aa29e90c1e76871d7fe9250ec5fa8992c7137084c6a51683a2cd4a2d1a85abe7d6f8f9a38c SHA512 0fa9baebd0c480978f9a9a13b5ceb5bd814e6e2c680089682e564512336bb846941c4aa996aadc3d74a64909e039496ec003f6cd9274ea8d052f34c400371162
 DIST jfrog-cli-2.54.0-deps.tar.xz 4229440 BLAKE2B 94adce8271c194abfa317b5e7cb448205cf39b9a5cfd48608cde66f6deb86655448f154182287d87fea7a71f8315221ac700b029798486c3fc60bf44f32d0117 SHA512 14c66209934301e11dea21f35111b29c3667fdb7c8e421e5e59b0dae3ba38585424bb723566f8a8d97f03aad77f12c87b0ec7f03b800f244118c851350f819ea
 DIST jfrog-cli-2.54.0.tar.gz 11650988 BLAKE2B eaba329e05e7c77a835a778e995783adc63290d74e6af77411745ca5f9e39a5b861ec633aa8f56ebfdf3dace042bea1ab0e4839b5f42e9242a48e1ae5be3d8ee SHA512 89ac5a0ff5487b8db9ebd5f78521dba3ee59552a3e53529bc7026486ee5df1a9684a7ca9512596bcfcc7e7680b84b47813a1a89a43b901da00dc80e94c073964
-EBUILD jfrog-cli-1.35.3.ebuild 551 BLAKE2B fed08c16526b5a29fdd8cc41a189fe5108ae73d590c33efeaaf851dbdb6b40cfc63b47dbbc7169f4986efd61578d002f3459fa75f0db47aa1afbf94c3744639f SHA512 1faff85e1f94847650c5ad7a3750aa29e0cb1c3a688b4290a938457a3eac135ab2cb7033322098c1b2fb47c0c5971c09d2537d547c6d6dd141af883917cbe2b1
-EBUILD jfrog-cli-2.46.3.ebuild 569 BLAKE2B 1e8a7953184c72527c0ca26370e14c4c61e9c71ffb348c602a27e185fbbd6b1dea6f18d7630ec6d92a53e1e14d241c62bcd20f1b9935ba32ec9fb98632394460 SHA512 65af27525592e28e51ad967e41de1cf64f32b285f27d8e7f5f6b6d19269e45fbf6025168af32675c39595a51d0b47c597d950be2037a10782dad5def4575fc3e
+EBUILD jfrog-cli-1.54.1.ebuild 573 BLAKE2B cfb82b9b2c7c16be417f459e612576d1a111c103aaeefc0a6e0afe4cf72c93f9713801825e7802af52d76638a77c63fdcfc42c4ed92c06905fb4964824d663c5 SHA512 fc742a799b09c6fc569a3aa74285ff75c86c50b10dd17767318f39460c47cf7eebeab22ee921fc639c29f603ec11f3e8efc38ac78606ac37fa872d5cbf0dcabe
 EBUILD jfrog-cli-2.54.0.ebuild 602 BLAKE2B edc0dadbb54c0f8aec9caf7a28bf99c3fde7955ec7fcf69160d94995d27c449917db314a3b11e5dd1c8aace8700b272cec56a3cf07fc313baee682ec4fd31987 SHA512 0f011a6e732ca03fe0ca0485b240a84cc99a252279cd3a132dcf4da91ee83b216e835d2640468bacd085755fd44d28b2bb1013bbacdf62ae7c86b8813f833517
 MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
diff --git a/dev-util/jfrog-cli/jfrog-cli-1.35.3.ebuild b/dev-util/jfrog-cli/jfrog-cli-1.54.1.ebuild
index ead7f3f92950..1d11bfe30702 100644
--- a/dev-util/jfrog-cli/jfrog-cli-1.35.3.ebuild
+++ b/dev-util/jfrog-cli/jfrog-cli-1.54.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 inherit go-module
 
 DESCRIPTION="Command line utility foroperations on container images and image repositories"
 HOMEPAGE="https://github.com/jfrog/jfrog-cli"
-SRC_URI="https://github.com/jfrog/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+SRC_URI="https://github.com/jfrog/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 src_compile() {
-	./build.sh || die
+	./build/build.sh || die
 }
 
 src_install() {
diff --git a/dev-util/jfrog-cli/jfrog-cli-2.46.3.ebuild b/dev-util/jfrog-cli/jfrog-cli-2.46.3.ebuild
deleted file mode 100644
index 45218cd304df..000000000000
--- a/dev-util/jfrog-cli/jfrog-cli-2.46.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="Command line utility for operations on container images and image repositories"
-HOMEPAGE="https://github.com/jfrog/jfrog-cli"
-SRC_URI="https://github.com/jfrog/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-src_compile() {
-	build/build.sh jfrog || die
-}
-
-src_install() {
-	dobin jfrog
-	einstalldocs
-}