gentoo auto-resync : 15:11:2022 - 12:52:47

12 files changed, 280 insertions, 13 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index b518ae7baa04..61b3175f683d 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/openssl-compat/Manifest b/dev-libs/openssl-compat/Manifest
index 791d9ada245f..73af544c173e 100644
--- a/dev-libs/openssl-compat/Manifest
+++ b/dev-libs/openssl-compat/Manifest
@@ -7,7 +7,10 @@ DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e
 DIST openssl-1.1.1o-test-fixes-expiry.patch.xz 6180 BLAKE2B 23ef36d7bd05c98f7fab6de25681a53fa7a558d114548836b6cd90a57c4f4e45dc9fb622936053608b463320605b7df60db2d2caf3811b249f6ead3791a1c081 SHA512 577aec97fb31cd9efe3b30d82c560d3e7da57ae52c4de0f86e951b777a673830baaadcc5eb366c523024d37405531c6d32de26bbbc1e77df15c7822c72e937e6
 DIST openssl-1.1.1o.tar.gz 9856386 BLAKE2B 5bd355fd17adf43ba4e3bf1a8036ceb724edd4f4ab80dc25aecc3d2647372e9db2bc12e2b89791fc4b6f7fd95a7b68e00490d09ca6518d25ab990ee27798e641 SHA512 75b2f1499cb4640229eb6cd35d85cbff2e19db17b959ac4d04b60f1b395b73567f9003521452a0fcfeea9b31b26de0a7bccf476ecf9caae02298f3647cfb7e23
 DIST openssl-1.1.1o.tar.gz.asc 488 BLAKE2B a03a967e7e2124d1a76ad7765e2f48065f40d32ba102a433be603ee8f86b26a2d246dcb97a95bd694ef3005889ce4f1951f76d39fe1d683f92da1aa3023e9c2d SHA512 da6d88de7c1cd807b6089d50f8bb102c317c0b45ca26e517e3e400c5c65f787d94a1ee522af76279e93790a7fb491348cf25ffcfd66ecb9a9d35209328cb221e
+DIST openssl-1.1.1s.tar.gz 9868981 BLAKE2B ecd19eaf84dbc80448b51651abe52a89cc0052f024537959c4ebe61528988f235d661244fce6967159a876dd038c817bad19df742e828ca1cbae97ce6a4124bb SHA512 2ef983f166b5e1bf456ca37938e7e39d58d4cd85e9fc4b5174a05f5c37cc5ad89c3a9af97a6919bcaab128a8a92e4bdc8a045e5d9156d90768da8f73ac67c5b9
+DIST openssl-1.1.1s.tar.gz.asc 858 BLAKE2B d95f0f80d460feac737f84ed629c45aaf5e453103ef202ec7d33cf33b89ad83a9007429433b10754b725d7963b1960e350b64e8bdfe569ad149e26bef462eeca SHA512 aa6e5e940448297a90c46ba162f8e6ee324c2e202a9283328c31f996dc2259dd9f5f981d94d1cf1dd3cc73c44647b473602dacb857b9719bf066931b43b899e6
 DIST openssl-compat-1.0.2u-versioned-symbols.patch.gz 24633 BLAKE2B 6bfad4ad27dbca0bd85bfd9521ffc844c3e93e6a1cca7c814edd49affc60ece1c706dd3aa7be2ce80857532531eac6f0f03f43c0be22a769d00d9241686eff71 SHA512 3d85aa34f2491e0e36eedc45829709e0fb552f6d558c2726b59dafa98c3e679b88497f3f7399d7565d88e727591e7d9b12f5b1e27116ba19b9a661d7f75b07a9
 EBUILD openssl-compat-1.0.2u-r2.ebuild 7794 BLAKE2B 292aa0999be2c173b86b9324a8e1e73fd536b38af5106d09d776931c8a170808ddf976536d7f88398260e1cda58945fe747255a8f3c2d4432ab4e8ca139e83a4 SHA512 271767ff717c9324a34c3ae1964a6a428f83e97d002be6df797cadc809768a198ab090cb313e5aa3bc9fd22d029f2cf17c3612f51e154e140a552bfdf9cb55f2
 EBUILD openssl-compat-1.1.1o.ebuild 7828 BLAKE2B 5f374aadbd173b82e7b2a1fd1de1f166e8f46887d96bcb889eb7baf8e3621e6dc4ac5998b4540bd2958cdecb38d827f3039da535be526d947dfbe00ddd08c413 SHA512 0ba38b74bca90d5a6848894bbe163b7d9f5019ea096f7bb02206ce91616bc6753c493be6546b592cdf49fccb535f964f1cc8c8a312b801db0fec09c36b9ea7a6
+EBUILD openssl-compat-1.1.1s.ebuild 7672 BLAKE2B e57cd370b40e51c7760210991ac26ee5a83f8c237dda83d2ffd674eafbd78a256ad162151832dfa219a56edabaf21708c6cf1c66f74facb18a104f680667974d SHA512 8e9ea75d023cc9321d6499bfad17ab2537c26d969656f8df2530aa36e2a6de2b13b949531366a8a5e6579a3008f786e713e15f0886b7b7179459cd8f46a55b75
 MISC metadata.xml 1223 BLAKE2B db6fe704a4a09590821cd011556759cfd60543fd531fef3bd233378f396ac5e67c7d834eee4e544995c3af02dc9f222ac787e0b8a1c48a6cadd06541c81372fb SHA512 3cd0b3d8ba2c2c31d3240a080c0edf61a3b090adb4bb14c3b79c9cd1f0c0ac332a9c9457b218a09fb9192cc82004dba57cd4cac404fdd5ddfe4f0c7780b596cd
diff --git a/dev-libs/openssl-compat/openssl-compat-1.1.1s.ebuild b/dev-libs/openssl-compat/openssl-compat-1.1.1s.ebuild
new file mode 100644
index 000000000000..7f129274d627
--- /dev/null
+++ b/dev-libs/openssl-compat/openssl-compat-1.1.1s.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
+inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
+
+MY_P=openssl-${PV/_/-}
+DESCRIPTION="Full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="openssl"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!=dev-libs/openssl-1.1.1*:0
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+		kernel_linux? ( sys-process/procps )
+	)
+	verify-sig? ( sec-keys/openpgp-keys-openssl )"
+
+# Do not install any docs
+DOCS=()
+
+PATCHES=(
+	# General patches which are suitable to always apply
+	# If they're Gentoo specific, add to USE=-vanilla logic in src_prepare!
+	"${FILESDIR}"/${PN/-compat}-1.1.0j-parallel_install_fix.patch # bug #671602
+	"${FILESDIR}"/${PN/-compat}-1.1.1i-riscv32.patch
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl doesn't work with userpriv!
+	if use test && use sctp; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_unpack() {
+	# Can delete this once test fix patch is dropped
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${P/-compat}.tar.gz{,.asc}
+	fi
+
+	default
+}
+
+src_prepare() {
+	# Allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	# Keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		PATCHES+=(
+			# Add patches which are Gentoo-specific customisations here
+		)
+	fi
+
+	default
+
+	if use test && use sctp && has network-sandbox ${FEATURES}; then
+		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
+		rm test/recipes/80-test_ssl_new.t || die
+	fi
+
+	# - Make sure the man pages are suffixed (bug #302165)
+	# - Don't bother building man pages if they're disabled
+	# - Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# Quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (bug #417795 again)
+	tc-is-clang && append-flags -Qunused-arguments
+
+	# We really, really need to build OpenSSL w/ strict aliasing disabled.
+	# It's filled with violations and it *will* result in miscompiled
+	# code. This has been in the ebuild for > 10 years but even in 2022,
+	# it's still relevant:
+	# - https://github.com/llvm/llvm-project/issues/55255
+	# - https://github.com/openssl/openssl/issues/18225
+	# Don't remove the no strict aliasing bits below!
+	filter-flags -fstrict-aliasing
+	append-flags -fno-strict-aliasing
+
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	# Prefixify Configure shebang (bug #141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+
+	if use prefix && [[ ${CHOST} == *-solaris* ]] ; then
+		# use GNU ld full option, not to confuse it on Solaris
+		sed -i \
+			-e 's/-Wl,-M,/-Wl,--version-script=/' \
+			-e 's/-Wl,-h,/-Wl,--soname=/' \
+			Configurations/10-main.conf || die
+
+		# fix building on Solaris 10
+		# https://github.com/openssl/openssl/issues/6333
+		sed -i \
+			-e 's/-lsocket -lnsl -ldl/-lsocket -lnsl -ldl -lrt/' \
+			Configurations/10-main.conf || die
+	fi
+
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# bug #197996
+	unset APPS
+	# bug #312551
+	unset SCRIPTS
+	# bug #311473
+	unset CROSS_COMPILE
+
+	tc-export AR CC CXX RANLIB RC
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths, bug #460790.
+	local ec_nistp_64_gcc_128
+
+	# Disable it for now though (bug #469976)
+	# echo "__uint128_t i;" > "${T}"/128.c
+	# if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	# 	ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	# fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# "disable-deprecated" option breaks too many consumers.
+	# Don't set it without thorough revdeps testing.
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	local myeconfargs=(
+		${sslout}
+
+		$(use cpu_flags_x86_sse2 || echo "no-sse2")
+		enable-camellia
+		enable-ec
+		enable-ec2m
+		enable-sm2
+		enable-srp
+		$(use elibc_musl && echo "no-async")
+		${ec_nistp_64_gcc_128}
+		enable-idea
+		enable-mdc2
+		enable-rc5
+		$(use_ssl sslv3 ssl3)
+		$(use_ssl sslv3 ssl3-method)
+		$(use_ssl asm)
+		$(use_ssl rfc3779)
+		$(use_ssl sctp)
+		$(use test || echo "no-tests")
+		$(use_ssl tls-compression zlib)
+		$(use_ssl tls-heartbeat heartbeats)
+		$(use_ssl weak-ssl-ciphers)
+
+		--prefix="${EPREFIX}"/usr
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
+		--libdir=$(get_libdir)
+
+		shared
+		threads
+	)
+
+	CFLAGS= LDFLAGS= edo ./${config} "${myeconfargs[@]}"
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+
+	emake build_libs
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	dolib.so lib{crypto,ssl}.so.$(ver_cut 1-2 "${SLOT}")
+}
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index ee780f1c01bf..e185850a182a 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -4,5 +4,5 @@ DIST poco-1.11.2.tar.gz 10935312 BLAKE2B 66b4cdb6cb4b5dd4f5f0eee744e1d147d66e985
 DIST poco-1.12.2.tar.gz 11268579 BLAKE2B fe23216884d1effb7e93072c5e90d5eabf813c6cf0326af5c4b6d3646d54e5411966485e97d50960df97cd545b3a265eb4b43c1cb041ff97b4457f53f6bd06bc SHA512 86b6b106e9a677397c73139e949a65925e78611cad478fc4206a6a7365613307fc1549b1160faf6ca8f02fb7f7ae58858c3913cb701111b7cbb5ffcbe5363bb3
 EBUILD poco-1.10.1.ebuild 3785 BLAKE2B ca9eeac5cedc288c23fef5400d2428704b09aa707fcdbe02d12d9905caf3d72beed144a1588e6a440c66f59751f7b7e3d9e81cbcc86acbfaee0dd27222e54028 SHA512 f67bb94b6b08ed7f5d17d3c3b6f7186d7d7bd834bb8eedf1db045e001d683ac8ddc3be94ef3e2e1e0a27c65ee5b88525e46208907dfda88c7b17fa5d4c1261d6
 EBUILD poco-1.11.2-r1.ebuild 3964 BLAKE2B ac053087d7eeca9274152973fd7a9a2ed21ac99c7c6aa5b85dce4667f9063e8c93c177a7ce0ef678950a80a17e8001ff8a497a367e3f57411501ef73192cc1f8 SHA512 950f19be0ef462fc7312f4c1bb2d2f74e3e15766d8c1345ae884219415df01b00b76fba3ac8110183e73908be848d4259a6c31633275de27981836afffd7a180
-EBUILD poco-1.12.2.ebuild 3970 BLAKE2B ba2c33b9dc9eb551259ba89b6371c5bdb1fe8db14bf767e6578bc19b4cf3ef0749f0211456a0e75b9c2699995257a6956cd1932440b1f85e091e8eee8ef06855 SHA512 36b0ea3cd6c5fe321f284f7da5ef9ef250a3f244e19c4e6201ab4350d2a1b443a4614c63008315f1edff8a5cf96d576f2504c3c872a289fe15cbc38f4deede8c
-MISC metadata.xml 2718 BLAKE2B 12755bed35c458a4e7e5d7c66681970d533e9c2bf9222e4a0599769251ef9b9c252be48e8e0155b32f69769e200cf1fb14435020cfd57937a50b290d719c586c SHA512 2688e2a138ab997e70fd21f8dab00aa60513cb9fa8112f690570fe3059be3084610cff97d11262900c6907fdde69b5a12e7cbe81266f7ac76c44966b16b12313
+EBUILD poco-1.12.2-r1.ebuild 4016 BLAKE2B 8d3cf023d1ead1584f44bb668a3b0e8e0dac5b0ea20d68bbc24cebfe49efb44952b576a2c110f8b47968983c85bdfd8ce2753ebe59e259993da1f16e479c1e9c SHA512 199df50e77dd646628d2bd9815b405c533fac278509a23568138c561bad2856aa6470b68c8863efd684279bb214632cfde91796940f2f806320a07fa4c563caf
+MISC metadata.xml 2851 BLAKE2B ebfb720cf7dd8bda9f0e1af356b22eb4e9461c179d965b8ac01d654ee7d9424436c223acf6782bfb5db98e49eb04808861795d980e0dfac7ebe6e5913e078b9f SHA512 32194a768ebc061ecf8859bddc86d89c2215c0017878800f580f47002010d7d57959f89ee8c74bf0e4b2d865d8e3b37f52a523a2b9289a1486fabc147ba52e1d
diff --git a/dev-libs/poco/metadata.xml b/dev-libs/poco/metadata.xml
index 5f1faf2571bf..47052fc34e8a 100644
--- a/dev-libs/poco/metadata.xml
+++ b/dev-libs/poco/metadata.xml
@@ -33,10 +33,11 @@ done quickly and working on the features that make their application unique.
 		<flag name="7z">Add Support for the 7z archive format</flag>
 		<flag name="activerecord">Add ActiveRecord support</flag>
 		<flag name="cppparser">Build and install a minimal C++ parser</flag>
-		<flag name="crypto">Encryption and digital signing classes</flag>
+		<flag name="crypto" restrict="&lt;=dev-libs/poco-1.12.2-r1">Encryption and digital signing classes</flag>
 		<flag name="data">Database abstraction layer to easily send/retrieve data to/from various databases</flag>
 		<flag name="file2pagecompiler">Utility to convert ordinary files to Page Compiler source files</flag>
 		<flag name="json">Add JSON support</flag>
+		<flag name="jwt" restrict="&gt;=dev-libs/poco-1.12.2-r1">Add JSON Web Token support</flag>
 		<flag name="mariadb">Prefer <pkg>dev-db/mariadb-connector-c</pkg> over <pkg>dev-db/mysql-connector-c</pkg></flag>
 		<flag name="mongodb">Add <pkg>dev-db/mongodb</pkg> support</flag>
 		<flag name="net">Classes to write network clients &amp; servers</flag>
diff --git a/dev-libs/poco/poco-1.12.2.ebuild b/dev-libs/poco/poco-1.12.2-r1.ebuild
index 33b7323596c5..b1bc0558e7d7 100644
--- a/dev-libs/poco/poco-1.12.2.ebuild
+++ b/dev-libs/poco/poco-1.12.2-r1.ebuild
@@ -13,12 +13,13 @@ S="${WORKDIR}/${PN}-${P}-release"
 LICENSE="Boost-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="7z activerecord cppparser +crypto +data examples +file2pagecompiler iodbc +json mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc postgres prometheus sqlite +ssl test +util +xml +zip"
+IUSE="7z activerecord cppparser +data examples +file2pagecompiler iodbc +json jwt mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc postgres prometheus sqlite +ssl test +util +xml +zip"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	7z? ( xml )
 	file2pagecompiler? ( pagecompiler )
 	iodbc? ( odbc )
+	jwt? ( json ssl )
 	mongodb? ( data )
 	mysql? ( data )
 	odbc? ( data )
@@ -46,7 +47,7 @@ RDEPEND="
 		dev-libs/openssl:0=
 	)
 	xml? ( dev-libs/expat )
-	zip? ( sys-libs/zlib )
+	zip? ( sys-libs/zlib:= )
 "
 DEPEND="${RDEPEND}"
 
@@ -98,6 +99,7 @@ src_configure() {
 		-DENABLE_DATA_POSTGRESQL="$(usex postgres)"
 		-DENABLE_DATA_SQLITE="$(usex sqlite)"
 		-DENABLE_JSON="$(usex util)"
+		-DENABLE_JWT="$(usex jwt)"
 		-DENABLE_MONGODB="$(usex mongodb)"
 		-DENABLE_NET="$(usex net)"
 		-DENABLE_NETSSL="$(usex ssl)"
diff --git a/dev-libs/qxlsx/Manifest b/dev-libs/qxlsx/Manifest
index d5f96323ff42..fd59d5ad0b2b 100644
--- a/dev-libs/qxlsx/Manifest
+++ b/dev-libs/qxlsx/Manifest
@@ -3,5 +3,5 @@ AUX qxlsx-1.4.4-qtdefs.patch 737 BLAKE2B c104e0f129beaca20726ce939c881e79af7606f
 AUX qxlsx-1.4.4-qtversion.patch 3193 BLAKE2B 1e9534bf4361ff0927ed77ba58c38e0ffa219245dc2cd8b314da1ff8c6331a80190df2c97fc67babae112f40e74d4f9d4369ac21c474c0c9df596d5788f312d7 SHA512 c8d46be8a08bf1134403ccea329b021b4cb5e2e6394ff11230b02b1316396490ccc4cab17a7970df7be6fb4329afd7d4184acadb9b2adab938274a3fe5c58f34
 AUX qxlsx-1.4.4-soversion.patch 682 BLAKE2B defb2375ec4ff00e6f042cdf20b52d7983d77806a335b301a1c799679d2da887b88458ed3e024bc085c26d6f6a9f8450868076d969eed8f608b80f30dfe8f14c SHA512 5434a4da6f58fd2aad1ade38b00ce8f48df73e519ef375b9bc7b014cfeb4601912bdc81e9b13529147b97800d6b0ff97fc8669a774f0dcb7814d5189fe90c6d1
 DIST qxlsx-1.4.4.tar.gz 4703732 BLAKE2B 0acf5e708f4dc981723a34b524c820a53a66cb13bf1ce5a1086106230e45dcac2ea6587b3c4ca039de491565ac886a2e5bd1225ee39437ee89a2ff7560da6fd7 SHA512 e6c3dd8822f2a8ab8bcd1a7434db7b202291e3d8de407e4629bdfc1afef507b57da4bc4a715d57b8d75915ce4b623189269083824c35d8e02d49d3e8909cceee
-EBUILD qxlsx-1.4.4.ebuild 1122 BLAKE2B 5459d5af1c8e07fe7c2c87be4cdf1db10e87e58a3feb4355689a79d2277353262b4e8dcae899483be90438200f5c21bd59819e848559ebefbe0c72c0d93bc5b7 SHA512 3887a950077b7624debb4e2764c65dfc73aed99a203cecae67dc8cee046b534c7650aac099795d194356d5a33cdf59f00eeb8feaeca1d371cbdef670b01dcf4f
+EBUILD qxlsx-1.4.4.ebuild 1129 BLAKE2B e23f75b5f8ca88d81e93fc7897293bd2dbe4d5180e04c3c64e64781e1306cd7102660a216421076ae6b993aabb61476b9e056ddd2aa294168a616a4c837b07f6 SHA512 cc78c2bc55f3ac155c5a1bb04ef288bca40711a54e344ca4bcbd7d2576661aeef832798cb943b2589368098fbb1c44de989dc2631c8cae825fd0aee7ed3b8357
 MISC metadata.xml 451 BLAKE2B 72b39f0c97bb2d329e87abf678364a963a0e1cceda24106ed304f50258418595349f2b88ad5d34b82677dda655d20b05176d7bd8b2e2ca2215bcf1264b5412cc SHA512 5e9172c378f82bd9fbe16f8acbc877934ebac97d5603ad471f5ad0e4c729f69fb7942125ad7cd70047a28b78b63f3fc670023018cee113061ed2a668c5fd2897
diff --git a/dev-libs/qxlsx/qxlsx-1.4.4.ebuild b/dev-libs/qxlsx/qxlsx-1.4.4.ebuild
index 2abdd125d872..df0c84a4e3c9 100644
--- a/dev-libs/qxlsx/qxlsx-1.4.4.ebuild
+++ b/dev-libs/qxlsx/qxlsx-1.4.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/QtExcel/QXlsx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 # soversion
 SLOT="0/0.${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 IUSE="qt5 qt6"
 REQUIRED_USE="|| ( qt5 qt6 )"
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 24d52c24553a..bf32ce980401 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -1,6 +1,6 @@
 DIST xapian-core-1.4.19.tar.xz 2994860 BLAKE2B 9566df1646192370e346c1b0d1e1cda68034fe5d3ab94835709f969df643fd36da49a58a2d3b4177a42faf5af2e71df771277848169ae62f94fe0bb0378ba6aa SHA512 d596058d7f9bfa0b73c5b6354331a799936b45f27012894f6792872ade8656bb0387b504aea8c1c3edfbd48787190452e7a49d2b62d181cb050c46edd3e67346
 DIST xapian-core-1.4.21.tar.xz 3018384 BLAKE2B 61a25ee381c84e0a9f20650d94aa097225f2e947dafad7f6b5497db74f383f5b0fcf277a35ea27ff461b34cd2a9a0b6333f88264c5817cff09a2caf42fa3b398 SHA512 4071791daf47f5ae77f32f358c6020fcfa9aa81c15c8da25489b055eef30383695e449ab1cb73670f2f5db2b2a5f78056da0e8eea89d83aaad91dfe340a6b13a
-EBUILD xapian-1.4.19.ebuild 1885 BLAKE2B 564a230f9ab784c55be59808404b631b9653ddec0befcc396bd71bbf23fec1c3de92a66d40dbfa6805701c659c48b8ef511958e9d42e12767dde12e586292ffe SHA512 9eafa08e04443a43e3d3346fd2d46fcba30c624cda8b84404cc5bd098dc6186b612545bcfbf34952e419ef1029efecbc1e27a66539de7f628cd5455121b5aa66
-EBUILD xapian-1.4.21-r1.ebuild 1442 BLAKE2B 11616926e8253292615ac885cafb21cf4f7a51e5bcc1300ba9b82be07948f3a3ed91271077a80c27311a907b69d832bfa561d6345a9867b446bf0abca3fbfd24 SHA512 a56e927607f735a0036bc637fb8f11cef8d9e9d29205324f190fd6c2071e8c3deea848eeb69f0936db687665014f411763abe8f814949fdf14b258c4c96453f4
-EBUILD xapian-1.4.21.ebuild 1887 BLAKE2B 6f8f4ac199015688467a276722492d998f336787f7a86fd2acc6feac078cd7cc1eb369d16113ee20c520096952c8a703280bb52a00376f61ce5bcbd015734e8f SHA512 531816d16c35969bc05a1c886d46c74553b6459b7151fabd7487cf81a055d3072cb1f52f919f356b45a4cae25f83025f10da396c550599b9c0a54971ea502572
+EBUILD xapian-1.4.19.ebuild 1881 BLAKE2B c35cd8b3aeccab24d62187fb405ed78a83d073ccfcda27caccc29461a2f1f16f7122ad462c796c9ca3527d26f2f7d72805be83dc1cc8a40c49ea5ef574e6cf33 SHA512 58770b49391f37da0322b208d6fdc21478138deb978aa7032625b82a34c43613aec973666466e7175ad0e8e739c573767600d0ca2aa4c0b882cad70386d2644d
+EBUILD xapian-1.4.21-r1.ebuild 1438 BLAKE2B 3c120dab585a626f629ea5ce1bb462b3fbd679fd68402b754bdfe19f27486afc432ac994c86957f025f0705f89654c75b3a837c0cbeb64d532310805168caa31 SHA512 e31d28ece3aa699d98cdcf49868ca7d134557c89e1ab79d5d58806e17f3dcb2b4b443a112c2e6132c3b44f826d243a0dba032a31bbf817fc2ddbfd0dd06c39f1
+EBUILD xapian-1.4.21.ebuild 1883 BLAKE2B 8103088fda7b818945e3a6bce9ca79ca0179393595915a55a6175efb573b688eb4b503a1bb52f3d9bc85c0ad3c40b281e473a5dfe399f9933d3301db2f6e6f41 SHA512 a5495a2ffc0b635126e3d422630eb128f51bc32c076f675aa6bff6fdb628c1086ba73254c19be49ca50f4bf555f47551705da9d393197231ca3f70581b180f64
 MISC metadata.xml 813 BLAKE2B b365d558fc9e5c1c86d9dfb90624fb27f4c502303fb602c7f21c9b392f729160cb1e7f56120d276d4fadeb88c616fca81912e5473b5273cc5841693d507f51d7 SHA512 0a40218154223a4ac13301ef324d925fd56d74749fa289c9a6d19cee7348f781430491fa65991bedc89aaaef9b0a0dd725eda49edcc993df506884b9cf3289d2
diff --git a/dev-libs/xapian/xapian-1.4.19.ebuild b/dev-libs/xapian/xapian-1.4.19.ebuild
index 00fe7b8f5d51..757d51d72f7e 100644
--- a/dev-libs/xapian/xapian-1.4.19.ebuild
+++ b/dev-libs/xapian/xapian-1.4.19.ebuild
@@ -8,7 +8,7 @@ inherit multilib-minimal
 MY_P="${PN}-core-${PV}"
 
 DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="https://www.xapian.org/"
+HOMEPAGE="https://xapian.org/"
 SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
diff --git a/dev-libs/xapian/xapian-1.4.21-r1.ebuild b/dev-libs/xapian/xapian-1.4.21-r1.ebuild
index fea1a23cc14a..383e75d11a63 100644
--- a/dev-libs/xapian/xapian-1.4.21-r1.ebuild
+++ b/dev-libs/xapian/xapian-1.4.21-r1.ebuild
@@ -6,7 +6,7 @@ EAPI="8"
 MY_P="${PN}-core-${PV}"
 
 DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="https://www.xapian.org/"
+HOMEPAGE="https://xapian.org/"
 SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
diff --git a/dev-libs/xapian/xapian-1.4.21.ebuild b/dev-libs/xapian/xapian-1.4.21.ebuild
index 28fb18bb8c23..57571b3c92a2 100644
--- a/dev-libs/xapian/xapian-1.4.21.ebuild
+++ b/dev-libs/xapian/xapian-1.4.21.ebuild
@@ -8,7 +8,7 @@ inherit multilib-minimal
 MY_P="${PN}-core-${PV}"
 
 DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="https://www.xapian.org/"
+HOMEPAGE="https://xapian.org/"
 SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"