From b7ebc951da8800f711142f69d9d958bde67a112d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 28 Apr 2019 09:54:45 +0100
Subject: gentoo resync : 28.04.2019
---
app-misc/jq/Manifest | 4 +-
.../jq/files/jq-1.6-never-bundle-oniguruma.patch | 80 ----------------------
.../files/jq-1.6-r3-never-bundle-oniguruma.patch | 27 ++++++++
app-misc/jq/jq-1.6-r2.ebuild | 61 -----------------
app-misc/jq/jq-1.6-r3.ebuild | 68 ++++++++++++++++++
5 files changed, 97 insertions(+), 143 deletions(-)
delete mode 100644 app-misc/jq/files/jq-1.6-never-bundle-oniguruma.patch
create mode 100644 app-misc/jq/files/jq-1.6-r3-never-bundle-oniguruma.patch
delete mode 100644 app-misc/jq/jq-1.6-r2.ebuild
create mode 100644 app-misc/jq/jq-1.6-r3.ebuild
(limited to 'app-misc/jq')
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
index f3fe14642f1c..a5e0e6b89781 100644
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@@ -1,11 +1,11 @@
AUX jq-1.5-dynamic-link.patch 292 BLAKE2B 65edf9902b3a97621cb5485931d6978625b89870e0728c92dec008abf0a978aa1ea496245294c0a8eed75498abec5a01b7fea8efa8185b7c54d4140e75af8abd SHA512 1573ab7bdb9bd28db1ef7cbf834aada998b9651ffc1a9c67941faf23490ac3b145b6af6f1e41212b2c8c990d738b24bc7912a591db386f922c0b829a59e465ee
AUX jq-1.5-heap_buffer_overflow_in_tokenadd.patch 1241 BLAKE2B ae161ea9ce220f57ee5aeec1b9d202de8401dcb5e842ba8d105eb3a2bc2cbd0f387980d76bfe8a30a6304ea04a1d00fe8733e7dab46507602d16eac74387f3a6 SHA512 7c0e7268a8715f9354322b81e82971fd6e6810206024fb59f55fdf319c1053fdd17ab4d2a78c8edc9ed1638339671419f4ea92cbb0f8ffbb34e5b521efb35718
AUX jq-1.5-remove-automagic-dep-on-oniguruma.patch 1879 BLAKE2B 821dc0ba57bdabf268efb3429417ee5e32d666dc33debea89aa7550c4bbad3c5938a6a0bf0cb4adfc2c0173b7bfeac3dcd16c52b19be6e92733ea8dfee89b4b5 SHA512 3c7efccf85beda5f80c66432f6950b2d885c4587e6ed3cdc66447f60440dc0287da834cc5744ddd7af8ad36677254ebae6969bc498d36e457dfac69ca0da3f6d
-AUX jq-1.6-never-bundle-oniguruma.patch 2574 BLAKE2B 0d23b17807c88940f3f586657d9e8247466bae172f135b8e22c7e888fc92363a7bbcced97934d643e5a0c45256c63fe70347fc48ea32b053cc456fa5e28e44ec SHA512 57924c5cf4e189c439a008f104a9e96ea8eefde2f950089baff4fe049cd52433693dba8b1aa4eaf63afc3256e169df4a3d167311662ace66416abb54c01215b2
+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
DIST jq-1.5.tar.gz 739309 BLAKE2B 9d36db80fa9365d9967c9e1691e723d5237e7db2ddef43e06391bb97ba3a163f07c79906b9cf94d4b53f20598dc8ccacaff9e54ff3c32387fef1b3d484c13e73 SHA512 4a0bb069ae875f47731d7d84ae6b82240703dc7a694cfb0aee4c7e9639defe7ba9af575d17dc32bda4426b80c186cc8dcd4505f3a6bcbe16b39e9b13097da238
DIST jq-1.6.tar.gz 1750584 BLAKE2B c9be1314e9d027247de63492ee362e996ef85faf45a47ee421cad95ebde9188bff8d3fc7db64e717ab922e1052f3b1c1500f5589fc5b2199ab66effb000e442d SHA512 5da71f53c325257f1f546a2520fe47828b495c953270df25ea0e37741463fdda72f0ba4d5b05b25114ec30f27a559344c2b024bacabf610759f4e3e9efadb480
EBUILD jq-1.5-r3.ebuild 1392 BLAKE2B 3bf5f4a5124ed0e44158969a38201e5c9a5311ce23af5bca431acb2b0e69f50d5c6be60561a29c067f813f7bb4bb1d57bd7659672258574e3e9cebaf9e8da1c7 SHA512 2d1a0ca492838b08b40232cc574d3cbd3319250a45f23a53f5b8688e12def7702cce59bb761d3d30e58fd50ba8cde1dc0e1d7790a0ce0411444dc39922a81426
-EBUILD jq-1.6-r2.ebuild 1414 BLAKE2B bcf4071d05aa6cd18c916a7f94bfadbc71404200d0cbc6ed9bda81141b4649fca052b8873aa5b37243446697128b0152ca631277df96f7e0924f9ea280220970 SHA512 b00d5da0c9b53a4434aa9c8d375173fd0e36e70890def0fa522aec9efba3bdd2abe3632aad6707aabcb6fc8b10d95c581580a3354f92a4b9bb3afbaf9975369a
+EBUILD jq-1.6-r3.ebuild 1825 BLAKE2B a344024a28fe7ad1a0e4958e39debd8a7ff3dbc07b0168aeb4e04059d35ed0337a2fb9da41fbb909e92329af435d4d799ef6190d8c35c40e3a7bbcbef60c8521 SHA512 c1237979fc40dc341c6df202fdc751660b71e787f7824ecd51fa5cf9635c5dd2c1cde8961e8f12001b59d81e5da07920281b2fa5ee0a02ed7ce852e729a85e9d
MISC metadata.xml 423 BLAKE2B 1e5f03ac7d6b93814bdfe760d9b2d9b74447272b554f7e92c40918069c7787ee8c60dd68a86df38c67f27422f0f281c7ad7234305a45532b657be0397a5b81af SHA512 1787b1ce5d050aaa440996ceaf2367e39192af71e7d9a0d973e8dc8a87854f910aefd020c869867e3da5da33d27cc261047a1ded58b18052b21bf6737ef3081c
diff --git a/app-misc/jq/files/jq-1.6-never-bundle-oniguruma.patch b/app-misc/jq/files/jq-1.6-never-bundle-oniguruma.patch
deleted file mode 100644
index 0b0e92600507..000000000000
--- a/app-misc/jq/files/jq-1.6-never-bundle-oniguruma.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 6344b4e..5f0c74d 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -48,7 +48,7 @@ AM_YFLAGS = --warnings=all -d
- lib_LTLIBRARIES = libjq.la
- libjq_la_SOURCES = ${LIBJQ_SRC}
- libjq_la_LIBADD = -lm
--libjq_la_LDFLAGS = $(onig_LDFLAGS) -export-symbols-regex '^j[qv]_' -version-info 1:4:0
-+libjq_la_LDFLAGS = -export-symbols-regex '^j[qv]_' -version-info 1:4:0
-
- if WIN32
- libjq_la_LIBADD += -lshlwapi
-@@ -137,15 +137,6 @@ jq.1: $(srcdir)/jq.1.prebuilt
- endif
-
-
--### Build oniguruma
--
--if BUILD_ONIGURUMA
--libjq_la_LIBADD += modules/oniguruma/src/.libs/libonig.la
--SUBDIRS = modules/oniguruma
--endif
--
--AM_CFLAGS += $(onig_CFLAGS)
--
- ### Packaging
-
- docs/site.yml: configure.ac
-diff --git a/configure.ac b/configure.ac
-index 280694c..0c5d86f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -236,45 +236,20 @@ AC_ARG_WITH([oniguruma],
- [try this for a non-standard install prefix of the oniguruma library])], ,
- [with_oniguruma=yes])
-
--onig_CFLAGS=
--onig_LDFLAGS=
--build_oniguruma=no
- AS_IF([test "x$with_oniguruma" != xno], [
- save_CFLAGS="$CFLAGS"
- save_LDFLAGS="$LDFLAGS"
-- AS_IF([test "x$with_oniguruma" != xyes], [
-- AS_IF([test "x$with_oniguruma" = xbuiltin], [
-- build_oniguruma=yes
-- ], [
-- onig_CFLAGS="-I${with_oniguruma}/include"
-- onig_LDFLAGS="-L${with_oniguruma}/lib"
-- ])
-- ])
- AS_IF([test "x$build_oniguruma" = xno], [
- # check for ONIGURUMA library, either in /usr or where requested
-- CFLAGS="$CFLAGS $onig_CFLAGS"
-- LDFLAGS="$LDFLAGS $onig_LDFLAGS"
- AC_CHECK_HEADER("oniguruma.h",
- AC_CHECK_LIB([onig],[onig_version]))
- # handle check results
- AS_IF([test "x$ac_cv_lib_onig_onig_version" != "xyes"], [
-- build_oniguruma=yes
-- AC_MSG_NOTICE([Oniguruma was not found. Will use the packaged oniguruma.])
-+ AC_MSG_ERROR(oniguruma.h not found)
- ])
- ])
-- AS_IF([test "x$build_oniguruma" = xyes -a -f "${srcdir}/modules/oniguruma/configure.ac" ], [
-- onig_CFLAGS="-I${srcdir}/modules/oniguruma/src"
-- onig_LDFLAGS="-L${srcdir}/modules/oniguruma/src -Wl,-rpath,${libdir}"
-- AC_CONFIG_SUBDIRS([modules/oniguruma])
-- AC_DEFINE([HAVE_LIBONIG],1,[Define to 1 if the system includes libonig])
-- ])
-- CFLAGS="$save_CFLAGS"
-- LDFLAGS="$save_LDFLAGS"
- ])
--AC_SUBST(onig_CFLAGS)
--AC_SUBST(onig_LDFLAGS)
-
--AM_CONDITIONAL([BUILD_ONIGURUMA], [test "x$build_oniguruma" = xyes])
- AC_SUBST([BUNDLER], ["$bundle_cmd"])
-
- AC_CONFIG_MACRO_DIR([config/m4])
diff --git a/app-misc/jq/files/jq-1.6-r3-never-bundle-oniguruma.patch b/app-misc/jq/files/jq-1.6-r3-never-bundle-oniguruma.patch
new file mode 100644
index 000000000000..75ab111f8810
--- /dev/null
+++ b/app-misc/jq/files/jq-1.6-r3-never-bundle-oniguruma.patch
@@ -0,0 +1,27 @@
+diff --git a/Makefile.am b/Makefile.am
+index 6344b4e..86d968e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -47,7 +47,7 @@ AM_YFLAGS = --warnings=all -d
+
+ lib_LTLIBRARIES = libjq.la
+ libjq_la_SOURCES = ${LIBJQ_SRC}
+-libjq_la_LIBADD = -lm
++libjq_la_LIBADD = -lm $(onig_LIBS)
+ libjq_la_LDFLAGS = $(onig_LDFLAGS) -export-symbols-regex '^j[qv]_' -version-info 1:4:0
+
+ if WIN32
+diff --git a/configure.ac b/configure.ac
+index 280694c..d96026e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -249,6 +249,9 @@ AS_IF([test "x$with_oniguruma" != xno], [
+ onig_CFLAGS="-I${with_oniguruma}/include"
+ onig_LDFLAGS="-L${with_oniguruma}/lib"
+ ])
++ ], [
++ # with_oniguruma == yes
++ PKG_CHECK_MODULES([onig], [oniguruma])
+ ])
+ AS_IF([test "x$build_oniguruma" = xno], [
+ # check for ONIGURUMA library, either in /usr or where requested
diff --git a/app-misc/jq/jq-1.6-r2.ebuild b/app-misc/jq/jq-1.6-r2.ebuild
deleted file mode 100644
index 9463846be754..000000000000
--- a/app-misc/jq/jq-1.6-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 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.com/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 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="oniguruma static-libs"
-
-DEPEND="
- >=sys-devel/bison-3.0
- sys-devel/flex
- oniguruma? ( dev-libs/oniguruma:=[static-libs?] )
-"
-RDEPEND="
- !static-libs? (
- oniguruma? ( dev-libs/oniguruma[static-libs?] )
- )
-"
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}"/jq-1.6-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
-
- 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)
- )
- econf "${econfargs[@]}"
-}
-
-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.6-r3.ebuild b/app-misc/jq/jq-1.6-r3.ebuild
new file mode 100644
index 000000000000..4207cef20c75
--- /dev/null
+++ b/app-misc/jq/jq-1.6-r3.ebuild
@@ -0,0 +1,68 @@
+# 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.com/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_install() {
+ local DOCS=( AUTHORS README.md )
+ default
+
+ use static-libs || { find "${D}" -name '*.la' -delete || die; }
+}
--
cgit v1.2.3