gentoo auto-resync : 28:02:2025 - 19:27:52

4 files changed, 10 insertions, 71 deletions

diff --git a/app-misc/yq/Manifest b/app-misc/yq/Manifest
index 1a79bb36f546..16869ecb2040 100644
--- a/app-misc/yq/Manifest
+++ b/app-misc/yq/Manifest
@@ -1,6 +1,5 @@
 AUX yq-3.1.2-test.patch 606 BLAKE2B 51d0578f5241400908efed53233a52fb0980e4733ad92e34ffee55e04c86d8bf34433133953420a5c00b6bb9160a5d7296a22fd710d83f7dee2d08b49d363925 SHA512 073395e7a5ed300c20da4747c0f97e7016909b79cb6dbaec482c8f56e8f1cb8dd009e439880726c48c37f148cfb3e9d3121cc072db92b05cc27400ca5ab0a198
-DIST yq-3.4.1.tar.gz 32876 BLAKE2B 628fbb62de0c2f138133444c2f371819f920ac3d7c89787b96cb2de59eaa49f1324227d53f6d33e29dd9a9a804283339b34d87851c6f32a16a1cc94a7451a726 SHA512 d11290d44eefeae23a8e5fe3f536f714ee532a5aa1636c949a9db3e89bdf5ad5480ba5f8d6e809fa06a245de5e671844233ed64eb609e49fa3de8813ab9556cc
+AUX yq-3.4.3-rename-cli.patch 207 BLAKE2B c5bbef4ec1107bd2392cb7e2592c80be59d0086f342d0592d54f8b1c6117cdea1c0e72cef100107f1b61d8fce88b510896ab63e3d2be2ce1516465f8af9f5295 SHA512 4d0b4801966b6592cba491d00303521ebf9efb47a6b22220306c8300595c6524ee363ead5def35f8a15ff48e95ad07166049cab5744277be824532f58de4c556
 DIST yq-3.4.3.tar.gz 33214 BLAKE2B a1b3d813d9761ac8a8429db3fe8efac64ade69e0d2fa9b137a1ca8c9e367a0f16b636482b6d9381e2de43392007f37388b6ab37def04739723488f271fd56d16 SHA512 db4ec57aafa1d08786ba11897040506c9f13d800cf06f76cea052d2bba88553db53627cdfcfdbbfbdec81324800114d397890759383fb4db31609727a10474eb
-EBUILD yq-3.4.1.ebuild 1187 BLAKE2B 1384067b77b23d69f16be86e5572f090b62d2f78956a60549b7a0c7d94edf97cfd90898a9b7617a2ff5d0d656694a05d6d20a7b29309cedbc7a9637e1fadd720 SHA512 4f1a25f673827fa8a7cae4951c89ce889188828ff595bcc946c826231268674ad607dcdde8d1f3a1ba6395beea83acf1b72f0430a3bbca9fca1f9e506bb87b91
-EBUILD yq-3.4.3.ebuild 1643 BLAKE2B a5793a06fde0da6d9769ad3d4e59f6316ef2d0466da7921192b769411a9e500ef14541487ec35b3614be0246a3e8d4c873131ed6ed3492469cf8a2c81b34a20f SHA512 b7acfff1b6b9028ec57897354200501cce85b7efd0fefa39e56d486fd4d52f6214c01120e177338e1e5a07e0e5efd271934538908bf4d2ea80490a748785b8b4
+EBUILD yq-3.4.3.ebuild 1406 BLAKE2B 1c2da4d95ec8aaf74586b20ba2465ac21874bcbe0181998c4e357861b3803acf24b31d68d61570acc5b8d4592ee8c4d1c56dbacf2ae521a8207a440aed8d8162 SHA512 4133893c56ad09d7bcba06e7433b7fdf0f765e1f81293971eaff9d36cc16b146f0b8ecfba5d7dc75caeef78caccb811139884f99e3727dc72e1ca6c98304cbed
 MISC metadata.xml 533 BLAKE2B 1a6a5d05f8c3e0edc24567c4f3f7218a7a4a00d10044dbeb34d8fe8e75345300841c3da061f6110c156162cec1b01ecf2c82bad142d8b2754518a8a6c7191c99 SHA512 3c4b73caa09d72d0edc99964380572c015d9baaaf6e86775fd1648b9256183f6bc2bff10cec3a1e63554734de145b21275d4df5156ec2cad0adace955b0d830a
diff --git a/app-misc/yq/files/yq-3.4.3-rename-cli.patch b/app-misc/yq/files/yq-3.4.3-rename-cli.patch
new file mode 100644
index 000000000000..19ab049a4705
--- /dev/null
+++ b/app-misc/yq/files/yq-3.4.3-rename-cli.patch
@@ -0,0 +1,5 @@
+--- a/setup.py
++++ b/setup.py
+@@ -37 +37 @@
+-        "console_scripts": ["yq=yq:cli", "xq=yq:xq_cli", "tomlq=yq:tq_cli"],
++        "console_scripts": ["yq-python=yq:cli", "xq=yq:xq_cli", "tomlq=yq:tq_cli"],
diff --git a/app-misc/yq/yq-3.4.1.ebuild b/app-misc/yq/yq-3.4.1.ebuild
deleted file mode 100644
index 5adf1f5a93d2..000000000000
--- a/app-misc/yq/yq-3.4.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit pypi distutils-r1
-
-DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
-HOMEPAGE="
-	https://yq.readthedocs.io/
-	https://github.com/kislyuk/yq/
-	https://pypi.org/project/yq/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-misc/jq
-	dev-python/argcomplete[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.11.6[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/yq-3.1.2-test.patch"
-)
-
-python_prepare_all() {
-	sed -e 's:unittest.main():unittest.main(verbosity=2):' \
-		-i test/test.py || die
-
-	sed -r -e 's:[[:space:]]*"coverage",:: ; s:[[:space:]]*"flake8",::' \
-		-i setup.py || die
-
-	sed -e '/license_file/ d' -i setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${EPYTHON}" test/test.py </dev/null || die "tests failed under ${EPYTHON}"
-}
diff --git a/app-misc/yq/yq-3.4.3.ebuild b/app-misc/yq/yq-3.4.3.ebuild
index 98ccb3b1e776..da520d087163 100644
--- a/app-misc/yq/yq-3.4.3.ebuild
+++ b/app-misc/yq/yq-3.4.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..13} pypy3 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 pypy3_11 )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit pypi distutils-r1
@@ -38,19 +38,10 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}/yq-3.1.2-test.patch"
+	"${FILESDIR}/yq-3.4.3-rename-cli.patch"
 )
 
 python_prepare_all() {
-	cat <<-\EOF > "${T}"/yq-python.patch
-	--- setup.py
-	+++ setup.py
-	@@ -37 +37 @@
-	-        "console_scripts": ["yq=yq:cli", "xq=yq:xq_cli", "tomlq=yq:tq_cli"],
-	+        "console_scripts": ["yq-python=yq:cli", "xq=yq:xq_cli", "tomlq=yq:tq_cli"],
-	EOF
-
-	eapply -p0 "${T}"/yq-python.patch
-
 	sed -e 's:unittest.main():unittest.main(verbosity=2):' \
 		-i test/test.py || die