From 992d51a146d493f8dd5d710e033427d323b9c739 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 6 Oct 2023 23:58:42 +0100 Subject: gentoo auto-resync : 06:10:2023 - 23:58:42 --- app-misc/jq/Manifest | 12 +-- app-misc/jq/files/jq-1.6-runpath.patch | 17 ----- app-misc/jq/files/jq-1.6-segfault-fix.patch | 22 ------ app-misc/jq/files/jq-1.7-visible-null.patch | 41 ---------- app-misc/jq/files/jq-1.7-warnings.patch | 44 ----------- .../jq-1.7_pre20201109-fix-configure-test.patch | 54 ------------- .../jq/files/jq-1.7_pre20201109-no-git-bdep.patch | 13 ---- app-misc/jq/jq-1.6-r3.ebuild | 78 ------------------- app-misc/jq/jq-1.7.ebuild | 2 +- app-misc/jq/jq-1.7_pre20201109-r1.ebuild | 88 ---------------------- 10 files changed, 2 insertions(+), 369 deletions(-) delete mode 100644 app-misc/jq/files/jq-1.6-runpath.patch delete mode 100644 app-misc/jq/files/jq-1.6-segfault-fix.patch delete mode 100644 app-misc/jq/files/jq-1.7-visible-null.patch delete mode 100644 app-misc/jq/files/jq-1.7-warnings.patch delete mode 100644 app-misc/jq/files/jq-1.7_pre20201109-fix-configure-test.patch delete mode 100644 app-misc/jq/files/jq-1.7_pre20201109-no-git-bdep.patch delete mode 100644 app-misc/jq/jq-1.6-r3.ebuild delete mode 100644 app-misc/jq/jq-1.7_pre20201109-r1.ebuild (limited to 'app-misc/jq') diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest index 89581b0a4cf2..f9a60a0a4d70 100644 --- a/app-misc/jq/Manifest +++ b/app-misc/jq/Manifest @@ -1,15 +1,5 @@ AUX jq-1.6-r3-never-bundle-oniguruma.patch 867 BLAKE2B 7afe5d3390071a4ccd14ae376c27db07f3d189a32973d82d77b3bd0b8826cf3ed6c032e31e0b7ffdf3834050aeb367316f8930dbb0a1a66218f86ab94cbd36ff SHA512 27b38e765e0850cb97c51015f36ebc447bd23066b640269ff4ea838946545dd86cdd975393943bf4257dc9ce8436a16b610e34883ddacc64b8106f895d1c79c3 -AUX jq-1.6-runpath.patch 563 BLAKE2B 9b7600e9673fd0a34dedd2c3c7a672b26d146778f929f639310bd1089bf4134bf1aed722701f23b108db62057b75328e2debf1b0313cdc7eef60b116173b7e5d SHA512 ce02eeba87606a1a95b301abdb42eaad2bcd6049ebac1514cd4316f0202439142c7c6d529f34770a663f10e34190ac22dde039c36c51a1e1d5300b1dc56bd555 -AUX jq-1.6-segfault-fix.patch 868 BLAKE2B 922960b595f84447c8a4b0c70a414dfd26104a30dc317cade0e0034b86dcf21296b7ed29c7e239204d9ab063d0418e3b8389ff7a39d688c3279c78fc4b22a126 SHA512 0c5b3f82cc6bb98413c7adf5a12e3cdeae7c611417853f3e9c5026e54d237c4f32ef47f6347b09d2cc63f0efa12b7790a588da98cf752d2d4cc0fa50978cab8b AUX jq-1.7-runpath.patch 572 BLAKE2B 31daf5c3062a446c9e745f065b90add1d23fb6738076becbb67cc3412bdff6b062a66502e453900366d0c4feef90925ffe220acd4d8672c96b611895185a3808 SHA512 00958a570efdc54af7105299576cf528d8091fac0a9aa63bb362a9852d0923d7c0d5207e9349eea29dc7d782547b192554c36b9cd1b50dfdcdbf622c46f7d1e0 -AUX jq-1.7-visible-null.patch 1428 BLAKE2B 109f45fc72bb927fb67202aadbcb61869d427f3598e2dd14eb47ab1983cf5a9978c873d1357e6ba3a23b931ce0b10dbe67498ee83b3375c2c67a3f97980cdfbf SHA512 39067401436538d85c65a51de3bcad99868d4c0b50d27717ccbfdbd7fbb8b011447fd6a326b4849ef94f57422692f032c8fab2974f8ca888b69a316616c26498 -AUX jq-1.7-warnings.patch 1302 BLAKE2B a38e9df57a74b8a19d70fe7d5aeb191e60bfb118f42f2ed3126626d601bd87549aa5c310c825687310e2eddb708e8c32a557f89f8073ac88ab8113cec3bb3468 SHA512 d5796a30684091aeeb0faa26170b675d9827a662299b122d0026e9ae237135636806aea5638e9b7d2dd5508cdd0726767f70d840e33894a8865f4acbb31ec14d -AUX jq-1.7_pre20201109-fix-configure-test.patch 2324 BLAKE2B daccf3a6ea7868bdb85264528139ae44ba41321fe3dfd2667efc9e3343d14d8b5f1da45b996091a58ee83be863a24c7fd120f054dcbf7842df4fd9aef6642927 SHA512 ec9570e741ee996befcc4fcc411fa08fb569bf6b9cb1aa10ccbbe5a59d755f9ccc535c46dc2eb055955a4f142653184dcaa9142f0a2962c484a062231d3bd0d9 -AUX jq-1.7_pre20201109-no-git-bdep.patch 540 BLAKE2B 745496f01bbc19ede3f5c17be4a7384664ab990eca053d0b4521f1c863af97f9f64afeeb600109ba0f44f155497954c48c6907df198c24d503006c42aada2a97 SHA512 64cc678b5d0850aa9ffc4cd4ef340fa22b3ce120a8b302757528633a7dd785aad1559a0b0abd3e0b1fe3b0d92cfcc388910c84f7cdefca876c864b01358ac04f -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 -EBUILD jq-1.6-r3.ebuild 2000 BLAKE2B e3d647a6c444db493d291f586d2accd96c34df232dcffc6137e66bbd7cbf7d164dac43d5d783e2666e6ff1135f9583dd2b1a48826808058295abf7c1ff2a311c SHA512 746bbeff6451adbd25916d5c0aad6630a5c2728841731d918b29bf7e4ea679b36b0b61489c8e5aa5bdd8e0a093b117fe04788a4046bbfc39039cb5c510e7cd69 -EBUILD jq-1.7.ebuild 2212 BLAKE2B 1a9a053128eb71a39daa98e6e14d84a7c184e46889b113e2190eccf7fc0aa35b27cce5c7385415e106877e2f7076c80743bd0564d1d76a8fe67f464578ebb158 SHA512 cffa5f51c814f2c42780f3307ce5504e412190a0f87d05319be420f6bcd1ad5a44f34ad78ae0e9ac123d85dc60a2b25379abfdb8d0cd056e9ed3b775479425ed -EBUILD jq-1.7_pre20201109-r1.ebuild 2438 BLAKE2B b25860c0d8eb96b90fa79cfbe7f3fdc23b6376d0142dbc0fee9224aa3793c64d4345c18d49e88440884432885d68facef23724fbc279559f81d44fa835e1e821 SHA512 965be67264be11a74a2ce6486c2271062731eda59eadfd470a8fc29aac93d3c7bcb9fe677551926b9e14111cdc97205e5f1345b74bc3c949c148076d242b2813 +EBUILD jq-1.7.ebuild 2211 BLAKE2B 08e4a7a0b2c8e687e360bad03891dec15cdd66ba4408db6dbc7c31e01ecde2a18a7bc06eb5073d77d885960b9c34c817dd8df6b9bd5cb427b35e5056afda3434 SHA512 2fae2d1bbc65f62667bfa74fe34c21b8f0a90997b696c2f202e9b160e3516966ed41294ad7b2ce2d36ea1a2505575e09d31278f8c903ad73eb160ff33cb21553 MISC metadata.xml 619 BLAKE2B 07d8852baec2c77bdef39bd1bb742ce1148dfdde1c76af80727ea7dda9ebfdc61ee24e3992c3f868c312fb258b8f7a2064996b3a609a801eaeabe09b7a10f6a0 SHA512 10824dca3462dcf96b2025d71f47dbddb3b1fa7ba864fcb5d0a7782423213323143c7c224174b1ac9d69e0c1094285286c213809f023d25542a865fc064d1b04 diff --git a/app-misc/jq/files/jq-1.6-runpath.patch b/app-misc/jq/files/jq-1.6-runpath.patch deleted file mode 100644 index 40a2ed02f3db..000000000000 --- a/app-misc/jq/files/jq-1.6-runpath.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 280694c..7227c9d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -280,4 +280,11 @@ AC_SUBST([BUNDLER], ["$bundle_cmd"]) - AC_CONFIG_MACRO_DIR([config/m4]) - AC_CONFIG_FILES([Makefile]) - AC_OUTPUT -- -+AC_ARG_ENABLE([rpathhack], -+ [AC_HELP_STRING([--enable-rpathhack], [patch libtool to remove RPATH])], -+ [ -+AC_MSG_RESULT([patching libtool to fix rpath]) -+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -+ ], -+ []) 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 -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/files/jq-1.7-visible-null.patch b/app-misc/jq/files/jq-1.7-visible-null.patch deleted file mode 100644 index 41e55df72111..000000000000 --- a/app-misc/jq/files/jq-1.7-visible-null.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/src/jv_print.c b/src/jv_print.c -index 2e781bb..e621b31 100644 ---- a/src/jv_print.c -+++ b/src/jv_print.c -@@ -32,7 +32,7 @@ static const jv_kind color_kinds[] = - static char color_bufs[sizeof(color_kinds)/sizeof(color_kinds[0])][16]; - static const char *color_bufps[8]; - static const char* def_colors[] = -- {COL("1;30"), COL("0;37"), COL("0;37"), COL("0;37"), -+ {COL("1;90"), COL("0;37"), COL("0;37"), COL("0;37"), - COL("0;32"), COL("1;37"), COL("1;37")}; - #define FIELD_COLOR COL("34;1") - -diff --git a/tests/shtest b/tests/shtest -index 8ed62b2..2d3f0da 100755 ---- a/tests/shtest -+++ b/tests/shtest -@@ -280,12 +280,12 @@ fi - - # Check $JQ_COLORS - $JQ -Ccn . > $d/color --printf '\033[1;30mnull\033[0m\n' > $d/expect -+printf '\033[1;90mnull\033[0m\n' > $d/expect - cmp $d/color $d/expect - JQ_COLORS='4;31' $JQ -Ccn . > $d/color - printf '\033[4;31mnull\033[0m\n' > $d/expect - cmp $d/color $d/expect --JQ_COLORS='1;30:0;31:0;32:0;33:0;34:1;35:1;36' \ -+JQ_COLORS='1;90:0;31:0;32:0;33:0;34:1;35:1;36' \ - $JQ -Ccn '[{"a":true,"b":false},123,null]' > $d/color - ( - printf '\033[1;35m[\033[1;36m{' -@@ -298,7 +298,7 @@ printf '[0m\033[0;31mfalse\033' - printf '[0m\033[1;36m\033[1;36' - printf 'm}\033[0m\033[1;35m,\033[' - printf '0;33m123\033[0m\033[1;' --printf '35m,\033[1;30mnull\033' -+printf '35m,\033[1;90mnull\033' - printf '[0m\033[1;35m\033[1;35' - printf 'm]\033[0m\n' - ) > $d/expect diff --git a/app-misc/jq/files/jq-1.7-warnings.patch b/app-misc/jq/files/jq-1.7-warnings.patch deleted file mode 100644 index 0047ca391cae..000000000000 --- a/app-misc/jq/files/jq-1.7-warnings.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/src/builtin.c b/src/builtin.c -index bf80c7b..12db573 100644 ---- a/src/builtin.c -+++ b/src/builtin.c -@@ -1,5 +1,6 @@ - #define _BSD_SOURCE - #define _GNU_SOURCE -+#define _DEFAULT_SOURCE - #ifndef __sun__ - # define _XOPEN_SOURCE - # define _XOPEN_SOURCE_EXTENDED 1 -diff --git a/src/jv_dtoa.c b/src/jv_dtoa.c -index 33feb99..fcbd902 100644 ---- a/src/jv_dtoa.c -+++ b/src/jv_dtoa.c -@@ -2327,7 +2327,7 @@ retlow1: - jvp_strtod - (struct dtoa_context* C, const char *s00, char **se) - { -- int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, e, e1, test_scale; -+ int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, e, e1; - int esign, i, j, k, nd, nd0, nf, nz, nz0, nz1, sign; - CONST char *s, *s0, *s1; - double aadj, aadj1; -diff --git a/src/jv_dtoa_tsd.c b/src/jv_dtoa_tsd.c -index 0f95df4..e5209dd 100644 ---- a/src/jv_dtoa_tsd.c -+++ b/src/jv_dtoa_tsd.c -@@ -24,7 +24,7 @@ static void tsd_dtoa_ctx_fini() { - } - - static void tsd_dtoa_ctx_init() { -- if (pthread_key_create(&dtoa_ctx_key, tsd_dtoa_ctx_dtor) != 0) { -+ if (pthread_key_create(&dtoa_ctx_key, (void (*)(void *))tsd_dtoa_ctx_dtor) != 0) { - fprintf(stderr, "error: cannot create thread specific key"); - abort(); - } -@@ -43,4 +43,4 @@ inline struct dtoa_context *tsd_dtoa_context_get() { - } - } - return ctx; --} -\ No newline at end of file -+} diff --git a/app-misc/jq/files/jq-1.7_pre20201109-fix-configure-test.patch b/app-misc/jq/files/jq-1.7_pre20201109-fix-configure-test.patch deleted file mode 100644 index 8be52042bcc4..000000000000 --- a/app-misc/jq/files/jq-1.7_pre20201109-fix-configure-test.patch +++ /dev/null @@ -1,54 +0,0 @@ -https://github.com/stedolan/jq/pull/2480 - -From 40bbd419ad8d1bd9cbe8b17063c323f8a40ab327 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 6 Sep 2022 09:59:31 -0700 -Subject: [PATCH 1/2] configure: Pass _XOPEN_SOURCE when checking for strptime - -Include sys/time.h for gettimeofday since thats where its in glibc - -Signed-off-by: Khem Raj ---- a/configure.ac -+++ b/configure.ac -@@ -139,7 +139,10 @@ AC_FUNC_ALLOCA - - AC_FIND_FUNC([isatty], [c], [#include ], [0]) - AC_FIND_FUNC([_isatty], [c], [#include ], [0]) -+OLD_CFLAGS=$CFLAGS -+CFLAGS="$CFLAGS -D_XOPEN_SOURCE" - AC_FIND_FUNC([strptime], [c], [#include ], [0, 0, 0]) -+CFLAGS=$OLD_CFLAGS - AC_FIND_FUNC([strftime], [c], [#include ], [0, 0, 0, 0]) - AC_FIND_FUNC([setenv], [c], [#include ], [0, 0, 0]) - AC_FIND_FUNC([timegm], [c], [#include ], [0]) -@@ -147,7 +150,7 @@ AC_FIND_FUNC([gmtime_r], [c], [#include ], [0, 0]) - AC_FIND_FUNC([gmtime], [c], [#include ], [0]) - AC_FIND_FUNC([localtime_r], [c], [#include ], [0, 0]) - AC_FIND_FUNC([localtime], [c], [#include ], [0]) --AC_FIND_FUNC([gettimeofday], [c], [#include ], [0, 0]) -+AC_FIND_FUNC([gettimeofday], [c], [#include ], [0, 0]) - AC_CHECK_MEMBER([struct tm.tm_gmtoff], [AC_DEFINE([HAVE_TM_TM_GMT_OFF],1,[Define to 1 if the system has the tm_gmt_off field in struct tm])], - [], [[#include ]]) - AC_CHECK_MEMBER([struct tm.__tm_gmtoff], [AC_DEFINE([HAVE_TM___TM_GMT_OFF],1,[Define to 1 if the system has the __tm_gmt_off field in struct tm])], - -From cda1734bed3b048c01452c798877d05b8c2f4c15 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 6 Sep 2022 10:00:59 -0700 -Subject: [PATCH 2/2] builtin: Replace _BSD_SOURCE with _DEFAULT_SOURCE - -newer glibc has remove _BSD_SOURCE and wants it to be replaced with _DEFAULT_SOURCE - -Fixes -/usr/include/features.h:194:3: warning: "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-W#warnings] -warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" - -Signed-off-by: Khem Raj ---- a/src/builtin.c -+++ b/src/builtin.c -@@ -1,4 +1,4 @@ --#define _BSD_SOURCE -+#define _DEFAULT_SOURCE - #define _GNU_SOURCE - #ifndef __sun__ - # define _XOPEN_SOURCE - diff --git a/app-misc/jq/files/jq-1.7_pre20201109-no-git-bdep.patch b/app-misc/jq/files/jq-1.7_pre20201109-no-git-bdep.patch deleted file mode 100644 index 726624df13d6..000000000000 --- a/app-misc/jq/files/jq-1.7_pre20201109-no-git-bdep.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 0441d4a..592ceb9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,8 +1,3 @@ --m4_define([jq_version], -- m4_esyscmd_s([(git rev-parse --verify -q jq-1.0 > /dev/null && -- (git describe --tags --dirty --match 'jq-*'|sed 's/^jq-//')) || -- echo `git rev-parse --abbrev-ref HEAD`-`git describe --always --dirty`]))) -- - AC_INIT([jq], [jq_version], [https://github.com/stedolan/jq/issues], - [jq], [https://stedolan.github.io/jq]) - 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; } -} diff --git a/app-misc/jq/jq-1.7.ebuild b/app-misc/jq/jq-1.7.ebuild index 53771f0bb061..e2afba51c23a 100644 --- a/app-misc/jq/jq-1.7.ebuild +++ b/app-misc/jq/jq-1.7.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_pre20201109-r1.ebuild b/app-misc/jq/jq-1.7_pre20201109-r1.ebuild deleted file mode 100644 index 6c0d7ed19c9b..000000000000 --- a/app-misc/jq/jq-1.7_pre20201109-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -COMMIT_HASH="a17dd3248a666d01be75f6b16be37e80e20b0954" - -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" -SRC_URI="https://github.com/stedolan/jq/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${COMMIT_HASH}" - -LICENSE="MIT CC-BY-3.0" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos" -IUSE="+oniguruma static-libs test" - -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?] ) - ) -" -PATCHES=( - "${FILESDIR}"/jq-1.6-r3-never-bundle-oniguruma.patch - "${FILESDIR}"/jq-1.7-runpath.patch - "${FILESDIR}"/jq-1.7-warnings.patch - "${FILESDIR}"/jq-1.7-visible-null.patch - # https://bugs.gentoo.org/776385 - "${FILESDIR}"/jq-1.7_pre20201109-no-git-bdep.patch - "${FILESDIR}"/jq-1.7_pre20201109-fix-configure-test.patch -) - -RESTRICT="!test? ( test )" -REQUIRED_USE="test? ( oniguruma )" - -src_prepare() { - sed -e '/^dist_doc_DATA/d; s:-Wextra ::' -i Makefile.am || die - sed -r -e "s:(m4_define\(\[jq_version\],) .+\):\1 \[${PV}\]):" \ - -i 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 -e '/modules\/oniguruma/d' -i 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 ! 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 README.md ) - default - - use static-libs || { find "${D}" -name '*.la' -delete || die; } -} -- cgit v1.2.3