3 files changed, 8 insertions, 118 deletions
diff --git a/dev-lang/jsonnet/Manifest b/dev-lang/jsonnet/Manifest
index 96786b91413c..acc1894ee848 100644
--- a/dev-lang/jsonnet/Manifest
+++ b/dev-lang/jsonnet/Manifest
@@ -2,10 +2,8 @@ AUX jsonnet-0.12.1-dont-call-make-from-setuppy.patch 387 BLAKE2B 8c0223b10cf1b61
 AUX jsonnet-0.16.0-cp-var.patch 824 BLAKE2B 111fff8e8b897864e14defa677c1a9b8589ef6a859b2344b24e16a940d90cdeff1affde6cd53c0a1a443a82553ee90d554990160f07c49e98c15a5fc7ea3e03a SHA512 96ecfb8a6b49d31e6a827ed401566b5eef39deb8a3542a6f1b3a5df148bfd93479038468585dc47a76fbb9e7953bf9a6c7161abc7acaff7b81cb8dffe3de2f6d
 AUX jsonnet-0.16.0-libdir.patch 963 BLAKE2B c4b71c01230710bf81fca03b1411bbd21ee02d9957b12997f629c9b4c8e543889658308868d48fe20e0bb9647848bd1b1fa2100c58426785bab1c9bfbbaa8bcb SHA512 9a85c5b8d80f6975ddd3e3c369adb44f6f49382a1e50e9848129c53f81846e69f60a44f401a8a1042657a03f94daaaeb5747632414fa7cb0dc9e2f014ec17a1d
 AUX jsonnet-0.18.0-unbundle.patch 2564 BLAKE2B 8945b6b17af162a99b7d561a68a48c218d0d939ba74784f35eaa8f8dbafe568e9b4db258d45cf9ce5d87504e3d265697f074d4202c8210e878daf07b56514ef5 SHA512 5bae8d02062ecd29d9650c2b623631e7f7a172148be052620a47ef42788ee272f795011ecc98df9d2000947f0ced4c76776e09f5143058b030cc61a54355bbbf
-DIST jsonnet-0.19.0.tar.gz 22478380 BLAKE2B 0a1612ca0525342763099e70921181578fcf7ab25c2a3811ffede944953e4ce114f1949642038d6147c96d52193cf701473fab8581d50c3e74036139fbd5c19a SHA512 f4e30d977df7840a4f13c7ba75614badd964a5c4484fb264d7b05d6de04aa2a2d3c4c5161523d6fa6559460ea94b94562b07ea6590a34876545c529474c4b9fa
-DIST jsonnet-0.19.1.tar.gz 22480685 BLAKE2B 7d86bc963f5ced622e91adf015c250b8cae2e817b6af5d60820d8731e04caecc1b2b8142d320414d253ef1fa3558d61aeb1b59480eab0823915d2b15c5d87aab SHA512 21312de71f63f4a74005f563290d67fcc2d220f043291a123af2fc834f4118f8bbc311ea8acc5dd52b13eff8c32f026a5ce6bfe3d88b4c6c770e585dd1f0b688
 DIST jsonnet-0.20.0.tar.gz 22481277 BLAKE2B 65d6a45a903d6f494bbb79fb92c484b2a5167fc5fc379f4acb131778e1779aa580fd249baf3309fd00fa9b2a3b129360bf9d2cb0a3a738bd03c5fcec7dc6bd32 SHA512 d46d2521d4389d05f91a16ecd9f181be1853f674a9264e9fac23e413f1084dee947e80682af59603e15e443061a0beb50a30c14c858853e10ed1ae7187d09730
-EBUILD jsonnet-0.19.0-r1.ebuild 2128 BLAKE2B df21dbc4afbca5992a0a8841c155aa63ddb83eeb716c7257c185097688fa87a8a2fb706299bcc19e0235acd650249034a7e2e39b1d8ebec7987d97dee10e4ebf SHA512 b9c20cd3cb195500537c9df8c47c59c1de77e2fcad365447297651de0c787085b5d2abb132aac2407ecf8f82b63e4a7e58f3de275aaf929ff5b9fecf4bf4f678
-EBUILD jsonnet-0.19.1.ebuild 2139 BLAKE2B e7190af8fbe34753a46876881b1bac40d2f1b5f221cfd039abe3438b23cad4649b8ad91581f14626b36d7b108675654e6ecdf20cb327038bcd6d8da8fbee114d SHA512 d5da70267a27785c57b7be29ff92c87d7469029e7125d08ca9eb379a8891e3886b404789b1ddfe656a5753da620b1a0122041ab047bf90511364727cf8484ffa
+DIST jsonnet-0.21.0.tar.gz 22128398 BLAKE2B 622363bf16bb96ab9e51138edd7b1d0a1ca4e75c947f5b91248cff0dffe82dc7c91c376414a0643b080e6bdbf6c22ce6c5bb3ce4259610e7d90714307c26539a SHA512 4fc39bd5e138623ba1ac7cf88594ea7957e9c3bcb952f0e9e346059a9de08eac3f60788376c31a70b34d6d522737a67ad4a122fadcd9621868722c23d9361d05
 EBUILD jsonnet-0.20.0-r1.ebuild 2162 BLAKE2B 212e1ec307f24854c37a24eee607a16f7a29b2caba0a02add17df25bf4d4ee708f37fdcddabf77f638739e57f872e356490767106385ad459e48c3921b61e07b SHA512 ffe0eb7168f3f9967bd803d606d5fb1dafb292e43819b48ef36dd04189940243e41bb44216e473dee601f98e6908a5b7e7a119208ce266c7eba0eac7bea3c67c
+EBUILD jsonnet-0.21.0.ebuild 2055 BLAKE2B 32ab08ff6d2874af7f0e39ec0df8f33e00c99e249091946ce0f949c0c3b49608df4a38a2349cdb8a2fa2ddc81bee3844ce81b587f61c129b88e3ff4d5fbbbe23 SHA512 33b98a9f1fc3a6d2798d4988809d37ac52fe4788bc59a6431970d28b6317598aafa3d20f78d8f18190404226fd37624d3cade6093d3d245d4d91868c9724085c
 MISC metadata.xml 636 BLAKE2B b4f30bead9e90492366ba9d8fd393cfa6610efcb1dbe7cf11307445f2b7aa596585b576e550aa0df3bcfd14c7a8b068d09040ea94dc815db76d6d15e0f09fccb SHA512 a106617bce041fc24e1fab61d08add74f450742e7c1be14633cd49b5137c86cf52bd5baf9ea8f5f2f51a90619c7dfad7e6bf749894d8e4df8063857f29a0492a
diff --git a/dev-lang/jsonnet/jsonnet-0.19.0-r1.ebuild b/dev-lang/jsonnet/jsonnet-0.19.0-r1.ebuild
deleted file mode 100644
index 71ae56d81023..000000000000
--- a/dev-lang/jsonnet/jsonnet-0.19.0-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit cmake toolchain-funcs flag-o-matic distutils-r1
-
-DESCRIPTION="A data templating language for app and tool developers"
-HOMEPAGE="https://jsonnet.org/"
-SRC_URI="https://github.com/google/jsonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-IUSE="custom-optimization doc examples python test"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-RDEPEND="
-	dev-cpp/rapidyaml:=
-	dev-cpp/nlohmann_json:=
-	python? ( ${PYTHON_DEPS} )
-"
-
-DEPEND="
-	${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-BDEPEND="
-	python? (
-		${PYTHON_DEPS}
-		${DISTUTILS_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}/jsonnet-0.12.1-dont-call-make-from-setuppy.patch"
-	"${FILESDIR}/jsonnet-0.16.0-libdir.patch"
-	"${FILESDIR}/jsonnet-0.16.0-cp-var.patch"
-	"${FILESDIR}/jsonnet-0.18.0-unbundle.patch"
-)
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	cmake_src_prepare
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	use custom-optimization || replace-flags '-O*' -O3
-	tc-export CC CXX
-
-	local mycmakeargs=(
-		-DUSE_SYSTEM_JSON=ON
-		-DBUILD_STATIC_LIBS=OFF
-	)
-
-	if use test; then
-		mycmakeargs+=(
-			-DBUILD_TESTS=ON
-			-DUSE_SYSTEM_GTEST=ON
-		)
-	else
-		mycmakeargs+=(
-			-DBUILD_TESTS=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use python && CMAKE_BUILD_DIR="${BUILD_DIR}" distutils-r1_src_compile
-}
-
-src_test() {
-	cmake_src_test
-	use python && CMAKE_BUILD_DIR="${BUILD_DIR}" distutils-r1_src_test
-}
-
-python_test() {
-	LD_LIBRARY_PATH="${CMAKE_BUILD_DIR}" "${EPYTHON}" -m unittest python._jsonnet_test -v \
-		|| die "Tests failed with ${EPYTHON}"
-}
-
-src_install() {
-	cmake_src_install
-	use python && distutils-r1_src_install
-
-	if use doc; then
-		find doc -name '.gitignore' -delete || die
-		docinto html
-		dodoc -r doc/.
-	fi
-	if use examples; then
-		docinto examples
-		dodoc -r examples/.
-	fi
-}
diff --git a/dev-lang/jsonnet/jsonnet-0.19.1.ebuild b/dev-lang/jsonnet/jsonnet-0.21.0.ebuild
index 8e5c294e6207..adefc9418b4d 100644
--- a/dev-lang/jsonnet/jsonnet-0.19.1.ebuild
+++ b/dev-lang/jsonnet/jsonnet-0.21.0.ebuild
@@ -1,24 +1,25 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
+DISTUTILS_EXT=1
+PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} python3_13t )
 
 inherit cmake toolchain-funcs flag-o-matic distutils-r1
 
 DESCRIPTION="A data templating language for app and tool developers"
 HOMEPAGE="https://jsonnet.org/"
 SRC_URI="https://github.com/google/jsonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-IUSE="custom-optimization doc examples python test"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="custom-optimization doc examples python test"
+
 RDEPEND="
-	dev-cpp/rapidyaml:=
 	dev-cpp/nlohmann_json:=
 	python? ( ${PYTHON_DEPS} )
 "
@@ -32,7 +33,7 @@ BDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		${DISTUTILS_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/setuptools-72.2[${PYTHON_USEDEP}]
 	)
 "
 RESTRICT="!test? ( test )"
@@ -40,10 +41,8 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 PATCHES=(
-	"${FILESDIR}/jsonnet-0.12.1-dont-call-make-from-setuppy.patch"
 	"${FILESDIR}/jsonnet-0.16.0-libdir.patch"
 	"${FILESDIR}/jsonnet-0.16.0-cp-var.patch"
-	"${FILESDIR}/jsonnet-0.18.0-unbundle.patch"
 )
 
 distutils_enable_tests unittest