gentoo auto-resync : 12:02:2023 - 09:56:54

3 files changed, 47 insertions, 7 deletions

diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
index cb6fbd874109..ba670db9d245 100644
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@@ -3,12 +3,14 @@ AUX jq-1.6-runpath.patch 563 BLAKE2B 9b7600e9673fd0a34dedd2c3c7a672b26d146778f92
 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-r1.patch 1173 BLAKE2B 61e7859e3b5167a86fb5160751cd724bd934d4fa4365523893c204aa585a057da3f465e18c5f81d7ff688bd40775961688c7e8eaa9e60c81eadeac8d0865191d SHA512 b68289acbc4b875e7c12570b107db0ebd9cc318a058eeed2d262ae7005ae1411b4b56ba6741a6a13eb1d67054c101377b67ba0eb25d6f53bf11501dc7926f32f
 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_pre20201109.tar.gz 1181867 BLAKE2B 9db187ab927b635c43fbc6191aeffa00451b12253ae023bbabe6fba5fdf8fb393f8450ee2011ef58cb93e2f27994d454fac967984a721439aaac93259c02f7f1 SHA512 f2997d70edb36d0a23b71a7d933a763cedd7c74ffa3129c2a6cb7189aaff1c5095cdc51062b7cd119324ec2c83ebae6ff0b7da3941315303b7a31146b9eb285a
+DIST jq-1.7_pre20230210.gh.tar.gz 1197799 BLAKE2B f4e90f78aa5afec88a4fc60f7a6f05f892647fcd9b59e67ea4727bb452eceead05b8cbe18b814d05665c5fadf8aaddc0cc9a06f2cb102c82503f857d0b70a485 SHA512 e7533c1dd53dad398c50b4cf37cef5d60f95eeee040d1c1ab776778fa14a093167500e1d99d71b22edc5f476079bad503c9c17f54fffefee0c5eb41b86bab406
 EBUILD jq-1.6-r3.ebuild 2000 BLAKE2B e3d647a6c444db493d291f586d2accd96c34df232dcffc6137e66bbd7cbf7d164dac43d5d783e2666e6ff1135f9583dd2b1a48826808058295abf7c1ff2a311c SHA512 746bbeff6451adbd25916d5c0aad6630a5c2728841731d918b29bf7e4ea679b36b0b61489c8e5aa5bdd8e0a093b117fe04788a4046bbfc39039cb5c510e7cd69
 EBUILD jq-1.7_pre20201109-r1.ebuild 2438 BLAKE2B b25860c0d8eb96b90fa79cfbe7f3fdc23b6376d0142dbc0fee9224aa3793c64d4345c18d49e88440884432885d68facef23724fbc279559f81d44fa835e1e821 SHA512 965be67264be11a74a2ce6486c2271062731eda59eadfd470a8fc29aac93d3c7bcb9fe677551926b9e14111cdc97205e5f1345b74bc3c949c148076d242b2813
-EBUILD jq-1.7_pre20201109.ebuild 2379 BLAKE2B 0745f1cb7d163845251d5c413d188a07e214b58474be66a30d10ff9af8eb3d521efd154136bb5921e3074f7dbd884b1a6749615d887813a946e0ae85083f1642 SHA512 5727657759ac7e3172caafb3e9c3d0a3990de4054994197b60db6dbc7c1d645cec99bb531ea66927dbd51fa396018605e14f097f3fdf9a01d6dc69ff829eb01a
+EBUILD jq-1.7_pre20230210.ebuild 2448 BLAKE2B 52a593751adca7208c668c3ea9896ae65466a210171b63fe456c731533132a6d4e33011563ea5c3e77ce411e5adf48f46055172bbecee7212012397193db5757 SHA512 1755dc4b0a88454c04f473f60c185603c2a67b18445c50127890d835d5d7d225795688c3e296da9b16c29a64a22d98b2bc75feb58dc2371193834287f7b1e332
 MISC metadata.xml 621 BLAKE2B 25da1d13b32964ec540f4e25f8d29807e5f954d3e47ace2143abfdd192382153e05947c4ccae46dd3c3608cc083ad1701f6aa66ab3b6b3c6866e858eab342be5 SHA512 955c6e85739c4b46f02e9f194a7534cd90e098014ee8df42587d3bc357ee25da45db830ea2736724c7f962b137e604b9818c7fe6c4427dadbb9d58ef4682da2b
diff --git a/app-misc/jq/files/jq-1.7-warnings-r1.patch b/app-misc/jq/files/jq-1.7-warnings-r1.patch
new file mode 100644
index 000000000000..4d0182493056
--- /dev/null
+++ b/app-misc/jq/files/jq-1.7-warnings-r1.patch
@@ -0,0 +1,37 @@
+diff --git a/src/builtin.c b/src/builtin.c
+index 1c6b08c..407df2a 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 cfccd40..d39911e 100644
+--- a/src/jv_dtoa_tsd.c
++++ b/src/jv_dtoa_tsd.c
+@@ -31,7 +31,7 @@ void jv_tsd_dtoa_ctx_fini() {
+ static
+ #endif
+ void jv_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();
+   }
diff --git a/app-misc/jq/jq-1.7_pre20201109.ebuild b/app-misc/jq/jq-1.7_pre20230210.ebuild
index d18b013e9a4c..3a2508ecac79 100644
--- a/app-misc/jq/jq-1.7_pre20201109.ebuild
+++ b/app-misc/jq/jq-1.7_pre20230210.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
-COMMIT_HASH="a17dd3248a666d01be75f6b16be37e80e20b0954"
+COMMIT_HASH="cff5336ec71b6fee396a95bb0e4bea365e0cd1e8"
 
 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"
+SRC_URI="https://github.com/stedolan/jq/archive/${COMMIT_HASH}.tar.gz -> ${P}.gh.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"
+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/
@@ -32,10 +32,11 @@ RDEPEND="
 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-warnings-r1.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 )"