11 files changed, 280 insertions, 128 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 82f0382e2a69..5544c944a209 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index 797ce3b999f9..8e1702715801 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,10 +1,7 @@
-AUX appstream-0.15.6-disable-Werror-flags.patch 1322 BLAKE2B 1e21a235c19e27230eb6ba8a094d8f14f02f0d3e6817dd5aa7e48e3da90c11ef37a813b28d05660eff7f50176eec2148a9c33c3483513ad79ea46bcee0e5e815 SHA512 8552f98316b9ba98f51c9ba799dc2e43b3cb684d03428c6405d0d0d9fcef8b3df78dcd64d495ef75dddbf3e348768df655be3f84b0c12232013ac9061fd73450
 AUX appstream-0.16.4-disable-Werror-flags.patch 1409 BLAKE2B 636a05a039450ff74d64b4b16d77f2c816c341d13fd4d59584e02306a3f891a8792a6aa62f5c190a08eb1574dd54126a0c5fa8891958fa33193cb485d97566ff SHA512 0867811a25714624149bbcb207214f7c912482d91f0255f6c208909f489db74b24811d634557830a7965b3b87e11d01a1dbb1d8381ae91bfb834c155b8645808
 AUX appstream-1.0.0-disable-Werror-flags.patch 1297 BLAKE2B e8b9bc262d39332f5390f7292b26d2c832326b96f0698b872c3d04b8f86ad0a492d0583f91886ee14698e84f91606c1944210eef858c892c9164b768aa912d1b SHA512 e5df79dda5f433c67dd0b02c681e04cde22e6648a4d438a50314575e37353686fbcbc4fd56ee209095f71498d0e553b4d061e328fcc740b19ab7ae9281b85423
-DIST AppStream-0.15.6.tar.xz 2517688 BLAKE2B 09519205c7dfc5f0715b9d5ae7e99a67673ab499f1e2cb39815edde64defc1aa5059215575278bbcfc4482cd385a79e081c70f6acea3c446c5869dc6b2e18f6c SHA512 7426bc89e22b751de7b3e27d7c07eb1c373f4439f9966868ce5ea410d209b8c5292e03695a34b7a49bfa61e2e62265c7f7cdffc0be871c950193c933f65757ef
 DIST AppStream-0.16.4.tar.xz 2570176 BLAKE2B ac051b846fd1c7b0cbb3429e0b4c3f81027cddb35ee6bcd5e9d38a09d937abcc37ac4908f68ec55404ae852fd146b4e749832d3ac96443458e86cfe506a6fed4 SHA512 e3a9fc423fe5a2baaaa002871566f320ecd6dbd3a01ab24221afe9b93a69e9afb6bed6d7772c434376501803dc7b2c80b79eda849fcaf4748f9f24a5908a22a8
-DIST AppStream-1.0.2.tar.xz 2629708 BLAKE2B eb31e675cea1c8b9357227c851bdd24f9cb949e232089380a8727630ab8055f0de6bebd74f70f3c1cf84e5420b9d4fef681671a0e4e97265af26d594b2874c48 SHA512 e5c109c383e3bf3af3693bfb3146663767c2c61fac0bd421f2ce52242fe7b869effeacc4d207987321dfeb4ab0ba77ece6c1c6eea054a7365204cd955426517a
-EBUILD appstream-0.15.6.ebuild 1855 BLAKE2B f011e0119b72afe5444ba203f5f46d5505de1c2159f5f914ddbaa6e55b25ccba68e7b072a8241b4c5ba6d4ae7efd8e65b490c7cc9ce2a9c3bb61706068bfcde9 SHA512 341fea8c66db13fd0fe3661264d21a8c9c4e73ec90f3fc2a27ed63a330a75c5d961fa18310e9b1475fd68528ba487508d37855133e9056172da75258d644365c
+DIST AppStream-1.0.3.tar.xz 2644220 BLAKE2B cd7aa28b49c23229ee48b9a69e57a08244f81115e23525695e463930d2296daf80b5c7bb098c89726c220caec8c3e072fd85d77ac808e96c5cf2ff0488ba4ba1 SHA512 9b70d965966d55dbcc6a62d85525fdd5990a28abb1d94b2df91ab1549c24ce9c40d95e2d761c2f24e0c61fe5b74ab6a1f829dda387a8282aa9dff9198dc9610d
 EBUILD appstream-0.16.4.ebuild 1934 BLAKE2B 2dbde137dd2c95e6e089689c3edc870f8385ba970670eec759dd34641570db9df8f6432cceb382267a8a3b38da40f8569310ad277b602622b4d5f6ede091803e SHA512 69fadebe2dba03287672884a454a7c2838f88b7a8b722ae75bac41a41188a690193bc7257ee7fffd7f8e537e665e56b1a6c145622d16c6b8ac99a4d52bb0f0d9
-EBUILD appstream-1.0.2.ebuild 1929 BLAKE2B 4f284995bbb1c13573be71d9f1fe2533faf65010dc7ee7bc9f10043a2629d5c8924468191fd9c1e34d00b91758060f675575251105424fc7b4e28ec1d2325988 SHA512 9c7492c57695b80a83e2c04634e4fca30079bcbc8b92a5af2b1cf188ef1ae43aaf5926f507cdbad2f1e1e9c3ed7fd0f0a30aa53b4eb49b17a5b81f3d50083049
+EBUILD appstream-1.0.3.ebuild 1929 BLAKE2B 4f284995bbb1c13573be71d9f1fe2533faf65010dc7ee7bc9f10043a2629d5c8924468191fd9c1e34d00b91758060f675575251105424fc7b4e28ec1d2325988 SHA512 9c7492c57695b80a83e2c04634e4fca30079bcbc8b92a5af2b1cf188ef1ae43aaf5926f507cdbad2f1e1e9c3ed7fd0f0a30aa53b4eb49b17a5b81f3d50083049
 MISC metadata.xml 400 BLAKE2B c9855a1e3650a66c8b42fb9055d6de0aa0575ed86bb1e8695d112f2e7cdfbd5f55d6805dfeb0ed19c3354ee3cda8208fd8a4adf4e8313e791493fa1730fb32d9 SHA512 9723ac7481f748429bddde7579b81c7db2dfad2ecd5150c1c4023843c5ef47e02ce41ff43508437ae60ba427a072d09e8d46a6e6b82fc946ea3af71dd71c52f2
diff --git a/dev-libs/appstream/appstream-0.15.6.ebuild b/dev-libs/appstream/appstream-0.15.6.ebuild
deleted file mode 100644
index 22035505fdee..000000000000
--- a/dev-libs/appstream/appstream-0.15.6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson xdg-utils
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ximion/${PN}"
-else
-	MY_PN="AppStream"
-	SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
-HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
-
-LICENSE="LGPL-2.1+ GPL-2+"
-# check as_api_level
-SLOT="0/4"
-IUSE="apt doc +introspection qt5 test"
-RESTRICT="test" # bug 691962
-
-RDEPEND="
-	>=dev-libs/glib-2.62:2
-	dev-libs/libxml2:2
-	>=dev-libs/libxmlb-0.3.6:=
-	dev-libs/libyaml
-	dev-libs/snowball-stemmer:=
-	>=net-misc/curl-7.62
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-	qt5? ( dev-qt/qtcore:5 )
-"
-DEPEND="${RDEPEND}
-	test? ( qt5? ( dev-qt/qttest:5 ) )
-"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxslt
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	doc? ( app-text/docbook-xml-dtd:4.5 )
-	test? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-disable-Werror-flags.patch ) # bug 733774
-
-src_prepare() {
-	default
-	sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die
-	if ! use test; then
-		sed -e "/^subdir.*tests/s/^/#DONT /" -i {,qt/}meson.build || die # bug 675944
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local emesonargs=(
-		-Dapidocs=false
-		-Ddocs=false
-		-Dcompose=false
-		-Dmaintainer=false
-		-Dstatic-analysis=false
-		-Dstemming=true
-		-Dvapi=false
-		-Dapt-support=$(usex apt true false)
-		-Dinstall-docs=$(usex doc true false)
-		-Dgir=$(usex introspection true false)
-		-Dqt=$(usex qt5 true false)
-	)
-
-	meson_src_configure
-}
diff --git a/dev-libs/appstream/appstream-1.0.2.ebuild b/dev-libs/appstream/appstream-1.0.3.ebuild
index e59ebce431a1..e59ebce431a1 100644
--- a/dev-libs/appstream/appstream-1.0.2.ebuild
+++ b/dev-libs/appstream/appstream-1.0.3.ebuild
diff --git a/dev-libs/appstream/files/appstream-0.15.6-disable-Werror-flags.patch b/dev-libs/appstream/files/appstream-0.15.6-disable-Werror-flags.patch
deleted file mode 100644
index ca50493e4fd6..000000000000
--- a/dev-libs/appstream/files/appstream-0.15.6-disable-Werror-flags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/meson.build	2022-12-22 23:48:12.000000000 +0100
-+++ b/meson.build	2022-12-24 22:15:49.620891586 +0100
-@@ -95,43 +95,6 @@
-   endif
- endif
- 
--# a few compiler warning flags we always want enabled
--add_project_arguments(
--  cc.get_supported_arguments([
--    '-Werror=shadow',
--    '-Werror=empty-body',
--    '-Werror=strict-prototypes',
--    '-Werror=missing-prototypes',
--    '-Werror=implicit-function-declaration',
--    '-Werror=pointer-arith',
--    '-Werror=missing-declarations',
--    '-Werror=return-type',
--    '-Werror=int-conversion',
--    '-Werror=incompatible-pointer-types',
--    '-Werror=misleading-indentation',
--    '-Werror=missing-include-dirs',
--    '-Werror=declaration-after-statement',
--    '-Werror=format-security',
--
--    '-Wno-missing-field-initializers',
--    '-Wno-error=missing-field-initializers',
--    '-Wno-unused-parameter',
--    '-Wno-error=unused-parameter',
--  ]),
--  language: 'c'
--)
--add_project_arguments(
--  '-Wno-unused-parameter',
--  '-Werror=shadow',
--  '-Werror=empty-body',
--  '-Werror=pointer-arith',
--  '-Werror=init-self',
--  '-Werror=missing-declarations',
--  '-Werror=return-type',
--  '-Werror=misleading-indentation',
--  '-Werror=format-security',
--  language: 'cpp'
--)
- add_project_arguments('-DAS_COMPILATION', language: 'c')
- 
- # Vendor extensions in system headers
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 3a56c1b748ea..6f1f7c55eb6f 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -4,7 +4,10 @@ AUX apr-1.7.2-fix-pkgconfig-libs.patch 963 BLAKE2B fb36bb31050286064e17c2a9c9f3d
 AUX apr-1.7.2-libtool.patch 517 BLAKE2B da77ee1d94bc2bd46d4ef97f18f018fbcc67cceb17162787f0e2f02e7ae205f80121166551a90b62e24d77c5f4313a2fa68b90dca713923b1a78e649bcca70da SHA512 4e09e88bd2d9e5f25a1edc52bdb632b0e73b28d971a9b0974bdcff9f8217ef2abe5c3ab3ef8a592e56c272bf928569e5a9be78bd3124afafb5954b6b8ee6d0eb
 AUX apr-1.7.2-respect-flags.patch 652 BLAKE2B e9cef7a8eff52a0d1799c261b377026849d8b65770a9e6b1d93f936d5d6533635827d6bdada9cbfdd8f274b191234d4b07ec7afa640383cac965562153c54164 SHA512 8305861c1196bbc5262bdc5d9fe87ef7d5d38d827d829455db2007036c70d749901bc3d2b63570528a70dfb3ff6171e78b54ceaea8c9646e4aa53c173440e70b
 AUX apr-1.7.2-sysroot.patch 1399 BLAKE2B 921694b66e2a0fe687ec9acb7458b1c860c12665e553aba4e043d56732bc0adc944c7bdd609dd001fcf2c9716b30989a47207506d3ad9c0141174848ce6ad70c SHA512 0dc3cb41fa8ab909c14e3650f755a061b5a0fab052b6b94c16678af58013841614ff9a407c82764cd3435db5b1d5d5a5ce41bb1b430dae0b272cffc438e49003
+AUX apr-1.7.4-config-cross.patch 697 BLAKE2B 2968ec992b9e4bf94c2d0817b8d5140a091476da060a88aec9dbbb00c364f6b4a0ed0761c1589092ff9af87cbf734debb9dc1188b178b7bb6aba4eb0b46f08de SHA512 7ce8e7771b763aecb9a9ed7467aa2620b24db6a50e2d8789ef3d131acd9492e9cf2d8ed27c7a89c5208c1e53edfb525235dabddf946c644f1aa2fa9fb768623e
+AUX apr-1.7.4-config-libdir.patch 802 BLAKE2B 28652eec482658ef4c0d3baad45a097b07813258cbad049f336b7f14b83d9edf3a90f867d9efc8e6d29215f15fcbf8631801ee126894ee057d99094b670d80f5 SHA512 ad516498d9c278496b22f2b3becaa4ace3e24388121b00a7e326e046d0385c31b8ad505c1cccf81960bb5b73afa80d3499b2fa6119e0525ff925d26b85f37792
 AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4af9e65169c1c5862c3fa3532cc02df8e084b540e7a81091c3b16d50388c6234cba469b15fff896d0428fc SHA512 3a87e718859c8f95793f828b764d240907d65c21fe2c99143815ab835f8b657154092c4ad496e86d79490bd85ef03d394d3acb57a15186f2f06a518b32d77fdf
 DIST apr-1.7.4.tar.bz2 894526 BLAKE2B a93b9d3f2c46fe0a34ce1d544e7a43ba40720e2fae8b8a7d0957413ac695057902378dbf96f067ced7486da86c8e513b7fbd48fa79839efeeb40a3295fe2d3df SHA512 2342c997765ea2ca96eac158e5fd260232dba68fc41b90a79a7ba9b25c539fc217981867362090e0ebebe632289257c342275e3c5baedb698c474ef8f49a9dcd
 EBUILD apr-1.7.4-r2.ebuild 4376 BLAKE2B 36bf924e908a129f3f21ee8baa038aa1277e6c80e263155e2db8bb972fab6c0be51f05ff739c6fd4a97f8e132f15f334a9ae257059a9a50e29342d9e9f09d169 SHA512 f3c0d8c7858e2b82e39a1410a43a7f669d9aaf93101e8c5f8b81a034e972f8b560a5211f3289919fad203a17789d6e7e58293bfcb9471ef48bc756d670be9ad2
+EBUILD apr-1.7.4-r3.ebuild 4422 BLAKE2B e8dce0c1dfcf7507286e34b33bb2d11031dee0e6255652fa10b9697c65ca87667182e3f7853513e2d3475971a8cd3091441893d56d0a5f80606d06bcef11fc69 SHA512 e7b45efc34a65084e7e39f67bae585b20f945dada77fe948ac0b273070697672ee728115e49fd5995d528ebddc161be058703a4ea48a277b96bf691251986f1a
 MISC metadata.xml 487 BLAKE2B 826e5b4b8b87d0077f1b2063ae1c808447987ddea524eeb4cdd17d60bea8b3919a2a714cdb0706cf758dfcf86109b702399c04dd054872d8465e1f6b3469c795 SHA512 9e8fbae61974080394151944ca7e2fec92a6c99b2c2fe75dc2486dced890933ac4694c8ac2984504bbfe42706bed6895b7d5fe9f9a9ced96c5c0ead8016f4366
diff --git a/dev-libs/apr/apr-1.7.4-r3.ebuild b/dev-libs/apr/apr-1.7.4-r3.ebuild
new file mode 100644
index 000000000000..a7f6b6d58e1d
--- /dev/null
+++ b/dev-libs/apr/apr-1.7.4-r3.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Apache Portable Runtime Library"
+HOMEPAGE="https://apr.apache.org/"
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1/${PV%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc old-kernel selinux static-libs +urandom valgrind"
+
+# See bug #815265 for libcrypt dependency
+DEPEND="
+	virtual/libcrypt:=
+	elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-base-policy )
+"
+DEPEND+=" valgrind? ( dev-debug/valgrind )"
+BDEPEND="
+	>=dev-build/libtool-2.4.2
+	doc? ( app-text/doxygen )
+"
+
+DOCS=( CHANGES NOTICE README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
+	"${FILESDIR}"/${PN}-1.7.2-libtool.patch
+	"${FILESDIR}"/${PN}-1.7.2-fix-pkgconfig-libs.patch
+	"${FILESDIR}"/${PN}-1.7.2-respect-flags.patch
+	"${FILESDIR}"/${PN}-1.7.2-autoconf-2.72.patch
+	"${FILESDIR}"/${PN}-1.7.4-config-cross.patch
+	"${FILESDIR}"/${PN}-1.7.4-config-libdir.patch
+	"${FILESDIR}"/config.layout.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.in configure.ac || die
+	AT_M4DIR="build" eautoreconf
+}
+
+src_configure() {
+	tc-export AS CC CPP
+
+	# the libtool script uses bash code in it and at configure time, tries
+	# to find a bash shell.  if /bin/sh is bash, it uses that.  this can
+	# cause problems for people who switch /bin/sh on the fly to other
+	# shells, so just force libtool to use /bin/bash all the time.
+	export CONFIG_SHELL="${EPREFIX}"/bin/bash
+	export ac_cv_path_SED="sed"
+	export ac_cv_path_EGREP="grep -E"
+	export ac_cv_path_EGREP_TRADITIONAL="grep -E"
+	export ac_cv_path_FGREP="grep -F"
+	export ac_cv_path_GREP="grep"
+	export ac_cv_path_lt_DD="dd"
+
+	local myconf=(
+		--enable-layout=gentoo
+		--enable-nonportable-atomics
+		--enable-posix-shm
+		--enable-threads
+		$(use_enable static-libs static)
+		$(use_with valgrind)
+		--with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
+	)
+
+	tc-is-static-only && myconf+=( --disable-dso )
+
+	if use old-kernel; then
+		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
+		export apr_cv_accept4="no"
+		export apr_cv_dup3="no"
+		export apr_cv_epoll_create1="no"
+		export apr_cv_sock_cloexec="no"
+	fi
+
+	if tc-is-cross-compiler; then
+		# The apache project relies heavily on AC_TRY_RUN and doesn't
+		# have any sane cross-compiling fallback logic.
+		export \
+			ac_cv_file__dev_zero="yes" \
+			ac_cv_func_sem_open="yes" \
+			ac_cv_mmap__dev_zero="yes" \
+			ac_cv_negative_eai="yes" \
+			ac_cv_o_nonblock_inherited="no" \
+			ac_cv_struct_rlimit="yes" \
+			ap_cv_atomic_builtins="yes" \
+			apr_cv_accept4="yes" \
+			apr_cv_dup3="yes" \
+			apr_cv_epoll="yes" \
+			apr_cv_epoll_create1="yes" \
+			apr_cv_gai_addrconfig="yes" \
+			apr_cv_mutex_recursive="yes" \
+			apr_cv_mutex_robust_shared="yes" \
+			apr_cv_process_shared_works="yes" \
+			apr_cv_pthreads_lib="-pthread" \
+			apr_cv_sock_cloexec="yes" \
+			apr_cv_tcp_nodelay_with_cork="yes"
+	fi
+
+	if use urandom; then
+		myconf+=( --with-devrandom=/dev/urandom )
+	else
+		myconf+=( --with-devrandom=/dev/random )
+	fi
+
+	# Avoid libapr containing undefined references (underlinked)
+	# undefined reference to `__sync_val_compare_and_swap_8'
+	# (May be possible to fix via libatomic linkage in future?)
+	# bug #740464
+	append-atomic-flags
+	if use x86 || [[ ${LIBS} == *atomic* ]] ; then
+		myconf+=( --disable-nonportable-atomics )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# This header is the same across targets, so use the build compiler.
+		emake tools/gen_test_char
+
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
+			tools/gen_test_char.c -o tools/gen_test_char || die
+	fi
+
+	emake all $(usev doc dox)
+}
+
+src_test() {
+	# Building tests in parallel is broken
+	emake -j1 check
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/dox/html/*
+	fi
+
+	# This file is only used on AIX systems, which Gentoo is not,
+	# and causes collisions between the SLOTs, so remove it.
+	# Even in Prefix, we don't need this on AIX.
+	rm "${ED}/usr/$(get_libdir)/apr.exp" || die
+}
diff --git a/dev-libs/apr/files/apr-1.7.4-config-cross.patch b/dev-libs/apr/files/apr-1.7.4-config-cross.patch
new file mode 100644
index 000000000000..5101f455230a
--- /dev/null
+++ b/dev-libs/apr/files/apr-1.7.4-config-cross.patch
@@ -0,0 +1,19 @@
+The apr-config script can automatically adjust its paths to help with
+cross-compiling, but it only does this if apr itself was originally
+cross-compiled, which may not be the case. Forcing it to consider that
+it might be cross-compiled doesn't do any harm though.
+
+Bug: https://bugs.gentoo.org/931829
+
+diff -Naur a/apr-config.in b/apr-config.in
+--- a/apr-config.in	2023-03-13 10:29:04.000000000 +0000
++++ b/apr-config.in	2024-05-14 10:23:28.429984195 +0100
+@@ -48,7 +48,7 @@
+ # NOTE: the following line is modified during 'make install': alter with care!
+ location=@APR_CONFIG_LOCATION@
+ 
+-cross_compiling=@APR_CROSS_COMPILING@
++cross_compiling=maybe
+ 
+ if test "$cross_compiling" != "no"; then
+ 
diff --git a/dev-libs/apr/files/apr-1.7.4-config-libdir.patch b/dev-libs/apr/files/apr-1.7.4-config-libdir.patch
new file mode 100644
index 000000000000..aed4aba59f9a
--- /dev/null
+++ b/dev-libs/apr/files/apr-1.7.4-config-libdir.patch
@@ -0,0 +1,17 @@
+Don't add the libdir to the search path or bake the libdir as a runpath when
+doing a native build because we always install to a standard location.
+
+Bug: https://bugs.gentoo.org/385775
+
+diff -Naur a/apr-config.in b/apr-config.in
+--- a/apr-config.in	2023-03-13 10:29:04.000000000 +0000
++++ b/apr-config.in	2024-05-14 10:23:28.429984195 +0100
+@@ -233,7 +233,7 @@
+         ### avoid using -L if libdir is a "standard" location like /usr/lib
+         # Since the user is specifying they are linking with libtool, we
+         # *know* that -R will be recognized by libtool.
+-        flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}"
++        flags="$flags -l${APR_LIBNAME}"
+     elif test "$location" = "crosscompile"; then
+         flags="$flags  -L${APR_TARGET_DIR}/$libdir  -l${APR_LIBNAME}"
+     else
diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest
index b5ed4fbe55e1..d7211b1a951f 100644
--- a/dev-libs/qtkeychain/Manifest
+++ b/dev-libs/qtkeychain/Manifest
@@ -1,3 +1,5 @@
 DIST qtkeychain-0.14.2.tar.gz 50915 BLAKE2B eed35eec296b62fec90e83e98c3ab817aa05f7cefd74c3790ce2f7c38c051d5b95b3664e688bef0cfe7b06583e844782f60454bb67b48f6507fc33c780c62bf0 SHA512 d681f60a6954a8fcb37039cfb1a6d69f5aee19f30313d65072c40cee1880c302b9f2ad3d994ae7a775b17479f443231774804ca438ef6b5e7ec25533d5d9f3c2
+DIST qtkeychain-0.14.3.tar.gz 50948 BLAKE2B 4f2189b2d6a1faf7b5041baeb1c2f00498d0297a8028799ab646aa92189d569114c76b45528d15a72d7cee8dc6252797bebd3e2849034e703709a3b41f74a805 SHA512 d1d87553db94bf54da1373016a847476e6cd608db6d427ed72532658e2272501daf45d7c9976efdde2f26ab3810ba9dbfec2518d46dee5a76ecaa369bfee2e4a
 EBUILD qtkeychain-0.14.2.ebuild 1536 BLAKE2B a4391e20a8ff747dffca3ba2e3e499eb48e075adc22391c744a2cc1296f075e4caf2995ec7c97f8e72fa9a7e5cf460c8d79c232d2d59c3e6f416fb6f1c5b4c69 SHA512 0971db6f08ff60c4f81a554f3da5a8f09a54070851e36037b33819a20e77957cdb67dbd76e7b4520ee59f715fcebfcba0f2918d5d01c96ded18005771ec79435
+EBUILD qtkeychain-0.14.3.ebuild 1539 BLAKE2B 880adf42d9d0cefb8064f47898d16a2be143899418a75a29ab82710a609c88181dfd5803b9b32be4af4a317a4ef5f4ac676ae991f8e0744c1a48901909a1d10b SHA512 d756f3f51d003cb5d610b7fc6f8fa6b5bbb41858018c35a2269da019f258bd34e9aa61a0c15ae17bafc546ede7aa8fe4fa5e2ae847600b8a70637c1e642734c7
 MISC metadata.xml 340 BLAKE2B 4ae9796b7c395cbb0dc0c4a06d203db9a270ec00dba635bdeb0f46b350fffd3784f98a700f645238824cf6b474215c1cbed4c1ede1df16f47185598c81de5610 SHA512 3bf8c371c3268190a04f67f2213b89efe9f1dad96cbf2ee5ad3d112d5ea6b164ccbfefabaed55a6e0cdfa3e4bb06d6e7959b88513567a1d619aa1138957c5027
diff --git a/dev-libs/qtkeychain/qtkeychain-0.14.3.ebuild b/dev-libs/qtkeychain/qtkeychain-0.14.3.ebuild
new file mode 100644
index 000000000000..40b5710678fd
--- /dev/null
+++ b/dev-libs/qtkeychain/qtkeychain-0.14.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake multibuild
+
+DESCRIPTION="Qt API for storing passwords securely"
+HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/frankosterfeld/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/frankosterfeld/${PN}.git"
+fi
+
+LICENSE="BSD-2"
+SLOT="0/1"
+IUSE="keyring +qt5 qt6"
+REQUIRED_USE="|| ( qt5 qt6 )"
+
+DEPEND="
+	keyring? (
+		app-crypt/libsecret
+		dev-libs/glib:2
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+	)
+	qt6? ( dev-qt/qtbase:6[dbus] )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	qt5? ( dev-qt/linguist-tools:5 )
+	qt6? ( dev-qt/qttools:6[linguist] )
+"
+
+DOCS=( ChangeLog ReadMe.md )
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
+}
+
+src_configure() {
+	my_src_configure() {
+		local mycmakeargs=(
+			-DECM_MKSPECS_INSTALL_DIR="${EPREFIX}"/usr/$(get_libdir)/${MULTIBUILD_VARIANT}/mkspecs
+			-DBUILD_TEST_APPLICATION=OFF
+			-DBUILD_TRANSLATIONS=ON
+			-DLIBSECRET_SUPPORT=$(usex keyring)
+		)
+
+		if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
+			mycmakeargs+=( -DBUILD_WITH_QT6=ON )
+		else
+			mycmakeargs+=( -DBUILD_WITH_QT6=OFF )
+		fi
+
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant my_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+}