commit: 79d039542c3c53925c72db7a58db0cf06f33faae
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 6 17:29:12 2023 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Oct 6 17:29:12 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79d03954
app-misc/jq: drop 1.7_pre20201109-r1
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
app-misc/jq/Manifest | 1 -
app-misc/jq/files/jq-1.6-runpath.patch | 17 -----
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.7_pre20201109-r1.ebuild | 88 ----------------------
7 files changed, 258 deletions(-)
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
index 09d558b12519..71d260f19bcd 100644
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@@ -1,2 +1 @@
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-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.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 <[email protected]>
-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 <[email protected]>
---- a/configure.ac
-+++ b/configure.ac
-@@ -139,7 +139,10 @@ AC_FUNC_ALLOCA
-
- AC_FIND_FUNC([isatty], [c], [#include <unistd.h>], [0])
- AC_FIND_FUNC([_isatty], [c], [#include <io.h>], [0])
-+OLD_CFLAGS=$CFLAGS
-+CFLAGS="$CFLAGS -D_XOPEN_SOURCE"
- AC_FIND_FUNC([strptime], [c], [#include <time.h>], [0, 0, 0])
-+CFLAGS=$OLD_CFLAGS
- AC_FIND_FUNC([strftime], [c], [#include <time.h>], [0, 0, 0, 0])
- AC_FIND_FUNC([setenv], [c], [#include <stdlib.h>], [0, 0, 0])
- AC_FIND_FUNC([timegm], [c], [#include <time.h>], [0])
-@@ -147,7 +150,7 @@ AC_FIND_FUNC([gmtime_r], [c], [#include <time.h>], [0, 0])
- AC_FIND_FUNC([gmtime], [c], [#include <time.h>], [0])
- AC_FIND_FUNC([localtime_r], [c], [#include <time.h>], [0, 0])
- AC_FIND_FUNC([localtime], [c], [#include <time.h>], [0])
--AC_FIND_FUNC([gettimeofday], [c], [#include <time.h>], [0, 0])
-+AC_FIND_FUNC([gettimeofday], [c], [#include <sys/time.h>], [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 <time.h>]])
- 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 <[email protected]>
-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 <[email protected]>
---- 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.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; }
-}
