Misc cleanup, more to come.

Signed-off-by: Jory Pratt <anarchy@gentoo.org>

19 files changed, 0 insertions, 688 deletions

diff --git a/mail-filter/libspf2/Manifest b/mail-filter/libspf2/Manifest
index 359d9492..c0838749 100644
--- a/mail-filter/libspf2/Manifest
+++ b/mail-filter/libspf2/Manifest
@@ -1,2 +1 @@
 DIST libspf2-1.2.10.tar.gz 508842 BLAKE2B d15a44f64c5e3da20aa349e61a6cc02a15f83ed3acff93fe4c23970e30533d6424b1db35d7d60ff488c9a239d343f8544426fbf8fcb66271237155e0b57df1b5 SHA512 162ce382628c6fcadac3e11f5a12442db622bb23f7ec503e16f5ba7fc88afdd777bce6b093c12a58210355985fd11b74b140f08fab347334d82d953dd183b130
-DIST libspf2-1.2.9.tar.gz 518001 BLAKE2B 711a10d8d7799a09f4f0a801ed7a4c7e82611bd8a6dd9a55f616827548761dae9924ca65c64c7271f8cf0f6f605ccb98ff5e8e3035fc3776ee4e7604ec0a02cd SHA512 3137571f438704c176c5251e7b93fd0a8b6b04e52ad37218685b42b1fc5da6286baee578da1a14291d185216bd2a909cca3e55d64ffe580e71be059d1043a248
diff --git a/mail-filter/libspf2/libspf2-1.2.9-r3.ebuild b/mail-filter/libspf2/libspf2-1.2.9-r3.ebuild
deleted file mode 100644
index 8f7fb0aa..00000000
--- a/mail-filter/libspf2/libspf2-1.2.9-r3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils autotools
-
-DESCRIPTION="libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocols"
-HOMEPAGE="http://www.libspf2.org"
-SRC_URI="http://www.libspf2.org/spf/libspf2-${PV}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 BSD-2 )"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="static static-libs"
-
-DEPEND=""
-RDEPEND="!dev-perl/Mail-SPF-Query"
-REQUIRED_USE="static? ( static-libs )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-ipv6.patch"
-	if ! use static; then
-		sed -i -e '/bin_PROGRAMS/s/spfquery_static//' src/spfquery/Makefile.am \
-			-e '/bin_PROGRAMS/s/spftest_static//' src/spftest/Makefile.am \
-			-e '/bin_PROGRAMS/s/spfd_static//' src/spfd/Makefile.am \
-			-e '/bin_PROGRAMS/s/spf_example_static//' src/spf_example/Makefile.am \
-			|| die
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README TODO INSTALL
-
-	use static-libs || rm -f "${D}"/usr/lib*/libspf2.la
-}
diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index d379adb2..619d7082 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -1,3 +1,2 @@
-DIST tcp-wrappers_7.6.q-22.debian.tar.gz 41730 BLAKE2B 2e507269b14e5cf3e1a599b4cdae40c2900b098a1e40fc1b74e6b5565183fc71e25306e8dd0863fb16e6e52a6c471aeccb73c0b7c42d6f3f98aa9f95274583fb SHA512 cee45f265c34ec1c4e9e81d54be636dcd9702964f9cf5bb076f72d6772d2dbc638d2ef366560b51c24a216724807826bb3b7bf9d5d0f5c0923b71de7d0b002a8
 DIST tcp-wrappers_7.6.q-28.debian.tar.xz 36104 BLAKE2B 209fd9730785db8afc8ebec581f7132cfb4352f8807d2cea4715daf5c11aa08a92cf084ab1ff31222f5b265f032286ce2dcf49a238e9dc5616161c400fce4f08 SHA512 2c63201937737c19b4e5ca97dbc0ede9fc2d3b8fc344f8854a7d2afc0109ccb9ee52af94ba8a8498da910336a4f473825daa7a0cca26a0d93e1078e67abe16b0
 DIST tcp_wrappers_7.6.tar.gz 99438 BLAKE2B 961d9858866990f0f5e8c6bb782f5f39a03b267a8957dcd89734aeefcc85ca32554e032c73314e0a88110f3bb8a0dbdd81f093392307623a996b0232773e1e67 SHA512 2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
deleted file mode 100644
index fbf284c2..00000000
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils toolchain-funcs versionator flag-o-matic multilib-minimal usr-ldscript
-
-MY_PV=$(get_version_component_range 1-2)
-DEB_PV=$(get_version_component_range 3)
-MY_P="${PN//-/_}_${MY_PV}"
-DESCRIPTION="TCP Wrappers"
-HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
-SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz
-	mirror://debian/pool/main/t/${PN}/${PN}_${MY_PV}.q-${DEB_PV}.debian.tar.gz"
-
-LICENSE="tcp_wrappers_license"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc x86"
-IUSE="ipv6 netgroups static-libs"
-
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	EPATCH_OPTS="-p1" \
-	epatch $(sed -e 's:^:../debian/patches/:' ../debian/patches/series)
-	epatch "${FILESDIR}"/${PN}-7.6-headers.patch
-	epatch "${FILESDIR}"/${PN}-7.6-redhat-bug11881.patch
-	epatch "${FILESDIR}"/${PN}-7.6.22-remove-DECLS.patch
-
-	multilib_copy_sources
-}
-
-temake() {
-	local mycppflags="-DHAVE_WEAKSYMS -DHAVE_STRERROR -DSYS_ERRLIST_DEFINED"
-	use ipv6 && mycppflags+=" -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len"
-	emake \
-		REAL_DAEMON_DIR="${EPREFIX}"/usr/sbin \
-		TLI= VSYSLOG= PARANOID= BUGS= \
-		AUTH="-DALWAYS_RFC931" \
-		AUX_OBJ="weak_symbols.o" \
-		DOT="-DAPPEND_DOT" \
-		HOSTNAME="-DALWAYS_HOSTNAME" \
-		NETGROUP=$(usex netgroups -DNETGROUPS "") \
-		STYLE="-DPROCESS_OPTIONS" \
-		LIBS=$(usex netgroups -lnsl "") \
-		LIB=$(usex static-libs libwrap.a "") \
-		AR="$(tc-getAR)" ARFLAGS=rc \
-		CC="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		COPTS="${CFLAGS} ${CPPFLAGS} ${mycppflags}" \
-		LDFLAGS="${LDFLAGS}" \
-		"$@" || die
-}
-
-multilib_src_configure() {
-	tc-export AR RANLIB
-	temake config-check
-}
-
-multilib_src_compile() {
-	temake all
-}
-
-multilib_src_install() {
-	into /usr
-	use static-libs && dolib.a libwrap.a
-	dolib.so shared/libwrap.so*
-
-	insinto /usr/include
-	doins tcpd.h
-
-	if multilib_is_native_abi; then
-		gen_usr_ldscript -a wrap
-		dosbin tcpd tcpdchk tcpdmatch safe_finger try-from
-	fi
-}
-
-multilib_src_install_all() {
-	doman *.[358]
-	dosym hosts_access.5 /usr/share/man/man5/hosts.allow.5
-	dosym hosts_access.5 /usr/share/man/man5/hosts.deny.5
-
-	insinto /etc
-	newins "${FILESDIR}"/hosts.allow.example hosts.allow
-
-	dodoc BLURB CHANGES DISCLAIMER README*
-}
-
-pkg_preinst() {
-	# don't clobber people with our default example config
-	[[ -e ${EROOT}/etc/hosts.allow ]] && cp -pP "${EROOT}"/etc/hosts.allow "${ED}"/etc/hosts.allow
-}
diff --git a/sys-libs/libapparmor/Manifest b/sys-libs/libapparmor/Manifest
deleted file mode 100644
index 6a84fadf..00000000
--- a/sys-libs/libapparmor/Manifest
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST apparmor-2.11.1.tar.gz 5017646 BLAKE2B ee0176c87b2800eb562c136ff324f08e444c412117c4593ff97c4b0e4c63db2aea0721c6ed38f3c733e3c95024165f329e520acf838c4798a8285b8dedf0d51e SHA512 f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c
-DIST apparmor-2.12.tar.gz 7258450 BLAKE2B c1d4e01d836c5f567ddb7c5ecf36dde6efccf1e59ae219824129fd5c92162a3fed7ebdc492f181ae132b07db068660078a9631543d40fd20ab0b44cd4c646d4c SHA512 d85fd47c66333fe5658ee5e977b32142697f6e36c575550712ee2ace2ad0fbf2aa59c8fd3b82ad8821c0190adf8cc150cf623ea09a84d5b32bde050a03dd6e9a
------BEGIN PGP SIGNATURE-----
-
-iQIzBAEBCAAdFiEE8JaD5QHaZGPThRiKxu9aAvVkeYcFAlrjjcYACgkQxu9aAvVk
-eYcGMQ/+M6Og6CkCvCW6PBUwYty2EBMAmJc0OctvlxXYhmjJiu9dgvUQz/pZw8xs
-MD8Kj2sw+NzwTFwxLsH4CIkSv+oGyDsR8sSPHhYIwI7gA/pxk3i0uK+F3J9EAHFv
-cEIqlO12IJ26IHP1UOML4Y6UXAgCNIX5DcpUtcipK2o00azsOPVzfcvpBYQXYTmD
-pI2/gRweFtL72MWXBdAzZCl7u6swq7XZg7p14uXYuz6MnQP/THLqxOmhDRUVvfr1
-sEAsmPZj9Tsm9PGtUm9wZnduxJMyr6I9JFGN4DTRJIuYfymuzRZ2JTe2sAvRd2Jb
-Y8nRR9tsMImqeocQPq7tnMul6ktoMi3LCeHY9OmVWw+ywmSJ0cesLItMIXZg3NsY
-N2ja/PqflNblywm+z9T9K89rNfLZakJgNOXesBQwOhFApFIG2dHdWlkbaivUJyyq
-cQU1y8UNQzqM0CapgE4KLMGK+g+DvQkGRg4lDOVawbmnaHmQ9cDZPyyz/oni3GQa
-6CKg8UiiYjoJCJmeJNccdIgxBDvgTPF0xNNCxnHPyX45EU0qPf+Q5ZGSDsPLDO8C
-ZiqZcg4wt4wFpNU3iCwp7MbXtcbr0LOao0eIy6lX8NJ8suCZLMzG+cFJLRPCxI5Q
-nbYbzEW614arzb2++EvOf8gmVy7tNQ1KrAxEEg7lRjQMKGyjdn0=
-=lOpQ
------END PGP SIGNATURE-----
diff --git a/sys-libs/libapparmor/files/libapparmor-2.10-symbol_visibility.patch b/sys-libs/libapparmor/files/libapparmor-2.10-symbol_visibility.patch
deleted file mode 100644
index beaf355a..00000000
--- a/sys-libs/libapparmor/files/libapparmor-2.10-symbol_visibility.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Adds an aditional symbol to allow dynamic linking.
-
---- src/libapparmor.map
-+++ src/libapparmor.map
-@@ -94,6 +94,7 @@
- 		_aa_autoclose;
- 		_aa_autofclose;
- 		_aa_dirat_for_each;
-+		_aa_asprintf;
- 	local:
- 		*;
- };
-
diff --git a/sys-libs/libapparmor/files/libapparmor-2.12-secure_getenv.patch b/sys-libs/libapparmor/files/libapparmor-2.12-secure_getenv.patch
deleted file mode 100644
index 56c40965..00000000
--- a/sys-libs/libapparmor/files/libapparmor-2.12-secure_getenv.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- a/libraries/libapparmor/configure.ac
-+++ b/libraries/libapparmor/configure.ac
-@@ -81,7 +81,7 @@ AM_CONDITIONAL(HAVE_RUBY, test x$with_ruby = xyes)
- AC_HEADER_STDC
- AC_CHECK_HEADERS(unistd.h stdint.h syslog.h)
- 
--AC_CHECK_FUNCS([asprintf __secure_getenv secure_getenv])
-+AC_CHECK_FUNCS([asprintf __secure_getenv secure_getenv scandirat])
- 
- AM_PROG_CC_C_O
- AC_C_CONST
---- a/libraries/libapparmor/src/Makefile.am
-+++ b/libraries/libapparmor/src/Makefile.am
-@@ -46,9 +46,9 @@ af_protos.h: /usr/include/netinet/in.h
- 	 LC_ALL=C  sed  -n -e "/IPPROTO_MAX/d"  -e "s/^\#define[ \\t]\\+IPPROTO_\\([A-Z0-9_]\\+\\)\\(.*\\)$$/AA_GEN_PROTO_ENT(\\UIPPROTO_\\1, \"\\L\\1\")/p" $< > $@
- 
- lib_LTLIBRARIES = libapparmor.la
--noinst_HEADERS = grammar.h parser.h scanner.h af_protos.h private.h
-+noinst_HEADERS = grammar.h parser.h scanner.h af_protos.h secure_getenv.h scandirat.h private.h
- 
--libapparmor_la_SOURCES = grammar.y libaalogparse.c kernel.c scanner.c private.c features.c kernel_interface.c policy_cache.c
-+libapparmor_la_SOURCES = grammar.y libaalogparse.c kernel.c scanner.c secure_getenv.c scandirat.c private.c features.c kernel_interface.c policy_cache.c
- libapparmor_la_LDFLAGS = -version-info $(AA_LIB_CURRENT):$(AA_LIB_REVISION):$(AA_LIB_AGE) -XCClinker -dynamic -pthread \
- 	-Wl,--version-script=$(top_srcdir)/src/libapparmor.map
- 
---- a/libraries/libapparmor/src/private.c
-+++ b/libraries/libapparmor/src/private.c
-@@ -39,10 +39,14 @@
-  #ifdef HAVE___SECURE_GETENV
-   #define secure_getenv __secure_getenv
-  #else
--  #error neither secure_getenv nor __secure_getenv is available
-+  #include "secure_getenv.h"
-  #endif
- #endif
- 
-+#ifndef HAVE_SCANDIRAT
-+#include "scandirat.h"
-+#endif
-+
- struct ignored_suffix_t {
- 	const char * text;
- 	int len;
---- /dev/null
-+++ b/libraries/libapparmor/src/scandirat.c
-@@ -0,0 +1,63 @@
-+#include <dirent.h>
-+#include <string.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <fcntl.h>
-+#include <inttypes.h>
-+#include <errno.h>
-+
-+#include "scandirat.h"
-+
-+#ifndef HAVE_SCANDIRAT
-+
-+int scandirat(int dir_fd, const char *dirp, struct dirent ***namelist,
-+	int (*filter)(const struct dirent *),
-+	int (*compar)(const struct dirent **, const struct dirent **))
-+{
-+	int fd;
-+	DIR *d;
-+	struct dirent *de, **names=0, **tmp;
-+	size_t cnt=0, len=0;
-+	int old_errno = errno;
-+
-+
-+	fd = openat(dir_fd, dirp, O_RDONLY|O_CLOEXEC);
-+	if (fd == -1) return -1;
-+
-+	d = fdopendir(fd);
-+
-+	if (!d) {
-+		close(fd);
-+		return -1;
-+	}
-+
-+	while ((errno=0), (de = readdir(d))) {
-+		if (filter && !filter(de)) continue;
-+		if (cnt >= len) {
-+			len = 2*len+1;
-+			if (len > SIZE_MAX/sizeof *names) break;
-+			tmp = realloc(names, len * sizeof *names);
-+			if (!tmp) break;
-+			names = tmp;
-+		}
-+		names[cnt] = malloc(de->d_reclen);
-+		if (!names[cnt]) break;
-+		memcpy(names[cnt++], de, de->d_reclen);
-+	}
-+
-+	closedir(d);
-+
-+	if (errno) {
-+		if (names) while (cnt-->0) free(names[cnt]);
-+		free(names);
-+		return -1;
-+	}
-+	errno = old_errno;
-+
-+	if (compar) qsort(names, cnt, sizeof *names, (int (*)(const void *, const void *))compar);
-+	*namelist = names;
-+	return cnt;
-+}
-+
-+#endif
-+
---- /dev/null
-+++ b/libraries/libapparmor/src/scandirat.h
-@@ -0,0 +1,13 @@
-+#ifndef LIBAPPARMOR_SCANDIRAT_H
-+#define LIBAPPARMOR_SCANDIRAT_H
-+
-+#include <dirent.h>
-+
-+#ifndef HAVE_SCANDIRAT
-+int scandirat(int dir_fd, const char *dirp, struct dirent ***namelist,
-+	int (*filter)(const struct dirent *),
-+	int (*compar)(const struct dirent **, const struct dirent **));
-+#endif
-+
-+#endif
-+
---- /dev/null
-+++ b/libraries/libapparmor/src/secure_getenv.c
-@@ -0,0 +1,15 @@
-+#include <stdlib.h>
-+#include <sys/auxv.h>
-+
-+#include "secure_getenv.h"
-+
-+#ifndef HAVE_SECURE_GETENV
-+char *secure_getenv(const char *name)
-+{
-+	if (!getauxval(AT_SECURE)) {
-+		return getenv(name);
-+	}
-+	return NULL;
-+}
-+#endif
-+
---- /dev/null
-+++ b/libraries/libapparmor/src/secure_getenv.h
-@@ -0,0 +1,8 @@
-+#ifndef LIBAPPARMOR_SECURE_GETENV_H
-+#define LIBAPPARMOR_SECURE_GETENV_H
-+
-+#ifndef HAVE_SECURE_GETENV
-+char *secure_getenv(const char *name);
-+#endif
-+
-+#endif
diff --git a/sys-libs/libapparmor/libapparmor-2.11.1.ebuild b/sys-libs/libapparmor/libapparmor-2.11.1.ebuild
deleted file mode 100644
index 0d6309ba..00000000
--- a/sys-libs/libapparmor/libapparmor-2.11.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{7,8,9} )
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit autotools-utils distutils-r1 perl-functions versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Library to support AppArmor userspace utilities"
-HOMEPAGE="http://apparmor.net/"
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +perl +python static-libs"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf-archive
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( dev-lang/perl )
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig	)"
-
-S=${WORKDIR}/apparmor-${PV}/libraries/${PN}
-
-RESTRICT="test"
-
-src_prepare() {
-	rm -r m4 || die "failed to remove bundled macros"
-	epatch "${FILESDIR}"/${PN}-2.10-symbol_visibility.patch
-	epatch "${FILESDIR}"/${PN}-2.12-secure_getenv.patch
-	autotools-utils_src_prepare
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with perl) \
-		$(use_with python)
-	)
-
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile -C src
-	autotools-utils_src_compile -C include
-	use doc && autotools-utils_src_compile -C doc
-	use perl && autotools-utils_src_compile -C swig/perl
-
-	if use python ; then
-		pushd "${BUILD_DIR}"/swig/python > /dev/null
-		emake libapparmor_wrap.c
-		distutils-r1_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install -C src
-	autotools-utils_src_install -C include
-	use doc && autotools-utils_src_install -C doc
-
-	if use perl ; then
-		autotools-utils_src_install -C swig/perl
-		perl_set_version
-		insinto "${VENDOR_ARCH}"
-		doins "${BUILD_DIR}"/swig/perl/LibAppArmor.pm
-
-		# bug 620886
-		perl_delete_localpod
-		perl_fix_packlist
-	fi
-
-	if use python ; then
-		pushd "${BUILD_DIR}"/swig/python > /dev/null
-		distutils-r1_src_install
-
-		python_moduleinto LibAppArmor
-		python_foreach_impl python_domodule LibAppArmor.py
-		popd > /dev/null
-	fi
-}
diff --git a/sys-libs/libapparmor/libapparmor-2.12.0.ebuild b/sys-libs/libapparmor/libapparmor-2.12.0.ebuild
deleted file mode 100644
index 5708621d..00000000
--- a/sys-libs/libapparmor/libapparmor-2.12.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{7,8,9} )
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit autotools-utils distutils-r1 perl-functions versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Library to support AppArmor userspace utilities"
-HOMEPAGE="http://apparmor.net/"
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${MY_PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="doc +perl +python static-libs"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf-archive
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( dev-lang/perl )
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig	)"
-
-S=${WORKDIR}/apparmor-${MY_PV}/libraries/${PN}
-
-RESTRICT="test"
-
-src_prepare() {
-	rm -r m4 || die "failed to remove bundled macros"
-	epatch "${FILESDIR}"/${PN}-2.10-symbol_visibility.patch
-	epatch "${FILESDIR}"/${PN}-2.12-secure_getenv.patch
-	autotools-utils_src_prepare
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with perl) \
-		$(use_with python)
-	)
-
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile -C src
-	autotools-utils_src_compile -C include
-	use doc && autotools-utils_src_compile -C doc
-	use perl && autotools-utils_src_compile -C swig/perl
-
-	if use python ; then
-		pushd "${BUILD_DIR}"/swig/python > /dev/null
-		emake libapparmor_wrap.c
-		distutils-r1_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install -C src
-	autotools-utils_src_install -C include
-	use doc && autotools-utils_src_install -C doc
-
-	if use perl ; then
-		autotools-utils_src_install -C swig/perl
-		perl_set_version
-		insinto "${VENDOR_ARCH}"
-		doins "${BUILD_DIR}"/swig/perl/LibAppArmor.pm
-
-		# bug 620886
-		perl_delete_localpod
-		perl_fix_packlist
-	fi
-
-	if use python ; then
-		pushd "${BUILD_DIR}"/swig/python > /dev/null
-		distutils-r1_src_install
-
-		python_moduleinto LibAppArmor
-		python_foreach_impl python_domodule LibAppArmor.py
-		popd > /dev/null
-	fi
-}
diff --git a/sys-libs/libapparmor/metadata.xml b/sys-libs/libapparmor/metadata.xml
deleted file mode 100644
index 42d1e8f6..00000000
--- a/sys-libs/libapparmor/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>kensington@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>hardened@gentoo.org</email>
-		<name>Gentoo Hardened</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">apparmor</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest
deleted file mode 100644
index c6b5e019..00000000
--- a/x11-libs/libpciaccess/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST libpciaccess-0.13.4.tar.bz2 372004 SHA256 07f864654561e4ac8629a0ef9c8f07fbc1f8592d1b6c418431593e9ba2cf2fcf SHA512 d5b32c525dd36dc85c9a09f45696808730eabbbd3cce892a6dbfb02a566598baad27be58567eb7ced15b3d99fb9afa1d1c24ec19754bcf7a1857a0c8cea34d92 WHIRLPOOL d48ecb99e7e31bc1c13e779261b7ae579ca28a054b20521cb7503c2bfe3182fa2f96c939eee0ebcca1783f3f38c07535173a3bb9a0713834cadd4b9709f25174
-DIST libpciaccess-0.14.tar.bz2 361375 BLAKE2B 05af836e52c7a8e19537a5c246f2dbbfee0a8c078ed0d6c45de6d1cc5f07b70d91b9409846b175da74f31b0e2536e38ffcb65983d79d40a54abc878b679d845d SHA512 bf40214dfd22f2a223f7c948566e6eaa4bfed60116e71b3eb19f6fe7ab2c4546649eb0416c06d5983e476ea5e27de036936646eb5f800ea97763b6d1f1976f4b
diff --git a/x11-libs/libpciaccess/files/libpciaccess-0.13.2-arm.patch b/x11-libs/libpciaccess/files/libpciaccess-0.13.2-arm.patch
deleted file mode 100644
index 263dc01f..00000000
--- a/x11-libs/libpciaccess/files/libpciaccess-0.13.2-arm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libpciaccess-0.13.2/src/linux_sysfs.c
-+++ b/libpciaccess-0.13.2/src/linux_sysfs.c
-@@ -45,7 +45,7 @@
- #include <dirent.h>
- #include <errno.h>
- 
--#if defined(__i386__) || defined(__x86_64__) || defined(__arm__)
-+#if defined(__i386__) || defined(__x86_64__)
- #include <sys/io.h>
- #else
- #define inb(x) -1
diff --git a/x11-libs/libpciaccess/files/libpciaccess-0.13.2-limits.patch b/x11-libs/libpciaccess/files/libpciaccess-0.13.2-limits.patch
deleted file mode 100644
index 463b4185..00000000
--- a/x11-libs/libpciaccess/files/libpciaccess-0.13.2-limits.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libpciaccess-0.13.2/src/linux_sysfs.c
-+++ b/libpciaccess-0.13.2/src/linux_sysfs.c
-@@ -44,6 +44,7 @@
- #include <sys/mman.h>
- #include <dirent.h>
- #include <errno.h>
-+#include <limits.h>
- 
- #if defined(__i386__) || defined(__x86_64__) || defined(__arm__)
- #include <sys/io.h>
diff --git a/x11-libs/libpciaccess/libpciaccess-0.13.4.ebuild b/x11-libs/libpciaccess/libpciaccess-0.13.4.ebuild
deleted file mode 100644
index 2f2f88f1..00000000
--- a/x11-libs/libpciaccess/libpciaccess-0.13.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="amd64 arm arm64 ~mips ppc x86"
-IUSE="zlib"
-
-DEPEND="!<x11-base/xorg-server-1.5
-	zlib? (	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	sys-apps/hwids"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.13.2-limits.patch
-	"${FILESDIR}"/${PN}-0.13.2-arm.patch
-)
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	XORG_CONFIGURE_OPTIONS=(
-		"$(use_with zlib)"
-		"--with-pciids-path=${EPREFIX}/usr/share/misc"
-	)
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi; then
-		dodir /usr/bin
-		${BASH} libtool --mode=install "$(type -P install)" -c scanpci/scanpci "${ED}"/usr/bin || die
-	fi
-}
diff --git a/x11-libs/libpciaccess/libpciaccess-0.14.ebuild b/x11-libs/libpciaccess/libpciaccess-0.14.ebuild
deleted file mode 100644
index e0f9cabf..00000000
--- a/x11-libs/libpciaccess/libpciaccess-0.14.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc x86"
-IUSE="zlib"
-
-DEPEND="!<x11-base/xorg-server-1.5
-	zlib? (	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	sys-apps/hwids"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.13.2-limits.patch
-	"${FILESDIR}"/${PN}-0.13.2-arm.patch
-)
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	XORG_CONFIGURE_OPTIONS=(
-		"$(use_with zlib)"
-		"--with-pciids-path=${EPREFIX}/usr/share/misc"
-	)
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi; then
-		dodir /usr/bin
-		${BASH} libtool --mode=install "$(type -P install)" -c scanpci/scanpci "${ED}"/usr/bin || die
-	fi
-}
diff --git a/x11-libs/libpciaccess/metadata.xml b/x11-libs/libpciaccess/metadata.xml
deleted file mode 100644
index e943b72b..00000000
--- a/x11-libs/libpciaccess/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-libs/xcb-util-xrm/Manifest b/x11-libs/xcb-util-xrm/Manifest
deleted file mode 100644
index e6e8ed04..00000000
--- a/x11-libs/xcb-util-xrm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xcb-util-xrm-1.3.tar.bz2 327586 BLAKE2B 06ba03ba22c9a51cad5045024b63d48f32e5ad38d2cf03035bd1132a04ef4906a71d89030141b407329bd8ec04cb131846be2cb3a95e755a57c2841a45b58fa4 SHA512 ebca5d92c9e2363f58485970a0c3a948b13652ce7acdd51dff918fc2e8bc7fcb69892eb3fc8b5f7eaf721ccd8dc2db42727d206bc5155481ec5e7e41d0c7f304
diff --git a/x11-libs/xcb-util-xrm/metadata.xml b/x11-libs/xcb-util-xrm/metadata.xml
deleted file mode 100644
index 2b0c7132..00000000
--- a/x11-libs/xcb-util-xrm/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<longdescription>
-		The XCB util modules provides a number of libraries which sit on top
-		of libxcb, the core X protocol library, and some of the extension
-		libraries. These experimental libraries provide convenience functions
-		and interfaces which make the raw X protocol more usable. Some of the
-		libraries also provide client-side code which is not strictly part of
-		the X protocol but which have traditionally been provided by Xlib.
-	</longdescription>
-	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">Airblader/xcb-util-xrm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3.ebuild b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3.ebuild
deleted file mode 100644
index 0f459026..00000000
--- a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_BASE_INDIVIDUAL_URI=""
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="https://xcb.freedesktop.org/"
-SRC_URI="https://github.com/Airblader/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	x11-libs/xcb-util[${MULTILIB_USEDEP}]
-	elibc_musl? ( sys-libs/queue-standalone )"
-DEPEND="${RDEPEND}
-	x11-libs/libX11[${MULTILIB_USEDEP}]" # Only for tests, but configure.ac requires it
-
-src_configure() {
-	xorg-2_src_configure
-}