Adding metadata

13 files changed, 0 insertions, 718 deletions

diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
deleted file mode 100644
index 95e5484d76c7..000000000000
--- a/dev-libs/apr/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST apr-1.7.5.tar.bz2 898264 BLAKE2B 1feacb24e213843c4d3312806abf698e332c45557b7cfd74c9c654d4f9d835dd3a8bf4f9a3bb8328483dcc244948ca118ed6fab9655e482ac6fb53cc7fd92908 SHA512 d8a7553642da0c81261ac3992536efd9d43ecb9154934ef1a10ae808d6a3ce8198b40433091d3a6d04f61e67c59426fb5276193a37e810ae4bc74a8a10fb651b
-DIST apr-1.7.6.tar.bz2 899670 BLAKE2B 6762df4f062392a352603ac6a17961a71c77e39682b40eedab721ee07e50793b5d1529abb58654513c750a5d219bd33aaa3dabfbd4a25223f3a13af7fc9726d0 SHA512 629b60680d1244641828019db903a1b199e8a19c8f27a5132b93faacb381ce561f88463345ab019258f1f1e8cfdf8aa986ac815153a8e7e04a22b3932f9fedd2
diff --git a/dev-libs/apr/apr-1.7.5.ebuild b/dev-libs/apr/apr-1.7.5.ebuild
deleted file mode 100644
index e67877a3a9e5..000000000000
--- a/dev-libs/apr/apr-1.7.5.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2025 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 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~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/apr-1.7.6-r1.ebuild b/dev-libs/apr/apr-1.7.6-r1.ebuild
deleted file mode 100644
index 21efbddd2b73..000000000000
--- a/dev-libs/apr/apr-1.7.6-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2026 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 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~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.4-config-cross.patch
-	"${FILESDIR}"/${PN}-1.7.4-config-libdir.patch
-	"${FILESDIR}"/config.layout.patch
-	"${FILESDIR}"/${PN}-1.7.6-autoconf.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.6.3-skip-known-failing-tests.patch b/dev-libs/apr/files/apr-1.6.3-skip-known-failing-tests.patch
deleted file mode 100644
index 79efb502a8d0..000000000000
--- a/dev-libs/apr/files/apr-1.6.3-skip-known-failing-tests.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Skip testlfs test which only runs on non 64-bit systems and fails
-on Gentoo due to a sandbox issue. Bug #603244
-
---- a/test/Makefile.in
-+++ b/test/Makefile.in
-@@ -172,7 +172,11 @@ check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
- 				fi; \
- 			done; \
- 	        else \
--			./$$prog -v; \
-+			if test "$$prog" = 'testall@EXEEXT@'; then \
-+				./$$prog -v -x testlfs; \
-+			else \
-+				./$$prog -v; \
-+			fi; \
- 			status=$$?; \
- 			if test $$status != 0; then \
- 				teststatus=$$status; \
diff --git a/dev-libs/apr/files/apr-1.7.2-autoconf-2.72.patch b/dev-libs/apr/files/apr-1.7.2-autoconf-2.72.patch
deleted file mode 100644
index 49d3fd3f1638..000000000000
--- a/dev-libs/apr/files/apr-1.7.2-autoconf-2.72.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://src.fedoraproject.org/rpms/apr/raw/rawhide/f/apr-1.7.2-autoconf.patch
-
-Similar to https://github.com/apache/apr/commit/a15958a37a06f71c42c690278f9c958b93b7ee20.
---- a/build/apr_common.m4
-+++ b/build/apr_common.m4
-@@ -468,15 +468,8 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING],
-  fi
-  AC_COMPILE_IFELSE(
-   [AC_LANG_SOURCE(
--   [
--#ifndef PACKAGE_NAME
--#include "confdefs.h"
--#endif
--   ]
--   [[$1]]
--   [int main(int argc, const char *const *argv) {]
-+   [[$1]],
-    [[$2]]
--   [   return 0; }]
-   )], [CFLAGS=$apr_save_CFLAGS
- $3],  [CFLAGS=$apr_save_CFLAGS
- $4])
-
diff --git a/dev-libs/apr/files/apr-1.7.2-fix-pkgconfig-libs.patch b/dev-libs/apr/files/apr-1.7.2-fix-pkgconfig-libs.patch
deleted file mode 100644
index 9b4935fe7f0a..000000000000
--- a/dev-libs/apr/files/apr-1.7.2-fix-pkgconfig-libs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Don't pollute Libs with internal bits like libcrypt.
-
-https://bugs.gentoo.org/811765
-https://sources.debian.org/patches/apr/1.7.2-2/fix-apr.pc.patch/
-https://sources.debian.org/patches/apr/1.7.2-2/omit_extra_libs.patch/
-
-From: <tfheen@debian.org>
-Subject: No description.
-
---- a/apr.pc.in
-+++ b/apr.pc.in
-@@ -7,5 +7,6 @@
- Name: APR
- Description: The Apache Portable Runtime library
- Version: @APR_DOTTED_VERSION@
--Libs: -L${libdir} -l@APR_LIBNAME@ @EXTRA_LIBS@
--Cflags: @EXTRA_CPPFLAGS@ @EXTRA_CFLAGS@ -I${includedir}
-+Libs: -L${libdir} -l@APR_LIBNAME@
-+Libs.private: @EXTRA_LIBS@
-+Cflags: @EXTRA_CPPFLAGS@ -I${includedir}
-
-From: Stefan Fritsch <sf@debian.org>
-Subject: #463399
-
---- a/apr-config.in
-+++ b/apr-config.in
-@@ -36,7 +36,7 @@ SHELL="@SHELL@"
- CPPFLAGS="@EXTRA_CPPFLAGS@"
- CFLAGS="@EXTRA_CFLAGS@"
- LDFLAGS="@EXTRA_LDFLAGS@"
--LIBS="@EXTRA_LIBS@"
-+LIBS=""
- EXTRA_INCLUDES="@EXTRA_INCLUDES@"
- SHLIBPATH_VAR="@shlibpath_var@"
- APR_SOURCE_DIR="@apr_srcdir@"
diff --git a/dev-libs/apr/files/apr-1.7.2-libtool.patch b/dev-libs/apr/files/apr-1.7.2-libtool.patch
deleted file mode 100644
index 121e4374f9fc..000000000000
--- a/dev-libs/apr/files/apr-1.7.2-libtool.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-generate a local copy of libtool for use in compiling
-
-https://bugs.gentoo.org/374355
---- a/configure.in
-+++ b/configure.in
-@@ -268,9 +268,7 @@ case $host in
-         fi
-     else
-     dnl libtoolize requires that the following not be indented
--    dnl should become LT_INIT(win32-dll)
--AC_LIBTOOL_WIN32_DLL
--AC_PROG_LIBTOOL
-+LT_INIT(win32-dll)
-         # get libtool's setting of shlibpath_var
-         if test "x$shlibpath_var" = "x"; then
-             eval `grep "^shlibpath_var=[[A-Z_]]*$" $apr_builddir/libtool`
diff --git a/dev-libs/apr/files/apr-1.7.2-respect-flags.patch b/dev-libs/apr/files/apr-1.7.2-respect-flags.patch
deleted file mode 100644
index f075fc0514d2..000000000000
--- a/dev-libs/apr/files/apr-1.7.2-respect-flags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://sources.debian.org/patches/apr/1.7.2-2/dont_override_external_buildflags/
-
-# Don't force apr-using projects to use the compile flags used during
-# apr's compilation.
---- a/build/apr_rules.mk.in
-+++ b/build/apr_rules.mk.in
-@@ -42,10 +42,10 @@ LIBTOOL=@LIBTOOL@
- # compilation and linking flags that are supposed to be set only by the user.
- # configure adds to them for tests, but we restore them at the end.
- #
--CFLAGS=@CFLAGS@
--CPPFLAGS=@CPPFLAGS@
--LDFLAGS=@LDFLAGS@
--LIBS=@LIBS@
-+CFLAGS?=@CFLAGS@
-+CPPFLAGS?=@CPPFLAGS@
-+LDFLAGS?=@LDFLAGS@
-+LIBS?=@LIBS@
- DEFS=@DEFS@
- 
- # anything added to the standard flags by configure is moved to EXTRA_*
-
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
deleted file mode 100644
index 5101f455230a..000000000000
--- a/dev-libs/apr/files/apr-1.7.4-config-cross.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index aed4aba59f9a..000000000000
--- a/dev-libs/apr/files/apr-1.7.4-config-libdir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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/apr/files/apr-1.7.6-autoconf.patch b/dev-libs/apr/files/apr-1.7.6-autoconf.patch
deleted file mode 100644
index 014839537ca3..000000000000
--- a/dev-libs/apr/files/apr-1.7.6-autoconf.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-https://src.fedoraproject.org/rpms/apr/blob/rawhide/f/apr-1.7.6-autoconf.patch
-https://github.com/apache/apr/pull/68
---- apr-1.7.6/build/apr_common.m4.5
-+++ apr-1.7.6/build/apr_common.m4
-@@ -467,19 +467,11 @@
-    CFLAGS="$CFLAGS -Werror"
-  fi
-  AC_COMPILE_IFELSE(
--  [AC_LANG_SOURCE(
--   [
--#ifndef PACKAGE_NAME
--#include "confdefs.h"
--#endif
--   ]
--   [[$1]]
--   [int main(int argc, const char *const *argv) {]
--   [[$2]]
--   [   return 0; }]
--  )], [CFLAGS=$apr_save_CFLAGS
--$3],  [CFLAGS=$apr_save_CFLAGS
--$4])
-+  [AC_LANG_PROGRAM([[$1]], [[$2]])],
-+  [CFLAGS=$apr_save_CFLAGS
-+   $3],
-+  [CFLAGS=$apr_save_CFLAGS
-+   $4])
- ])
- 
- dnl
---- apr-1.7.6/build/apr_network.m4.5
-+++ apr-1.7.6/build/apr_network.m4
-@@ -259,11 +259,12 @@
- #ifdef HAVE_STDLIB_H
- #include <stdlib.h>
- #endif
-+#include <stdio.h>
- ],[
- int tmp = gethostbyname_r((const char *) 0, (struct hostent *) 0, 
-                           (char *) 0, 0, (struct hostent **) 0, &tmp);
- /* use tmp to suppress the warning */
--tmp=0;
-+puts(tmp ? "non-zero" : "zero");
- ], ac_cv_gethostbyname_r_style=glibc2, ac_cv_gethostbyname_r_style=none))
- 
- if test "$ac_cv_gethostbyname_r_style" = "glibc2"; then
-@@ -287,11 +288,12 @@
- #ifdef HAVE_STDLIB_H
- #include <stdlib.h>
- #endif
-+#include <stdio.h>
- ],[
- int tmp = gethostbyname_r((const char *) 0, (struct hostent *) 0, 
-                           (struct hostent_data *) 0);
- /* use tmp to suppress the warning */
--tmp=0;
-+puts(tmp ? "non-zero" : "zero");
- ], ac_cv_gethostbyname_r_arg=hostent_data, ac_cv_gethostbyname_r_arg=char))
- 
- if test "$ac_cv_gethostbyname_r_arg" = "hostent_data"; then
-@@ -327,12 +329,13 @@
- #ifdef HAVE_STDLIB_H
- #include <stdlib.h>
- #endif
-+#include <stdio.h>
- ],[
- int tmp = getservbyname_r((const char *) 0, (const char *) 0,
-                           (struct servent *) 0, (char *) 0, 0,
-                           (struct servent **) 0);
- /* use tmp to suppress the warning */
--tmp=0;
-+puts(tmp ? "non-zero" : "zero");
- ], ac_cv_getservbyname_r_style=glibc2, ac_cv_getservbyname_r_style=none)
- 
- if test "$ac_cv_getservbyname_r_style" = "none"; then
-@@ -354,11 +357,12 @@
-     #ifdef HAVE_STDLIB_H
-     #include <stdlib.h>
-     #endif
-+    #include <stdio.h>
-     ],[
-     struct servent *tmp = getservbyname_r((const char *) 0, (const char *) 0,
-                                           (struct servent *) 0, (char *) 0, 0);
-     /* use tmp to suppress the warning */
--    tmp=NULL;
-+    puts(tmp ? "non-zero" : "zero");
-     ], ac_cv_getservbyname_r_style=solaris, ac_cv_getservbyname_r_style=none)
- fi
- 
-@@ -381,11 +385,12 @@
-     #ifdef HAVE_STDLIB_H
-     #include <stdlib.h>
-     #endif
-+    #include <stdio.h>
-     ],[
-     int tmp = getservbyname_r((const char *) 0, (const char *) 0,
-                               (struct servent *) 0, (struct servent_data *) 0);
-     /* use tmp to suppress the warning */
--    tmp=0;
-+    puts(tmp ? "non-zero" : "zero");
-     ], ac_cv_getservbyname_r_style=osf1, ac_cv_getservbyname_r_style=none)
- fi
- ])
---- apr-1.7.6/build/buildcheck.sh.5
-+++ apr-1.7.6/build/buildcheck.sh
-@@ -15,11 +15,11 @@
-   echo "buildconf: python version $py_version (ok)"
- fi
- 
--# autoconf 2.59 or newer
-+# autoconf 2.61 or newer
- ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;q'`
- if test -z "$ac_version"; then
-   echo "buildconf: autoconf not found."
--  echo "           You need autoconf version 2.59 or newer installed"
-+  echo "           You need autoconf version 2.61 or newer installed"
-   echo "           to build APR from SVN."
-   res=1
- else
---- apr-1.7.6/configure.in.5
-+++ apr-1.7.6/configure.in
-@@ -145,12 +145,14 @@
-     APR_CROSS_COMPILING=maybe
-   elif test "x$build_alias" != "x$host_alias"; then
-     APR_CROSS_COMPILING=yes
-+  else
-+    APR_CROSS_COMPILING=no
-   fi
- else
-     APR_CROSS_COMPILING=no
- fi
--
- AC_SUBST(APR_CROSS_COMPILING)
-+AC_MSG_NOTICE([cross-compilation detection: $APR_CROSS_COMPILING])
- 
- # Libtool might need this symbol -- it must point to the location of
- # the generated libtool script (not necessarily the "top" build dir).
-@@ -1876,6 +1878,7 @@
- AC_CHECK_TYPE(ssize_t, int)
- AC_C_INLINE
- AC_C_CONST
-+AC_C_VARARRAYS
- AC_FUNC_SETPGRP
- 
- APR_CHECK_SOCKLEN_T
-@@ -1971,6 +1974,8 @@
-     AC_ERROR([could not detect a 64-bit integer type])
- fi
- 
-+AC_MSG_NOTICE([for apr_(u)int64_t using $int64_strfn and ${int64_value}/${uint64_value}])
-+
- # If present, allow the C99 macro INT64_C to override our conversion.
- #
- # HP-UX's ANSI C compiler provides this without any includes, so we
-@@ -2152,7 +2157,6 @@
-     aprlfs=0     
- fi
- 
--AC_MSG_CHECKING([which type to use for apr_off_t])
- if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then
-     # LFS is go!
-     off_t_fmt='#define APR_OFF_T_FMT APR_INT64_T_FMT'
-@@ -2203,7 +2207,7 @@
-    off_t_fmt=d
-    off_t_strfn='strtoi'
- fi
--AC_MSG_RESULT($off_t_value)
-+AC_MSG_NOTICE([for apr_off_t using $off_t_strfn and $off_t_value])
- 
- # Regardless of whether _LARGEFILE64_SOURCE is used, on some
- # platforms _FILE_OFFSET_BITS will affect the size of ino_t and hence
-@@ -2234,7 +2238,7 @@
-     fi
-     ;;
- esac
--AC_MSG_NOTICE([using $ino_t_value for ino_t])
-+AC_MSG_NOTICE([for apr_ino_t using $ino_t_value])
- 
- # Checks for endianness
- AC_C_BIGENDIAN
---- apr-1.7.6/poll/unix/poll.c.5
-+++ apr-1.7.6/poll/unix/poll.c
-@@ -73,7 +73,7 @@
-                                    apr_interval_time_t timeout)
- {
-     int i, num_to_poll;
--#ifdef HAVE_VLA
-+#ifdef HAVE_C_VARARRAYS
-     /* XXX: I trust that this is a segv when insufficient stack exists? */
-     struct pollfd pollset[num + 1]; /* +1 since allocating 0 is undefined behaviour */
- #elif defined(HAVE_ALLOCA)
-@@ -130,7 +130,7 @@
-         }
-     }
-     
--#if !defined(HAVE_VLA) && !defined(HAVE_ALLOCA)
-+#if !defined(HAVE_C_VARARRAYS) && !defined(HAVE_ALLOCA)
-     if (num > SMALL_POLLSET_LIMIT) {
-         free(pollset);
-     }
diff --git a/dev-libs/apr/files/config.layout.patch b/dev-libs/apr/files/config.layout.patch
deleted file mode 100644
index 9f650a0abe90..000000000000
--- a/dev-libs/apr/files/config.layout.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/config.layout
-+++ b/config.layout
-@@ -229,3 +229,22 @@
-     infodir:       ${exec_prefix}/share/info
-     libsuffix:    -${APR_MAJOR_VERSION}
- </Layout>
-+
-+# Gentoo layout
-+<Layout gentoo>
-+    prefix:        /usr
-+    exec_prefix:   ${prefix}
-+    bindir:        ${exec_prefix}/bin
-+    sbindir:       ${exec_prefix}/bin
-+    libdir:        ${exec_prefix}/lib
-+    libexecdir:    ${exec_prefix}/modules
-+    mandir:        ${prefix}/man
-+    sysconfdir:    ${prefix}/conf
-+    datadir:       /usr/share/apr-${APR_MAJOR_VERSION}
-+    installbuilddir: ${datadir}/build-${APR_MAJOR_VERSION}
-+    includedir:    ${prefix}/include/apr-${APR_MAJOR_VERSION}
-+    localstatedir: ${prefix}
-+    libsuffix:     -${APR_MAJOR_VERSION}
-+</Layout>
-+
-+
diff --git a/dev-libs/apr/metadata.xml b/dev-libs/apr/metadata.xml
deleted file mode 100644
index eea755d1d658..000000000000
--- a/dev-libs/apr/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>apache-bugs@gentoo.org</email>
-    <name>Apache project</name>
-  </maintainer>
-  <use>
-    <flag name="old-kernel">Enable compatibility with older kernels</flag>
-    <flag name="urandom">Use /dev/urandom instead of /dev/random</flag>
-  </use>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:apache:portable_runtime</remote-id>
-  </upstream>
-  <origin>baldeagleos-repo</origin>
-</pkgmetadata>