gentoo auto-resync : 12:10:2023 - 12:14:42

9 files changed, 141 insertions, 7 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index ed3d32a17667..de06dbb48bb6 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 4c653c55f9a1..9cb31c2fa825 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,3 +1,4 @@
+AUX botan-3.2.0-ninja.patch 575 BLAKE2B f75eb0a16fadfae6e0a1bb554262d8d902152c054fd97c19a1c4eda31a780138efd42ce05992896d16d98415c555a7cfa01b6dfa201c7e97ad971deab851e7b7 SHA512 ff9078ae1a43404680cf757da15bd17541f51f8de02a1a8d02f075676a1e35ff9a78adba0f3b84847634bc4904ed7b5824df6c708785865a4d01d4f9139e617b
 DIST Botan-2.19.3.tar.xz 6105896 BLAKE2B 6d7778d9e9a101c76f35c65b0fb0201641cd91967ba934510f3836ee4b924d54cabdc760dd460997679250aa66e1d2a99369cd03f8fb9e7b2fe672d4b355215f SHA512 80012397e2aa7cc88a9536340ac9b770d1195fddda53b9d4cfde82318dd05f9d4f925bbdff773aba99883a701f4d30581e9d5c97e915fa80c3ca2acfa5a92110
 DIST Botan-2.19.3.tar.xz.asc 488 BLAKE2B cd86bf77306aad2956cced6ac4fb96081279af88743e87d8fe5437e72e9fa8db8aaf40d0b5cb9c5b3a85204cb7d63c3baa3054126ab4c9a2db527e6835a069d7 SHA512 9142f932c958138b4bac32f503a550e6c73b61612690a280dcb98efe8c367aa6bd3cd88b4ed4decec376bb87596a780a21bdcb01d4a3573a1c44fbeb0aa49d23
 DIST Botan-3.1.1.tar.xz 8800368 BLAKE2B c31365e6bd4106f96a033e5f092c528c0185577f41d9a698d2630ece0f660f87f03e0775ebeb5c4d812819bbc6eb556b5ff15c16f243288ae73c8bf1fbb991ce SHA512 ed6bdadb910b0775245648140212953ed364aa26107f851e39ac5cb664d7f476c519a22cdad41f0e520796c4ebe453c56ca68a2178e39f815d445e9979333795
@@ -6,5 +7,5 @@ DIST Botan-3.2.0.tar.xz 8998204 BLAKE2B f21e7574af93ab3331607f4a4ecf1b2cbbc0db4b
 DIST Botan-3.2.0.tar.xz.asc 488 BLAKE2B f7bc716dd18eedf35928933e22c75de3d2731330dfdaf8a5048e8ad86e1f3896ea55294a64b7f82593af16dd2e4097a9ba68f25baa024e175b7334478bcf84a6 SHA512 3ee42ac73e1bd6cea0a2e9f468b88d67c02a4a69786c41ddf9fc7f94b6847be00e0f3f0f38f934ab599b8d6dd29006414294df8b371f5cf2422292f3dd176756
 EBUILD botan-2.19.3-r2.ebuild 4822 BLAKE2B 78f05a4a8832e5eee611da509d40243c57f39e41e39119d07647f94843689052583867c3150fce437cd322369ad6e0d5e0ab03ab7ec19300fb961b269db0e2a1 SHA512 4c0e0eb0e35285af725816edd2c414cf054d7dd06aab9b1c550d70fa892fe603c2e6c20283ee964e1c53a35b87e5177c74c8b4ace5aaa661bc24c73eb72935be
 EBUILD botan-3.1.1.ebuild 5703 BLAKE2B ea6b59cfa80842a3dd9364bba6118439880d9731fb00afaeb28d78d95d0d23e9b067ac70b93fc55b834c7eb7665930c1c0809d15b0e62a18ad55cda5e32f03bf SHA512 7636b43a92eaaaadd17dc641af79ff689014e9654ebb083ffbc8f8ef1493332f0da604ffccb39d0e0ecfa19c721e0750463e9a432ef3e34a5d60a34ae089804e
-EBUILD botan-3.2.0.ebuild 5880 BLAKE2B 3c5c326ff89360f50b6c73a0b09100961ced57292c40f9e18f216b18a1bbb3b3733ca0351b99900433758f9bc421d43d45882a4ad4102bf693dc8074cc9a9496 SHA512 f71ecc158473e11bd125fb7681f196a5c4170474039002149d6d082b905c10a021468d7b25b5979c331ea2ff4853dd254aa2edea8e3995ab7a9686966199cc4a
+EBUILD botan-3.2.0-r1.ebuild 5968 BLAKE2B 01d9334b1e15c10af0f3796350f32f7a52fd9d5f99fc07df7ece805eda6114ec2d08ee7905ef6e93f8986215dbba56837bf6ba1a3f1735ea96bfe77a649e28ac SHA512 cc2835648518ce325c64f6898c536eb8ba0ac201e3413293a6c34d6400d6edb314cd5674db8bb26b6287a7e697faadf8e87f0685074a2775d53f414eb4ca7353
 MISC metadata.xml 587 BLAKE2B 8d46466fee633fda0f81549a6e512e4ef5963eda31d7c882cee2fe2bfae8b0379509f046d0bdfdb1fe9481eea0585f1754753ed6b509c4f922b8fbf9ae089f39 SHA512 258e04098b9db5821a66e38d02ffb195b57378621fd2a549c8892744cf257be857ebf75c8e4a2f041cd267f07c2f1c3a5fca8df61db0538d8282507cf03a029d
diff --git a/dev-libs/botan/botan-3.2.0.ebuild b/dev-libs/botan/botan-3.2.0-r1.ebuild
index bb651261749f..bd7375f6945b 100644
--- a/dev-libs/botan/botan-3.2.0.ebuild
+++ b/dev-libs/botan/botan-3.2.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/botan.asc
-inherit edo flag-o-matic multiprocessing python-r1 toolchain-funcs verify-sig
+inherit edo flag-o-matic multiprocessing ninja-utils python-r1 toolchain-funcs verify-sig
 
 MY_P="Botan-${PV}"
 DESCRIPTION="C++ crypto library"
@@ -46,6 +46,7 @@ RDEPEND="
 "
 BDEPEND="
 	${PYTHON_DEPS}
+	${NINJA_DEPEND}
 	$(python_gen_any_dep '
 		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	')
@@ -56,6 +57,9 @@ BDEPEND="
 # NOTE: Considering patching Botan?
 # Please see upstream's guidance:
 # https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches
+PATCHES=(
+	"${FILESDIR}"/${P}-ninja.patch
+)
 
 python_check_deps() {
 	use doc || return 0
@@ -150,8 +154,7 @@ src_configure() {
 		$(use_with sqlite sqlite3)
 		$(use_with zlib)
 
-		# Broken in 3.2.0, bug #915544
-		#--build-tool=ninja
+		--build-tool=ninja
 		--cpu=${chostarch}
 		--docdir=share/doc
 		--disable-modules=$(IFS=","; echo "${disable_modules[*]}")
@@ -203,12 +206,16 @@ src_configure() {
 	edo ${EPYTHON} configure.py --verbose "${myargs[@]}"
 }
 
+src_compile() {
+	eninja
+}
+
 src_test() {
 	LD_LIBRARY_PATH="${S}" edo ./botan-test$(ver_cut 1) --test-threads="$(makeopts_jobs)"
 }
 
 src_install() {
-	default
+	DESTDIR="${D}" eninja install
 
 	if [[ -d "${ED}"/usr/share/doc/${P} && ${P} != ${PF} ]] ; then
 		# --docdir in configure controls the parent directory unfortunately
diff --git a/dev-libs/botan/files/botan-3.2.0-ninja.patch b/dev-libs/botan/files/botan-3.2.0-ninja.patch
new file mode 100644
index 000000000000..826fc496fb31
--- /dev/null
+++ b/dev-libs/botan/files/botan-3.2.0-ninja.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/915544
+https://github.com/randombit/botan/commit/a1a32558669a6751e39420b26930d477790509ce
+
+From a1a32558669a6751e39420b26930d477790509ce Mon Sep 17 00:00:00 2001
+From: Jack Lloyd <jack@randombit.net>
+Date: Wed, 11 Oct 2023 07:36:31 -0400
+Subject: [PATCH] Fix Ninja build to pass instruction set flags to the compiler
+
+Fixes #3750
+--- a/src/build-data/ninja.in
++++ b/src/build-data/ninja.in
+@@ -161,6 +161,7 @@ build tidy: tidy
+ 
+ %{for lib_build_info}
+ build %{obj}: compile_lib %{src}
++  isa_flags = %{isa_flags}
+ %{endfor}
+ 
+ %{for cli_build_info}
+
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 1b08442d3adf..4f512e163e87 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -2,5 +2,5 @@ AUX gjs-1.76.0-move_have_gtk4_to_the_appropriate_place.patch 1417 BLAKE2B 203701
 DIST gjs-1.76.2.tar.xz 646232 BLAKE2B 66466eeb5f956d5041f4e63ba977dc9a688455770c39bcedd63576f56fde9821ed3c827c470f7e3befbbf7828fbd197706637da458876ec129d6c16323e414e8 SHA512 26b024874ce69a6f58b5fabe006b8d5417971db9de00e21ecd352715b4535f405d162bb81c0cf6b20313f0f78833962080ac1cb9bd42cfff9cf6a74340458540
 DIST gjs-1.78.0.tar.xz 653500 BLAKE2B f2b6c3d80f55c1b3365fdc94dcedec357fc21ec7f92eccdf24cc028eb006538057d0d6e3328bc2f743a563ba496da5daa8585fabd6fbf52acd38c990b8a4e8ba SHA512 28ad3ff5c031b8e78622244918994ca5f510e4b403a382e7d0b0bcb9a0611be61e103398773328be4c405b49d7984c089180a5fb603518b412d01a935fb3ceb3
 EBUILD gjs-1.76.2.ebuild 2054 BLAKE2B dfa49fe0e2831e150bb43428b12c7475464a98fd305cc0151318125e0cdd2d0e32c2cf303e3efbdc65ad88c80969c2cd2cbb67ee53a274f069dac5397dc04383 SHA512 18f55663e333ef183fafee8eb9e3e201e258a7caa06e1714035c0cfafbfba42faf2b33db861940d4329f69ddbcbfce831419ef6548044325add84d624124ee7b
-EBUILD gjs-1.78.0.ebuild 1956 BLAKE2B d564cd46ecfac794e8c2f251f8feae5787aa7ad3ab2e3903a05fa17d1f7e013c1d58080788006f39c73a21d49d833c4a9354d4877126f75b593a0372062d7bf3 SHA512 01955c0b0a5a563759495e41e9f61c3eee182d829cabe870e26a76256c626fc395c3e9e80ed1049b429afa6feea19d78d39491d23faf82d67bf5a437974e93e8
+EBUILD gjs-1.78.0.ebuild 1963 BLAKE2B 61c84fe06406b20e6c53aca59460c5198ab9833611e553f322e828d9a18995d38a7e22c66b5e96e0e58cd5e120e78a8f7d770e04d1a506a5e1b6d9c45cfef73f SHA512 8f361f0b5b9e0186cd20ac2834d1cea5bccf7eaf0ca6a78f11b839125e19710393d999e73a89dd81bd62ea6330f15dc41c4c50dbda6dbf64c3ed1245f5dc9da1
 MISC metadata.xml 473 BLAKE2B 0d57ec402b3daaa00af170335374e711150ecccd019aea100484079a055015f36119c4564ae2d95e82e4ac8d6de6d84b83379aedfdcbfb7aaabaa752b51d8203 SHA512 a4f99ef450b30c381845a774865b4e82b2a554cc7f0a2edba7002096563943b58b290f704210cc00ca0508cf6e81a11be2fa0c6402117d2b05f0e4eb2e03a0c2
diff --git a/dev-libs/gjs/gjs-1.78.0.ebuild b/dev-libs/gjs/gjs-1.78.0.ebuild
index c5181d62024c..3f77c1d06628 100644
--- a/dev-libs/gjs/gjs-1.78.0.ebuild
+++ b/dev-libs/gjs/gjs-1.78.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples readline sysprof test"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index 59f514d358ee..8d9b480dc8a3 100644
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@@ -1,4 +1,6 @@
+AUX jansson-2.14-default-symver-test.patch 1604 BLAKE2B 5a18c4723997e7ed668ae34516c2fa6c8bee5acda747d6ad180213f427070f1c65a7c7970b594e1b77549c53f7aeb208149e038213bf00f49d350d3c25149729 SHA512 396b1c259549b41ac8ecef9be252f9f7d6fd611ae0890ae4f38ad44e3fe3937647891eb45ed340119ee62dae11b8fb5c8865865bcd226e689161bc5a9ee26e12
 AUX jansson-2.14-test-symbols.patch 1100 BLAKE2B 605e64b3f8487e25d56d879b6ef260db5449bd331baf6a05b9612532e1582d6a99af888701f12e5660f494892725fba79d5f22840c1a9faf89d186a785450158 SHA512 5de00dd9c9c4558bbfceed9e100d2821707d66befe446e992c724b4f14b0a560eb432caf65377d13e7f9a71711a14a9ae2cf5c716fa250fa1e86603665dc219c
 DIST jansson-2.14.tar.gz 535618 BLAKE2B eb514ff222444d4c0d1ef6b99150e3e43bd4d7a1bec3d66e5ece8bc59ac19a0898d9eb061cacad52afda7fe172ec6df46b5a90952707422f56daae53f82c9427 SHA512 5a592776c7ba8c0b1f5efaf813f77948bbc4bda168a72d221d176af0cf61038e26c1f30795433be10e2fc5069d5763d11852a8574774906a9f8ad261ac30109c
 EBUILD jansson-2.14-r1.ebuild 853 BLAKE2B 3e38a4341110c9439cd6ebc0120ed105394362699e35cfbabd9bdc1175300fd7fde305b2d549cbee83f2514bf93e27a32ae17916c553f255d25d6807c21dd457 SHA512 db0d69739bb11215c7439634509f0c60f4aab3e7b919a5e79dc04da9b51134b7b3a7c48f6eb3817b2318bd58175f36a07ffad28160d3118a6564a2045dcab855
+EBUILD jansson-2.14-r2.ebuild 934 BLAKE2B 20d9bfb3ee3bae1eea1418ad73be4201a0aad225e00c3bf7c4ed34a65a53b13358a05961b03f58f5792f1940adfd3f535f77eaf2e594c6aec0ffb9b1cb867743 SHA512 73b829acf360221806f6b0b5e00be5a7e39cde220dff718027ace8ab7988fa37b56a68d8daa5c18eda572e12beeef9e98524fd658c3d24d8ad3f83d0df668e28
 MISC metadata.xml 475 BLAKE2B 9cc60096cb39c1f472a534fd3a1e32da41f251b7f9601e10bd64164f3aa46fef7b492f8c2902b09ea56ac185de146e9c32014d5c741542cce2b5b289864d983a SHA512 7412836cd76c643dd976b26732d827d7efd607d87cecf79ef7d27815e7a14bba4210ee33c01c4f6da5193068c8662fd857935bb1e304edd81a86ae2bf3094ca1
diff --git a/dev-libs/jansson/files/jansson-2.14-default-symver-test.patch b/dev-libs/jansson/files/jansson-2.14-default-symver-test.patch
new file mode 100644
index 000000000000..0da70dc5afcb
--- /dev/null
+++ b/dev-libs/jansson/files/jansson-2.14-default-symver-test.patch
@@ -0,0 +1,55 @@
+From https://github.com/akheron/jansson/pull/666/commits/1e2ac681e5f39fc7a7e8b8deb2162a93976d4622 Mon Sep 17 00:00:00 2001
+From: Violet Purcell <vimproved@inventati.org>
+Date: Wed, 11 Oct 2023 20:51:57 -0400
+Subject: [PATCH] Port check for --default-symver to autoconf
+
+This commit ports the configure check for -Wl,--default-symver that is
+present in CMake to autoconf. This fixes building Jansson via autoconf
+with non-bfd linkers on glibc systems.
+
+Signed-off-by: Violet Purcell <vimproved@inventati.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,6 +25,9 @@ AC_TYPE_UINT16_T
+ AC_TYPE_UINT8_T
+ AC_TYPE_LONG_LONG_INT
+ 
++jansson_soversion="4"
++AC_SUBST([jansson_soversion])
++
+ AC_C_INLINE
+ case $ac_cv_c_inline in
+     yes) json_inline=inline;;
+@@ -138,8 +141,12 @@ AS_IF([test "x$with_Bsymbolic" = "xyes"], [JSON_BSYMBOLIC_LDFLAGS=-Wl[,]-Bsymbol
+ AC_SUBST(JSON_BSYMBOLIC_LDFLAGS)
+ 
+ # Enable symbol versioning on GNU libc
++m4_pattern_forbid([^AX_CHECK_LINK_FLAG$])
+ JSON_SYMVER_LDFLAGS=
+-AC_CHECK_DECL([__GLIBC__], [JSON_SYMVER_LDFLAGS=-Wl,--default-symver])
++AC_CHECK_DECL([__GLIBC__],
++  [AX_CHECK_LINK_FLAG([-Wl,--default-symver],
++    [JSON_SYMVER_LDFLAGS=-Wl,--default-symver],
++    [JSON_SYMVER_LDFLAGS=-Wl,--version-script,$ac_abs_confdir/jansson.sym])])
+ AC_SUBST([JSON_SYMVER_LDFLAGS])
+ 
+ AC_ARG_ENABLE([ossfuzzers],
+@@ -168,6 +175,7 @@ AC_SUBST([AM_CFLAGS])
+ 
+ AC_CONFIG_FILES([
+         jansson.pc
++	jansson.sym
+         Makefile
+         doc/Makefile
+         src/Makefile
+--- /dev/null
++++ b/jansson.sym.in
+@@ -0,0 +1,5 @@
++JANSSON_@jansson_soversion@ {
++	global:
++	*;
++};
++
+-- 
+2.42.0
+
diff --git a/dev-libs/jansson/jansson-2.14-r2.ebuild b/dev-libs/jansson/jansson-2.14-r2.ebuild
new file mode 100644
index 000000000000..8f8601ce9046
--- /dev/null
+++ b/dev-libs/jansson/jansson-2.14-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="C library for encoding, decoding and manipulating JSON data"
+HOMEPAGE="https://www.digip.org/jansson/"
+SRC_URI="https://github.com/akheron/jansson/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="doc static-libs"
+
+BDEPEND="
+	sys-devel/autoconf-archive
+	doc? ( dev-python/sphinx )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-default-symver-test.patch"
+	"${FILESDIR}/${P}-test-symbols.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+
+	if use doc ; then
+		emake html
+		HTML_DOCS=( doc/_build/html/. )
+	fi
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}