8 files changed, 558 insertions, 0 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 6c167c079dae..4410b7bb314c 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 9c6e5fdf11a5..89b7b99b257a 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -5,6 +5,7 @@ AUX apr-util-1.6.1-libtool.patch 533 BLAKE2B d942a897aaeeb543e4dbb4fbaac7b54f4ac
 AUX apr-util-1.6.1-mariadb-support.patch 4929 BLAKE2B 9f8a06e657386f5f773642f36f0897bba5e55270e860f2f1edc86ebe44214395a64e70c3f984f324328a8f7a6276c86cb46caca16719ab3ad51aff995868818f SHA512 edd5e1cd7d31e7bfb1b166c162ad8c69c704c8e9a09e85770df3b625ed918ed52918a16728a9b4d69370ccc75ade32dd64ef73b31ce6e8dac7a360fe44ca34e7
 AUX apr-util-1.6.1-my_bool.patch 311 BLAKE2B c0fdf523983dc75ff977c8f602678cdd7d0b3e539fc266891e2266fa3b60e0971e93d77f2e28ed95959d8ca62bca4f9f566fefea525c845d49ce545ee6b5a99a SHA512 ed7d7857be8b5d29cc17a7216c1b06134798eb5129d50389bb0d5484a46e19e3169f8cea80cab7f845548e528a2cd9909b72016a7216b402092ae15879db792c
 DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
+EBUILD apr-util-1.6.1-r10.ebuild 3847 BLAKE2B 12960c27568406d1f30782a098db89581ce4d308b13f92759f7018328000e13e929209a6c551bb7088f56c11e47ee3373793300f2e6bf5ef61e58ef408729b57 SHA512 ab06a2029e1dc21325e295c18b51780abc14dead20916b29d25bd391a35ebf2c6173904c8540124c07cf5d0aff7053ce72357451822c35702dfe900724f54ef8
 EBUILD apr-util-1.6.1-r8.ebuild 3787 BLAKE2B 1e4f8ec847da2607556c7cf58773ee5e5a94793d9231168eff0f96eb4ed359a18d87a19c193ba55b8753c123de75e194ef9fad797d60e6808b0a181a9ec8341b SHA512 1c85cb121e872b923188db6fc568ae7f7fa240a051caaa2b8df871deb2012c316402f7457547a3ffaba4d7e477427ccece507978bdba0508bfa232ba4c1fa566
 EBUILD apr-util-1.6.1-r9.ebuild 3838 BLAKE2B b13ae850ab30a8103a9e1442ab80de76ea326a61062d806b7dbaa575bbeec5ae6a36b0bf66d196141643f0d860f9fea1d2b0b29edc7a25b0f74d9ff04998864d SHA512 c03a5ee1aad83998a23d8674e8c8e5757a2588e6efa4b186844e2d46704b375cc894a88bffa37d978b317695acd5318fc8b0a0a338a66d90274e88cdeea29c44
 MISC metadata.xml 469 BLAKE2B d4ef8b9223183a322e324290e26e78fd291bfd3e60b48a18d1345f0aaf467302cabb62ae330ee5282bf38fcdf84a020dcca1b32a8351e3494d9fecd723196031 SHA512 727443f6ab071b3c657287a698ccaccea336a3b861f199dd07c4472cd61e1252e2a25f24a86dcdd72cedcfb73fb6cb0ebe0cbdc93220223dab5501e9626ecb4e
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild
new file mode 100644
index 000000000000..ead27eb1858b
--- /dev/null
+++ b/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Usually apr-util has the same PV as apr, but in case of security fixes, this may change.
+# APR_PV="${PV}"
+APR_PV="1.7.0-r6"
+
+inherit autotools db-use libtool multilib toolchain-funcs
+
+DESCRIPTION="Apache Portable Runtime Utility Library"
+HOMEPAGE="https://apr.apache.org/"
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="berkdb doc gdbm ldap mysql nss odbc openssl postgres sqlite static-libs"
+#RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/apr-${APR_PV}:1=
+	dev-libs/expat
+	virtual/libcrypt:=
+	berkdb? ( >=sys-libs/db-4:= )
+	gdbm? ( sys-libs/gdbm:= )
+	ldap? ( net-nds/openldap:= )
+	mysql? ( || (
+		dev-db/mariadb-connector-c
+		>=dev-db/mysql-connector-c-8
+	) )
+	nss? ( dev-libs/nss )
+	odbc? ( dev-db/unixODBC )
+	openssl? (
+		dev-libs/openssl:0=
+	)
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="
+	${RDEPEND}
+	>=sys-devel/libtool-2.4.2
+	doc? ( app-doc/doxygen )
+"
+
+DOCS=(CHANGES NOTICE README)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.3-sysroot.patch #385775
+	"${FILESDIR}"/${PN}-1.6.1-fix-gdbm-error-handling.patch
+	"${FILESDIR}"/${PN}-1.6.1-libtool.patch # 779487
+	"${FILESDIR}"/${PN}-1.6.1-mariadb-support.patch
+	"${FILESDIR}"/${PN}-1.6.1-my_bool.patch
+	"${FILESDIR}"/${PN}-1.6.1-drop-my_init.patch
+)
+
+src_prepare() {
+	default
+
+	# Fix usage of libmysqlclient (bug #620230)
+	grep -lrF "libmysqlclient_r" "${S}" \
+		| xargs sed 's@libmysqlclient_r@libmysqlclient@g' -i \
+		|| die
+
+	mv configure.{in,ac} || die
+	eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=(
+		--datadir="${EPREFIX}"/usr/share/apr-util-1
+		--with-apr="${ESYSROOT}"/usr
+		--with-expat="${EPREFIX}"/usr
+		--without-sqlite2
+		$(use_with gdbm)
+		$(use_with ldap)
+		$(use_with mysql)
+		$(use_with nss)
+		$(use_with odbc)
+		$(use_with openssl)
+		$(use_with postgres pgsql)
+		$(use_with sqlite sqlite3)
+	)
+
+	tc-is-static-only && myconf+=( --disable-util-dso )
+
+	if use berkdb; then
+		local db_version
+		db_version="$(db_findver sys-libs/db)" || die "Unable to find Berkeley DB version"
+		db_version="$(db_ver_to_slot "${db_version}")"
+		db_version="${db_version/\./}"
+		myconf+=(
+			--with-dbm=db${db_version}
+			# We use $T for the libdir because otherwise it'd simply be the normal
+			# system libdir.  That's pointless as the compiler will search it for
+			# us already.  This makes cross-compiling and such easier.
+			--with-berkeley-db="${SYSROOT}$(db_includedir 2>/dev/null):${T}"
+		)
+	else
+		myconf+=( --without-berkeley-db )
+	fi
+
+	if use nss || use openssl ; then
+		myconf+=( --with-crypto ) # 518708
+	fi
+
+	econf "${myconf[@]}"
+	# Use the current env build settings rather than whatever apr was built with.
+	sed -i -r \
+		-e "/^(apr_builddir|apr_builders|top_builddir)=/s:=:=${SYSROOT}:" \
+		-e "/^CC=/s:=.*:=$(tc-getCC):" \
+		-e '/^(C|CPP|CXX|LD)FLAGS=/d' \
+		-e '/^LTFLAGS/s:--silent::' \
+		build/rules.mk || die
+}
+
+src_compile() {
+	emake
+	use doc && emake dox
+}
+
+src_test() {
+	# Building tests in parallel is broken
+	emake -j1 check
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name "*.la" -delete || die
+	if [[ -d "${ED}/usr/$(get_libdir)/apr-util-${SLOT}" ]] ; then
+		find "${ED}/usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete || die
+	fi
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -not -name "*$(get_libname)" -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.
+	rm "${ED}/usr/$(get_libdir)/aprutil.exp" || die
+}
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 6d3403e813d8..ddbed6627c47 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -5,8 +5,10 @@ AUX apr-1.5.0-sysroot.patch 1309 BLAKE2B de3dc13a44a9d5071c249875322b7d6be9ed765
 AUX apr-1.6.3-skip-known-failing-tests.patch 512 BLAKE2B 29607bce9a35853d824f8872557f361f3d5ffa0f2c7cd35e06cbf4d449e54f1b12978c0220b8ce4ae5d590ee9e04b5cd77af22876e3880deef115efbeb5a1dcc SHA512 ac097d28d5ae0b2437522da0578ff8bd049190d8df576e4e5298426f827b2bf69891e4f33bd1ffaf1a3c53143927e71f10d8362567121faa03cdf908d4fbc6c2
 AUX apr-1.7.0-CVE-2021-35940.patch 1749 BLAKE2B 256687934fd6b2af494198456d059f8a6edaaeb8b17f9186d0801bef489443faffefda3724d6c083f05811356c5168db31e5defbe19394699092090f7befdae6 SHA512 a2419817809dfd92a6d3b12e2067a802505d77d400fd47a4b9bb6fd5ae94c4be092e0d3b5894de429c6cc4a82d8133b801636bcab93d0f740c8f06a46516cd72
 AUX apr-1.7.0-autoconf-2.70.patch 1970 BLAKE2B b552e2bb1be932a692e2d1fad5124b5db9163e45b1bef1fe97082db28efd6f6079d75253e961ca257bd31f53f814bdb11a2c6554fd5d1925d26fe7b42664db42 SHA512 63a56be83f555a78f422f9ce7074e5c3a497a4996d32ead78d9e1a05fba2e0dbdfb135c34143676b8ad16e8276642843d5ed8b17a540be58c6bf7e9662896c2f
+AUX apr-1.7.0-clang-16.patch 4341 BLAKE2B 3d8a7d0e62016c4fd7f1b851d06ef595f8ddbacc4af2e3142cc922c711c6b56b2b99158abdffa611e20407f53f95ef5dc6ffe24cca90457d6d381176e2ce27a0 SHA512 adef5a1bccb6ccd4627c7e8416168aec3e87cb071f3c313ac18f0d246c502d1fc8cc41196e2c49958c1c52d01ffc82758e12ece802cf19bc675813a8064c74f5
 AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4af9e65169c1c5862c3fa3532cc02df8e084b540e7a81091c3b16d50388c6234cba469b15fff896d0428fc SHA512 3a87e718859c8f95793f828b764d240907d65c21fe2c99143815ab835f8b657154092c4ad496e86d79490bd85ef03d394d3acb57a15186f2f06a518b32d77fdf
 DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148
 EBUILD apr-1.7.0-r4.ebuild 4511 BLAKE2B 74ea0dd4227e2785e1a45eff3d1293d9fe937b57917107e736c0a1b056623eca5524e2bd3fe6c4f53c807e41394beca57513fed1318cf34c2b96abe8dede4c40 SHA512 dcf4320fe8c7ac38b3e89fe32a94fa9f4150d2269fc0e49822a9f488c9de485449f1ffa9e4d370b2f2c8ed1aecf46eea5313dfe779c1b08f55f4baa13bf0ac51
 EBUILD apr-1.7.0-r5.ebuild 4568 BLAKE2B 6350799dc75d8c20c6aad27d7378fc7ea1f1b62600c80c77dcfefae2b4981313433c44e221a5200bb36b2e3a6458251a488c7c7a0607e485ec2815f928d331c4 SHA512 c368c2c5c05110da877abcc3a5ad57df0f532ed113d35d06f663b2db37cc82c8cd2dd65b9e50f6d41f1672999d927215edc2875bb14b52020bebbc2bb7ef8b0a
+EBUILD apr-1.7.0-r6.ebuild 4624 BLAKE2B 64b6a74b0d0b88ac92bf4249b440e3b41bc06687efd31970596771532604798a62e25373e4f0f785b74a3472b95427e140a3c2730f0962e5906c0ce858dc6cbe SHA512 37bd853a818154762242877a38264f2e8aef0686915175c394999d10d15f534ed01116538c1634918cea315db1f95ad0c3cea0c35a6bf2be926d6abeb308887c
 MISC metadata.xml 511 BLAKE2B 5b4f31f74a9e3fe93b63bb337b5e0b7396c18439c269de0ec6c8308becf69ac8474d72dc921c80c06321bcaf708d49c9e26ec282036e84a9b03c08858c942980 SHA512 82063beddf8ce88d5f151ddeb8b3b69c10124af1c7b727b4c73885b4b14a427e93cd4164ddd4e3dfcdf7175727a8dffa357f1f14c3daee192a255f8995e6b0b5
diff --git a/dev-libs/apr/apr-1.7.0-r6.ebuild b/dev-libs/apr/apr-1.7.0-r6.ebuild
new file mode 100644
index 000000000000..4ba3505bd8f8
--- /dev/null
+++ b/dev-libs/apr/apr-1.7.0-r6.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
+
+# See bug #815265 for libcrypt dependency
+CDEPEND="virtual/libcrypt:=
+	elibc_glibc? ( >=sys-apps/util-linux-2.16 )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-base-policy )"
+DEPEND="${CDEPEND}
+	>=sys-devel/libtool-2.4.2
+	doc? ( app-doc/doxygen )"
+
+DOCS=( CHANGES NOTICE README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.0-mint.patch
+	"${FILESDIR}"/${PN}-1.5.0-libtool.patch
+	"${FILESDIR}"/${PN}-1.5.0-cross-types.patch
+	"${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
+	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
+	"${FILESDIR}"/${PN}-1.7.0-autoconf-2.70.patch #750353
+	"${FILESDIR}"/${PN}-1.7.0-CVE-2021-35940.patch #828545
+	"${FILESDIR}"/${PN}-1.7.0-clang-16.patch #870004
+)
+
+src_prepare() {
+	default
+
+	mv configure.in configure.ac || die
+	AT_M4DIR="build" eautoreconf
+	elibtoolize
+
+	eapply "${FILESDIR}/config.layout.patch"
+}
+
+src_configure() {
+	local myconf=(
+		--enable-layout=gentoo
+		--enable-nonportable-atomics
+		--enable-posix-shm
+		--enable-threads
+		$(use_enable static-libs static)
+		--with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
+	)
+
+	if use older-kernels-compatibility; 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_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 )
+	elif (( ${CHOST#*-hpux11.} <= 11 )); then
+		: # no /dev/*random on hpux11.11 and before, ${PN} detects this.
+	else
+		myconf+=( --with-devrandom=/dev/random )
+	fi
+
+	tc-is-static-only && myconf+=( --disable-dso )
+
+	# shl_load does not search runpath, but hpux11 supports dlopen
+	[[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn )
+
+	if [[ ${CHOST} == *-solaris2.10 ]]; then
+		case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in
+		*atomic_cas_ptr*) ;;
+		*)
+			elog "You do not have Solaris Patch ID "$(
+				[[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885
+			)" (Problem 4954703) installed on your host ($(hostname)),"
+			elog "using generic atomic operations instead."
+			myconf+=( --disable-nonportable-atomics )
+			;;
+		esac
+	else
+		if use ppc || use sparc || use mips; then
+			# 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
+			myconf+=( --disable-nonportable-atomics )
+		fi
+	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
+
+	if use doc; then
+		emake dox
+	fi
+}
+
+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.0-clang-16.patch b/dev-libs/apr/files/apr-1.7.0-clang-16.patch
new file mode 100644
index 000000000000..2244b07a14ff
--- /dev/null
+++ b/dev-libs/apr/files/apr-1.7.0-clang-16.patch
@@ -0,0 +1,174 @@
+https://bugs.gentoo.org/870004
+
+Fixed upstream, hopefully (it's hard to keep track of 1.7.x branch churn):
+- https://bz.apache.org/bugzilla/show_bug.cgi?id=64753
+- https://bz.apache.org/bugzilla/show_bug.cgi?id=65087
+--- a/build/apr_common.m4
++++ b/build/apr_common.m4
+@@ -467,6 +467,7 @@ changequote([, ])dnl
+ AC_MSG_CHECKING(size of $2)
+ AC_CACHE_VAL(AC_CV_NAME,
+ [AC_TRY_RUN([#include <stdio.h>
++#include <stdlib.h>
+ $1
+ #ifdef WIN32
+ #define binmode "b"
+@@ -531,7 +532,8 @@ AC_TRY_RUN([
+ #include <errno.h>
+ #include <string.h>
+ #include <stdio.h>
+-main()
++#include <stdlib.h>
++int main()
+ {
+   char buf[1024];
+   if (strerror_r(ERANGE, buf, sizeof buf) < 1) {
+--- a/build/apr_network.m4
++++ b/build/apr_network.m4
+@@ -63,6 +63,10 @@ AC_DEFUN([APR_CHECK_WORKING_GETADDRINFO], [
+ #ifdef HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+ #endif
++#include <stdlib.h>
++
++#include <netinet/in.h>
++#include <arpa/inet.h>
+ 
+ int main(void) {
+     struct addrinfo hints, *ai;
+@@ -136,6 +140,11 @@ dnl
+ AC_DEFUN([APR_CHECK_WORKING_GETNAMEINFO], [
+   AC_CACHE_CHECK(for working getnameinfo, ac_cv_working_getnameinfo,[
+   AC_TRY_RUN( [
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
++#include <stdlib.h>
++
+ #ifdef HAVE_NETDB_H
+ #include <netdb.h>
+ #endif
+@@ -195,6 +204,8 @@ AC_DEFUN([APR_CHECK_NEGATIVE_EAI], [
+ #include <netdb.h>
+ #endif
+ 
++#include <stdlib.h>
++
+ int main(void) {
+     if (EAI_ADDRFAMILY < 0) {
+         exit(0);
+@@ -388,9 +399,14 @@ AC_DEFUN([APR_CHECK_TCP_NODELAY_INHERITED], [
+   AC_CACHE_CHECK(if TCP_NODELAY setting is inherited from listening sockets, ac_cv_tcp_nodelay_inherited,[
+   AC_TRY_RUN( [
+ #include <stdio.h>
++#include <stdlib.h>
++
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+-#endif
++#end
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endifif
+ #ifdef HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+ #endif
+@@ -734,6 +750,9 @@ AC_TRY_COMPILE([
+ #ifdef HAVE_ARPA_INET_H
+ #include <arpa/inet.h>
+ #endif
++
++#include <sys/socket.h>
++#include <netinet/in.h>
+ ],[
+ inet_addr("127.0.0.1");
+ ],[
+@@ -754,6 +773,9 @@ fi
+ AC_DEFUN([APR_CHECK_INET_NETWORK], [
+ AC_CACHE_CHECK(for inet_network, ac_cv_func_inet_network,[
+ AC_TRY_COMPILE([
++#include <sys/socket.h>
++#include <netinet/in.h>
++
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
+--- a/configure.in
++++ b/configure.in
+@@ -1440,8 +1440,6 @@ AC_CHECK_FUNCS(sigaction, [ have_sigaction="1" ], [ have_sigaction="0" ])
+ AC_DECL_SYS_SIGLIST
+ 
+ AC_CHECK_FUNCS(fork, [ fork="1" ], [ fork="0" ])
+-APR_CHECK_INET_ADDR
+-APR_CHECK_INET_NETWORK
+ AC_SUBST(apr_inaddr_none)
+ AC_CHECK_FUNC(_getch)
+ AC_CHECK_FUNCS(strerror_r, [ strerror_r="1" ], [ strerror_r="0" ])
+@@ -1547,6 +1545,9 @@ APR_FLAG_HEADERS(
+     sys/un.h		\
+     sys/wait.h)
+ 
++APR_CHECK_INET_ADDR
++APR_CHECK_INET_NETWORK
++
+ # IRIX 6.5 has a problem in <netinet/tcp.h> which prevents it from
+ # being included by itself.  Check for <netinet/tcp.h> manually,
+ # including another header file first.
+@@ -2208,7 +2209,8 @@ AC_TRY_RUN([
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
+-main()
++#include <stdlib.h>
++int main()
+ {
+     struct rlimit limit;
+     limit.rlim_cur = 0;
+@@ -2247,7 +2249,7 @@ AC_TRY_RUN([
+ #ifndef SEM_FAILED
+ #define SEM_FAILED (-1)
+ #endif
+-main()
++int main()
+ {
+     sem_t *psem;
+     const char *sem_name = "/apr_autoconf";
+@@ -2307,6 +2309,7 @@ if test "$threads" = "1"; then
+       AC_TRY_RUN([
+ #include <sys/types.h>
+ #include <pthread.h>
++#include <stdlib.h>
+         int main()
+         {
+             pthread_mutex_t mutex;
+@@ -2435,6 +2438,8 @@ int fd;
+ struct flock proc_mutex_lock_it = {0};
+ const char *fname = "conftest.fcntl";
+ 
++int lockit();
++
+ int main()
+ {
+     int rc, status;;
+--- a/poll/os2/pollset.c
++++ b/poll/os2/pollset.c
+@@ -308,7 +308,7 @@ APR_DECLARE(apr_status_t) apr_pollset_wakeup(apr_pollset_t *pollset)
+ 
+ 
+ 
+-APR_DECLARE(const char *) apr_poll_method_defname()
++APR_DECLARE(const char *) apr_poll_method_defname(void)
+ {
+     return "select";
+ }
+--- a/poll/unix/pollset.c
++++ b/poll/unix/pollset.c
+@@ -188,7 +188,7 @@ APR_DECLARE(const char *) apr_pollset_method_name(apr_pollset_t *pollset)
+     return pollset->provider->name;
+ }
+ 
+-APR_DECLARE(const char *) apr_poll_method_defname()
++APR_DECLARE(const char *) apr_poll_method_defname(void)
+ {
+     const apr_pollset_provider_t *provider = NULL;
+ 
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 6a1ffb36b43a..7bc5ff6f6c52 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,5 +1,6 @@
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
+DIST llvm-project-14f996dca8a2b5b17d6917528bfd9ee71ba6192a.tar.gz 169054148 BLAKE2B a23af6658a6ea8a7cb4272faef151937da229e39383ec068d7ef81e72a25d2a46dc2a86255a7f1148b7385b339d1c17e62f627df834d8eccc39be8921575f88d SHA512 e719d296016e7af718d022424c337a5df8d7124fdb49b9f219ab2a5dc592e6a59f6c09064775ea9349bcf4eed9d72214abb648de649ab872174c35635c945c04
 DIST llvm-project-15.0.2.src.tar.xz 112071864 BLAKE2B 96f2884d6c1007260d71e5dd41951eed029e8f50ff78f3c90f7194df13e1d4fb80ab7705c51c45a3e6b2a7714a98d9c5919fc7064d1d5f7c675e65b9b4229b65 SHA512 a0e815369c15bb4f8e8aa0fede29c3d557fcc5c8f2b39d457c03f1ef1d860082a41027238571b2aee9a158a87eb118deb08dc2ba94ce750320837a84e9908b8c
 DIST llvm-project-15.0.2.src.tar.xz.sig 438 BLAKE2B 37a3a7fbc2d74db9060e85f04e159b475cf818c95a6fe2e9f5f038eb990f414d94833ecac2f9c826825a69b752876399e37e70e6934def06363f7ccb18be033a SHA512 cfe3bc400a64536ad9181c2ede7227a0953a8632fdc777d1ea1d9225c1fc4e699d90ce0b99e057ee5b87c1272d5810c4b52fb0cac167ddd2aad88f1f3ef46ee8
 DIST llvm-project-ebb258d3b0785f6dcc65e1f277d0690891ddc94d.tar.gz 168823463 BLAKE2B 111afe0f6ba6cef28c3d0162c9c650d15239f981949030768780ebe308418346d0ad367e0e58417832ae43e57b27bccaf56415f81e8221c6c5e78d1113f5617b SHA512 80351d7eeac77a15bf5613b289c71d718ecaccd8a6a4ea6736ed8bfc15c8154099c771564f99ea6c8b491f99bf1ca3a45fac977d638f6a03d7f7b42ba522fa20
@@ -8,4 +9,5 @@ EBUILD libclc-15.0.2.ebuild 1413 BLAKE2B 837a7970e531e7198059f14a7ab25f416852993
 EBUILD libclc-15.0.3.9999.ebuild 1402 BLAKE2B 3c240051e1752ea60d9c040f75a5f95319e97754684c4e98c8bdcc8fe60ec266736d573f71929328f12ce96357ca33376244adf7305d674ec5e21a182b635bb6 SHA512 0986f1338d3048444632759c5276c1bbfc8ed4dc4450a83603985aea7643b26eef86d24550eba3b52be06e851c0ad4d866eee295e84385b26bc3df911c1ad9a6
 EBUILD libclc-16.0.0.9999.ebuild 1423 BLAKE2B 340c42c12fee9ca7f7fca73019d304e182f4e67b4ccd01c742f893483246d95fceafb4bdbdb6b3832520803ab3a7c58b6a21ead7ae40e32c7f0a3cbd48cab862 SHA512 448e79b028b81c9a6a601abb16ed1b4e71ae73611820e5c0f4287a924011619fe9af7d06eb0f2458a3c07fec8e30d1298d3ab810d5bd8bd995fe4e3e894b84c5
 EBUILD libclc-16.0.0_pre20221010.ebuild 1423 BLAKE2B 340c42c12fee9ca7f7fca73019d304e182f4e67b4ccd01c742f893483246d95fceafb4bdbdb6b3832520803ab3a7c58b6a21ead7ae40e32c7f0a3cbd48cab862 SHA512 448e79b028b81c9a6a601abb16ed1b4e71ae73611820e5c0f4287a924011619fe9af7d06eb0f2458a3c07fec8e30d1298d3ab810d5bd8bd995fe4e3e894b84c5
+EBUILD libclc-16.0.0_pre20221016.ebuild 1423 BLAKE2B 340c42c12fee9ca7f7fca73019d304e182f4e67b4ccd01c742f893483246d95fceafb4bdbdb6b3832520803ab3a7c58b6a21ead7ae40e32c7f0a3cbd48cab862 SHA512 448e79b028b81c9a6a601abb16ed1b4e71ae73611820e5c0f4287a924011619fe9af7d06eb0f2458a3c07fec8e30d1298d3ab810d5bd8bd995fe4e3e894b84c5
 MISC metadata.xml 394 BLAKE2B 2c73a04cae5f0956ff187000d761ce8709fa39ab701f9adf2747f87da65fee48f996a56df540d5b95cfdecadef6383001b5e3dd57e1002f7f494d1ba3ecc987c SHA512 17bc874995ebeff9513d60dc850f3d1c5e7a3417f7170ec727edae1d09fb83242955ad24ff3fd24718a8eeadc80602cbe21618d081d50e6dc809a597dca72df1
diff --git a/dev-libs/libclc/libclc-16.0.0_pre20221016.ebuild b/dev-libs/libclc/libclc-16.0.0_pre20221016.ebuild
new file mode 100644
index 000000000000..2ec99d83a103
--- /dev/null
+++ b/dev-libs/libclc/libclc-16.0.0_pre20221016.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="https://libclc.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
+SLOT="0"
+KEYWORDS=""
+IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
+IUSE="${IUSE_VIDEO_CARDS}"
+REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
+
+LLVM_MAX_SLOT=16
+BDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		sys-devel/clang:16
+		sys-devel/clang:15
+		sys-devel/clang:14
+		sys-devel/clang:13
+	)
+"
+
+LLVM_COMPONENTS=( libclc )
+llvm.org_set_globals
+
+llvm_check_deps() {
+	has_version -b "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	# we do not need llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libclc_targets=()
+
+	use video_cards_nvidia && libclc_targets+=(
+		"nvptx--"
+		"nvptx64--"
+		"nvptx--nvidiacl"
+		"nvptx64--nvidiacl"
+	)
+	use video_cards_r600 && libclc_targets+=(
+		"r600--"
+	)
+	use video_cards_radeonsi && libclc_targets+=(
+		"amdgcn--"
+		"amdgcn-mesa-mesa3d"
+		"amdgcn--amdhsa"
+	)
+	# TODO: spirv
+	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
+
+	libclc_targets=${libclc_targets[*]}
+	local mycmakeargs=(
+		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
+		-DLLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+	)
+	cmake_src_configure
+}