gentoo resync : 25.11.2020

5 files changed, 192 insertions, 0 deletions

diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
index 6afcc9832e9a..df12ee40b6f5 100644
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@@ -1,6 +1,11 @@
 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
 DIST jq-1.6.tar.gz 1750584 BLAKE2B c9be1314e9d027247de63492ee362e996ef85faf45a47ee421cad95ebde9188bff8d3fc7db64e717ab922e1052f3b1c1500f5589fc5b2199ab66effb000e442d SHA512 5da71f53c325257f1f546a2520fe47828b495c953270df25ea0e37741463fdda72f0ba4d5b05b25114ec30f27a559344c2b024bacabf610759f4e3e9efadb480
+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_pre20201109.ebuild 2283 BLAKE2B 61ea18499c26d85c0cada8a4e7032a0e31e712049415d5607f3ff557ce3cfb8e4da8f036f529cd8cfcf961e831c2fdc2b172857cba528c4010a0766785e8cf1e SHA512 e25b379c1b33052436ee854c089bb4e6fe82127b0fb49eb6740329b082d399069d8b09581c3724f0d784ef68f320000135b048633b64cc99a8d80e5f3103ad19
 MISC metadata.xml 595 BLAKE2B cf785d8ceab62aa62f65f3f9eadf20fddab1e15f4461960e66a3b8c4fb747d6748a94576f2300ac7bef4220a635a51d90dc85d8c8eedfa097eef76c1dd9456be SHA512 ff760e992f881a3f7b252cbc59d7a97dbff503100d6ab72d2f0e5beae7ae5431bbc69fd58e3db12bb9c353826613e2c671790e04203a607a7029ca67003a42f6
diff --git a/app-misc/jq/files/jq-1.7-runpath.patch b/app-misc/jq/files/jq-1.7-runpath.patch
new file mode 100644
index 000000000000..a8f76f7c90e1
--- /dev/null
+++ b/app-misc/jq/files/jq-1.7-runpath.patch
@@ -0,0 +1,17 @@
+diff --git a/configure.ac b/configure.ac
+index 0441d4a..8f1aa23 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -283,4 +283,11 @@ AC_SUBST([BUNDLER], ["$bundle_cmd"])
+ AC_CONFIG_MACRO_DIR([config/m4])
+ AC_CONFIG_FILES([Makefile libjq.pc])
+ 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
new file mode 100644
index 000000000000..41e55df72111
--- /dev/null
+++ b/app-misc/jq/files/jq-1.7-visible-null.patch
@@ -0,0 +1,41 @@
+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
new file mode 100644
index 000000000000..0047ca391cae
--- /dev/null
+++ b/app-misc/jq/files/jq-1.7-warnings.patch
@@ -0,0 +1,44 @@
+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/jq-1.7_pre20201109.ebuild b/app-misc/jq/jq-1.7_pre20201109.ebuild
new file mode 100644
index 000000000000..fa0a2415e13b
--- /dev/null
+++ b/app-misc/jq/jq-1.7_pre20201109.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 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 ~ppc ~ppc64 ~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
+)
+
+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; }
+}