From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3F3F1158043 for ; Thu, 18 Apr 2024 05:34:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05F8AE2A19; Thu, 18 Apr 2024 05:34:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DC0F7E2A18 for ; Thu, 18 Apr 2024 05:34:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 163F93434AA for ; Thu, 18 Apr 2024 05:34:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E9A21171F for ; Thu, 18 Apr 2024 05:34:43 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1713418315.8d64b3da3e2b4f45b6d9d41e68dd6013d1d5a14c.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/jq/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/jq/Manifest app-misc/jq/jq-1.7.ebuild X-VCS-Directories: app-misc/jq/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 8d64b3da3e2b4f45b6d9d41e68dd6013d1d5a14c X-VCS-Branch: master Date: Thu, 18 Apr 2024 05:34:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 62c3ac5b-c94c-41d5-9669-07aff3342dd1 X-Archives-Hash: a5fd5cc20d0a3ac8b6a348df68c585e7 commit: 8d64b3da3e2b4f45b6d9d41e68dd6013d1d5a14c Author: Michał Górny gentoo org> AuthorDate: Thu Apr 18 05:31:55 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Apr 18 05:31:55 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d64b3da app-misc/jq: Remove old Signed-off-by: Michał Górny gentoo.org> app-misc/jq/Manifest | 1 - app-misc/jq/jq-1.7.ebuild | 84 ----------------------------------------------- 2 files changed, 85 deletions(-) diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest index 847492397362..cb0502875c76 100644 --- a/app-misc/jq/Manifest +++ b/app-misc/jq/Manifest @@ -1,2 +1 @@ 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 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; } -}