summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <chutzpah@gentoo.org>2023-10-06 09:24:12 -0700
committerPatrick McLean <chutzpah@gentoo.org>2023-10-06 09:24:12 -0700
commit653c8c89ef66817684380ce0b635e65ff6aa8e89 (patch)
tree9dfb856d0ac742f6f1b0a6e9fa4dc930f0eebabf /app-misc/jq
parentdev-python/pydata-sphinx-theme: Stabilize 0.14.1 ALLARCHES, #915310 (diff)
downloadgentoo-653c8c89ef66817684380ce0b635e65ff6aa8e89.tar.gz
gentoo-653c8c89ef66817684380ce0b635e65ff6aa8e89.tar.bz2
gentoo-653c8c89ef66817684380ce0b635e65ff6aa8e89.zip
app-misc/jq: drop 1.6-r3
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Diffstat (limited to 'app-misc/jq')
-rw-r--r--app-misc/jq/Manifest1
-rw-r--r--app-misc/jq/files/jq-1.6-segfault-fix.patch22
-rw-r--r--app-misc/jq/jq-1.6-r3.ebuild78
3 files changed, 0 insertions, 101 deletions
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
index eb1d037f5221..09d558b12519 100644
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@@ -1,3 +1,2 @@
-DIST jq-1.6.tar.gz 1750584 BLAKE2B c9be1314e9d027247de63492ee362e996ef85faf45a47ee421cad95ebde9188bff8d3fc7db64e717ab922e1052f3b1c1500f5589fc5b2199ab66effb000e442d SHA512 5da71f53c325257f1f546a2520fe47828b495c953270df25ea0e37741463fdda72f0ba4d5b05b25114ec30f27a559344c2b024bacabf610759f4e3e9efadb480
DIST jq-1.7.gh.tar.gz 1267139 BLAKE2B b6a54f9beaabd7915d7a8f14cda9621573f1796af53fe1645561a7a199787a7e9b2b2df038208f23e63f339dec567851b70696ffb8194986250527333d36d44e SHA512 01676319fe98d5ab1e278430b2c58ec594191cc9485a20312d658c0e199ac7ea5f5e934817ce98da0864ec7e0a018aae9b87525260e8ab6a7bde918db483bd84
DIST jq-1.7_pre20201109.tar.gz 1181867 BLAKE2B 9db187ab927b635c43fbc6191aeffa00451b12253ae023bbabe6fba5fdf8fb393f8450ee2011ef58cb93e2f27994d454fac967984a721439aaac93259c02f7f1 SHA512 f2997d70edb36d0a23b71a7d933a763cedd7c74ffa3129c2a6cb7189aaff1c5095cdc51062b7cd119324ec2c83ebae6ff0b7da3941315303b7a31146b9eb285a
diff --git a/app-misc/jq/files/jq-1.6-segfault-fix.patch b/app-misc/jq/files/jq-1.6-segfault-fix.patch
deleted file mode 100644
index 8eb7d456bc6b..000000000000
--- a/app-misc/jq/files/jq-1.6-segfault-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From a1f1231a73c221155d539a281181ef37f874869d Mon Sep 17 00:00:00 2001
-From: William Langford <wlangfor@gmail.com>
-Date: Tue, 20 Nov 2018 09:58:25 -0500
-Subject: [PATCH] Add missing jv_copy when printing with -ar
-
----
- src/main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/main.c b/src/main.c
-index b154689e..61ae43f9 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -168,7 +168,7 @@ static int process(jq_state *jq, jv value, int flags, int dumpopts) {
- while (jv_is_valid(result = jq_next(jq))) {
- if ((options & RAW_OUTPUT) && jv_get_kind(result) == JV_KIND_STRING) {
- if (options & ASCII_OUTPUT) {
-- jv_dumpf(result, stdout, JV_PRINT_ASCII);
-+ jv_dumpf(jv_copy(result), stdout, JV_PRINT_ASCII);
- } else {
- fwrite(jv_string_value(result), 1, jv_string_length_bytes(jv_copy(result)), stdout);
- }
diff --git a/app-misc/jq/jq-1.6-r3.ebuild b/app-misc/jq/jq-1.6-r3.ebuild
deleted file mode 100644
index f1172ab62ab9..000000000000
--- a/app-misc/jq/jq-1.6-r3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A lightweight and flexible command-line JSON processor"
-HOMEPAGE="https://stedolan.github.io/jq/"
-SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="MIT CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
-IUSE="oniguruma static-libs"
-
-ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.1.3' # Keep this in sync with bundled modules/oniguruma/
-DEPEND="
- >=sys-devel/bison-3.0
- sys-devel/flex
- oniguruma? ( ${ONIGURUMA_MINPV}:=[static-libs?] )
-"
-RDEPEND="
- !static-libs? (
- oniguruma? ( ${ONIGURUMA_MINPV}[static-libs?] )
- )
-"
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}"/jq-1.6-r3-never-bundle-oniguruma.patch
- "${FILESDIR}"/jq-1.6-runpath.patch
- "${FILESDIR}"/jq-1.6-segfault-fix.patch
- )
- use oniguruma || { sed -i 's:tests/onigtest::' Makefile.am || die; }
- sed -i '/^dist_doc_DATA/d' Makefile.am || die
- sed -i -r "s:(m4_define\(\[jq_version\],) .+\):\1 \[${PV}\]):" \
- configure.ac || 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 -i -e '/modules\/oniguruma/d' Makefile.am || die
- rm -rf "${S}"/modules/oniguruma || die
-
- default
- 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 ! emake check; then
- if [[ -r test-suite.log ]]; then
- eerror "Tests failed, outputting testsuite log"
- cat test-suite.log
- fi
- die "Tests failed"
- fi
-}
-
-src_install() {
- local DOCS=( AUTHORS README.md )
- default
-
- use static-libs || { find "${D}" -name '*.la' -delete || die; }
-}