10 files changed, 188 insertions, 11 deletions
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index d89c8e9b9823..a0025f84e65a 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -2,3 +2,4 @@ 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
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..fc2dd1865e9e
--- /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_{8,9,10,11,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 1ef9e9b431d6..a3d116ab224d 100644
--- a/dev-util/android-tools/metadata.xml
+++ b/dev-util/android-tools/metadata.xml
@@ -7,7 +7,6 @@
  </maintainer>
  <upstream>
   <remote-id type="cpe">cpe:/a:google:android_debug_bridge</remote-id>
-  <remote-id type="launchpad">ubuntu</remote-id>
   <changelog>https://android.googlesource.com/platform/packages/modules/adb/+log</changelog>
   <bugs-to>https://source.android.com/setup/contribute/report-bugs</bugs-to>
   <doc>https://android.googlesource.com/platform/packages/modules/adb/+/HEAD/OVERVIEW.TXT</doc>
diff --git a/dev-util/fortls/fortls-2.13.0.ebuild b/dev-util/fortls/fortls-2.13.0.ebuild
index e8429e2a8256..55fd95dbcec0 100644
--- a/dev-util/fortls/fortls-2.13.0.ebuild
+++ b/dev-util/fortls/fortls-2.13.0.ebuild
@@ -21,6 +21,7 @@ RDEPEND="
 
 distutils_enable_tests pytest
 
+# Disable test that requires pypi.org connection
 EPYTEST_DESELECT=(
 	test/test_interface.py::test_version_update_pypi
 )
diff --git a/dev-util/fortls/fortls-3.0.0_rc2.ebuild b/dev-util/fortls/fortls-3.0.0_rc2.ebuild
index e8429e2a8256..55fd95dbcec0 100644
--- a/dev-util/fortls/fortls-3.0.0_rc2.ebuild
+++ b/dev-util/fortls/fortls-3.0.0_rc2.ebuild
@@ -21,6 +21,7 @@ RDEPEND="
 
 distutils_enable_tests pytest
 
+# Disable test that requires pypi.org connection
 EPYTEST_DESELECT=(
 	test/test_interface.py::test_version_update_pypi
 )
diff --git a/dev-util/jfrog-cli/Manifest b/dev-util/jfrog-cli/Manifest
index 2bec8e1b424b..3f0d1d9a656d 100644
--- a/dev-util/jfrog-cli/Manifest
+++ b/dev-util/jfrog-cli/Manifest
@@ -1,4 +1,4 @@
-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
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.54.0.ebuild
index 45218cd304df..0a91f897a2de 100644
--- a/dev-util/jfrog-cli/jfrog-cli-2.46.3.ebuild
+++ b/dev-util/jfrog-cli/jfrog-cli-2.54.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,11 +7,12 @@ 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"
+	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
+PATCHES=("${S}/go-mod-sum.patch")
 
 src_compile() {
 	build/build.sh jfrog || die
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index be81f8fa181c..3087c33ec47a 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,2 +1,3 @@
 DIST meld-3.22.0.tar.xz 674212 BLAKE2B 1d5af5fa9943c46fd150bd1e1c74003579a0017dea56178e92c4ba0dd1ba0bc3348a6f2625bfe5191fe4d8394b06462a30f2173ae623ffd32c637642f9c36183 SHA512 4cc1c9a76379401c1f116292bb4730301ec0f2413cdab7b463ed519ea7ee0ee86143a9c83a13f1ef09860aad192c04769d111bfb1eb10b5e1bc81fb44c530526
 DIST meld-3.22.1.tar.xz 675984 BLAKE2B 47ad8cc0b3f55e2ab8066bd811a925eb12446d041b26220d56a11eedc727042357c8bbec26a5b9f1a9e220357753968acbc43dd257fe48013a3fcf7ef4243364 SHA512 7cb4c64a8134d02ee629c5459d5361c8ee1b1fb80efb02b9f3d2c577ecb69dca2ff66b90affb479682b7fceda41c60717ef859d93e3b93070a84901ae772b2cd
+DIST meld-3.22.2.tar.xz 676376 BLAKE2B 5e592e378ac2c942dd98df6d9ac4f9af7a1eee552af1691aade2e0f453a5ddf649ca09c38191b2c2ffdb7b6fa165012b4d8372e9e99c33052f612e2ab8ca8670 SHA512 fd8b12567cd8dcf77f265d831c9ac9ba33d13fb78c95b01b496b016308ff4159963b4610a68f41d04a52cc5bcc13bb4568d24bbade5bd79246111e463e413284
diff --git a/dev-util/meld/meld-3.22.2.ebuild b/dev-util/meld/meld-3.22.2.ebuild
new file mode 100644
index 000000000000..6b490680d403
--- /dev/null
+++ b/dev-util/meld/meld-3.22.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=x11-libs/gtk+-3.20:3[introspection]
+	>=dev-libs/glib-2.48:2
+	>=x11-libs/gtksourceview-4.0.0:4[introspection]
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.30:3[cairo,${PYTHON_USEDEP}]
+	')
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/pango-1.34[introspection]
+	x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-util/desktop-file-utils
+		dev-libs/appstream-glib
+	)
+"
+BDEPEND="
+	dev-util/intltool
+	dev-util/itstool
+	sys-devel/gettext
+	$(python_gen_cond_dep 'dev-python/distro[${PYTHON_USEDEP}]')
+"
+# dev-python/distro is soft-required in BDEPEND for python3.8 and onwards,
+# but it's mainly needed for debian and derivatives - seems the fallback
+# works fine, as we aren't a special_case, just an annoying warning.
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dprofile=''
+		-Dbyte-compile=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+	python_fix_shebang "${ED}"/usr/bin/meld
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}