gentoo auto-resync : 18:04:2024 - 12:04:39

3 files changed, 2 insertions, 88 deletions

diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
index 754866e512ce..2a50a3edbcde 100644
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@@ -1,7 +1,5 @@
 AUX jq-1.6-r3-never-bundle-oniguruma.patch 867 BLAKE2B 7afe5d3390071a4ccd14ae376c27db07f3d189a32973d82d77b3bd0b8826cf3ed6c032e31e0b7ffdf3834050aeb367316f8930dbb0a1a66218f86ab94cbd36ff SHA512 27b38e765e0850cb97c51015f36ebc447bd23066b640269ff4ea838946545dd86cdd975393943bf4257dc9ce8436a16b610e34883ddacc64b8106f895d1c79c3
 AUX jq-1.7-runpath.patch 572 BLAKE2B 31daf5c3062a446c9e745f065b90add1d23fb6738076becbb67cc3412bdff6b062a66502e453900366d0c4feef90925ffe220acd4d8672c96b611895185a3808 SHA512 00958a570efdc54af7105299576cf528d8091fac0a9aa63bb362a9852d0923d7c0d5207e9349eea29dc7d782547b192554c36b9cd1b50dfdcdbf622c46f7d1e0
 DIST jq-1.7.1.gh.tar.gz 1323338 BLAKE2B 17e3b68e23f9a7f1aa8749ede6c0b8fe435990899886f0c96da36d130c17d13609ba7f910321316f0c3b35985360f8cb5e6a3b12caea5e9bc7792e128798f137 SHA512 af9c444e5306423182f467a53acdf45bb8aefa058a47f490ce16395f0aebfb7627e3843f65e96f41cd9d4b72b8ad274ab0bdb061abc6990b1158f86d2256d4ec
-DIST jq-1.7.gh.tar.gz 1267139 BLAKE2B b6a54f9beaabd7915d7a8f14cda9621573f1796af53fe1645561a7a199787a7e9b2b2df038208f23e63f339dec567851b70696ffb8194986250527333d36d44e SHA512 01676319fe98d5ab1e278430b2c58ec594191cc9485a20312d658c0e199ac7ea5f5e934817ce98da0864ec7e0a018aae9b87525260e8ab6a7bde918db483bd84
-EBUILD jq-1.7.1.ebuild 2219 BLAKE2B 3736b326b46f405a92ce99a690f69a8b6cd90899ae098f2123c3c684b19475be3ff0b2c18af61df76f925d80c628712e2bba5716ba9e8d0b3f0c571b70b1bdb8 SHA512 b32b685332a17387804953df1d216a02aa14451d9bb9bc18251906dfc8baf039e39029fa16c827a743cef509b338936519a63344ae3c0489aab0ec7a09f29f6a
-EBUILD jq-1.7.ebuild 2217 BLAKE2B e61a4350121fd8f13af941c30d3995b9932709dd1bc479666cbc1b873cb653b4a83e494dbe157440e3fb61e1d92b0a68383e0c53cf16d19f0728d1b31207780d SHA512 4ccd85145e3613621ce47e3d4c6e2fce307065f29f2f60bfce8dccfa10d016574a0a376581ff608c752ac71b47c1c7215049f86fe32c3882b6dfcb0d0c8dba69
+EBUILD jq-1.7.1.ebuild 2217 BLAKE2B e61a4350121fd8f13af941c30d3995b9932709dd1bc479666cbc1b873cb653b4a83e494dbe157440e3fb61e1d92b0a68383e0c53cf16d19f0728d1b31207780d SHA512 4ccd85145e3613621ce47e3d4c6e2fce307065f29f2f60bfce8dccfa10d016574a0a376581ff608c752ac71b47c1c7215049f86fe32c3882b6dfcb0d0c8dba69
 MISC metadata.xml 619 BLAKE2B 07d8852baec2c77bdef39bd1bb742ce1148dfdde1c76af80727ea7dda9ebfdc61ee24e3992c3f868c312fb258b8f7a2064996b3a609a801eaeabe09b7a10f6a0 SHA512 10824dca3462dcf96b2025d71f47dbddb3b1fa7ba864fcb5d0a7782423213323143c7c224174b1ac9d69e0c1094285286c213809f023d25542a865fc064d1b04
diff --git a/app-misc/jq/jq-1.7.1.ebuild b/app-misc/jq/jq-1.7.1.ebuild
index e94109ed9ab0..81be3fadd8dc 100644
--- a/app-misc/jq/jq-1.7.1.ebuild
+++ b/app-misc/jq/jq-1.7.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+oniguruma static-libs test"
 
 ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.9.3' # Keep this in sync with bundled modules/oniguruma/
diff --git a/app-misc/jq/jq-1.7.ebuild b/app-misc/jq/jq-1.7.ebuild
deleted file mode 100644
index 81be3fadd8dc..000000000000
--- a/app-misc/jq/jq-1.7.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MY_PV="${PV/_/}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="A lightweight and flexible command-line JSON processor"
-HOMEPAGE="https://stedolan.github.io/jq/"
-SRC_URI="https://github.com/jqlang/jq/archive/refs/tags/${MY_P}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LICENSE="MIT CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="+oniguruma static-libs test"
-
-ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.9.3' # Keep this in sync with bundled modules/oniguruma/
-DEPEND="
-	>=sys-devel/bison-3.0
-	app-alternatives/lex
-	oniguruma? ( ${ONIGURUMA_MINPV}:=[static-libs?] )
-"
-RDEPEND="
-	!static-libs? (
-		oniguruma? ( ${ONIGURUMA_MINPV}[static-libs?] )
-	)
-"
-PATCHES=(
-	"${FILESDIR}"/jq-1.6-r3-never-bundle-oniguruma.patch
-	"${FILESDIR}"/jq-1.7-runpath.patch
-)
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( oniguruma )"
-
-src_prepare() {
-	sed -e '/^dist_doc_DATA/d; s:-Wextra ::' -i Makefile.am || die
-	printf "#!/bin/sh\\nprintf '%s'\\n\n" "${MY_PV}" > scripts/version || die
-
-	# jq-1.6-r3-never-bundle-oniguruma makes sure we build with the system oniguruma,
-	# but the bundled copy of oniguruma still gets eautoreconf'd since it
-	# exists; save the cycles by nuking it.
-	sed -e '/modules\/oniguruma/d' -i Makefile.am || die
-	rm -rf "${S}"/modules/oniguruma || die
-
-	default
-
-	sed -i "s/\[jq_version\]/[${MY_PV}]/" configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		# don't try to rebuild docs
-		--disable-docs
-		--disable-valgrind
-		--disable-maintainer-mode
-		--enable-rpathhack
-		$(use_enable static-libs static)
-		$(use_with oniguruma oniguruma yes)
-	)
-	econf "${econfargs[@]}"
-}
-
-src_test() {
-	if ! LD_LIBRARY_PATH="${S}/.libs" nonfatal emake check; then
-		if [[ -r "${S}/test-suite.log" ]]; then
-			eerror "Tests failed, outputting testsuite log"
-			cat "${S}/test-suite.log"
-		fi
-		die "Tests failed"
-	fi
-}
-
-src_install() {
-	local DOCS=( AUTHORS NEWS.md README.md SECURITY.md )
-	default
-
-	use static-libs || { find "${D}" -name '*.la' -delete || die; }
-}