Merge "Merge commit '931df15b06fdb32d1416e5780b2059e3f98ee531' into cros_sdk"
diff --git a/app-admin/sudo/OWNERS b/app-admin/sudo/OWNERS
new file mode 100644
index 0000000..0300dc1
--- /dev/null
+++ b/app-admin/sudo/OWNERS
@@ -0,0 +1 @@
+include chromiumos/overlays/chromiumos-overlay:/OWNERS.security
diff --git a/app-admin/sudo/sudo-1.9.5_p2-r1.ebuild b/app-admin/sudo/sudo-1.9.5_p2-r1.ebuild
new file mode 120000
index 0000000..6ff16fc
--- /dev/null
+++ b/app-admin/sudo/sudo-1.9.5_p2-r1.ebuild
@@ -0,0 +1 @@
+sudo-1.9.5_p2.ebuild
\ No newline at end of file
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index ea65e98..a717127 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -1 +1 @@
-DIST brotli-1.0.7.tar.gz 23827908 BLAKE2B b9fc554cd23c8387b648638b6f9bb2d29fa87035856d03cf284662f9281984f3bf8e40109e61155ece18673f4391bc0fff704f8ab800a2041d3ce1824478d2ae SHA512 a82362aa36d2f2094bca0b2808d9de0d57291fb3a4c29d7c0ca0a37e73087ec5ac4df299c8c363e61106fccf2fe7f58b5cf76eb97729e2696058ef43b1d3930a
+DIST brotli-1.0.9.tar.gz 486984 BLAKE2B 8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904 SHA512 b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5
diff --git a/app-arch/brotli/brotli-1.0.7.ebuild b/app-arch/brotli/brotli-1.0.7.ebuild
deleted file mode 100644
index 9e560a8..0000000
--- a/app-arch/brotli/brotli-1.0.7.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
-DISTUTILS_OPTIONAL="1"
-DISTUTILS_IN_SOURCE_BUILD="1"
-
-inherit cmake-multilib distutils-r1
-
-DESCRIPTION="Generic-purpose lossless compression algorithm"
-HOMEPAGE="https://github.com/google/brotli"
-
-SLOT="0/$(ver_cut 1)"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-
-IUSE="python test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-LICENSE="MIT python? ( Apache-2.0 )"
-
-DOCS=( README.md CONTRIBUTING.md )
-
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/google/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="*"
-	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	use python && distutils-r1_src_prepare
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake-utils_src_configure
-}
-src_configure() {
-	cmake-multilib_src_configure
-	use python && distutils-r1_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-}
-src_compile() {
-	cmake-multilib_src_compile
-	use python && distutils-r1_src_compile
-}
-
-python_test(){
-	esetup.py test || die
-}
-
-multilib_src_test() {
-	cmake-utils_src_test
-}
-src_test() {
-	cmake-multilib_src_test
-	use python && distutils-r1_src_test
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-multilib_src_install_all() {
-	use python && distutils-r1_src_install
-}
diff --git a/app-arch/brotli/brotli-1.0.9-r2.ebuild b/app-arch/brotli/brotli-1.0.9-r2.ebuild
new file mode 100644
index 0000000..55eed04
--- /dev/null
+++ b/app-arch/brotli/brotli-1.0.9-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_OPTIONAL="1"
+DISTUTILS_IN_SOURCE_BUILD="1"
+
+inherit cmake-multilib distutils-r1
+
+DESCRIPTION="Generic-purpose lossless compression algorithm"
+HOMEPAGE="https://github.com/google/brotli"
+
+SLOT="0/$(ver_cut 1)"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+
+IUSE="python static-libs test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+LICENSE="MIT python? ( Apache-2.0 )"
+
+DOCS=( README.md CONTRIBUTING.md )
+
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/google/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="*"
+	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+# tests are currently broken, see https://github.com/google/brotli/issues/850
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-linker.patch"
+)
+
+src_prepare() {
+	use python && distutils-r1_src_prepare
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake-utils_src_configure
+}
+src_configure() {
+	cmake-multilib_src_configure
+	use python && distutils-r1_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+}
+src_compile() {
+	cmake-multilib_src_compile
+	use python && distutils-r1_src_compile
+}
+
+python_test() {
+	esetup.py test || die
+}
+
+multilib_src_test() {
+	cmake-utils_src_test
+}
+src_test() {
+	cmake-multilib_src_test
+	use python && distutils-r1_src_test
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a || die
+}
+multilib_src_install_all() {
+	use python && distutils-r1_src_install
+}
diff --git a/app-arch/brotli/files/1.0.9-linker.patch b/app-arch/brotli/files/1.0.9-linker.patch
new file mode 100644
index 0000000..8ecf2e4
--- /dev/null
+++ b/app-arch/brotli/files/1.0.9-linker.patch
@@ -0,0 +1,47 @@
+From 092446fafb4bfb81738853b7c7f76b293cd92a80 Mon Sep 17 00:00:00 2001
+From: Evgenii Kliuchnikov <eustas.ru@gmail.com>
+Date: Wed, 2 Sep 2020 10:49:49 +0200
+Subject: [PATCH] Revert "Add runtime linker path to pkg-config files (#740)"
+
+This reverts commit 31754d4ffce14153b5c2addf7a11019ec23f51c1.
+---
+ scripts/libbrotlicommon.pc.in | 2 +-
+ scripts/libbrotlidec.pc.in    | 2 +-
+ scripts/libbrotlienc.pc.in    | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/libbrotlicommon.pc.in b/scripts/libbrotlicommon.pc.in
+index 10ca969e..2a8cf7a3 100644
+--- a/scripts/libbrotlicommon.pc.in
++++ b/scripts/libbrotlicommon.pc.in
+@@ -7,5 +7,5 @@ Name: libbrotlicommon
+ URL: https://github.com/google/brotli
+ Description: Brotli common dictionary library
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -R${libdir} -lbrotlicommon
++Libs: -L${libdir} -lbrotlicommon
+ Cflags: -I${includedir}
+diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in
+index e7c3124f..6f8ef2e4 100644
+--- a/scripts/libbrotlidec.pc.in
++++ b/scripts/libbrotlidec.pc.in
+@@ -7,6 +7,6 @@ Name: libbrotlidec
+ URL: https://github.com/google/brotli
+ Description: Brotli decoder library
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -R${libdir} -lbrotlidec
++Libs: -L${libdir} -lbrotlidec
+ Requires.private: libbrotlicommon >= 1.0.2
+ Cflags: -I${includedir}
+diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in
+index 4dd0811b..2098afe2 100644
+--- a/scripts/libbrotlienc.pc.in
++++ b/scripts/libbrotlienc.pc.in
+@@ -7,6 +7,6 @@ Name: libbrotlienc
+ URL: https://github.com/google/brotli
+ Description: Brotli encoder library
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -R${libdir} -lbrotlienc
++Libs: -L${libdir} -lbrotlienc
+ Requires.private: libbrotlicommon >= 1.0.2
+ Cflags: -I${includedir}
diff --git a/app-arch/brotli/files/brotli-1.0.2-no-rpath.patch b/app-arch/brotli/files/brotli-1.0.2-no-rpath.patch
deleted file mode 100644
index 779b5e6..0000000
--- a/app-arch/brotli/files/brotli-1.0.2-no-rpath.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ac55f6b3..2dc7232c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,16 +24,6 @@ mark_as_advanced(BROTLI_BUNDLED_MODE)
- 
- include(GNUInstallDirs)
- 
--# When building shared libraries it is important to set the correct rpath.
--# See https://cmake.org/Wiki/CMake_RPATH_handling#Always_full_RPATH
--set(CMAKE_SKIP_BUILD_RPATH FALSE)
--set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
--set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
--list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_LIBDIR}" isSystemDir)
--if ("${isSystemDir}" STREQUAL "-1")
--  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}")
--endif()
--
- # Parse version information from common/version.h. Normally we would
- # define these values here and write them out to configuration file(s)
- # (i.e., config.h), but in this case we parse them from
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 4db66c1..a4b18f5 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -1 +1 @@
-DIST bzip2-1.0.6.tar.gz 782025 BLAKE2B b31533af7c71d715e6600874bb0a11b9b3aebbb08af0414a6d88bd5a2ad879a482ad408338159cb6c241815da8f48798d2ea7789ea971431d0be42ee827b0a7e SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12
+DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
diff --git a/app-arch/bzip2/bzip2-1.0.6-r11.ebuild b/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
deleted file mode 100644
index 234a528..0000000
--- a/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
-#      (since we're building shared libs) ...
-
-EAPI=6
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
-HOMEPAGE="https://sourceware.org/bzip2/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="BZIP2"
-SLOT="0/1" # subslot = SONAME
-KEYWORDS="*"
-IUSE="static static-libs"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
-	"${FILESDIR}"/${PN}-1.0.6-saneso.patch
-	"${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
-	"${FILESDIR}"/${PN}-1.0.6-progress.patch
-	"${FILESDIR}"/${PN}-1.0.3-no-test.patch
-	"${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365
-	"${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573
-	"${FILESDIR}"/${PN}-1.0.6-out-of-tree-build.patch
-	"${FILESDIR}"/${PN}-1.0.6-CVE-2016-3189.patch #620466
-	"${FILESDIR}"/${PN}-1.0.6-ubsan-error.patch
-	"${FILESDIR}"/${PN}-1.0.6-nselectors-upper-bound-check.patch
-)
-
-DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf )
-HTML_DOCS=( manual.html )
-
-src_prepare() {
-	default
-
-	# - Use right man path
-	# - Generate symlinks instead of hardlinks
-	# - pass custom variables to control libdir
-	sed -i \
-		-e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
-		-e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
-		-e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
-		Makefile || die
-}
-
-bemake() {
-	emake \
-		VPATH="${S}" \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		"$@"
-}
-
-multilib_src_compile() {
-	bemake -f "${S}"/Makefile-libbz2_so all
-	# Make sure we link against the shared lib #504648
-	ln -s libbz2.so.${PV} libbz2.so || die
-	bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')"
-}
-
-multilib_src_install() {
-	into /usr
-
-	# Install the shared lib manually.  We install:
-	#  .x.x.x - standard shared lib behavior
-	#  .x.x   - SONAME some distros use #338321
-	#  .x     - SONAME Gentoo uses
-	dolib.so libbz2.so.${PV}
-	local v
-	for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
-		dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
-	done
-	use static-libs && dolib.a libbz2.a
-
-	if multilib_is_native_abi ; then
-		gen_usr_ldscript -a bz2
-
-		dobin bzip2recover
-		into /
-		dobin bzip2
-	fi
-}
-
-multilib_src_install_all() {
-	# `make install` doesn't cope with out-of-tree builds, nor with
-	# installing just non-binaries, so handle things ourselves.
-	insinto /usr/include
-	doins bzlib.h
-	into /usr
-	dobin bz{diff,grep,more}
-	doman *.1
-
-	dosym bzdiff /usr/bin/bzcmp
-	dosym bzdiff.1 /usr/share/man/man1/bzcmp.1
-
-	dosym bzmore /usr/bin/bzless
-	dosym bzmore.1 /usr/share/man/man1/bzless.1
-
-	local x
-	for x in bunzip2 bzcat bzip2recover ; do
-		dosym bzip2.1 /usr/share/man/man1/${x}.1
-	done
-	for x in bz{e,f}grep ; do
-		dosym bzgrep /usr/bin/${x}
-		dosym bzgrep.1 /usr/share/man/man1/${x}.1
-	done
-
-	einstalldocs
-
-	# move "important" bzip2 binaries to /bin and use the shared libbz2.so
-	dosym bzip2 /bin/bzcat
-	dosym bzip2 /bin/bunzip2
-}
diff --git a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
new file mode 100644
index 0000000..17ecfab
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
+#      (since we're building shared libs) ...
+
+EAPI=7
+
+inherit toolchain-funcs multilib-minimal usr-ldscript
+
+DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
+HOMEPAGE="https://sourceware.org/bzip2/"
+SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz"
+
+LICENSE="BZIP2"
+SLOT="0/1" # subslot = SONAME
+KEYWORDS="*"
+IUSE="static static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
+	"${FILESDIR}"/${PN}-1.0.8-saneso.patch
+	"${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
+	"${FILESDIR}"/${PN}-1.0.6-progress.patch
+	"${FILESDIR}"/${PN}-1.0.3-no-test.patch
+	"${FILESDIR}"/${PN}-1.0.8-mingw.patch #393573
+	"${FILESDIR}"/${PN}-1.0.8-out-of-tree-build.patch
+)
+
+DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf )
+HTML_DOCS=( manual.html )
+
+src_prepare() {
+	default
+
+	# - Use right man path
+	# - Generate symlinks instead of hardlinks
+	# - pass custom variables to control libdir
+	sed -i \
+		-e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
+		-e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
+		-e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
+		Makefile || die
+}
+
+bemake() {
+	emake \
+		VPATH="${S}" \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		"$@"
+}
+
+multilib_src_compile() {
+	bemake -f "${S}"/Makefile-libbz2_so all
+	# Make sure we link against the shared lib #504648
+	ln -s libbz2.so.${PV} libbz2.so || die
+	bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')"
+}
+
+multilib_src_install() {
+	into /usr
+
+	# Install the shared lib manually.  We install:
+	#  .x.x.x - standard shared lib behavior
+	#  .x.x   - SONAME some distros use #338321
+	#  .x     - SONAME Gentoo uses
+	dolib.so libbz2.so.${PV}
+	local v
+	for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
+		dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
+	done
+
+	# Install libbz2.so.1.0 due to accidental soname change in 1.0.7.
+	# Reference: 98da0ad82192d21ad74ae52366ea8466e2acea24.
+	# OK to remove one year after 2020-04-11.
+	if [[ ! -L "${ED}/usr/$(get_libdir)/libbz2.so.1.0" ]]; then
+		dosym libbz2.so.${PV} "/usr/$(get_libdir)/libbz2.so.1.0"
+	fi
+
+	use static-libs && dolib.a libbz2.a
+
+	if multilib_is_native_abi ; then
+		gen_usr_ldscript -a bz2
+
+		dobin bzip2recover
+		into /
+		dobin bzip2
+	fi
+}
+
+multilib_src_install_all() {
+	# `make install` doesn't cope with out-of-tree builds, nor with
+	# installing just non-binaries, so handle things ourselves.
+	insinto /usr/include
+	doins bzlib.h
+	into /usr
+	dobin bz{diff,grep,more}
+	doman *.1
+
+	dosym bzdiff /usr/bin/bzcmp
+	dosym bzdiff.1 /usr/share/man/man1/bzcmp.1
+
+	dosym bzmore /usr/bin/bzless
+	dosym bzmore.1 /usr/share/man/man1/bzless.1
+
+	local x
+	for x in bunzip2 bzcat bzip2recover ; do
+		dosym bzip2.1 /usr/share/man/man1/${x}.1
+	done
+	for x in bz{e,f}grep ; do
+		dosym bzgrep /usr/bin/${x}
+		dosym bzgrep.1 /usr/share/man/man1/${x}.1
+	done
+
+	einstalldocs
+
+	# move "important" bzip2 binaries to /bin and use the shared libbz2.so
+	dosym bzip2 /bin/bzcat
+	dosym bzip2 /bin/bunzip2
+}
diff --git a/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch b/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch
deleted file mode 100644
index 74f8df0..0000000
--- a/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-bzgrep uses !/bin/sh but then uses the bashism ${var//} so replace those
-with calls to sed so POSIX shells work
-
-http://bugs.gentoo.org/193365
-
---- a/bzgrep
-+++ b/bzgrep
-@@ -63,10 +63,9 @@
-     bzip2 -cdfq "$i" | $grep $opt "$pat"
-     r=$?
-   else
--    j=${i//\\/\\\\}
--    j=${j//|/\\|}
--    j=${j//&/\\&}
--    j=`printf "%s" "$j" | tr '\n' ' '`
-+    # the backslashes here are doubled up as we have to escape each one for the
-+    # shell and then escape each one for the sed expression
-+    j=`printf "%s" "${i}" | sed -e 's:\\\\:\\\\\\\\:g' -e 's:[|]:\\\\|:g' -e 's:[&]:\\\\&:g' | tr '\n' ' '`
-     bzip2 -cdfq "$i" | $grep $opt "$pat" | sed "s|^|${j}:|"
-     r=$?
-   fi
diff --git a/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch b/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch
deleted file mode 100644
index b031c80..0000000
--- a/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Upstream-Status: Backport
-https://bugzilla.suse.com/attachment.cgi?id=681334
-
-CVE: CVE-2016-3189
-Signed-off-by: Armin Kuster <akuster@mvista.com>
-
-Index: bzip2-1.0.6/bzip2recover.c
-===================================================================
---- a/bzip2recover.c
-+++ b/bzip2recover.c
-@@ -457,6 +457,7 @@ Int32 main ( Int32 argc, Char** argv )
-             bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 );
-             bsPutUInt32 ( bsWr, blockCRC );
-             bsClose ( bsWr );
-+            outFile = NULL;
-          }
-          if (wrBlock >= rbCtr) break;
-          wrBlock++;
diff --git a/app-arch/bzip2/files/bzip2-1.0.6-mingw.patch b/app-arch/bzip2/files/bzip2-1.0.6-mingw.patch
deleted file mode 100644
index 51469ca..0000000
--- a/app-arch/bzip2/files/bzip2-1.0.6-mingw.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-make it build for mingw targets
-
-https://bugs.gentoo.org/393573
-
---- a/bzip2.c
-+++ b/bzip2.c
-@@ -129,7 +129,7 @@
- #if BZ_LCCWIN32
- #   include <io.h>
- #   include <fcntl.h>
--#   include <sys\stat.h>
-+#   include <sys/stat.h>
- 
- #   define NORETURN       /**/
- #   define PATH_SEP       '\\'
---- a/bzlib.h
-+++ b/bzlib.h
-@@ -81,6 +81,9 @@ typedef
-       /* windows.h define small to char */
- #      undef small
- #   endif
-+#   ifndef WINAPI
-+#   define WINAPI
-+#   endif
- #   ifdef BZ_EXPORT
- #   define BZ_API(func) WINAPI func
- #   define BZ_EXTERN extern
diff --git a/app-arch/bzip2/files/bzip2-1.0.6-nselectors-upper-bound-check.patch b/app-arch/bzip2/files/bzip2-1.0.6-nselectors-upper-bound-check.patch
deleted file mode 100644
index a7731f7..0000000
--- a/app-arch/bzip2/files/bzip2-1.0.6-nselectors-upper-bound-check.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 13ca8fee0c897121ae79ae644a212418398dfea7 Mon Sep 17 00:00:00 2001
-From: Amin Hassani <ahassani@chromium.org>
-Date: Fri, 8 Mar 2019 09:58:20 -0800
-Subject: [PATCH] Check for upper bounds of nselectors.
-
-Currently there is no check for the upper bounds of the
-nselectors. Hence, a corrupt input can cause a segfault.
-
-This issue was discovered by one of our fuzzers. The actual error was:
-
-../bzip2-1.0.6/decompress.c:299:10: runtime error: index 18002 out of bounds for type 'UChar [18002]'
----
- decompress.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/decompress.c b/decompress.c
-index 311f566..391552d 100644
---- a/decompress.c
-+++ b/decompress.c
-@@ -288,6 +288,7 @@ Int32 BZ2_decompress ( DState* s )
-       if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR);
-       GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15);
-       if (nSelectors < 1) RETURN(BZ_DATA_ERROR);
-+      if (nSelectors > BZ_MAX_SELECTORS) RETURN(BZ_DATA_ERROR);
-       for (i = 0; i < nSelectors; i++) {
-          j = 0;
-          while (True) {
--- 
-2.21.0.360.g471c308f928-goog
-
diff --git a/app-arch/bzip2/files/bzip2-1.0.6-out-of-tree-build.patch b/app-arch/bzip2/files/bzip2-1.0.6-out-of-tree-build.patch
deleted file mode 100644
index 806339e..0000000
--- a/app-arch/bzip2/files/bzip2-1.0.6-out-of-tree-build.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -53,7 +53,6 @@ libbz2.a: $(OBJS)
- 
- check: test
- test: bzip2
--	@cat words1
- 	./bzip2 -1  < sample1.ref > sample1.rb2
- 	./bzip2 -2  < sample2.ref > sample2.rb2
- 	./bzip2 -3  < sample3.ref > sample3.rb2
-@@ -66,7 +65,6 @@ test: bzip2
- 	cmp sample1.tst sample1.ref
- 	cmp sample2.tst sample2.ref
- 	cmp sample3.tst sample3.ref
--	@cat words3
- 
- install: bzip2 bzip2recover
- 	if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
-@@ -115,25 +113,8 @@ clean:
- 	sample1.rb2 sample2.rb2 sample3.rb2 \
- 	sample1.tst sample2.tst sample3.tst
- 
--blocksort.o: blocksort.c
--	@cat words0
--	$(CC) $(CFLAGS) -c blocksort.c
--huffman.o: huffman.c
--	$(CC) $(CFLAGS) -c huffman.c
--crctable.o: crctable.c
--	$(CC) $(CFLAGS) -c crctable.c
--randtable.o: randtable.c
--	$(CC) $(CFLAGS) -c randtable.c
--compress.o: compress.c
--	$(CC) $(CFLAGS) -c compress.c
--decompress.o: decompress.c
--	$(CC) $(CFLAGS) -c decompress.c
--bzlib.o: bzlib.c
--	$(CC) $(CFLAGS) -c bzlib.c
--bzip2.o: bzip2.c
--	$(CC) $(CFLAGS) -c bzip2.c
--bzip2recover.o: bzip2recover.c
--	$(CC) $(CFLAGS) -c bzip2recover.c
-+%.o: %.c
-+	$(CC) $(CFLAGS) -c $<
- 
- 
- distclean: clean
---- a/Makefile-libbz2_so
-+++ b/Makefile-libbz2_so
-@@ -36,9 +36,7 @@ OBJS= blocksort.o  \
- 
- all: $(OBJS)
- 	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS)
--	$(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
--	rm -f libbz2.so.1.0
--	ln -s libbz2.so.1.0.6 libbz2.so.1.0
-+	ln -sf libbz2.so.1.0.6 libbz2.so.1.0
- 
- clean: 
- 	rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared
-@@ -43,17 +43,5 @@ all: $(OBJS)
- clean: 
- 	rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared
- 
--blocksort.o: blocksort.c
--	$(CC) $(CFLAGS) -c blocksort.c
--huffman.o: huffman.c
--	$(CC) $(CFLAGS) -c huffman.c
--crctable.o: crctable.c
--	$(CC) $(CFLAGS) -c crctable.c
--randtable.o: randtable.c
--	$(CC) $(CFLAGS) -c randtable.c
--compress.o: compress.c
--	$(CC) $(CFLAGS) -c compress.c
--decompress.o: decompress.c
--	$(CC) $(CFLAGS) -c decompress.c
--bzlib.o: bzlib.c
--	$(CC) $(CFLAGS) -c bzlib.c
-+%.o: %.c
-+	$(CC) $(CFLAGS) -c $<
diff --git a/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch b/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch
deleted file mode 100644
index 52ea791..0000000
--- a/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile-libbz2_so
-+++ b/Makefile-libbz2_so
-@@ -35,8 +35,8 @@
-       bzlib.o
- 
- all: $(OBJS)
--	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
--	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
-+	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
- 	rm -f libbz2.so.1.0
- 	ln -s libbz2.so.1.0.6 libbz2.so.1.0
- 
diff --git a/app-arch/bzip2/files/bzip2-1.0.6-ubsan-error.patch b/app-arch/bzip2/files/bzip2-1.0.6-ubsan-error.patch
deleted file mode 100644
index 84b8111..0000000
--- a/app-arch/bzip2/files/bzip2-1.0.6-ubsan-error.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Manoj Gupta <manojgupta@google.com>
-
-Use unsigned 1 for shifting instead of signed 1.
-
-This fixed an issue with shift caught by undefined behavior
-sanitizer in clang.
-bzip2-1.0.6/blocksort.c:255:7
-runtime error: left shift of 1 by 31 places cannot be represented in type 'int'
-
---- a/blocksort.c
-+++ b/blocksort.c
-@@ -202,9 +202,9 @@ void fallbackQSort3 ( UInt32* fmap,
-       bhtab [ 0 .. 2+(nblock/32) ] destroyed
- */
- 
--#define       SET_BH(zz)  bhtab[(zz) >> 5] |= (1 << ((zz) & 31))
--#define     CLEAR_BH(zz)  bhtab[(zz) >> 5] &= ~(1 << ((zz) & 31))
--#define     ISSET_BH(zz)  (bhtab[(zz) >> 5] & (1 << ((zz) & 31)))
-+#define       SET_BH(zz)  bhtab[(zz) >> 5] |= (1u << ((zz) & 31))
-+#define     CLEAR_BH(zz)  bhtab[(zz) >> 5] &= ~(1u << ((zz) & 31))
-+#define     ISSET_BH(zz)  (bhtab[(zz) >> 5] & (1u << ((zz) & 31)))
- #define      WORD_BH(zz)  bhtab[(zz) >> 5]
- #define UNALIGNED_BH(zz)  ((zz) & 0x01f)
- 
diff --git a/app-arch/bzip2/files/bzip2-1.0.8-mingw.patch b/app-arch/bzip2/files/bzip2-1.0.8-mingw.patch
new file mode 100644
index 0000000..b512a8f
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.8-mingw.patch
@@ -0,0 +1,16 @@
+make it build for mingw targets
+
+https://bugs.gentoo.org/393573
+
+--- a/bzlib.h
++++ b/bzlib.h
+@@ -81,6 +81,9 @@ typedef
+       /* windows.h define small to char */
+ #      undef small
+ #   endif
++#   ifndef WINAPI
++#   define WINAPI
++#   endif
+ #   ifdef BZ_EXPORT
+ #   define BZ_API(func) WINAPI func
+ #   define BZ_EXTERN extern
diff --git a/app-arch/bzip2/files/bzip2-1.0.8-out-of-tree-build.patch b/app-arch/bzip2/files/bzip2-1.0.8-out-of-tree-build.patch
new file mode 100644
index 0000000..0481826
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.8-out-of-tree-build.patch
@@ -0,0 +1,76 @@
+--- bzip2-1.0.8/Makefile
++++ bzip2-1.0.8/Makefile
+@@ -54,7 +54,6 @@
+ 
+ check: test
+ test: bzip2
+-	@cat words1
+ 	./bzip2 -1  < sample1.ref > sample1.rb2
+ 	./bzip2 -2  < sample2.ref > sample2.rb2
+ 	./bzip2 -3  < sample3.ref > sample3.rb2
+@@ -67,7 +66,6 @@
+ 	cmp sample1.tst sample1.ref
+ 	cmp sample2.tst sample2.ref
+ 	cmp sample3.tst sample3.ref
+-	@cat words3
+ 
+ install: bzip2 bzip2recover
+ 	if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
+@@ -113,25 +111,8 @@
+ 	sample1.rb2 sample2.rb2 sample3.rb2 \
+ 	sample1.tst sample2.tst sample3.tst
+ 
+-blocksort.o: blocksort.c
+-	@cat words0
+-	$(CC) $(CFLAGS) -c blocksort.c
+-huffman.o: huffman.c
+-	$(CC) $(CFLAGS) -c huffman.c
+-crctable.o: crctable.c
+-	$(CC) $(CFLAGS) -c crctable.c
+-randtable.o: randtable.c
+-	$(CC) $(CFLAGS) -c randtable.c
+-compress.o: compress.c
+-	$(CC) $(CFLAGS) -c compress.c
+-decompress.o: decompress.c
+-	$(CC) $(CFLAGS) -c decompress.c
+-bzlib.o: bzlib.c
+-	$(CC) $(CFLAGS) -c bzlib.c
+-bzip2.o: bzip2.c
+-	$(CC) $(CFLAGS) -c bzip2.c
+-bzip2recover.o: bzip2recover.c
+-	$(CC) $(CFLAGS) -c bzip2recover.c
++%.o: %.c
++	$(CC) $(CFLAGS) -c $<
+ 
+ 
+ distclean: clean
+--- bzip2-1.0.8/Makefile-libbz2_so
++++ bzip2-1.0.8/Makefile-libbz2_so
+@@ -36,24 +36,10 @@
+ 
+ all: $(OBJS)
+ 	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.8 $(OBJS)
+-	$(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
+-	rm -f libbz2.so.1.0
+-	ln -s libbz2.so.1.0.8 libbz2.so.1.0
++	ln -sf libbz2.so.1.0.8 libbz2.so.1.0
+ 
+ clean: 
+ 	rm -f $(OBJS) bzip2.o libbz2.so.1.0.8 libbz2.so.1.0 bzip2-shared
+ 
+-blocksort.o: blocksort.c
+-	$(CC) $(CFLAGS) -c blocksort.c
+-huffman.o: huffman.c
+-	$(CC) $(CFLAGS) -c huffman.c
+-crctable.o: crctable.c
+-	$(CC) $(CFLAGS) -c crctable.c
+-randtable.o: randtable.c
+-	$(CC) $(CFLAGS) -c randtable.c
+-compress.o: compress.c
+-	$(CC) $(CFLAGS) -c compress.c
+-decompress.o: decompress.c
+-	$(CC) $(CFLAGS) -c decompress.c
+-bzlib.o: bzlib.c
+-	$(CC) $(CFLAGS) -c bzlib.c
++%.o: %.c
++	$(CC) $(CFLAGS) -c $<
diff --git a/app-arch/bzip2/files/bzip2-1.0.8-saneso.patch b/app-arch/bzip2/files/bzip2-1.0.8-saneso.patch
new file mode 100644
index 0000000..63409f5
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.8-saneso.patch
@@ -0,0 +1,13 @@
+--- bzip2-1.0.8/Makefile-libbz2_so
++++ bzip2-1.0.8/Makefile-libbz2_so
+@@ -35,8 +35,8 @@
+       bzlib.o
+ 
+ all: $(OBJS)
+-	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
+-	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
++	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.8 $(OBJS)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
+ 	rm -f libbz2.so.1.0
+ 	ln -s libbz2.so.1.0.8 libbz2.so.1.0
+ 
diff --git a/app-arch/cabextract/Manifest b/app-arch/cabextract/Manifest
index 61f11f2..17fd6ea 100644
--- a/app-arch/cabextract/Manifest
+++ b/app-arch/cabextract/Manifest
@@ -1 +1 @@
-DIST cabextract-1.6.tar.gz 241731 SHA256 cee661b56555350d26943c5e127fc75dd290b7f75689d5ebc1f04957c4af55fb SHA512 d1c71c0292e3d73d8edbff5f5230b3127c63028f5aba1d0cad968bc945202fb9c0773327affce3d28466068377f029c80735adbabe0929d29b2204dea73738f8 WHIRLPOOL 5816e3f6ee3a3caad574bbc3d8aeff55bb99383a4ce80a40332d59696a1d4fbaba6823e9a77023e7cbbc257a0693a35f7817d7ff20383b30898de5d4e50eb1f2
+DIST cabextract-1.9.1.tar.gz 469369 BLAKE2B 5bfc697b40cbf47b42ab7857804b703c9622d8dae1648aae1bb5c0ec7c7978bff01b7ca2526f1b6090f193d88c00e3f49ae111f348d03fec9f575bddbb4b4096 SHA512 c354a4b20a222b40813f01baf8311c9a76611da427f9f44e977a3fd09508e24a18b486e3eef889a9debdca459f1b0c28d5d25429ccd555d3a2e4ff92d91cec14
diff --git a/app-arch/cabextract/cabextract-1.6.ebuild b/app-arch/cabextract/cabextract-1.6.ebuild
deleted file mode 100644
index 7f0e808..0000000
--- a/app-arch/cabextract/cabextract-1.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Extracts files from Microsoft cabinet archive files"
-HOMEPAGE="http://www.cabextract.org.uk/"
-SRC_URI="http://www.cabextract.org.uk/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="*"
-IUSE="extras"
-
-RDEPEND="extras? ( dev-lang/perl )"
-
-src_prepare() {
-	# the code attempts to set up a fnmatch replacement, but then fails to code
-	# it properly leading to undefined references to rpl_fnmatch().  This may be
-	# removed in the future if building still works by setting "yes" to "no".
-	export ac_cv_func_fnmatch_works=yes
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO doc/magic
-	dohtml doc/wince_cab_format.html
-	if use extras; then
-		dobin src/{wince_info,wince_rename,cabinfo,cabsplit}
-	fi
-}
diff --git a/app-arch/cabextract/cabextract-1.9.1.ebuild b/app-arch/cabextract/cabextract-1.9.1.ebuild
new file mode 100644
index 0000000..82fad40
--- /dev/null
+++ b/app-arch/cabextract/cabextract-1.9.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/kyz/libmspack.git"
+	inherit git-r3
+	MY_P="${PN}-9999"
+
+	LIBMSPACK_DEPEND="~dev-libs/libmspack-9999:="
+else
+	KEYWORDS="*"
+	MY_PV="${PV/_alpha/alpha}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
+
+	LIBMSPACK_DEPEND=">=dev-libs/libmspack-0.8_alpha:="
+fi
+
+DESCRIPTION="Extracts files from Microsoft cabinet archive files"
+HOMEPAGE="https://www.cabextract.org.uk/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="extras"
+
+DEPEND="${LIBMSPACK_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${LIBMSPACK_DEPEND}
+	extras? ( dev-lang/perl )"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		# Re-create file layout from release tarball
+		pushd "${WORKDIR}" &>/dev/null || die
+		cp -aL "${S}"/${PN} "${WORKDIR}"/${PN}-source || die
+		rm -r "${S}" || die
+		mv "${WORKDIR}"/${PN}-source "${S}" || die
+		popd &>/dev/null || die
+	fi
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-external-libmspack=yes
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	local DOCS=( AUTHORS ChangeLog NEWS README TODO doc/magic )
+	default
+	docinto html
+	dodoc doc/wince_cab_format.html
+	if use extras; then
+		dobin src/{wince_info,wince_rename,cabinfo,cabsplit}
+	fi
+}
diff --git a/app-arch/cabextract/files/cabextract-1.9-fix-bigendian.patch b/app-arch/cabextract/files/cabextract-1.9-fix-bigendian.patch
new file mode 100644
index 0000000..760dd9d
--- /dev/null
+++ b/app-arch/cabextract/files/cabextract-1.9-fix-bigendian.patch
@@ -0,0 +1,17 @@
+https://github.com/kyz/libmspack/commit/c19e707936947b45cf05bc9aaee68517c6c2aca6
+
+---
+ configure.ac  | 1 +
+ 1 files changed, 1 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,6 +30,7 @@ AC_CHECK_HEADERS([inttypes.h])
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ AC_C_INLINE
++AC_C_BIGENDIAN
+ AC_TYPE_MODE_T
+ AC_TYPE_OFF_T
+ AC_TYPE_SIZE_T
diff --git a/app-arch/cabextract/files/cabextract-1.9-remove-spurious-test_files.patch b/app-arch/cabextract/files/cabextract-1.9-remove-spurious-test_files.patch
new file mode 100644
index 0000000..d80b870
--- /dev/null
+++ b/app-arch/cabextract/files/cabextract-1.9-remove-spurious-test_files.patch
@@ -0,0 +1,17 @@
+https://github.com/kyz/libmspack/commit/2f78851e3927b05931574b380ca6dccaf91e3807
+
+---
+ test/bugs.test | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/test/bugs.test
++++ b/test/bugs.test
+@@ -2,7 +2,7 @@
+ # test that known crash bugs remain fixed
+ . test/testcase
+ 
+-$cabextract -t $test_files/bugs/*.cab
++$cabextract -t bugs/*.cab
+ 
+ # fail if exit code indicates a crash (SIGBUS, SIGSEGV, etc.)
+ test $? -le 1
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 4dabca3..223ecc3 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -1 +1 @@
-DIST gzip-1.9.tar.xz 762516 BLAKE2B 4001fc7a770634916d52b026dab1b621fc96275bfb61ec2df2d0e7d7ec1c81414270d3c866034e6ef758870f38e9d4396a25832abe558915a7ded1f1511eb4b0 SHA512 c0852e7f7662141e79d14bc36e50f1940dba3e804feff3b0b8fa084ffec720ac245352282d2f1db117fadc95758424dd418d192b94621dac4367834ccf101fad
+DIST gzip-1.10.tar.xz 775144 BLAKE2B 431dc0fd11061eabd9db86594777b86510b124b124fd74799eacd67334631af60f638be2638413bee0153a9da35528d0aecc5b5083152c395223705400c9103b SHA512 e6ba9e3906cdb6a6235b213515093d02afa1722686f73eddacbacae628542b586b449829783b6a1701e9b9e0c4d4dfa6845904d3b6b010f5cf21aec4997c9299
diff --git a/app-arch/gzip/files/gzip-1.9-gnulib-glibc-2.28.patch b/app-arch/gzip/files/gzip-1.9-gnulib-glibc-2.28.patch
deleted file mode 100644
index 20039b9..0000000
--- a/app-arch/gzip/files/gzip-1.9-gnulib-glibc-2.28.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-fix build failure against glibc-2.28
-
-https://bugs.gentoo.org/663928
-
-Adopted gnulib's upstream patch:
-
-From 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Mon, 5 Mar 2018 10:56:29 -0800
-Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Problem reported by Daniel P. Berrangé in:
-https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
-* lib/fflush.c (clear_ungetc_buffer_preserving_position)
-(disable_seek_optimization, rpl_fflush):
-* lib/fpurge.c (fpurge):
-* lib/freadahead.c (freadahead):
-* lib/freading.c (freading):
-* lib/fseeko.c (fseeko):
-* lib/fseterr.c (fseterr):
-Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
-* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
-Define if not already defined.
----
- lib/fflush.c     |  6 +++---
- lib/fpurge.c     |  2 +-
- lib/freading.c   |  2 +-
- lib/fseeko.c     |  4 ++--
- lib/fseterr.c    |  2 +-
- lib/stdio-impl.h |  6 ++++++
-
---- a/lib/fflush.c
-+++ b/lib/fflush.c
-@@ -33,7 +33,7 @@
- #undef fflush
- 
- 
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- 
- /* Clear the stream's ungetc buffer, preserving the value of ftello (fp).  */
- static void
-@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp)
- 
- #endif
- 
--#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
-+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
- 
- # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
-@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream)
-   if (stream == NULL || ! freading (stream))
-     return fflush (stream);
- 
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- 
-   clear_ungetc_buffer_preserving_position (stream);
- 
---- a/lib/fpurge.c
-+++ b/lib/fpurge.c
-@@ -62,7 +62,7 @@ fpurge (FILE *fp)
-   /* Most systems provide FILE as a struct and the necessary bitmask in
-      <stdio.h>, because they need it for implementing getc() and putc() as
-      fast macros.  */
--# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   fp->_IO_read_end = fp->_IO_read_ptr;
-   fp->_IO_write_ptr = fp->_IO_write_base;
-   /* Avoid memory leak when there is an active ungetc buffer.  */
---- a/lib/freading.c
-+++ b/lib/freading.c
-@@ -31,7 +31,7 @@ freading (FILE *fp)
-   /* Most systems provide FILE as a struct and the necessary bitmask in
-      <stdio.h>, because they need it for implementing getc() and putc() as
-      fast macros.  */
--# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   return ((fp->_flags & _IO_NO_WRITES) != 0
-           || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
-               && fp->_IO_read_base != NULL));
---- a/lib/fseeko.c
-+++ b/lib/fseeko.c
-@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence)
- #endif
- 
-   /* These tests are based on fpurge.c.  */
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   if (fp->_IO_read_end == fp->_IO_read_ptr
-       && fp->_IO_write_ptr == fp->_IO_write_base
-       && fp->_IO_save_base == NULL)
-@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence)
-           return -1;
-         }
- 
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-       fp->_flags &= ~_IO_EOF_SEEN;
-       fp->_offset = pos;
- #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
---- a/lib/fseterr.c
-+++ b/lib/fseterr.c
-@@ -29,7 +29,7 @@ fseterr (FILE *fp)
-   /* Most systems provide FILE as a struct and the necessary bitmask in
-      <stdio.h>, because they need it for implementing getc() and putc() as
-      fast macros.  */
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   fp->_flags |= _IO_ERR_SEEN;
- #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
-   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
---- a/lib/stdio-impl.h
-+++ b/lib/stdio-impl.h
-@@ -18,6 +18,12 @@
-    the same implementation of stdio extension API, except that some fields
-    have different naming conventions, or their access requires some casts.  */
- 
-+/* Glibc 2.28 made _IO_IN_BACKUP private.  For now, work around this
-+   problem by defining it ourselves.  FIXME: Do not rely on glibc
-+   internals.  */
-+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
-+# define _IO_IN_BACKUP 0x100
-+#endif
- 
- /* BSD stdio derived implementations.  */
- 
--- 
-2.19.1
-
diff --git a/app-arch/gzip/gzip-1.10.ebuild b/app-arch/gzip/gzip-1.10.ebuild
new file mode 100644
index 0000000..1aaa71d
--- /dev/null
+++ b/app-arch/gzip/gzip-1.10.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="Standard GNU compressor"
+HOMEPAGE="https://www.gnu.org/software/gzip/"
+SRC_URI="mirror://gnu/gzip/${P}.tar.xz
+	https://alpha.gnu.org/gnu/gzip/${P}.tar.xz
+	mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="*"
+IUSE="pic static"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.8-install-symlinks.patch"
+)
+
+src_configure() {
+	use static && append-flags -static
+	# avoid text relocation in gzip
+	use pic && export DEFS="NO_ASM"
+	econf --disable-gcc-warnings #663928
+}
+
+src_install() {
+	default
+	docinto txt
+	dodoc algorithm.doc gzip.doc
+
+	# keep most things in /usr, just the fun stuff in /
+	dodir /bin
+	mv "${ED}"/usr/bin/{gunzip,gzip,uncompress,zcat} "${ED}"/bin/ || die
+	sed -e "s:${EPREFIX}/usr:${EPREFIX}:" -i "${ED}"/bin/gunzip || die
+}
diff --git a/app-arch/gzip/gzip-1.9.ebuild b/app-arch/gzip/gzip-1.9.ebuild
deleted file mode 100644
index 6328e39..0000000
--- a/app-arch/gzip/gzip-1.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="Standard GNU compressor"
-HOMEPAGE="https://www.gnu.org/software/gzip/"
-SRC_URI="mirror://gnu/gzip/${P}.tar.xz
-	mirror://gnu-alpha/gzip/${P}.tar.xz
-	mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="*"
-IUSE="pic static"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.8-install-symlinks.patch"
-	"${FILESDIR}/${PN}-1.9-gnulib-glibc-2.28.patch"
-)
-
-src_configure() {
-	use static && append-flags -static
-	# avoid text relocation in gzip
-	use pic && export DEFS="NO_ASM"
-	econf --disable-gcc-warnings #663928
-}
-
-src_install() {
-	default
-	docinto txt
-	dodoc algorithm.doc gzip.doc
-
-	# keep most things in /usr, just the fun stuff in /
-	dodir /bin
-	mv "${ED%/}"/usr/bin/{gunzip,gzip,uncompress,zcat} "${ED%/}"/bin/ || die
-	sed -e "s:${EPREFIX}/usr:${EPREFIX}:" -i "${ED%/}"/bin/gunzip || die
-}
diff --git a/app-arch/lbzip2/Manifest b/app-arch/lbzip2/Manifest
index 98b292c..37602fe 100644
--- a/app-arch/lbzip2/Manifest
+++ b/app-arch/lbzip2/Manifest
@@ -1 +1 @@
-DIST lbzip2-2.5.tar.gz 651399 SHA256 46c75ee93cc95eedc6005625442b2b8e59a2bef3ba80987d0491f055185650e9 SHA512 76e96cfa75b3ed515b2f891349dffc1403daab2dd0a2a614fa0c811cec6ca25faa395da08ad68a9b6ba4069332c4571f70fb7424f06ef3d800c3082c08d7d3d7 WHIRLPOOL b64e70239d89782499cd59731130258d0432dbd69f84d1bed2adb7f573f706ab635a80bd2e2331231f4aad0c92b51151a0c45f192f4fcea9579fb1eef2fa8708
+DIST lbzip2-2.5_p20181227.tar.gz 704920 BLAKE2B e5da0091c0e4fb73724c5ea472d757d76356cffbf1fc679bf4ee05e25690b7712dceaf17f355383bfd4eb525c4aea04c2e5312592df5bb99159e000769bcee2e SHA512 53b29721a106d280927f2c18f33247645bb7fb3e67d835885d73e037910bf02e473f1210d848df41a387be30f829213d98ac9387b2a9201b94d12117809fbcf5
diff --git a/app-arch/lbzip2/files/lbzip2-2.5_p20181227-fix-unaligned.patch b/app-arch/lbzip2/files/lbzip2-2.5_p20181227-fix-unaligned.patch
new file mode 100644
index 0000000..c23d1af
--- /dev/null
+++ b/app-arch/lbzip2/files/lbzip2-2.5_p20181227-fix-unaligned.patch
@@ -0,0 +1,33 @@
+https://github.com/kjn/lbzip2/pull/25
+
+From d570020ade2add591b97e61927545a005a2d4a6f Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Wed, 7 Aug 2019 11:47:04 -0700
+Subject: [PATCH] Align zero-length array to avoid unaligned accesses
+
+When make_tree() creates the left-justified base table (uint64_t *B)
+it does so with 64-bit stores:
+
+    B[k] = sofar;
+
+But B points to memory in the zero-length array "uint32_t tt[0]" at the
+end of struct decoder_state. Since tt's type is uint32_t, it is only
+aligned to a four byte boundary, and so the 64-bit store in make_tree()
+causes an unaligned trap on strict platforms like sparc.
+---
+ src/decode.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/decode.h b/src/decode.h
+index c9a9086..7c0ca3f 100644
+--- a/src/decode.h
++++ b/src/decode.h
+@@ -62,7 +62,7 @@ struct decoder_state {
+   uint8_t rle_char;             /* current character */
+   uint8_t rle_prev;             /* prevoius character */
+ 
+-  uint32_t tt[0];
++  uint32_t tt[0] __attribute__((aligned (8)));
+ };
+ 
+ 
diff --git a/app-arch/lbzip2/lbzip2-2.5.ebuild b/app-arch/lbzip2/lbzip2-2.5.ebuild
deleted file mode 100644
index 376acf5..0000000
--- a/app-arch/lbzip2/lbzip2-2.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Parallel bzip2 utility"
-HOMEPAGE="https://github.com/kjn/lbzip2/"
-SRC_URI="http://archive.lbzip2.org/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="*"
-IUSE="debug symlink"
-
-RDEPEND="symlink? ( !app-arch/pbzip2[symlink] )"
-DEPEND=""
-
-PATCHES=( "${FILESDIR}"/${PN}-2.3-s_isreg.patch )
-
-src_configure() {
-	local myeconfargs=(
-		--disable-silent-rules
-		$(use_enable debug tracing)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use symlink; then
-		dosym ${PN} /usr/bin/bzip2
-		dosym lbunzip2 /usr/bin/bunzip2
-	fi
-}
diff --git a/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild b/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
new file mode 100644
index 0000000..07b2f52
--- /dev/null
+++ b/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Parallel bzip2 utility"
+HOMEPAGE="https://github.com/kjn/lbzip2/"
+SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="*"
+IUSE="debug static symlink"
+
+RDEPEND="symlink? ( !app-arch/pbzip2[symlink] )"
+DEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3-s_isreg.patch
+	"${FILESDIR}"/${P}-fix-unaligned.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	local myeconfargs=(
+		$(use_enable debug tracing)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use symlink; then
+		dosym ${PN} /usr/bin/bzip2
+		dosym lbunzip2 /usr/bin/bunzip2
+	fi
+}
diff --git a/app-arch/lbzip2/metadata.xml b/app-arch/lbzip2/metadata.xml
index b2cb179..f6621e0 100644
--- a/app-arch/lbzip2/metadata.xml
+++ b/app-arch/lbzip2/metadata.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>mattst88@gentoo.org</email>
-    <name>Matt Turner</name>
-  </maintainer>
-  <longdescription lang="en">
-	A multi-threaded bzip2/bunzip2 utility that employs multiple threads and an 
-	input-bound splitter even when decompressing .bz2 files created by standard 
-	bzip2
+	<maintainer type="person">
+		<email>mattst88@gentoo.org</email>
+		<name>Matt Turner</name>
+	</maintainer>
+	<longdescription lang="en">
+		A multi-threaded bzip2/bunzip2 utility that employs multiple threads and an
+		input-bound splitter even when decompressing .bz2 files created by standard
+		bzip2
 	</longdescription>
-  <upstream>
-    <remote-id type="github">kjn/lbzip2</remote-id>
-  </upstream>
+	<use>
+		<flag name="symlink">Install symlinks which override <pkg>app-arch/bzip2</pkg> implementation</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">kjn/lbzip2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index dc4b48a..5a2008c 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1 +1 @@
-DIST libarchive-3.4.2.tar.gz 6979481 BLAKE2B eea90e4751ae487cd1a9b0eecd16598d1b81ffff665ae97a160e3858c8ffe60b82003f081af644f3f32260d0e1d3f3077240125e8279bf8111a79d93c68ac25d SHA512 a8922e54f2e985889d205ee8a0594c1d30dad950438b602a5be6bb1b274a735ad20a48ed484efd458013a0810d26ee4ae76e3a6c820823243d24ea0593ed7021
+DIST libarchive-3.5.1.tar.gz 7008338 BLAKE2B 243dfda2bd4582bbc20679328b89aae0c530475c822dcf9ff25c65df2017b8f18bb616142d6ab016ccea4a5aa1b410d46b913c2ee0afefd2fdb1a41cf51585d9 SHA512 08ddd74bef4cef0981739da202879f36cf7ca33a8f6d438724588efe3ab8477f2f1d0cccf7b8ed0bedfc0c8d0cab16ee3ae5c0c6e83b6811bc650d7d7471a996
diff --git a/app-arch/libarchive/files/libarchive-3.3.3-libressl.patch b/app-arch/libarchive/files/libarchive-3.3.3-libressl.patch
deleted file mode 100644
index 4d7c0ec..0000000
--- a/app-arch/libarchive/files/libarchive-3.3.3-libressl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/libarchive/archive_openssl_evp_private.h
-+++ b/libarchive/archive_openssl_evp_private.h
-@@ -28,7 +28,8 @@
- #include <openssl/evp.h>
- #include <openssl/opensslv.h>
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
- #include <stdlib.h> /* malloc, free */
- #include <string.h> /* memset */
- static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
diff --git a/app-arch/libarchive/files/libarchive-3.4.0-without_zlib_build_fix.patch b/app-arch/libarchive/files/libarchive-3.4.0-without_zlib_build_fix.patch
deleted file mode 100644
index e0a3167..0000000
--- a/app-arch/libarchive/files/libarchive-3.4.0-without_zlib_build_fix.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From 64333cef68d7bcc67bef6ecf177fbeaa549b9139 Mon Sep 17 00:00:00 2001
-From: Martin Matuska <martin@matuska.org>
-Date: Sat, 29 Jun 2019 00:20:58 +0200
-Subject: [PATCH] Unbreak compilation without zlib
-
-Fixes #1214
----
- libarchive/archive_read_support_filter_gzip.c | 54 ++++++++++++-------
- libarchive/test/test_read_format_raw.c        |  4 ++
- 2 files changed, 39 insertions(+), 19 deletions(-)
-
-diff --git a/libarchive/archive_read_support_filter_gzip.c b/libarchive/archive_read_support_filter_gzip.c
-index 458b6f729..9fa9e2b0d 100644
---- a/libarchive/archive_read_support_filter_gzip.c
-+++ b/libarchive/archive_read_support_filter_gzip.c
-@@ -131,12 +131,20 @@ archive_read_support_filter_gzip(struct archive *_a)
-  */
- static ssize_t
- peek_at_header(struct archive_read_filter *filter, int *pbits,
--	       struct private_data *state)
-+#ifdef HAVE_ZLIB_H
-+	       struct private_data *state
-+#else
-+	       void *state
-+#endif
-+	      )
- {
- 	const unsigned char *p;
- 	ssize_t avail, len;
- 	int bits = 0;
- 	int header_flags;
-+#ifndef HAVE_ZLIB_H
-+	(void)state; /* UNUSED */
-+#endif
- 
- 	/* Start by looking at the first ten bytes of the header, which
- 	 * is all fixed layout. */
-@@ -153,8 +161,10 @@ peek_at_header(struct archive_read_filter *filter, int *pbits,
- 	bits += 3;
- 	header_flags = p[3];
- 	/* Bytes 4-7 are mod time in little endian. */
-+#ifdef HAVE_ZLIB_H
- 	if (state)
- 		state->mtime = archive_le32dec(p + 4);
-+#endif
- 	/* Byte 8 is deflate flags. */
- 	/* XXXX TODO: return deflate flags back to consume_header for use
- 	   in initializing the decompressor. */
-@@ -171,7 +181,9 @@ peek_at_header(struct archive_read_filter *filter, int *pbits,
- 
- 	/* Null-terminated optional filename. */
- 	if (header_flags & 8) {
-+#ifdef HAVE_ZLIB_H
- 		ssize_t file_start = len;
-+#endif
- 		do {
- 			++len;
- 			if (avail < len)
-@@ -181,11 +193,13 @@ peek_at_header(struct archive_read_filter *filter, int *pbits,
- 				return (0);
- 		} while (p[len - 1] != 0);
- 
-+#ifdef HAVE_ZLIB_H
- 		if (state) {
- 			/* Reset the name in case of repeat header reads. */
- 			free(state->name);
- 			state->name = strdup((const char *)&p[file_start]);
- 		}
-+#endif
- 	}
- 
- 	/* Null-terminated optional comment. */
-@@ -236,24 +250,6 @@ gzip_bidder_bid(struct archive_read_filter_bidder *self,
- 	return (0);
- }
- 
--static int
--gzip_read_header(struct archive_read_filter *self, struct archive_entry *entry)
--{
--	struct private_data *state;
--
--	state = (struct private_data *)self->data;
--
--	/* A mtime of 0 is considered invalid/missing. */
--	if (state->mtime != 0)
--		archive_entry_set_mtime(entry, state->mtime, 0);
--
--	/* If the name is available, extract it. */
--	if (state->name)
--		archive_entry_set_pathname(entry, state->name);
--
--	return (ARCHIVE_OK);
--}
--
- #ifndef HAVE_ZLIB_H
- 
- /*
-@@ -277,6 +273,24 @@ gzip_bidder_init(struct archive_read_filter *self)
- 
- #else
- 
-+static int
-+gzip_read_header(struct archive_read_filter *self, struct archive_entry *entry)
-+{
-+	struct private_data *state;
-+
-+	state = (struct private_data *)self->data;
-+
-+	/* A mtime of 0 is considered invalid/missing. */
-+	if (state->mtime != 0)
-+		archive_entry_set_mtime(entry, state->mtime, 0);
-+
-+	/* If the name is available, extract it. */
-+	if (state->name)
-+		archive_entry_set_pathname(entry, state->name);
-+
-+	return (ARCHIVE_OK);
-+}
-+
- /*
-  * Initialize the filter object.
-  */
-@@ -306,7 +320,9 @@ gzip_bidder_init(struct archive_read_filter *self)
- 	self->read = gzip_filter_read;
- 	self->skip = NULL; /* not supported */
- 	self->close = gzip_filter_close;
-+#ifdef HAVE_ZLIB_H
- 	self->read_header = gzip_read_header;
-+#endif
- 
- 	state->in_stream = 0; /* We're not actually within a stream yet. */
- 
-diff --git a/libarchive/test/test_read_format_raw.c b/libarchive/test/test_read_format_raw.c
-index 0dac8bfba..3961723b4 100644
---- a/libarchive/test/test_read_format_raw.c
-+++ b/libarchive/test/test_read_format_raw.c
-@@ -36,7 +36,9 @@ DEFINE_TEST(test_read_format_raw)
- 	const char *reffile1 = "test_read_format_raw.data";
- 	const char *reffile2 = "test_read_format_raw.data.Z";
- 	const char *reffile3 = "test_read_format_raw.bufr";
-+#ifdef HAVE_ZLIB_H
- 	const char *reffile4 = "test_read_format_raw.data.gz";
-+#endif
- 
- 	/* First, try pulling data out of an uninterpretable file. */
- 	extract_reference_file(reffile1);
-@@ -119,6 +121,7 @@ DEFINE_TEST(test_read_format_raw)
- 	assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
- 	assertEqualInt(ARCHIVE_OK, archive_read_free(a));
- 
-+#ifdef HAVE_ZLIB_H
- 	/* Fourth, try with gzip which has metadata. */
- 	extract_reference_file(reffile4);
- 	assert((a = archive_read_new()) != NULL);
-@@ -144,4 +147,5 @@ DEFINE_TEST(test_read_format_raw)
- 	assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
- 	assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
- 	assertEqualInt(ARCHIVE_OK, archive_read_free(a));
-+#endif
- }
diff --git a/app-arch/libarchive/files/libarchive-3.5.0-darwin-strnlen.patch b/app-arch/libarchive/files/libarchive-3.5.0-darwin-strnlen.patch
new file mode 100644
index 0000000..8f540e4
--- /dev/null
+++ b/app-arch/libarchive/files/libarchive-3.5.0-darwin-strnlen.patch
@@ -0,0 +1,27 @@
+https://github.com/macports/macports-ports/blob/master/archivers/libarchive/files/patch-libarchive-3.5-strnlen.diff
+
+next release should have a fix for this
+
+--- a/libarchive/archive_read_support_format_mtree.c
++++ b/libarchive/archive_read_support_format_mtree.c
+@@ -65,6 +65,20 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_mtree.c 2011
+ #define O_CLOEXEC	0
+ #endif
+ 
++#ifdef __APPLE__
++#if  __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070
++static size_t strnlen(const char *s, size_t maxlen) {
++  size_t l = 0;
++  while (l < maxlen && *s) {
++    l++;
++    s++;
++  }
++  return l;
++}
++#endif
++#endif
++
++
+ #define	MTREE_HAS_DEVICE	0x0001
+ #define	MTREE_HAS_FFLAGS	0x0002
+ #define	MTREE_HAS_GID		0x0004
diff --git a/app-arch/libarchive/libarchive-3.4.2.ebuild b/app-arch/libarchive/libarchive-3.4.2.ebuild
deleted file mode 100644
index 8f8dcf1..0000000
--- a/app-arch/libarchive/libarchive-3.4.2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit libtool multilib-minimal toolchain-funcs
-
-DESCRIPTION="Multi-format archive and compression library"
-HOMEPAGE="https://www.libarchive.org/"
-SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 BSD-4 public-domain"
-SLOT="0/13"
-KEYWORDS="*"
-IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
-
-RDEPEND="
-	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
-	blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
-	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	kernel_linux? (
-		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	)
-	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
-	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
-	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	kernel_linux? (
-		virtual/os-headers
-		e2fsprogs? ( sys-fs/e2fsprogs )
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3.3-libressl.patch
-)
-
-# Various test problems, starting with the fact that sandbox
-# explodes on long paths. https://bugs.gentoo.org/598806
-RESTRICT="test"
-
-src_prepare() {
-	default
-	elibtoolize  # is required for Solaris sol2_ld linker fix
-}
-
-multilib_src_configure() {
-	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
-
-	local myconf=(
-		$(use_enable acl)
-		$(use_enable static-libs static)
-		$(use_enable xattr)
-		$(use_with blake2 libb2)
-		$(use_with bzip2 bz2lib)
-		$(use_with expat)
-		$(use_with !expat xml2)
-		$(use_with iconv)
-		$(use_with lz4)
-		$(use_with lzma)
-		$(use_with lzo lzo2)
-		$(use_with nettle)
-		$(use_with zlib)
-		$(use_with zstd)
-
-		# Windows-specific
-		--without-cng
-	)
-	if multilib_is_native_abi ; then
-		myconf+=(
-			--enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
-			--enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
-			--enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
-		)
-	else
-		myconf+=(
-			--disable-bsdcat
-			--disable-bsdcpio
-			--disable-bsdtar
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		emake libarchive.la
-	fi
-}
-
-multilib_src_test() {
-	# Replace the default src_test so that it builds tests in parallel
-	multilib_is_native_abi && emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		emake DESTDIR="${D}" install
-
-		# Create symlinks for FreeBSD
-		if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
-			# Exclude cat for the time being #589876
-			for bin in cpio tar; do
-				dosym bsd${bin} /usr/bin/${bin}
-				echo '.so bsd${bin}.1' > "${T}"/${bin}.1
-				doman "${T}"/${bin}.1
-			done
-		fi
-	else
-		local install_targets=(
-			install-includeHEADERS
-			install-libLTLIBRARIES
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${install_targets[@]}"
-	fi
-
-	# Libs.private: should be used from libarchive.pc instead
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-multilib_src_install_all() {
-	cd "${S}" || die
-	einstalldocs
-}
diff --git a/app-arch/libarchive/libarchive-3.5.1.ebuild b/app-arch/libarchive/libarchive-3.5.1.ebuild
new file mode 100644
index 0000000..ec84407
--- /dev/null
+++ b/app-arch/libarchive/libarchive-3.5.1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit libtool multilib-minimal toolchain-funcs
+
+DESCRIPTION="Multi-format archive and compression library"
+HOMEPAGE="https://www.libarchive.org/"
+SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 BSD-4 public-domain"
+SLOT="0/13"
+KEYWORDS="*"
+IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
+
+RDEPEND="
+	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
+	blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
+	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	kernel_linux? (
+		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	)
+	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
+	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
+	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	kernel_linux? (
+		virtual/os-headers
+		e2fsprogs? ( sys-fs/e2fsprogs )
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5.0-darwin-strnlen.patch  # drop on next release
+)
+
+src_prepare() {
+	default
+	elibtoolize  # is required for Solaris sol2_ld linker fix
+}
+
+multilib_src_configure() {
+	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
+
+	local myconf=(
+		$(use_enable acl)
+		$(use_enable static-libs static)
+		$(use_enable xattr)
+		$(use_with blake2 libb2)
+		$(use_with bzip2 bz2lib)
+		$(use_with expat)
+		$(use_with !expat xml2)
+		$(use_with iconv)
+		$(use_with lz4)
+		$(use_with lzma)
+		$(use_with lzo lzo2)
+		$(use_with nettle)
+		$(use_with zlib)
+		$(use_with zstd)
+
+		# Windows-specific
+		--without-cng
+	)
+	if multilib_is_native_abi ; then
+		myconf+=(
+			--enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
+			--enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
+			--enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
+		)
+	else
+		myconf+=(
+			--disable-bsdcat
+			--disable-bsdcpio
+			--disable-bsdtar
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		emake libarchive.la
+	fi
+}
+
+src_test() {
+	mkdir -p "${T}"/bin || die
+	# tests fail when lbzip2[symlink] is used in place of ref bunzip2
+	ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die
+	local -x PATH=${T}/bin:${PATH}
+	multilib-minimal_src_test
+}
+
+multilib_src_test() {
+	# sandbox is breaking long symlink behavior
+	local -x SANDBOX_ON=0
+	local -x LD_PRELOAD=
+	# some locales trigger different output that breaks tests
+	local -x LC_ALL=C
+	emake check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		emake DESTDIR="${D}" install
+
+		# Create symlinks for FreeBSD
+		if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
+			# Exclude cat for the time being #589876
+			for bin in cpio tar; do
+				dosym bsd${bin} /usr/bin/${bin}
+				echo '.so bsd${bin}.1' > "${T}"/${bin}.1
+				doman "${T}"/${bin}.1
+			done
+		fi
+	else
+		local install_targets=(
+			install-includeHEADERS
+			install-libLTLIBRARIES
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${install_targets[@]}"
+	fi
+
+	# Libs.private: should be used from libarchive.pc instead
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+multilib_src_install_all() {
+	cd "${S}" || die
+	einstalldocs
+}
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index cfa76df..c60a5c0 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -1 +1 @@
-DIST lz4-1.9.2.tar.gz 305796 BLAKE2B 0021487bee8657bc825fdd2b98a6dc8a6d10be3240fe0bebf6563e9c855a15bf5440a02d5cd6ee1f1e8502743348bcec1e866d3287b07e623887e9eb9da35eee SHA512 ae714c61ec8e33ed91359b63f2896cfa102d66b730dce112b74696ec5850e59d88bd5527173e01e354a70fbe8f036557a47c767ee0766bc5f9c257978116c3c1
+DIST lz4-1.9.3.tar.gz 320958 BLAKE2B 9a194bd18ff52f780aa03a8a53fe7fab7b58117d768f4ba8e5005830c935d16328d0f7cc54f9413b58faf245017c0ac85fb4e709a9db150cb150a0a2a3c21645 SHA512 c246b0bda881ee9399fa1be490fa39f43b291bb1d9db72dba8a85db1a50aad416a97e9b300eee3d2a4203c2bd88bda2762e81bc229c3aa409ad217eb306a454c
diff --git a/app-arch/lz4/lz4-1.9.2.ebuild b/app-arch/lz4/lz4-1.9.2.ebuild
deleted file mode 100644
index cb2f37b..0000000
--- a/app-arch/lz4/lz4-1.9.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lz4/lz4.git"
-	EGIT_BRANCH=dev
-else
-	SRC_URI="https://github.com/lz4/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="*"
-fi
-
-DESCRIPTION="Extremely Fast Compression algorithm"
-HOMEPAGE="https://github.com/lz4/lz4"
-
-LICENSE="BSD-2 GPL-2"
-# https://abi-laboratory.pro/tracker/timeline/lz4/
-SLOT="0/r132"
-IUSE="static-libs"
-
-CMAKE_USE_DIR=${S}/contrib/cmake_unofficial
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/app-arch/lz4/lz4-1.9.3.ebuild b/app-arch/lz4/lz4-1.9.3.ebuild
new file mode 100644
index 0000000..1afce14
--- /dev/null
+++ b/app-arch/lz4/lz4-1.9.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Extremely Fast Compression algorithm"
+HOMEPAGE="https://github.com/lz4/lz4"
+SRC_URI="https://github.com/lz4/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2 GPL-2"
+# https://abi-laboratory.pro/tracker/timeline/lz4/
+SLOT="0/r132"
+KEYWORDS="*"
+IUSE="static-libs"
+
+CMAKE_USE_DIR=${S}/build/cmake
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+	)
+
+	cmake_src_configure
+}
diff --git a/app-arch/lz4/metadata.xml b/app-arch/lz4/metadata.xml
index 694c0de..26e7c6e 100644
--- a/app-arch/lz4/metadata.xml
+++ b/app-arch/lz4/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ryao@gentoo.org</email>
-		<name>Richard Yao</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
@@ -14,7 +10,7 @@
 		<name>Guilherme Amadio</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">Cyan4973/lz4</remote-id>
+		<remote-id type="github">lz4/lz4</remote-id>
 		<remote-id type="cpe">cpe:/a:lz4_project:lz4</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-arch/lzop/Manifest b/app-arch/lzop/Manifest
index 18b535c..f21b8f4 100644
--- a/app-arch/lzop/Manifest
+++ b/app-arch/lzop/Manifest
@@ -1 +1 @@
-DIST lzop-1.03.tar.gz 370775 RMD160 306c454f52632b14740d6b00c1b315f0221fb45b SHA1 4ee0b49b2a6b0a13572ddca5785ee48ef4c8f80f SHA256 c1425b8c77d49f5a679d5a126c90ea6ad99585a55e335a613cae59e909dbb2c9
+DIST lzop-1.04.tar.gz 393483 BLAKE2B ebeceac9492ce45e6976cd5cde262d9755286e1649802e3e16bfae0abdd74714bf86b076816aa309542cadef5bb65971342208763e1b2761fce2332dc9daa38c SHA512 5829b4495ffefab549aa697a05c536ce593c572c9eee6004460583a0090abcd317c6074c4f981dfee6be61ac8d127f02dd37053b6cb782af64db41586a8bbb6e
diff --git a/app-arch/lzop/lzop-1.03.ebuild b/app-arch/lzop/lzop-1.03.ebuild
deleted file mode 100644
index 03663b5..0000000
--- a/app-arch/lzop/lzop-1.03.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lzop/lzop-1.03.ebuild,v 1.9 2011/08/25 20:24:32 mattst88 Exp $
-
-EAPI=2
-
-DESCRIPTION="Utility for fast (even real-time) compression/decompression"
-HOMEPAGE="http://www.lzop.org/"
-SRC_URI="http://www.lzop.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND=">=dev-libs/lzo-2"
-DEPEND="${RDEPEND}"
-
-src_test() {
-	einfo "compressing config.status to test"
-	src/lzop config.status || die 'compression failed'
-	ls -la config.status{,.lzo}
-	src/lzop -t config.status.lzo || die 'lzo test failed'
-	src/lzop -dc config.status.lzo | diff config.status - || die 'decompression generated differences from original'
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS
-	dodoc doc/lzop.{txt,ps}
-	dohtml doc/*.html
-}
diff --git a/app-arch/lzop/lzop-1.04.ebuild b/app-arch/lzop/lzop-1.04.ebuild
new file mode 100644
index 0000000..3ab393b
--- /dev/null
+++ b/app-arch/lzop/lzop-1.04.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Utility for fast (even real-time) compression/decompression"
+HOMEPAGE="https://www.lzop.org/"
+SRC_URI="https://www.lzop.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="*"
+IUSE=""
+
+RDEPEND=">=dev-libs/lzo-2"
+DEPEND="${RDEPEND}"
+
+src_test() {
+	einfo "compressing config.status to test"
+	src/lzop config.status || die 'compression failed'
+	ls -la config.status{,.lzo}
+	src/lzop -t config.status.lzo || die 'lzo test failed'
+	src/lzop -dc config.status.lzo | diff config.status - || die 'decompression generated differences from original'
+}
+
+src_install() {
+	# do not install COPYING or redundant conversions of manpage
+	emake DESTDIR="${D}" install \
+		dist_doc_DATA="AUTHORS NEWS README THANKS"
+}
diff --git a/app-arch/lzop/metadata.xml b/app-arch/lzop/metadata.xml
index caaa4ac..0319eec 100644
--- a/app-arch/lzop/metadata.xml
+++ b/app-arch/lzop/metadata.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-    <email>binki@gentoo.org</email>
-    <name>Nathan Phillip Brink</name>
-</maintainer>
-<longdescription></longdescription>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-arch/makeself/Manifest b/app-arch/makeself/Manifest
index 67c47f6..ab06f79 100644
--- a/app-arch/makeself/Manifest
+++ b/app-arch/makeself/Manifest
@@ -1 +1 @@
-DIST release-2.2.0.tar.gz 21640 SHA256 9c9d003e097d9c198433a05926e64d9b7cd330c7f10cb4e6048877d0a87de341 SHA512 11cd536baed2d56405103f18a8318a202092755a74baf10730aa58dc57032e327697b1c7f76bf9bf438927093ba9ac467ffa0c4564c7f6b1d3b2b3936f34fa73 WHIRLPOOL ec9d7caa4ffed938e61e756636af04cf793158761c3a2b41e7ee4c18a415d6a41a4ed4499bd0b867dee930f281f901a80082bed75d9e9d7e237f3f85ad7ea590
+DIST makeself-2.4.4.tar.gz 38889 BLAKE2B eac74fa28ac39cbc6b18d11671bfa32d6c0b04b55b3603c6c928483dd64af38d416936ef242f55aa4840affd4bf7fb91c2987f87afab093816331e50f16379ab SHA512 3d4d03458f7f11a8df46340d1b489ca60d413d5ed857cc67bb8ef15335ce2848e4675e080791c26fdf29423f813d468b4b797438fe0876dad54e85c6346b9b8b
diff --git a/app-arch/makeself/files/makeself-2.2.0-help-header.patch b/app-arch/makeself/files/makeself-2.2.0-help-header.patch
deleted file mode 100644
index 5726bf5..0000000
--- a/app-arch/makeself/files/makeself-2.2.0-help-header.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From c9f605cb4a3903985f2c6f816c30c1edf728c1b5 Mon Sep 17 00:00:00 2001
-From: Jon Salz <jsalz@google.com>
-Date: Mon, 27 Jan 2014 16:04:33 +0800
-Subject: [PATCH] Add --help-header option to prepend a string to the archive's
- --help.
-
----
- makeself-header.sh |  3 ++-
- makeself.sh        | 71 ++++++++++++++++++++++++++++++------------------------
- 2 files changed, 41 insertions(+), 33 deletions(-)
-
-diff --git a/makeself-header.sh b/makeself-header.sh
-index e3f6c11..f97758c 100755
---- a/makeself-header.sh
-+++ b/makeself-header.sh
-@@ -13,6 +13,7 @@ label="$LABEL"
- script="$SCRIPT"
- scriptargs="$SCRIPTARGS"
- licensetxt="$LICENSE"
-+helpheader='$HELPHEADER'
- targetdir="$archdirname"
- filesizes="$filesizes"
- keep="$KEEP"
-@@ -119,7 +120,7 @@ MS_dd_Progress()
- MS_Help()
- {
-     cat << EOH >&2
--Makeself version $MS_VERSION
-+\${helpheader}Makeself version $MS_VERSION
-  1) Getting help or info about \$0 :
-   \$0 --help   Print this message
-   \$0 --info   Print embedded info : title, default target directory, embedded script ...
-diff --git a/makeself.sh b/makeself.sh
-index 361d710..cb2d6f2 100755
---- a/makeself.sh
-+++ b/makeself.sh
-@@ -88,38 +88,39 @@ MS_Usage()
- {
-     echo "Usage: $0 [params] archive_dir file_name label startup_script [args]"
-     echo "params can be one or more of the following :"
--    echo "    --version | -v  : Print out Makeself version number and exit"
--    echo "    --help | -h     : Print out this help message"
--    echo "    --quiet | -q    : Do not print any messages other than errors."
--    echo "    --gzip          : Compress using gzip (default if detected)"
--    echo "    --bzip2         : Compress using bzip2 instead of gzip"
--    echo "    --pbzip2        : Compress using pbzip2 instead of gzip"
--    echo "    --xz            : Compress using xz instead of gzip"
--    echo "    --compress      : Compress using the UNIX 'compress' command"
--    echo "    --complevel lvl : Compression level for gzip xz bzip2 and pbzip2 (default 9)"
--    echo "    --base64        : Instead of compressing, encode the data using base64"
--    echo "    --nocomp        : Do not compress the data"
--    echo "    --notemp        : The archive will create archive_dir in the"
--    echo "                      current directory and uncompress in ./archive_dir"
--    echo "    --copy          : Upon extraction, the archive will first copy itself to"
--    echo "                      a temporary directory"
--    echo "    --append        : Append more files to an existing Makeself archive"
--    echo "                      The label and startup scripts will then be ignored"
--    echo "    --target dir    : Extract directly to a target directory"
--    echo "                      directory path can be either absolute or relative"
--    echo "    --current       : Files will be extracted to the current directory"
--    echo "                      Both --current and --target imply --notemp"
--    echo "    --tar-extra opt : Append more options to the tar command line"
--    echo "    --nomd5         : Don't calculate an MD5 for archive"
--    echo "    --nocrc         : Don't calculate a CRC for archive"
--    echo "    --header file   : Specify location of the header script"
--    echo "    --follow        : Follow the symlinks in the archive"
--    echo "    --noprogress    : Do not show the progress during the decompression"
--    echo "    --nox11         : Disable automatic spawn of a xterm"
--    echo "    --nowait        : Do not wait for user input after executing embedded"
--    echo "                      program from an xterm"
--    echo "    --lsm file      : LSM file describing the package"
--    echo "    --license file  : Append a license file"
-+    echo "    --version | -v     : Print out Makeself version number and exit"
-+    echo "    --help | -h        : Print out this help message"
-+    echo "    --quiet | -q       : Do not print any messages other than errors."
-+    echo "    --gzip             : Compress using gzip (default if detected)"
-+    echo "    --bzip2            : Compress using bzip2 instead of gzip"
-+    echo "    --pbzip2           : Compress using pbzip2 instead of gzip"
-+    echo "    --xz               : Compress using xz instead of gzip"
-+    echo "    --compress         : Compress using the UNIX 'compress' command"
-+    echo "    --complevel lvl    : Compression level for gzip xz bzip2 and pbzip2 (default 9)"
-+    echo "    --base64           : Instead of compressing, encode the data using base64"
-+    echo "    --nocomp           : Do not compress the data"
-+    echo "    --notemp           : The archive will create archive_dir in the"
-+    echo "                         current directory and uncompress in ./archive_dir"
-+    echo "    --copy             : Upon extraction, the archive will first copy itself to"
-+    echo "                         a temporary directory"
-+    echo "    --append           : Append more files to an existing Makeself archive"
-+    echo "                         The label and startup scripts will then be ignored"
-+    echo "    --target dir       : Extract directly to a target directory"
-+    echo "                         directory path can be either absolute or relative"
-+    echo "    --current          : Files will be extracted to the current directory"
-+    echo "                         Both --current and --target imply --notemp"
-+    echo "    --tar-extra opt    : Append more options to the tar command line"
-+    echo "    --nomd5            : Don't calculate an MD5 for archive"
-+    echo "    --nocrc            : Don't calculate a CRC for archive"
-+    echo "    --header file      : Specify location of the header script"
-+    echo "    --follow           : Follow the symlinks in the archive"
-+    echo "    --noprogress       : Do not show the progress during the decompression"
-+    echo "    --nox11            : Disable automatic spawn of a xterm"
-+    echo "    --nowait           : Do not wait for user input after executing embedded"
-+    echo "                         program from an xterm"
-+    echo "    --lsm file         : LSM file describing the package"
-+    echo "    --license file     : Append a license file"
-+    echo "    --help-header file : Add a header to the archive's --help output"
-     echo
-     echo "Do not forget to give a fully qualified startup script name"
-     echo "(i.e. with a ./ prefix if inside the archive)."
-@@ -254,6 +255,12 @@ do
- 	LSM_CMD="cat \"$2\" >> \"\$archname\""
-     if ! shift 2; then MS_Help; exit 1; fi
- 	;;
-+    --help-header)
-+	HELPHEADER=`sed -e "s/'/'\\\\\''/g" $2`
-+    if ! shift 2; then MS_Help; exit 1; fi
-+	[ -n "$HELPHEADER" ] && HELPHEADER="$HELPHEADER
-+"
-+    ;;
-     -q | --quiet)
- 	QUIET=y
- 	shift
--- 
-1.8.5.5
-
diff --git a/app-arch/makeself/files/makeself-unpack b/app-arch/makeself/files/makeself-unpack
deleted file mode 100755
index d8f5e17..0000000
--- a/app-arch/makeself/files/makeself-unpack
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/bash
-
-# Glue to keep unpack_makeself() unchanged
-source /etc/init.d/functions.sh
-find_unpackable_file() { echo "$@"; }
-debug-print() { :; }
-emktemp() { mktemp "$@"; }
-die() { eerror "$*"; exit 1; }
-assert() { _pipestatus="${PIPESTATUS[*]}"; [[ "${_pipestatus// /}" -eq 0 ]] || die; }
-
-# Straight copied from unpacker.eclass ... should be kept in sync
-
-unpack_banner() {
-	echo ">>> Unpacking ${1##*/} to ${PWD}"
-}
-
-unpack_makeself() {
-	local src_input=${1:-${A}}
-	local src=$(find_unpackable_file "${src_input}")
-	local skip=$2
-	local exe=$3
-
-	[[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
-
-	unpack_banner "${src}"
-
-	if [[ -z ${skip} ]] ; then
-		local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
-		local skip=0
-		exe=tail
-		case ${ver} in
-			1.5.*|1.6.0-nv*)	# tested 1.5.{3,4,5} ... guessing 1.5.x series is same
-				skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
-				;;
-			2.0|2.0.1)
-				skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
-				;;
-			2.1.1)
-				skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
-				(( skip++ ))
-				;;
-			2.1.2)
-				skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
-				(( skip++ ))
-				;;
-			2.1.3)
-				skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
-				(( skip++ ))
-				;;
-			2.1.4|2.1.5|2.1.6|2.2.0)
-				skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
-				skip=$(head -n ${skip} "${src}" | wc -c)
-				exe="dd"
-				;;
-			*)
-				eerror "I'm sorry, but I was unable to support the Makeself file."
-				eerror "The version I detected was '${ver}'."
-				eerror "Please file a bug about the file ${src##*/} at"
-				eerror "http://bugs.gentoo.org/ so that support can be added."
-				die "makeself version '${ver}' not supported"
-				;;
-		esac
-		debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
-	fi
-	case ${exe} in
-		tail)	exe="tail -n +${skip} '${src}'";;
-		dd)		exe="dd ibs=${skip} skip=1 if='${src}'";;
-		*)		die "makeself cant handle exe '${exe}'"
-	esac
-
-	# lets grab the first few bytes of the file to figure out what kind of archive it is
-	local filetype tmpfile=$(emktemp)
-	eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
-	filetype=$(file -b "${tmpfile}") || die
-	case ${filetype} in
-		*tar\ archive*)
-			eval ${exe} | tar --no-same-owner -xf -
-			;;
-		bzip2*)
-			eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
-			;;
-		gzip*)
-			eval ${exe} | tar --no-same-owner -xzf -
-			;;
-		compress*)
-			eval ${exe} | gunzip | tar --no-same-owner -xf -
-			;;
-		XZ*)
-			eval ${exe} | unxz | tar --no-same-owner -xf -
-			;;
-		*)
-			eerror "Unknown filetype \"${filetype}\" ?"
-			false
-			;;
-	esac
-	assert "failure unpacking (${filetype}) makeself ${src##*/} ('${ver}' +${skip})"
-	rm "${tmpfile}"
-}
-
-for x; do unpack_makeself "$x" ; done
diff --git a/app-arch/makeself/makeself-2.2.0.ebuild b/app-arch/makeself/makeself-2.2.0.ebuild
deleted file mode 100644
index 9a673da..0000000
--- a/app-arch/makeself/makeself-2.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/makeself/makeself-2.2.0.ebuild,v 1.1 2014/02/18 06:18:50 vapier Exp $
-
-EAPI="4"
-
-inherit unpacker eutils
-
-DESCRIPTION="shell script that generates a self-extractible tar.gz"
-HOMEPAGE="http://www.megastep.org/makeself/"
-SRC_URI="https://github.com/megastep/makeself/archive/release-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-help-header.patch
-}
-
-src_install() {
-	dobin makeself-header.sh makeself.sh "${FILESDIR}"/makeself-unpack
-	dosym makeself.sh /usr/bin/makeself
-	doman makeself.1
-	dodoc README.md makeself.lsm
-}
diff --git a/app-arch/makeself/makeself-2.4.4.ebuild b/app-arch/makeself/makeself-2.4.4.ebuild
new file mode 100644
index 0000000..dac3f96
--- /dev/null
+++ b/app-arch/makeself/makeself-2.4.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature
+
+DESCRIPTION="Shell script that generates a self-extractible tar.gz"
+HOMEPAGE="http://www.megastep.org/makeself/"
+SRC_URI="https://github.com/megastep/makeself/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-release-${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="*"
+
+src_compile() { :; }
+
+src_install() {
+	dobin makeself-header.sh makeself.sh
+	dosym makeself.sh /usr/bin/makeself
+	doman makeself.1
+	dodoc README.md makeself.lsm
+}
+
+pkg_postinst() {
+	optfeature "lz4 support" app-arch/lz4
+	optfeature "lzop support" app-arch/lzop
+	optfeature "pbzip2 support" app-arch/pbzip2
+	optfeature "pigz support" app-arch/pigz
+	optfeature "zstd support" app-arch/zstd
+
+	# Also bzip2 and xz are supported but they are in @system.
+}
diff --git a/app-arch/makeself/metadata.xml b/app-arch/makeself/metadata.xml
index 91f4e72..3ded3c2 100644
--- a/app-arch/makeself/metadata.xml
+++ b/app-arch/makeself/metadata.xml
@@ -1,7 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
+  <maintainer type="person" proxied="yes">
+    <email>matt@offtopica.uk</email>
+    <name>Matt Smith</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <stabilize-allarches/>
+  <upstream>
+    <remote-id type="github">megastep/makeself</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index df39623..29b37f2 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1 +1 @@
-DIST p7zip_16.02_src_all.tar.bz2 4239909 SHA256 5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f SHA512 d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f WHIRLPOOL b22f4dce96505094ffdee0963fa7e5fd75e92f2c920f2e69e18eff60a2ad9d4757c3512c8d4e7c4848a36212f54637a963ff41fc5c00bb7381f43220662108b9
+DIST p7zip_16.02_src_all.tar.bz2 4239909 BLAKE2B 075356fba5284cbb124e30c36364a910ae5a7ac6bee8a8fb682c5a7ce2f1870ef83d3160c84f8dabad1d616c13d642cba1f19fb9384160d21590cf678dd8f1a6 SHA512 d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f
diff --git a/app-arch/p7zip/files/CVE-2018-10115.patch b/app-arch/p7zip/files/CVE-2018-10115.patch
new file mode 100644
index 0000000..7d9c4bf
--- /dev/null
+++ b/app-arch/p7zip/files/CVE-2018-10115.patch
@@ -0,0 +1,311 @@
+From: Robert Luberda <robert@debian.org>
+Date: Tue, 29 May 2018 23:59:09 +0200
+Subject: Fix CVE-2018-10115
+
+Apply "patch" taken from https://landave.io/files/patch_7zip_CVE-2018-10115.txt
+
+
+Bugs-Debian: https://bugs.debian.org/897674
+---
+ CPP/7zip/Compress/Rar1Decoder.cpp | 16 +++++++++++-----
+ CPP/7zip/Compress/Rar1Decoder.h   |  3 ++-
+ CPP/7zip/Compress/Rar2Decoder.cpp | 17 +++++++++++++----
+ CPP/7zip/Compress/Rar2Decoder.h   |  3 ++-
+ CPP/7zip/Compress/Rar3Decoder.cpp | 19 +++++++++++++++----
+ CPP/7zip/Compress/Rar3Decoder.h   |  3 ++-
+ CPP/7zip/Compress/Rar5Decoder.cpp |  8 ++++++++
+ CPP/7zip/Compress/Rar5Decoder.h   |  1 +
+ 8 files changed, 54 insertions(+), 16 deletions(-)
+
+diff --git a/CPP/7zip/Compress/Rar1Decoder.cpp b/CPP/7zip/Compress/Rar1Decoder.cpp
+index 68030c7..8c890c8 100644
+--- a/CPP/7zip/Compress/Rar1Decoder.cpp
++++ b/CPP/7zip/Compress/Rar1Decoder.cpp
+@@ -29,7 +29,7 @@ public:
+ };
+ */
+ 
+-CDecoder::CDecoder(): m_IsSolid(false), _errorMode(false) { }
++CDecoder::CDecoder(): _isSolid(false), _solidAllowed(false), _errorMode(false) { }
+ 
+ void CDecoder::InitStructures()
+ {
+@@ -345,7 +345,7 @@ void CDecoder::GetFlagsBuf()
+ 
+ void CDecoder::InitData()
+ {
+-  if (!m_IsSolid)
++  if (!_isSolid)
+   {
+     AvrPlcB = AvrLn1 = AvrLn2 = AvrLn3 = NumHuf = Buf60 = 0;
+     AvrPlc = 0x3500;
+@@ -391,6 +391,11 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
+   if (inSize == NULL || outSize == NULL)
+     return E_INVALIDARG;
+ 
++  if (_isSolid && !_solidAllowed)
++    return S_FALSE;
++
++  _solidAllowed = false;
++
+   if (!m_OutWindowStream.Create(kHistorySize))
+     return E_OUTOFMEMORY;
+   if (!m_InBitStream.Create(1 << 20))
+@@ -398,13 +403,13 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
+ 
+   m_UnpackSize = (Int64)*outSize;
+   m_OutWindowStream.SetStream(outStream);
+-  m_OutWindowStream.Init(m_IsSolid);
++  m_OutWindowStream.Init(_isSolid);
+   m_InBitStream.SetStream(inStream);
+   m_InBitStream.Init();
+ 
+   // CCoderReleaser coderReleaser(this);
+   InitData();
+-  if (!m_IsSolid)
++  if (!_isSolid)
+   {
+     _errorMode = false;
+     InitStructures();
+@@ -475,6 +480,7 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
+   }
+   if (m_UnpackSize < 0)
+     return S_FALSE;
++  _solidAllowed = true;
+   return m_OutWindowStream.Flush();
+ }
+ 
+@@ -491,7 +497,7 @@ STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
+ {
+   if (size < 1)
+     return E_INVALIDARG;
+-  m_IsSolid = ((data[0] & 1) != 0);
++  _isSolid = ((data[0] & 1) != 0);
+   return S_OK;
+ }
+ 
+diff --git a/CPP/7zip/Compress/Rar1Decoder.h b/CPP/7zip/Compress/Rar1Decoder.h
+index 01b606b..8abb3a3 100644
+--- a/CPP/7zip/Compress/Rar1Decoder.h
++++ b/CPP/7zip/Compress/Rar1Decoder.h
+@@ -38,7 +38,8 @@ public:
+   UInt32 LastLength;
+ 
+   Int64 m_UnpackSize;
+-  bool m_IsSolid;
++  bool _isSolid;
++  bool _solidAllowed;
+   bool _errorMode;
+ 
+   UInt32 ReadBits(int numBits);
+diff --git a/CPP/7zip/Compress/Rar2Decoder.cpp b/CPP/7zip/Compress/Rar2Decoder.cpp
+index 0580c8d..be8d842 100644
+--- a/CPP/7zip/Compress/Rar2Decoder.cpp
++++ b/CPP/7zip/Compress/Rar2Decoder.cpp
+@@ -80,7 +80,8 @@ static const UInt32 kHistorySize = 1 << 20;
+ static const UInt32 kWindowReservSize = (1 << 22) + 256;
+ 
+ CDecoder::CDecoder():
+-  m_IsSolid(false),
++  _isSolid(false),
++  _solidAllowed(false),
+   m_TablesOK(false)
+ {
+ }
+@@ -320,6 +321,10 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
+   if (inSize == NULL || outSize == NULL)
+     return E_INVALIDARG;
+ 
++  if (_isSolid && !_solidAllowed)
++    return S_FALSE;
++  _solidAllowed = false;
++
+   if (!m_OutWindowStream.Create(kHistorySize))
+     return E_OUTOFMEMORY;
+   if (!m_InBitStream.Create(1 << 20))
+@@ -330,12 +335,12 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
+   UInt64 pos = 0, unPackSize = *outSize;
+   
+   m_OutWindowStream.SetStream(outStream);
+-  m_OutWindowStream.Init(m_IsSolid);
++  m_OutWindowStream.Init(_isSolid);
+   m_InBitStream.SetStream(inStream);
+   m_InBitStream.Init();
+ 
+   // CCoderReleaser coderReleaser(this);
+-  if (!m_IsSolid)
++  if (!_isSolid)
+   {
+     InitStructures();
+     if (unPackSize == 0)
+@@ -343,6 +348,7 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
+       if (m_InBitStream.GetProcessedSize() + 2 <= m_PackSize) // test it: probably incorrect;
+         if (!ReadTables())
+           return S_FALSE;
++      _solidAllowed = true;
+       return S_OK;
+     }
+     if (!ReadTables())
+@@ -386,6 +392,9 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
+ 
+   if (!ReadLastTables())
+     return S_FALSE;
++
++  _solidAllowed = true;
++
+   return m_OutWindowStream.Flush();
+ }
+ 
+@@ -402,7 +411,7 @@ STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
+ {
+   if (size < 1)
+     return E_INVALIDARG;
+-  m_IsSolid = ((data[0] & 1) != 0);
++  _isSolid = ((data[0] & 1) != 0);
+   return S_OK;
+ }
+ 
+diff --git a/CPP/7zip/Compress/Rar2Decoder.h b/CPP/7zip/Compress/Rar2Decoder.h
+index 0e9005f..370bce2 100644
+--- a/CPP/7zip/Compress/Rar2Decoder.h
++++ b/CPP/7zip/Compress/Rar2Decoder.h
+@@ -138,7 +138,8 @@ class CDecoder :
+   Byte m_LastLevels[kMaxTableSize];
+ 
+   UInt64 m_PackSize;
+-  bool m_IsSolid;
++  bool _isSolid;
++  bool _solidAllowed;
+   bool m_TablesOK;
+ 
+   void InitStructures();
+diff --git a/CPP/7zip/Compress/Rar3Decoder.cpp b/CPP/7zip/Compress/Rar3Decoder.cpp
+index 6cb8a6a..7b85833 100644
+--- a/CPP/7zip/Compress/Rar3Decoder.cpp
++++ b/CPP/7zip/Compress/Rar3Decoder.cpp
+@@ -92,7 +92,8 @@ CDecoder::CDecoder():
+   _writtenFileSize(0),
+   _vmData(0),
+   _vmCode(0),
+-  m_IsSolid(false),
++  _isSolid(false),
++  _solidAllowed(false),
+   _errorMode(false)
+ {
+   Ppmd7_Construct(&_ppmd);
+@@ -821,7 +822,7 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress)
+ {
+   _writtenFileSize = 0;
+   _unsupportedFilter = false;
+-  if (!m_IsSolid)
++  if (!_isSolid)
+   {
+     _lzSize = 0;
+     _winPos = 0;
+@@ -840,12 +841,15 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress)
+   if (_errorMode)
+     return S_FALSE;
+ 
+-  if (!m_IsSolid || !TablesRead)
++  if (!_isSolid || !TablesRead)
+   {
+     bool keepDecompressing;
+     RINOK(ReadTables(keepDecompressing));
+     if (!keepDecompressing)
++    {
++      _solidAllowed = true;
+       return S_OK;
++    }
+   }
+ 
+   for (;;)
+@@ -870,6 +874,9 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress)
+     if (!keepDecompressing)
+       break;
+   }
++
++  _solidAllowed = true;
++
+   RINOK(WriteBuf());
+   UInt64 packSize = m_InBitStream.BitDecoder.GetProcessedSize();
+   RINOK(progress->SetRatioInfo(&packSize, &_writtenFileSize));
+@@ -890,6 +897,10 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream
+     if (!inSize)
+       return E_INVALIDARG;
+ 
++    if (_isSolid && !_solidAllowed)
++      return S_FALSE;
++    _solidAllowed = false;
++
+     if (!_vmData)
+     {
+       _vmData = (Byte *)::MidAlloc(kVmDataSizeMax + kVmCodeSizeMax);
+@@ -928,7 +939,7 @@ STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
+ {
+   if (size < 1)
+     return E_INVALIDARG;
+-  m_IsSolid = ((data[0] & 1) != 0);
++  _isSolid = ((data[0] & 1) != 0);
+   return S_OK;
+ }
+ 
+diff --git a/CPP/7zip/Compress/Rar3Decoder.h b/CPP/7zip/Compress/Rar3Decoder.h
+index 2f72d7d..32c8943 100644
+--- a/CPP/7zip/Compress/Rar3Decoder.h
++++ b/CPP/7zip/Compress/Rar3Decoder.h
+@@ -191,7 +191,8 @@ class CDecoder:
+   CRecordVector<CTempFilter *>  _tempFilters;
+   UInt32 _lastFilter;
+ 
+-  bool m_IsSolid;
++  bool _isSolid;
++  bool _solidAllowed;
+   bool _errorMode;
+ 
+   bool _lzMode;
+diff --git a/CPP/7zip/Compress/Rar5Decoder.cpp b/CPP/7zip/Compress/Rar5Decoder.cpp
+index dc8830f..a826d5a 100644
+--- a/CPP/7zip/Compress/Rar5Decoder.cpp
++++ b/CPP/7zip/Compress/Rar5Decoder.cpp
+@@ -72,6 +72,7 @@ CDecoder::CDecoder():
+     _writtenFileSize(0),
+     _dictSizeLog(0),
+     _isSolid(false),
++    _solidAllowed(false),
+     _wasInit(false),
+     _inputBuf(NULL)
+ {
+@@ -801,7 +802,10 @@ HRESULT CDecoder::CodeReal()
+   */
+ 
+   if (res == S_OK)
++  {
++    _solidAllowed = true;
+     res = res2;
++  }
+      
+   if (res == S_OK && _unpackSize_Defined && _writtenFileSize != _unpackSize)
+     return S_FALSE;
+@@ -821,6 +825,10 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream
+ {
+   try
+   {
++    if (_isSolid && !_solidAllowed)
++      return S_FALSE;
++    _solidAllowed = false;
++
+     if (_dictSizeLog >= sizeof(size_t) * 8)
+       return E_NOTIMPL;
+ 
+diff --git a/CPP/7zip/Compress/Rar5Decoder.h b/CPP/7zip/Compress/Rar5Decoder.h
+index b0a4dd1..3db5018 100644
+--- a/CPP/7zip/Compress/Rar5Decoder.h
++++ b/CPP/7zip/Compress/Rar5Decoder.h
+@@ -271,6 +271,7 @@ class CDecoder:
+   Byte _dictSizeLog;
+   bool _tableWasFilled;
+   bool _isSolid;
++  bool _solidAllowed;
+   bool _wasInit;
+ 
+   UInt32 _reps[kNumReps];
diff --git a/app-arch/p7zip/files/WimHandler.cpp.patch b/app-arch/p7zip/files/WimHandler.cpp.patch
new file mode 100644
index 0000000..db7d73a
--- /dev/null
+++ b/app-arch/p7zip/files/WimHandler.cpp.patch
@@ -0,0 +1,11 @@
+--- ./CPP/7zip/Archive/Wim/WimHandler.cpp	2016-06-11 11:08:06.000000000 +0300
++++ ./CPP/7zip/Archive/Wim/WimHandler.cpp.new	2020-01-22 09:36:59.671803569 +0300
+@@ -298,7 +298,7 @@ STDMETHODIMP CHandler::GetArchivePropert
+ 
+       AString res;
+ 
+-      bool numMethods = 0;
++      int numMethods = 0;
+       for (unsigned i = 0; i < ARRAY_SIZE(k_Methods); i++)
+       {
+         if (methodMask & ((UInt32)1 << i))
diff --git a/app-arch/p7zip/p7zip-16.02-r2.ebuild b/app-arch/p7zip/p7zip-16.02-r2.ebuild
deleted file mode 100644
index 5c68bd7..0000000
--- a/app-arch/p7zip/p7zip-16.02-r2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-
-inherit toolchain-funcs wxwidgets
-
-DESCRIPTION="Port of 7-Zip archiver for Unix"
-HOMEPAGE="http://p7zip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
-
-LICENSE="LGPL-2.1 rar? ( unRAR )"
-SLOT="0"
-KEYWORDS="*"
-IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
-
-REQUIRED_USE="kde? ( wxwidgets )"
-
-RDEPEND="wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-DEPEND="${RDEPEND}
-	abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/nasm )"
-
-S=${WORKDIR}/${PN}_${PV}
-
-DOCS=( ChangeLog README TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-darwin.patch
-	"${FILESDIR}"/CVE-2017-17969.patch
-	"${FILESDIR}"/CVE-2018-5996.patch
-)
-
-src_prepare() {
-	default
-
-	if ! use pch; then
-		sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
-	fi
-
-	sed \
-		-e 's:-m32 ::g' \
-		-e 's:-m64 ::g' \
-		-e 's:-pipe::g' \
-		-e '/ALLFLAGS/s:-s ::' \
-		-e "/OPTFLAGS=/s:=.*:=${CXXFLAGS}:" \
-		-i makefile* || die
-
-	# remove non-free RAR codec
-	if use rar; then
-		ewarn "Enabling nonfree RAR decompressor"
-	else
-		sed \
-			-e '/Rar/d' \
-			-e '/RAR/d' \
-			-i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
-		rm -rf CPP/7zip/Compress/Rar || die
-	fi
-
-	if use abi_x86_x32; then
-		sed -i -e "/^ASM=/s:amd64:x32:" makefile* || die
-		cp -f makefile.linux_amd64_asm makefile.machine || die
-	elif use amd64; then
-		cp -f makefile.linux_amd64_asm makefile.machine || die
-	elif use x86; then
-		cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
-	elif [[ ${CHOST} == *-darwin* ]] ; then
-		# Mac OS X needs this special makefile, because it has a non-GNU
-		# linker, it doesn't matter so much for bitwidth, for it doesn't
-		# do anything with it
-		cp -f makefile.macosx_llvm_64bits makefile.machine
-		# bundles have extension .bundle but don't die because USE=-rar
-		# removes the Rar directory
-		sed -i -e '/strcpy(name/s/\.so/.bundle/' \
-			CPP/Windows/DLL.cpp || die
-		sed -i -e '/^PROG=/s/\.so/.bundle/' \
-			CPP/7zip/Bundles/Format7zFree/makefile.list \
-			$(use rar && echo CPP/7zip/Compress/Rar/makefile.list) || die
-	elif use x86-fbsd; then
-		# FreeBSD needs this special makefile, because it hasn't -ldl
-		sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
-	fi
-
-	if use static; then
-		sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
-	fi
-
-	if use kde || use wxwidgets; then
-		need-wxwidgets unicode
-		einfo "Preparing dependency list"
-		emake depend
-	fi
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) CXX=$(tc-getCXX) all3
-	if use kde || use wxwidgets; then
-		emake CC=$(tc-getCC) CXX=$(tc-getCXX) -- 7zG
-#		emake -- 7zFM
-	fi
-}
-
-src_test() {
-	emake test test_7z test_7zr
-}
-
-src_install() {
-	# this wrappers can not be symlinks, p7zip should be called with full path
-	make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
-	make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
-	make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
-
-	if use kde || use wxwidgets; then
-		make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
-#		make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"
-
-#		make_desktop_entry 7zFM "${PN} FM" ${PN} "GTK;Utility;Archiving;Compression"
-
-		dobin GUI/p7zipForFilemanager
-		exeinto /usr/$(get_libdir)/${PN}
-#		doexe bin/7z{G,FM}
-		doexe bin/7zG
-
-		insinto /usr/$(get_libdir)/${PN}
-		doins -r GUI/Lang
-		doins -r DOC/MANUAL
-
-		insinto /usr/share/icons/hicolor/16x16/apps/
-		newins GUI/p7zip_16_ok.png p7zip.png
-
-		if use kde; then
-			rm GUI/kde4/p7zip_compress.desktop || die
-			insinto /usr/share/kservices5/ServiceMenus
-			doins GUI/kde4/*.desktop
-			dodir /usr/share/kde4/services/ServiceMenus # drop these lines after konqueror:4/krusader:4 are gone
-			for item in "${ED}"usr/share/kservices5/ServiceMenus/*.desktop; do
-				item="$(basename ${item})"
-				dosym "/usr/share/kservices5/ServiceMenus/${item}" "/usr/share/kde4/services/ServiceMenus/${item}"
-			done
-		fi
-	fi
-
-	dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
-	doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
-
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
-	doexe bin/*$(get_modname)
-	if use rar; then
-		exeinto /usr/$(get_libdir)/${PN}/Codecs/
-		doexe bin/Codecs/*$(get_modname)
-	fi
-
-	doman man1/7z.1 man1/7za.1 man1/7zr.1
-
-	if use doc; then
-		dodoc DOC/*.txt
-		dohtml -r DOC/MANUAL/*
-	fi
-}
diff --git a/app-arch/p7zip/p7zip-16.02-r8.ebuild b/app-arch/p7zip/p7zip-16.02-r8.ebuild
new file mode 100644
index 0000000..cd648a8
--- /dev/null
+++ b/app-arch/p7zip/p7zip-16.02-r8.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+inherit multilib toolchain-funcs wrapper wxwidgets xdg
+
+DESCRIPTION="Port of 7-Zip archiver for Unix"
+HOMEPAGE="http://p7zip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
+S="${WORKDIR}/${PN}_${PV}"
+
+LICENSE="LGPL-2.1 rar? ( unRAR )"
+SLOT="0"
+KEYWORDS="*"
+IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
+REQUIRED_USE="kde? ( wxwidgets )"
+
+RDEPEND="wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/nasm )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-darwin.patch
+	"${FILESDIR}"/CVE-2016-9296.patch
+	"${FILESDIR}"/CVE-2017-17969.patch
+	"${FILESDIR}"/CVE-2018-5996.patch
+	"${FILESDIR}"/CVE-2018-10115.patch
+	"${FILESDIR}"/WimHandler.cpp.patch
+)
+
+src_prepare() {
+	default
+
+	if ! use pch; then
+		sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
+	fi
+
+	sed \
+		-e 's|-m32 ||g' \
+		-e 's|-m64 ||g' \
+		-e 's|-pipe||g' \
+		-e "/[ALL|OPT]FLAGS/s|-s||;/OPTIMIZE/s|-s||" \
+		-e "/CFLAGS=/s|=|+=|" \
+		-e "/CXXFLAGS=/s|=|+=|" \
+		-i makefile* || die
+
+	# remove non-free RAR codec
+	if use rar; then
+		ewarn "Enabling nonfree RAR decompressor"
+	else
+		sed \
+			-e '/Rar/d' \
+			-e '/RAR/d' \
+			-i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
+		rm -r CPP/7zip/Compress/Rar || die
+	fi
+
+	if use abi_x86_x32; then
+		sed -i -e "/^ASM=/s:amd64:x32:" makefile* || die
+		cp -f makefile.linux_amd64_asm makefile.machine || die
+	elif use amd64; then
+		cp -f makefile.linux_amd64_asm makefile.machine || die
+	elif use x86; then
+		cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
+	elif [[ ${CHOST} == *-darwin* ]] ; then
+		# Mac OS X needs this special makefile, because it has a non-GNU
+		# linker, it doesn't matter so much for bitwidth, for it doesn't
+		# do anything with it
+		cp -f makefile.macosx_llvm_64bits makefile.machine || die
+		# bundles have extension .bundle but don't die because USE=-rar
+		# removes the Rar directory
+		sed -i -e '/strcpy(name/s/\.so/.bundle/' \
+			CPP/Windows/DLL.cpp || die
+		sed -i -e '/^PROG=/s/\.so/.bundle/' \
+			CPP/7zip/Bundles/Format7zFree/makefile.list \
+			$(use rar && echo CPP/7zip/Compress/Rar/makefile.list) || die
+	elif use x86-fbsd; then
+		# FreeBSD needs this special makefile, because it hasn't -ldl
+		sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine || die
+	fi
+
+	if use static; then
+		sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
+	fi
+
+	if use kde || use wxwidgets; then
+		setup-wxwidgets unicode
+		einfo "Preparing dependency list"
+		emake CC=$(tc-getCC) CXX=$(tc-getCXX) depend
+	fi
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) CXX=$(tc-getCXX) all3
+	if use kde || use wxwidgets; then
+		emake CC=$(tc-getCC) CXX=$(tc-getCXX) -- 7zG
+	fi
+}
+
+src_test() {
+	emake test test_7z test_7zr
+}
+
+src_install() {
+	# these wrappers cannot be symlinks, p7zip should be called with full path
+	make_wrapper 7zr /usr/$(get_libdir)/p7zip/7zr
+	make_wrapper 7za /usr/$(get_libdir)/p7zip/7za
+	make_wrapper 7z /usr/$(get_libdir)/p7zip/7z
+
+	if use kde || use wxwidgets; then
+		make_wrapper 7zG /usr/$(get_libdir)/p7zip/7zG
+
+		dobin GUI/p7zipForFilemanager
+		exeinto /usr/$(get_libdir)/p7zip
+		doexe bin/7zG
+
+		insinto /usr/$(get_libdir)/p7zip
+		doins -r GUI/Lang
+
+		insinto /usr/share/icons/hicolor/16x16/apps/
+		newins GUI/p7zip_16_ok.png p7zip.png
+
+		if use kde; then
+			rm GUI/kde4/p7zip_compress.desktop || die
+			insinto /usr/share/kservices5/ServiceMenus
+			doins GUI/kde4/*.desktop
+		fi
+	fi
+
+	dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
+	doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
+
+	exeinto /usr/$(get_libdir)/p7zip
+	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
+	doexe bin/*$(get_modname)
+	if use rar; then
+		exeinto /usr/$(get_libdir)/p7zip/Codecs
+		doexe bin/Codecs/*$(get_modname)
+	fi
+
+	doman man1/7z.1 man1/7za.1 man1/7zr.1
+
+	dodoc ChangeLog README TODO
+	if use doc; then
+		dodoc DOC/*.txt
+		docinto html
+		dodoc -r DOC/MANUAL/.
+	fi
+}
diff --git a/app-arch/pbzip2/Manifest b/app-arch/pbzip2/Manifest
index ceff5eb..c66c7c1 100644
--- a/app-arch/pbzip2/Manifest
+++ b/app-arch/pbzip2/Manifest
@@ -1 +1 @@
-DIST pbzip2-1.1.13.tar.gz 48015 SHA256 8fd13eaaa266f7ee91f85c1ea97c86d9c9cc985969db9059cdebcb1e1b7bdbe6 SHA512 a150e476a85b2ae71c244561380f8f113072ef712173afaa0bdace5845d5f81a15b135258cb01376156b69a5085b02b7ab866cfab5713aa773b251b203c087b8 WHIRLPOOL 113a73732e571ff3431d29a6b8c150a2199fe839ccf3282f6cc1adf4bbace649fce4d377e25401132fd8f1c1c3eb48840a0c00536960cdaa288958de51f28d99
+DIST pbzip2-1.1.13.tar.gz 48015 BLAKE2B 1bb410acadc728963c3a04d2665fb1b1f0c206a893ed90352a9c16512e9bd5f82c3f5f3b383b382134bbe904735a1c8a81615a8bc54de8c6bc91633d9ce72c57 SHA512 a150e476a85b2ae71c244561380f8f113072ef712173afaa0bdace5845d5f81a15b135258cb01376156b69a5085b02b7ab866cfab5713aa773b251b203c087b8
diff --git a/app-arch/pbzip2/pbzip2-1.1.13.ebuild b/app-arch/pbzip2/pbzip2-1.1.13.ebuild
index d3c34ce..74e8839 100644
--- a/app-arch/pbzip2/pbzip2-1.1.13.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.1.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI="7"
 
-inherit flag-o-matic eutils
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Parallel bzip2 (de)compressor using libbz2"
 HOMEPAGE="http://compression.ca/pbzip2/ https://launchpad.net/pbzip2"
@@ -21,10 +21,17 @@
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.10-makefile.patch
+)
+
 src_prepare() {
+	default
 	# https://bugs.launchpad.net/pbzip2/+bug/1746369
 	sed -i 's:"PRIuMAX":" PRIuMAX ":g' *.cpp || die
-	epatch "${FILESDIR}"/${PN}-1.1.10-makefile.patch
+}
+
+src_configure() {
 	tc-export CXX
 	use static && append-ldflags -static
 }
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index 059936d..33a88c5 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1 +1 @@
-DIST pigz-2.3.1.tar.gz 86651 SHA256 629b0ce5422a3978f31742bf8275d0be2f84987140d18f390f1e3b4e46e0af54 SHA512 7cb00ab87802352c817d9b2f745948199a7e571181aec3ef161305c1d8b828790bc2fb0083d6068ba5aead5d8b8c7f53ec25ab641ae2e98eda9adf14f195dbc6 WHIRLPOOL 242e38d05215269c3c9b6602191cc6e02fd9e781b0425738c3907ccf60da9a4a36ebcda866c9c0e949ad5988dad6b468f97102352d2ed13adb7e890688c221f7
+DIST pigz-2.6.tar.gz 106840 BLAKE2B 8e1a8ca593896fc947a7d6ffaa71d9be69d347f7cf1ed2f635b8480aa05708f4679a4768cf3a18ac515ea94dd8352dd4158bd3c9d1b6fdebd82ad1b582d04cba SHA512 04d2e44bc7a7eb061c3c48100ce5b8fc79931aeac72340abd768fd2a4499ff1004e2bc009772fc2003a4c599f6e90f3abc8bef5c377d6397f1c8e9f7c49f95e2
diff --git a/app-arch/pigz/metadata.xml b/app-arch/pigz/metadata.xml
index 07909a4..1da600e 100644
--- a/app-arch/pigz/metadata.xml
+++ b/app-arch/pigz/metadata.xml
@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
 	</maintainer>
 	<longdescription lang="en">
-		A parallel implementation of gzip for modern
-		multi-processor, multi-core machines.
+		pigz, which stands for parallel implementation of gzip,
+		is a fully functional replacement for gzip that exploits
+		multiple processors and multiple cores to the hilt when compressing data.
 	</longdescription>
+	<use>
+		<flag name="symlink">Install symlinks which override <pkg>app-arch/gzip</pkg> implementation</flag>
+	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:zlib:pigz</remote-id>
+		<remote-id type="github">madler/pigz</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-arch/pigz/pigz-2.3.1.ebuild b/app-arch/pigz/pigz-2.3.1.ebuild
deleted file mode 100644
index 723f317..0000000
--- a/app-arch/pigz/pigz-2.3.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pigz/pigz-2.3.1.ebuild,v 1.4 2014/01/18 01:43:34 vapier Exp $
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="A parallel implementation of gzip"
-HOMEPAGE="http://www.zlib.net/pigz/"
-SRC_URI="http://www.zlib.net/pigz/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="*"
-IUSE="static symlink test"
-
-LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	test? ( app-arch/ncompress )"
-
-src_compile() {
-	use static && append-ldflags -static
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	dosym ${PN} /usr/bin/un${PN}
-	dodoc README
-	doman ${PN}.1
-
-	if use symlink; then
-		dosym ${PN} /usr/bin/gzip
-		dosym un${PN} /usr/bin/gunzip
-	fi
-}
diff --git a/app-arch/pigz/pigz-2.6.ebuild b/app-arch/pigz/pigz-2.6.ebuild
new file mode 100644
index 0000000..c28f432
--- /dev/null
+++ b/app-arch/pigz/pigz-2.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="A parallel implementation of gzip"
+HOMEPAGE="https://www.zlib.net/pigz/"
+SRC_URI="https://www.zlib.net/pigz/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="*"
+IUSE="static symlink test"
+RESTRICT="!test? ( test )"
+
+LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	test? ( app-arch/ncompress )"
+
+src_compile() {
+	use static && append-ldflags -static
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	dosym ${PN} /usr/bin/un${PN}
+	dodoc README
+	doman ${PN}.1
+
+	if use symlink; then
+		dosym ${PN} /usr/bin/gzip
+		dosym un${PN} /usr/bin/gunzip
+	fi
+}
diff --git a/app-arch/pixz/Manifest b/app-arch/pixz/Manifest
index 3fe12b2..e3e7105 100644
--- a/app-arch/pixz/Manifest
+++ b/app-arch/pixz/Manifest
@@ -1 +1 @@
-DIST pixz-1.0.6.tar.xz 119516 SHA256 02c50746b134fa1b1aae41fcc314d7c6f1919b3d48bcdea01bf11769f83f72e8 SHA512 361a8d8b736c350e4e3fd19b5d36777129a087eb81439d05edc08f9378938583bef8fc70e440ffd22efb6dad1f6494c6c3e532d7dd1ab12c9350b6078aa993d7 WHIRLPOOL cc5849746665a07e41e2f670410f00428a7ef9390e4dea83f1797efe51b1e73324002d68d74bf9c659affdcfc597ce45442da5f548d3326eb48af9fc6ce033c4
+DIST pixz-1.0.7.tar.xz 120876 BLAKE2B 23563837169611d54dc4540715537b2e16c66bd9682097e4f37957e7422b487f221603b11aa30a39fd05c77dbeddc1697ac9ffe208d984c1da885a67f79a180f SHA512 7f343cb74958b9582b60a2e916243e72421fad1ebecc5867c9e046c881e8a318da9bb885edd71da8fe6953fd5d5c2f5119133cd0bbbf4d0f9b35f8aecd61120d
diff --git a/app-arch/pixz/metadata.xml b/app-arch/pixz/metadata.xml
new file mode 100644
index 0000000..4256054
--- /dev/null
+++ b/app-arch/pixz/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zerochaos@gentoo.org</email>
+    <name>Rick Farina</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">vasi/pixz</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-arch/pixz/pixz-1.0.6.ebuild b/app-arch/pixz/pixz-1.0.6.ebuild
deleted file mode 120000
index 4bcdc73..0000000
--- a/app-arch/pixz/pixz-1.0.6.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-pixz-9999.ebuild
\ No newline at end of file
diff --git a/app-arch/pixz/pixz-1.0.7.ebuild b/app-arch/pixz/pixz-1.0.7.ebuild
new file mode 100644
index 0000000..8ad7b94
--- /dev/null
+++ b/app-arch/pixz/pixz-1.0.7.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/vasi/${PN}.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/vasi/pixz/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="*"
+fi
+
+DESCRIPTION="Parallel Indexed XZ compressor"
+HOMEPAGE="https://github.com/vasi/pixz"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="static"
+
+LIB_DEPEND="
+	>=app-arch/libarchive-2.8:=[static-libs(+)]
+	>=app-arch/xz-utils-5[static-libs(+)]
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+"
+[[ ${PV} == "9999" ]] && BDEPEND+=" app-text/asciidoc"
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	append-flags -std=gnu99
+	# Workaround silly logic that breaks cross-compiles.
+	# https://github.com/vasi/pixz/issues/67
+	export ac_cv_file_src_pixz_1=$([[ -f src/pixz.1 ]] && echo yes || echo no)
+	econf
+}
+
+src_test() {
+	emake check
+}
diff --git a/app-arch/pixz/pixz-9999.ebuild b/app-arch/pixz/pixz-9999.ebuild
deleted file mode 100644
index 8e80105..0000000
--- a/app-arch/pixz/pixz-9999.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit flag-o-matic
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/vasi/${PN}.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://github.com/vasi/pixz/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="*"
-fi
-
-DESCRIPTION="Parallel Indexed XZ compressor"
-HOMEPAGE="https://github.com/vasi/pixz"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="static"
-
-LIB_DEPEND=">=app-arch/libarchive-2.8:=[static-libs(+)]
-	>=app-arch/xz-utils-5[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-[[ ${PV} == "9999" ]] && DEPEND+=" app-text/asciidoc"
-
-src_prepare() {
-	default
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	append-flags -std=gnu99
-	# Workaround silly logic that breaks cross-compiles.
-	# https://github.com/vasi/pixz/issues/67
-	export ac_cv_file_src_pixz_1=$([[ -f src/pixz.1 ]] && echo yes || echo no)
-	econf
-}
diff --git a/app-arch/rpm2targz/Manifest b/app-arch/rpm2targz/Manifest
index 6f6263d..e187af5 100644
--- a/app-arch/rpm2targz/Manifest
+++ b/app-arch/rpm2targz/Manifest
@@ -1 +1 @@
-DIST rpm2targz-9.0.0.5g.tar.xz 5740 SHA256 4327b7dd30bf55e473198444b920029624948e24af575edff9ce466dcd4075e0 SHA512 a595d23581bd396a3a00b6eae4cf6edca1c65b52510a02c7b162afc3d89f45026663a271279bb519741b4a35a0ee653fbfb124c5a7d6d921b466dc9236cbf549 WHIRLPOOL 24ef16afdd2c6fc1c803d849da9140bf53c10ecc041a1b3363459d233f5862a97f6199186932eaeb43e8100e4b2c015d3c0253a2e0d993b246f9fd0f692ab45b
+DIST rpm2targz-2021.03.16.tar.xz 6500 BLAKE2B fac1122fbfcab2b982ea6f5369b95b30814d438d0f853d846ef62a33ceaaf81d44b2a743bc20a3ef46defb63331bff06f9a268a5a805ecd899b11f86ec414bc2 SHA512 efd677642fbf73d4b8c90f338eea20452052f2bdc2b7a3a61c0e9215676575b5063aad733ec3ea4840baf281eb332db8f6fdeef600cc8a8aa7e208f2fa8ee599
diff --git a/app-arch/rpm2targz/metadata.xml b/app-arch/rpm2targz/metadata.xml
index 96a2d58..56c1244 100644
--- a/app-arch/rpm2targz/metadata.xml
+++ b/app-arch/rpm2targz/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild b/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild
new file mode 100644
index 0000000..d55fa44
--- /dev/null
+++ b/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Convert a .rpm file to a .tar.gz archive"
+HOMEPAGE="http://www.slackware.com/config/packages.php"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+
+LICENSE="BSD-1"
+SLOT="0"
+KEYWORDS="*"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-arch/cpio"
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}"/usr install
+	einstalldocs
+}
diff --git a/app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild
deleted file mode 100644
index 41ef0a0..0000000
--- a/app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild,v 1.12 2014/01/18 01:18:10 vapier Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Convert a .rpm file to a .tar.gz archive"
-HOMEPAGE="http://www.slackware.com/config/packages.php"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="BSD-1"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="app-arch/cpio"
-DEPEND="app-arch/xz-utils"
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install # need explicit install line #397835
-	dodoc *.README*
-}
diff --git a/app-arch/sharutils/Manifest b/app-arch/sharutils/Manifest
index 90adbe3..b2a7522 100644
--- a/app-arch/sharutils/Manifest
+++ b/app-arch/sharutils/Manifest
@@ -1 +1 @@
-DIST sharutils-4.14.tar.xz 1089052 SHA256 eae388efcf52aba0b081f09053189e0a3ad238561d88716b880b5c0676c07a0c SHA512 c1b87bc87915f7aebc9e02dfc1e08321f5ed2e144509c063139cde23eb8f75cb6469aa8042e4c6ec801f55d805e595f4c1c674cf5f2b4580a1e4933fcd605614 WHIRLPOOL dc3f9f3e2caaf296fbf6317f4b8eb1d4d8b8cb5aef59ef570dd24483afcaf3dd55f46e07a70e1213b393390c77e631e60891adae52ff9693ad446692189db649
+DIST sharutils-4.15.2.tar.xz 1122476 BLAKE2B e2acae027679ebdf723ecae6f243608f501f5c24685a19223dd27580ccf76bc7d38905a9d202b30cf2633e5580d727821398f1162b170233f03c17f3da683917 SHA512 80d0b804a0617e11e5c23dc0d59b218bbf93e40aaf5e9a5401a18ef9cb700390aab711e2b2e2f26c8fd5b8ef99a91d3405e01d02cadabcba7639979314e59f8d
diff --git a/app-arch/sharutils/files/sharutils-4.14-popen-rb.patch b/app-arch/sharutils/files/sharutils-4.14-popen-rb.patch
deleted file mode 100644
index c502a62..0000000
--- a/app-arch/sharutils/files/sharutils-4.14-popen-rb.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-delete the run time test which dies on cross-compiles.
-we know the answer already, so hardcode it to true.
-
---- a/configure
-+++ b/configure
-@@ -30745,25 +30745,8 @@
-   CATALOGS="$new_CATALOGS"
- fi
- 
--if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--int
--main ()
--{
--    FILE * fp = popen ("date", "rb");
--    exit (fp == NULL);
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
-+if false; then
-+if true; then
- 
- $as_echo "#define BINARY_MODE_POPEN 1" >>confdefs.h
- 
diff --git a/app-arch/sharutils/files/sharutils-4.15.2-CVE-2018-1000097.patch b/app-arch/sharutils/files/sharutils-4.15.2-CVE-2018-1000097.patch
new file mode 100644
index 0000000..f616620
--- /dev/null
+++ b/app-arch/sharutils/files/sharutils-4.15.2-CVE-2018-1000097.patch
@@ -0,0 +1,16 @@
+From: Petr Pisar
+Subject: Fix CVE-2018-1000097, heap buffer overflow in unshar
+Bug-Debian: https://bugs.debian.org/893525
+X-Debian-version: 1:4.15.2-3
+
+--- a/src/unshar.c
++++ b/src/unshar.c
+@@ -240,7 +240,7 @@
+       off_t position = ftello (file);
+ 
+       /* Read next line, fail if no more and no previous process.  */
+-      if (!fgets (rw_buffer, BUFSIZ, file))
++      if (!fgets (rw_buffer, rw_base_size, file))
+ 	{
+ 	  if (!start)
+ 	    error (0, 0, _("Found no shell commands in %s"), name);
diff --git a/app-arch/sharutils/files/sharutils-4.15.2-gcc-10.patch b/app-arch/sharutils/files/sharutils-4.15.2-gcc-10.patch
new file mode 100644
index 0000000..4a0c02f
--- /dev/null
+++ b/app-arch/sharutils/files/sharutils-4.15.2-gcc-10.patch
@@ -0,0 +1,48 @@
+https://bugs.gentoo.org/706256
+
+Fix build failure on gcc-10/-fno-common.
+
+--- a/src/shar-opts.h
++++ b/src/shar-opts.h
+@@ -352,7 +352,7 @@ extern "C" {
+  *  global exported definitions
+  */
+ #include "local.h"
+-char const * const program_name;
++extern char const * const program_name;
+ 
+ extern bool initialization_done;
+ extern int optidx;
+--- a/src/unshar-opts.h
++++ b/src/unshar-opts.h
+@@ -192,7 +192,7 @@ extern "C" {
+ extern size_t       separator_str_len;
+ 
+ #include "local.h"
+-char const * const program_name;
++extern char const * const program_name;
+ 
+ 
+ /* * * * * *
+--- a/src/uudecode-opts.h
++++ b/src/uudecode-opts.h
+@@ -170,7 +170,7 @@ extern "C" {
+  *  global exported definitions
+  */
+ #include "local.h"
+-char const * const program_name;
++extern char const * const program_name;
+ 
+ 
+ /* * * * * *
+--- a/src/uuencode-opts.h
++++ b/src/uuencode-opts.h
+@@ -166,7 +166,7 @@ extern "C" {
+  *  global exported definitions
+  */
+ #include "local.h"
+-char const * const program_name;
++extern char const * const program_name;
+ 
+ 
+ /* * * * * *
diff --git a/app-arch/sharutils/files/sharutils-4.15.2-glibc228.patch b/app-arch/sharutils/files/sharutils-4.15.2-glibc228.patch
new file mode 100644
index 0000000..15bd682
--- /dev/null
+++ b/app-arch/sharutils/files/sharutils-4.15.2-glibc228.patch
@@ -0,0 +1,95 @@
+From: Santiago Vila <sanvila@debian.org>
+Subject: Fix FTBFS with glibc 2.28
+Bug-Debian: https://bugs.debian.org/915173
+X-Debian-version: 1:4.15.2-4
+
+Based on this gnulib commit by Paul Eggert:
+
+https://lists.gnu.org/r/bug-gnulib/2018-03/msg00002.html
+
+--- a/lib/fflush.c
++++ b/lib/fflush.c
+@@ -33,7 +33,7 @@
+ #undef fflush
+ 
+ 
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ 
+ /* Clear the stream's ungetc buffer, preserving the value of ftello (fp).  */
+ static void
+@@ -72,7 +72,7 @@
+ 
+ #endif
+ 
+-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
+ 
+ # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
+@@ -148,7 +148,7 @@
+   if (stream == NULL || ! freading (stream))
+     return fflush (stream);
+ 
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ 
+   clear_ungetc_buffer_preserving_position (stream);
+ 
+--- a/lib/fpurge.c
++++ b/lib/fpurge.c
+@@ -62,7 +62,7 @@
+   /* Most systems provide FILE as a struct and the necessary bitmask in
+      <stdio.h>, because they need it for implementing getc() and putc() as
+      fast macros.  */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+   fp->_IO_read_end = fp->_IO_read_ptr;
+   fp->_IO_write_ptr = fp->_IO_write_base;
+   /* Avoid memory leak when there is an active ungetc buffer.  */
+--- a/lib/freading.c
++++ b/lib/freading.c
+@@ -31,7 +31,7 @@
+   /* Most systems provide FILE as a struct and the necessary bitmask in
+      <stdio.h>, because they need it for implementing getc() and putc() as
+      fast macros.  */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+   return ((fp->_flags & _IO_NO_WRITES) != 0
+           || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
+               && fp->_IO_read_base != NULL));
+--- a/lib/fseeko.c
++++ b/lib/fseeko.c
+@@ -47,7 +47,7 @@
+ #endif
+ 
+   /* These tests are based on fpurge.c.  */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+   if (fp->_IO_read_end == fp->_IO_read_ptr
+       && fp->_IO_write_ptr == fp->_IO_write_base
+       && fp->_IO_save_base == NULL)
+@@ -123,7 +123,7 @@
+           return -1;
+         }
+ 
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+       fp->_flags &= ~_IO_EOF_SEEN;
+       fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+--- a/lib/stdio-impl.h
++++ b/lib/stdio-impl.h
+@@ -18,6 +18,12 @@
+    the same implementation of stdio extension API, except that some fields
+    have different naming conventions, or their access requires some casts.  */
+ 
++/* Glibc 2.28 made _IO_IN_BACKUP private.  For now, work around this
++   problem by defining it ourselves.  FIXME: Do not rely on glibc
++   internals.  */
++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
++# define _IO_IN_BACKUP 0x100
++#endif
+ 
+ /* BSD stdio derived implementations.  */
+ 
diff --git a/app-arch/sharutils/metadata.xml b/app-arch/sharutils/metadata.xml
index 801bcd0..92fa546 100644
--- a/app-arch/sharutils/metadata.xml
+++ b/app-arch/sharutils/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+  <email>base-system@gentoo.org</email>
+  <name>Gentoo Base System</name>
+</maintainer>
 <upstream>
   <remote-id type="cpe">cpe:/a:gnu:sharutils</remote-id>
 </upstream>
diff --git a/app-arch/sharutils/sharutils-4.14-r1.ebuild b/app-arch/sharutils/sharutils-4.14-r1.ebuild
deleted file mode 100644
index 5976676..0000000
--- a/app-arch/sharutils/sharutils-4.14-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.14-r1.ebuild,v 1.10 2014/08/12 12:19:31 vapier Exp $
-
-EAPI="5"
-
-inherit eutils
-
-MY_P="${P/_/-}"
-DESCRIPTION="Tools to deal with shar archives"
-HOMEPAGE="http://www.gnu.org/software/sharutils/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="*"
-IUSE="nls"
-
-DEPEND="app-arch/xz-utils
-	sys-apps/texinfo
-	nls? ( >=sys-devel/gettext-0.10.35 )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.14-popen-rb.patch
-}
-
-src_configure() {
-	strip-linguas -u po
-	econf $(use_enable nls)
-}
diff --git a/app-arch/sharutils/sharutils-4.15.2-r2.ebuild b/app-arch/sharutils/sharutils-4.15.2-r2.ebuild
new file mode 100644
index 0000000..010dbd4
--- /dev/null
+++ b/app-arch/sharutils/sharutils-4.15.2-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic l10n
+
+MY_P="${P/_/-}"
+DESCRIPTION="Tools to deal with shar archives"
+HOMEPAGE="https://www.gnu.org/software/sharutils/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="*"
+IUSE="nls"
+
+DEPEND="app-arch/xz-utils
+	sys-apps/texinfo
+	nls? ( >=sys-devel/gettext-0.10.35 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.15.2-glibc228.patch
+	"${FILESDIR}"/${PN}-4.15.2-CVE-2018-1000097.patch
+	"${FILESDIR}"/${PN}-4.15.2-gcc-10.patch
+)
+
+src_prepare() {
+	default
+
+	# Upstream is aware but thinks this isn't a bug/problem in sharutils itself
+	# See http://lists.gnu.org/archive/html/bug-gnu-utils/2013-10/msg00011.html
+	append-cflags $(test-flags-CC -Wno-error=format-security)
+}
+
+src_configure() {
+	strip-linguas -u po
+	econf $(use_enable nls)
+}
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index 3870b8d..0995e29 100644
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@@ -1 +1 @@
-DIST snappy-1.1.7.tar.gz 1090550 SHA256 3dfa02e873ff51a11ee02b9ca391807f0c8ea0529a4924afa645fbf97163f9d4 SHA512 32046f532606ba545a4e4825c0c66a19be449f2ca2ff760a6fa170a3603731479a7deadb683546e5f8b5033414c50f4a9a29f6d23b7a41f047e566e69eca7caf WHIRLPOOL ed5dacdbdcbfbe88982b23d389d781548bf8780c1ecb9b99c8a09442821a97b6aca2fe5eec86b8db1c8e305e17b381391a595d5abacd24b9ace5048dc64cf232
+DIST snappy-1.1.8.tar.gz 1096137 BLAKE2B e21f2ea23727f118920b7f67981354194f12d1d61eaa18eb1cb2f4285fabafdd221b88cf1e3b3261634f65469a714d3efe6b218c0b1e9d41639cdeb21097d75e SHA512 efe18ff1b3edda1b4b6cefcbc6da8119c05d63afdbf7a784f3490353c74dced76baed7b5f1aa34b99899729192b9d657c33c76de4b507a51553fa8001ae75c1c
diff --git a/app-arch/snappy/files/snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch b/app-arch/snappy/files/snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
index 3327b8b..f4fdd47 100644
--- a/app-arch/snappy/files/snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
+++ b/app-arch/snappy/files/snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
@@ -14,8 +14,7 @@
 index 3f534b1..3a44aa9 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -118,7 +118,10 @@ if(SNAPPY_BUILD_TESTS)
-       "${PROJECT_SOURCE_DIR}/snappy-test.cc"
+@@ -119,6 +119,9 @@ if(SNAPPY_BUILD_TESTS)
    )
    target_compile_definitions(snappy_unittest PRIVATE -DHAVE_CONFIG_H)
 -  target_link_libraries(snappy_unittest snappy ${GFLAGS_LIBRARIES})
diff --git a/app-arch/snappy/metadata.xml b/app-arch/snappy/metadata.xml
index e5215ea..c149214 100644
--- a/app-arch/snappy/metadata.xml
+++ b/app-arch/snappy/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type='person'>
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">Snappy is a compression/decompression library. It does not aim for
 		maximum compression, or compatibility with any other compression
 		library; instead, it aims for very high speeds and reasonable
diff --git a/app-arch/snappy/snappy-1.1.7.ebuild b/app-arch/snappy/snappy-1.1.7.ebuild
deleted file mode 100644
index c015af9..0000000
--- a/app-arch/snappy/snappy-1.1.7.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib
-
-DESCRIPTION="A high-speed compression/decompression library by Google"
-HOMEPAGE="https://github.com/google/snappy"
-SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV%%.*}"
-KEYWORDS="*"
-IUSE="static-libs test"
-# upstream killed static lib support with build system update
-# (and we have packages depending on the flag)
-REQUIRED_USE="!static-libs"
-
-# all test dependencies are optional:
-# - gflags-2.2 is supposedly needed for command-line option parsing
-# but it's a huge hack and does not work,
-# - gtest probably gives nicer output,
-# - compression libraries are used for benchmarks which we do not run.
-DEPEND="test? ( dev-cpp/gtest )"
-
-# AUTHORS is useless, ChangeLog is stale
-DOCS=( format_description.txt framing_format.txt NEWS README.md )
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
-	)
-
-	# command-line option parsing does not work at all, so just force
-	# it off
-	sed -i -e '/run_microbenchmarks/s:true:false:' snappy-test.cc || die
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	# TODO: would be nice to make unittest build conditional
-	# but it is not a priority right now
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-
-		# use gtest for tests only
-		-DCMAKE_DISABLE_FIND_PACKAGE_GTest=$(usex '!test')
-		# gflags does not work anyway
-		-DCMAKE_DISABLE_FIND_PACKAGE_Gflags=ON
-
-		# we do not want to run benchmarks, and those are only used
-		# for benchmarks
-		-DHAVE_LIBZ=NO
-		-DHAVE_LIBLZO2=NO
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	# run tests directly to get verbose output
-	cd "${S}" || die
-	"${BUILD_DIR}"/snappy_unittest || die
-}
diff --git a/app-arch/snappy/snappy-1.1.8.ebuild b/app-arch/snappy/snappy-1.1.8.ebuild
new file mode 100644
index 0000000..1aaa5e3
--- /dev/null
+++ b/app-arch/snappy/snappy-1.1.8.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="A high-speed compression/decompression library by Google"
+HOMEPAGE="https://github.com/google/snappy"
+SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV%%.*}"
+KEYWORDS="*"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# all test dependencies are optional:
+# - gflags-2.2 is supposedly needed for command-line option parsing
+# but it's a huge hack and does not work,
+# - gtest probably gives nicer output,
+# - compression libraries are used for benchmarks which we do not run.
+DEPEND="test? ( dev-cpp/gtest )"
+
+# AUTHORS is useless, ChangeLog is stale
+DOCS=( format_description.txt framing_format.txt NEWS README.md )
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
+	)
+
+	# command-line option parsing does not work at all, so just force
+	# it off
+	sed -i -e '/run_microbenchmarks/s:true:false:' snappy-test.cc || die
+
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	# TODO: would be nice to make unittest build conditional
+	# but it is not a priority right now
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+
+		# use gtest for tests only
+		-DCMAKE_DISABLE_FIND_PACKAGE_GTest=$(usex '!test')
+		# gflags does not work anyway
+		-DCMAKE_DISABLE_FIND_PACKAGE_Gflags=ON
+
+		# we do not want to run benchmarks, and those are only used
+		# for benchmarks
+		-DHAVE_LIBZ=NO
+		-DHAVE_LIBLZO2=NO
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	# run tests directly to get verbose output
+	cd "${S}" || die
+	"${BUILD_DIR}"/snappy_unittest || die
+}
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index 0ee31a3..6166b3a 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -1 +1,3 @@
+DIST tar-1.32.tar.bz2 2947264 BLAKE2B 4e380a9a2f84a2af5130464e1b298ae6acf02ee459cbca20dd0991c2859785e5aac789d57b87b32e8b45d89985b6414af9dd37161385da9568d6030c5aa42c0e SHA512 3139e87112123269ee0600243b3ea081687cc93667bef5832bfe3c785c1be622f520f00fcfbdf44ad1d3247866d0ecfe347a85bbfec38eb38fa1014baef566f6
+DIST tar-1.33.tar.xz 2224824 BLAKE2B 500bcf4b919881da13f7336c617b4d618b5f898e4d8606867c8917be165d4a3718783a2959896226df451d7acdd78ba2fd1d9fc774d7905fe0dbe2375e3329fb SHA512 d7c31147fafcd815bb54e3862c078dccc3f192a9fa149c2275bd89a21fcd54a4bdaa8343cacf4f76cadc2f57fd4ed955682c1b6f23d438add5a13cc35bd25260
 DIST tar-1.34.tar.xz 2226068 BLAKE2B 741a662457509a6775338ffe5d2d84872fcf38b93ace70c8b748a81055b9b62f65a48c4e541955d08ae99e6f528509e89eacd7c799a65bcc3d017a259110c115 SHA512 5e77c4a7b49983ad7d15238c2bce28be7a8aa437b4b1815fc00abd13096da308b6bba196cc6e3ed79d85e62823d520ae0d8fcda2d93873842cf84dc3369fc902
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index ad8ad1d..8d218b5 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -1 +1 @@
-DIST unrar-5.9.4.tar.gz 229921 BLAKE2B d87189a6b6b3566a0efac7f72e40732ff673cdcac6f4fdaa96b5a771025f02779d74e2822053681477b3490f45817196673aa5707846767c4061ca95718557a1 SHA512 4c026bc12c38314c7df6e1b2f296be681fffa4ba525e378809063519cb5d51889fe8d3cbce16e802023354f02b45b1bcc672b79a6fa81b4baa13a374ce22c8f1
+DIST unrar-6.0.6.tar.gz 232874 BLAKE2B dd32f09167a641d7a63a2dc4979f6eb4462b1a16529e92fd0fb1e0e27f4eeb22e7ee15b96e7aa9d852db4dddd09d73efb53f2bcb2426e12612afa244f06f0387 SHA512 cb50cdde120c02461bb6618e4b8773a221982c5ba81309669001b9713fc14bedc42bc5a601f30a62674be7ffd5c674d51be285c02a468d6e3fe0ebc02da8bd8f
diff --git a/app-arch/unrar/metadata.xml b/app-arch/unrar/metadata.xml
index 0889838..0a18fba 100644
--- a/app-arch/unrar/metadata.xml
+++ b/app-arch/unrar/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>whissi@gentoo.org</email>
-  <name>Thomas Deutschmann</name>
-</maintainer>
-<maintainer type="project">
-  <email>base-system@gentoo.org</email>
-  <name>Gentoo Base System</name>
-</maintainer>
-<slots>
-  <subslots>Reflect ABI of libunrar.so.</subslots>
-</slots>
-<upstream>
-  <remote-id type="cpe">cpe:/a:rarlab:unrar</remote-id>
-</upstream>
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<slots>
+		<subslots>Reflect ABI of libunrar.so.</subslots>
+	</slots>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:rarlab:unrar</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-arch/unrar/unrar-5.9.4.ebuild b/app-arch/unrar/unrar-5.9.4.ebuild
deleted file mode 100644
index a24399d..0000000
--- a/app-arch/unrar/unrar-5.9.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib toolchain-funcs
-
-MY_PN="${PN}src"
-
-DESCRIPTION="Uncompress rar files"
-HOMEPAGE="https://www.rarlab.com/rar_add.htm"
-SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="unRAR"
-# subslot = soname version
-SLOT="0/5"
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
-
-S="${WORKDIR}/unrar"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.9.3-build.patch
-	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
-)
-
-src_prepare() {
-	default
-
-	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
-	else
-		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
-	fi
-	sed -i "${sed_args[@]}" makefile || die
-}
-
-src_configure() {
-	mkdir -p build-{lib,bin}
-	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
-	cp build-{lib,bin}/Makefile || die
-}
-
-src_compile() {
-	unrar_make() {
-		emake AR="$(tc-getAR)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
-	}
-
-	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
-	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
-	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
-
-	unrar_make -C build-bin
-}
-
-src_install() {
-	dobin build-bin/unrar
-	dodoc readme.txt
-
-	dolib.so build-lib/libunrar*
-
-	insinto /usr/include/libunrar${PV%.*.*}
-	doins *.hpp
-	dosym libunrar${PV%.*.*} /usr/include/libunrar
-
-	find "${ED}" -type f -name "*.a" -delete || die
-}
diff --git a/app-arch/unrar/unrar-6.0.6.ebuild b/app-arch/unrar/unrar-6.0.6.ebuild
new file mode 100644
index 0000000..4ececf4
--- /dev/null
+++ b/app-arch/unrar/unrar-6.0.6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib toolchain-funcs
+
+MY_PN="${PN}src"
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="unRAR"
+# subslot = soname version
+SLOT="0/6"
+KEYWORDS="*"
+
+RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
+
+S="${WORKDIR}/unrar"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.9.3-build.patch
+	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
+)
+
+src_prepare() {
+	default
+
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin} || die
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake AR="$(tc-getAR)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+
+	find "${ED}" -type f -name "*.a" -delete || die
+}
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index 6b82ac8..8f65ff0 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -1,2 +1,2 @@
-DIST unzip60.tar.gz 1376845 SHA256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d WHIRLPOOL eab32d6d0ab100d302b608658a3ae290d3dad4beddccebaf6cb6527102bb238f751ec6482dea68ae62474005de89f11f9e0cf1b1e12bee2ca5a2336a3c0c9808
-DIST unzip_6.0-21.debian.tar.xz 17740 SHA256 8accd9d214630a366476437a3ec1842f2e057fdce16042a7b19ee569c33490a3 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36 WHIRLPOOL ce4d74e27ff27183989c680ef022328915c8ade5c1f12b39bcc1ee905dbd2fd3974cbb22da9bed40d8dc7a59de9ba768bfc6bb61d3bdd1b6f571945d06bf19f6
+DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a0407c0c60bd7bb5ec5012031f916d8b204a6149ba291c2c35beba40d9b43c76fc093026e79471329ab0e47 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d
+DIST unzip_6.0-26.debian.tar.xz 23708 BLAKE2B 7655396df2f8c4443bbd37a2fab590f1e66b3b8531871a6d95f281ac702e64a0e602f2412a58ff2addf4ce9cae8d146af650a18b02919d120c9db6c49df480b5 SHA512 9a56e400ad0984f87c7ee0548429349be549e35a3cae4c9acb88a8fb97a1d1fbd116cfa3292622ad8b2c67ffe79ae268861ddec1269993ba98f1a6a411b7611f
diff --git a/app-arch/unzip/files/unzip-6.0-fix-false-overlap-detection-on-32bit-systems.patch b/app-arch/unzip/files/unzip-6.0-fix-false-overlap-detection-on-32bit-systems.patch
new file mode 100644
index 0000000..ad6a157
--- /dev/null
+++ b/app-arch/unzip/files/unzip-6.0-fix-false-overlap-detection-on-32bit-systems.patch
@@ -0,0 +1,50 @@
+From 13f0260beae851f7d5dd96e9ef757d8d6d7daac1 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Sun, 9 Feb 2020 07:20:13 -0800
+Subject: [PATCH] Fix false overlapped components detection on 32-bit systems.
+
+32-bit systems with ZIP64_SUPPORT enabled could have different
+size types for zoff_t and zusz_t. That resulted in bad parameter
+passing to the bound tracking functions, itself due to the lack of
+use of C function prototypes in unzip. This commit assures that
+parameters are cast properly for those calls.
+
+This problem occurred only for ill-chosen make options, which give
+a 32-bit zoff_t. A proper build will result in a zoff_t of 64 bits,
+even on 32-bit systems.
+---
+ extract.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/extract.c b/extract.c
+index 1b73cb0..d9866f9 100644
+--- a/extract.c
++++ b/extract.c
+@@ -329,7 +329,7 @@ static ZCONST char Far OverlappedComponents[] =
+ 
+ 
+ /* A growable list of spans. */
+-typedef zoff_t bound_t;
++typedef zusz_t bound_t;
+ typedef struct {
+     bound_t beg;        /* start of the span */
+     bound_t end;        /* one past the end of the span */
+@@ -518,7 +518,8 @@ int extract_or_test_files(__G)    /* return PK-type error code */
+         return PK_MEM;
+     }
+     if ((G.extra_bytes != 0 &&
+-         cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) ||
++         cover_add((cover_t *)G.cover,
++                   (bound_t)0, (bound_t)G.extra_bytes) != 0) ||
+         (G.ecrec.have_ecr64 &&
+          cover_add((cover_t *)G.cover, G.ecrec.ec64_start,
+                    G.ecrec.ec64_end) != 0) ||
+@@ -1216,7 +1217,7 @@ static int extract_or_test_entrylist(__G__ numchunk,
+ 
+         /* seek_zipf(__G__ pInfo->offset);  */
+         request = G.pInfo->offset + G.extra_bytes;
+-        if (cover_within((cover_t *)G.cover, request)) {
++        if (cover_within((cover_t *)G.cover, (bound_t)request)) {
+             Info(slide, 0x401, ((char *)slide,
+               LoadFarString(OverlappedComponents)));
+             return PK_BOMB;
diff --git a/app-arch/unzip/metadata.xml b/app-arch/unzip/metadata.xml
index e0009bf..a151503 100644
--- a/app-arch/unzip/metadata.xml
+++ b/app-arch/unzip/metadata.xml
@@ -9,7 +9,8 @@
 		<flag name="natspec">Use <pkg>dev-libs/libnatspec</pkg> to correctly decode non-ascii file names archived in Windows.</flag>
 	</use>
 	<upstream>
-		<remote-id type="sourceforge">infozip</remote-id>
 		<remote-id type="cpe">cpe:/a:info-zip:unzip</remote-id>
+		<remote-id type="github">madler/unzip</remote-id>
+		<remote-id type="sourceforge">infozip</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-arch/unzip/unzip-6.0_p21-r2.ebuild b/app-arch/unzip/unzip-6.0_p21-r2.ebuild
deleted file mode 100644
index 07de804..0000000
--- a/app-arch/unzip/unzip-6.0_p21-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_PV="${PV//.}"
-MY_PV="${MY_PV%_p*}"
-MY_P="${PN}${MY_PV}"
-
-DESCRIPTION="unzipper for pkzip-compressed files"
-HOMEPAGE="http://www.info-zip.org/"
-SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
-	mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz"
-
-LICENSE="Info-ZIP"
-SLOT="0"
-KEYWORDS="*"
-IUSE="bzip2 natspec unicode"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-	natspec? ( dev-libs/libnatspec )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	local deb="${WORKDIR}"/debian/patches
-	rm "${deb}"/02-this-is-debian-unzip.patch || die
-	eapply "${deb}"/*.patch
-
-	eapply "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch
-	eapply "${FILESDIR}"/${PN}-6.0-format-security.patch
-	use natspec && eapply "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
-	sed -i -r \
-		-e '/^CFLAGS/d' \
-		-e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \
-		-e '/^STRIP/s:=.*:=true:' \
-		-e "s:\<CC *= *\"?g?cc2?\"?\>:CC=\"$(tc-getCC)\":" \
-		-e "s:\<LD *= *\"?(g?cc2?|ld)\"?\>:LD=\"$(tc-getCC)\":" \
-		-e "s:\<AS *= *\"?(g?cc2?|as)\"?\>:AS=\"$(tc-getCC)\":" \
-		-e 's:LF2 = -s:LF2 = :' \
-		-e 's:LF = :LF = $(LDFLAGS) :' \
-		-e 's:SL = :SL = $(LDFLAGS) :' \
-		-e 's:FL = :FL = $(LDFLAGS) :' \
-		-e "/^#L_BZ2/s:^$(use bzip2 && echo .)::" \
-		-e 's:$(AS) :$(AS) $(ASFLAGS) :g' \
-		unix/Makefile \
-		|| die "sed unix/Makefile failed"
-
-	# Delete bundled code to make sure we don't use it.
-	rm -r bzip2 || die
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-	i?86*-*linux*)       TARGET="linux_asm" ;;
-	*linux*)             TARGET="linux_noasm" ;;
-	i?86*-*bsd* | \
-	i?86*-dragonfly*)    TARGET="freebsd" ;; # mislabelled bsd with x86 asm
-	*bsd* | *dragonfly*) TARGET="bsd" ;;
-	*-darwin*)           TARGET="macosx" ;;
-	*-cygwin*)           TARGET="cygwin" ;;
-	*) die "Unknown target; please update the ebuild to handle ${CHOST}	" ;;
-	esac
-
-	[[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD
-	use bzip2 && append-cppflags -DUSE_BZIP2
-	use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DUSE_ICONV_MAPPING
-	append-cppflags -DLARGE_FILE_SUPPORT #281473
-}
-
-src_compile() {
-	ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \
-	emake -f unix/Makefile ${TARGET}
-}
-
-src_install() {
-	dobin unzip funzip unzipsfx unix/zipgrep
-	dosym unzip /usr/bin/zipinfo
-	doman man/*.1
-	dodoc BUGS History* README ToDo WHERE
-}
diff --git a/app-arch/unzip/unzip-6.0_p26.ebuild b/app-arch/unzip/unzip-6.0_p26.ebuild
new file mode 100644
index 0000000..f0daed3
--- /dev/null
+++ b/app-arch/unzip/unzip-6.0_p26.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
+
+MY_PV="${PV//.}"
+MY_PV="${MY_PV%_p*}"
+MY_P="${PN}${MY_PV}"
+
+DESCRIPTION="unzipper for pkzip-compressed files"
+HOMEPAGE="http://www.info-zip.org/"
+SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
+	mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz"
+
+LICENSE="Info-ZIP"
+SLOT="0"
+KEYWORDS="*"
+IUSE="bzip2 natspec unicode"
+
+DEPEND="bzip2? ( app-arch/bzip2 )
+	natspec? ( dev-libs/libnatspec )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	local deb="${WORKDIR}"/debian/patches
+	rm "${deb}"/02-this-is-debian-unzip.patch || die
+	eapply "${deb}"/*.patch
+
+	eapply "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch
+	eapply "${FILESDIR}"/${PN}-6.0-format-security.patch
+	eapply "${FILESDIR}"/${PN}-6.0-fix-false-overlap-detection-on-32bit-systems.patch
+	use natspec && eapply "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
+	sed -i -r \
+		-e '/^CFLAGS/d' \
+		-e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \
+		-e '/^STRIP/s:=.*:=true:' \
+		-e "s:\<CC *= *\"?g?cc2?\"?\>:CC=\"$(tc-getCC)\":" \
+		-e "s:\<LD *= *\"?(g?cc2?|ld)\"?\>:LD=\"$(tc-getCC)\":" \
+		-e "s:\<AS *= *\"?(g?cc2?|as)\"?\>:AS=\"$(tc-getCC)\":" \
+		-e 's:LF2 = -s:LF2 = :' \
+		-e 's:LF = :LF = $(LDFLAGS) :' \
+		-e 's:SL = :SL = $(LDFLAGS) :' \
+		-e 's:FL = :FL = $(LDFLAGS) :' \
+		-e "/^#L_BZ2/s:^$(use bzip2 && echo .)::" \
+		-e 's:$(AS) :$(AS) $(ASFLAGS) :g' \
+		unix/Makefile \
+		|| die "sed unix/Makefile failed"
+
+	# Delete bundled code to make sure we don't use it.
+	rm -r bzip2 || die
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		i?86*-*linux*)       TARGET="linux_asm" ;;
+		*linux*)             TARGET="linux_noasm" ;;
+		i?86*-*bsd* | \
+		i?86*-dragonfly*)    TARGET="freebsd" ;; # mislabelled bsd with x86 asm
+		*bsd* | *dragonfly*) TARGET="bsd" ;;
+		*-darwin*)           TARGET="macosx" ;;
+		*-solaris*)          TARGET="generic" ;;
+		*-cygwin*)           TARGET="generic" ;;
+		*) die "Unknown target; please update the ebuild to handle ${CHOST}	" ;;
+	esac
+
+	[[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD
+	use bzip2 && append-cppflags -DUSE_BZIP2
+	use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DUSE_ICONV_MAPPING
+	append-cppflags -DLARGE_FILE_SUPPORT #281473
+}
+
+src_compile() {
+	ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \
+		emake -f unix/Makefile ${TARGET}
+}
+
+src_install() {
+	dobin unzip funzip unzipsfx unix/zipgrep
+	dosym unzip /usr/bin/zipinfo
+	doman man/*.1
+	dodoc BUGS History* README ToDo WHERE
+}
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 37aea0d..dc22299 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1 +1 @@
-DIST xz-5.2.4.tar.gz 1572354 BLAKE2B 877242324afd3c7eb21d3a9414c53843f4d1bb089206e8e545e280b32ff5372f7fb4a1b0c27cb6fdf0d0a27a668e9772ecc3fffc181df95d081ca9c2e987b83b SHA512 e5bf6eb88365d2dbdc774db49261fb9fae0544ed297891fc20f1ed223f4072cb0357cbd98146ac35b6d29410a12b6739bbd111cd57d4a225bef255ed46988578
+DIST xz-5.2.5.tar.gz 1791345 BLAKE2B aded57324e129572c41646b3cc3b0b59a459452d9338d9245663b63dac2a463fb1f1b2b1d2d4ad3c09cb71fb8439df52cd94f24db99e782fc899b94a288a3043 SHA512 7443674247deda2935220fbc4dfc7665e5bb5a260be8ad858c8bd7d7b9f0f868f04ea45e62eb17c0a5e6a2de7c7500ad2d201e2d668c48ca29bd9eea5a73a3ce
diff --git a/app-arch/xz-utils/metadata.xml b/app-arch/xz-utils/metadata.xml
index 74270db..290b6fa 100644
--- a/app-arch/xz-utils/metadata.xml
+++ b/app-arch/xz-utils/metadata.xml
@@ -6,7 +6,7 @@
 	<name>Gentoo Base System</name>
 </maintainer>
 <use>
-	<flag name='extra-filters'>Build additional filters that are not
+	<flag name="extra-filters">Build additional filters that are not
 		used in any of the default xz presets. This includes delta
 		and BCJ coders, additional match finders and SHA256 checks.</flag>
 </use>
diff --git a/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild b/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
deleted file mode 100644
index 8f26d57..0000000
--- a/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Remember: we cannot leverage autotools in this ebuild in order
-#           to avoid circular deps with autotools
-
-EAPI=6
-
-inherit multilib toolchain-funcs libtool multilib-minimal preserve-libs usr-ldscript
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
-	inherit git-r3 autotools
-	SRC_URI=""
-	EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
-else
-	MY_P="${PN/-utils}-${PV/_}"
-	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
-	[[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
-	KEYWORDS="*"
-	S="${WORKDIR}/${MY_P}"
-	EXTRA_DEPEND=
-fi
-
-DESCRIPTION="utils for managing LZMA compressed files"
-HOMEPAGE="https://tukaani.org/xz/"
-
-# See top-level COPYING file as it outlines the various pieces and their licenses.
-LICENSE="public-domain LGPL-2.1+ GPL-2+"
-SLOT="0"
-IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"
-
-RDEPEND="!<app-arch/lzma-4.63
-	!<app-arch/p7zip-4.57"
-DEPEND="${RDEPEND}
-	${EXTRA_DEPEND}"
-
-# Tests currently do not account for smaller feature set
-RESTRICT="!extra-filters? ( test )"
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		eautopoint
-		eautoreconf
-	else
-		elibtoolize  # to allow building shared libs on Solaris/x64
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(use_enable nls)
-		$(use_enable threads)
-		$(use_enable static-libs static)
-	)
-	multilib_is_native_abi ||
-		myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} )
-	if ! use extra-filters; then
-		myconf+=(
-			# LZMA1 + LZMA2 for standard .lzma & .xz files
-			--enable-encoders=lzma1,lzma2
-			--enable-decoders=lzma1,lzma2
-			# those are used by default, depending on preset
-			--enable-match-finders=hc3,hc4,bt4
-			# CRC64 is used by default, though some (old?) files use CRC32
-			--enable-checks=crc32,crc64
-		)
-	fi
-
-	use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-	gen_usr_ldscript -a lzma
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-	rm "${ED%/}"/usr/share/doc/${PF}/COPYING* || die
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
-}
diff --git a/app-arch/xz-utils/xz-utils-5.2.5.ebuild b/app-arch/xz-utils/xz-utils-5.2.5.ebuild
new file mode 100644
index 0000000..4f769e1
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.2.5.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#           to avoid circular deps with autotools
+
+EAPI=7
+
+inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
+	inherit git-r3 autotools
+	SRC_URI=""
+	BDEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
+else
+	MY_P="${PN/-utils}-${PV/_}"
+	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
+	[[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
+	KEYWORDS="*"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="utils for managing LZMA compressed files"
+HOMEPAGE="https://tukaani.org/xz/"
+
+# See top-level COPYING file as it outlines the various pieces and their licenses.
+LICENSE="public-domain LGPL-2.1+ GPL-2+"
+SLOT="0"
+IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"
+
+RDEPEND="!<app-arch/lzma-4.63
+	!<app-arch/p7zip-4.57
+	!<app-i18n/man-pages-de-2.16"
+DEPEND="${RDEPEND}"
+
+# Tests currently do not account for smaller feature set
+RESTRICT="!extra-filters? ( test )"
+
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]] ; then
+		eautopoint
+		eautoreconf
+	else
+		elibtoolize  # to allow building shared libs on Solaris/x64
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(use_enable nls)
+		$(use_enable threads)
+		$(use_enable static-libs static)
+	)
+	multilib_is_native_abi ||
+		myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} )
+	if ! use extra-filters; then
+		myconf+=(
+			# LZMA1 + LZMA2 for standard .lzma & .xz files
+			--enable-encoders=lzma1,lzma2
+			--enable-decoders=lzma1,lzma2
+			# those are used by default, depending on preset
+			--enable-match-finders=hc3,hc4,bt4
+			# CRC64 is used by default, though some (old?) files use CRC32
+			--enable-checks=crc32,crc64
+		)
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# undo Solaris-based defaults pointing to /usr/xpg5/bin
+		myconf+=( --disable-path-for-script )
+		export gl_cv_posix_shell=${EPREFIX}/bin/sh
+	fi
+
+	use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	default
+	gen_usr_ldscript -a lzma
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
diff --git a/app-arch/zip/Manifest b/app-arch/zip/Manifest
index bb4f745..37fcc7a 100644
--- a/app-arch/zip/Manifest
+++ b/app-arch/zip/Manifest
@@ -1 +1 @@
-DIST zip30.zip 1287223 SHA256 7061ceac0407682b6dc54bb480347205f680f4e56cf34fe1423df2309f18968a SHA512 642ea6768d79adc1499251a3fb7bfc7ddc8d708699cbf9e0cfe849deda94165cb93e21dc2606bea1166ae5d8531e1e2cb056a7246bf2ab86ea7587bd4712d8d8 WHIRLPOOL 9e25cd9bcc25645667438019ab3423056a43b62d137c176e7aabad4ed8b7f7ddf6a7ccdedd9ada848c22d33b7f50f442910c39c4b2a5a188ad872109519cae7f
+DIST zip30.zip 1287223 BLAKE2B d29a3e3ddbaa3ce50c80b2dd058b39c35791bf2079879b61dab0be4f011ccd3331d1768ebda5a69aa150c651713eb7a99b02833bb727eee75a3e0bbdc8504cbc SHA512 642ea6768d79adc1499251a3fb7bfc7ddc8d708699cbf9e0cfe849deda94165cb93e21dc2606bea1166ae5d8531e1e2cb056a7246bf2ab86ea7587bd4712d8d8
diff --git a/app-arch/zip/files/zip-2.3-unix_configure-pic.patch b/app-arch/zip/files/zip-2.3-unix_configure-pic.patch
deleted file mode 100644
index 45b137b..0000000
--- a/app-arch/zip/files/zip-2.3-unix_configure-pic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- unix/configure.orig	2004-09-28 06:45:33.000000000 +0000
-+++ unix/configure	2004-09-28 06:54:53.000000000 +0000
-@@ -29,6 +29,9 @@
- 
- echo Check if we can use asm code
- OBJA=""
-+piclib="$(echo | $CPP -dM $CFLAGS - | grep -i __pic__)"
-+echo "Checking if compiler wants to create pic code"
-+[ "$piclib" == "" ] && \
- if eval "$CPP match.S > _match.s 2>/dev/null"; then
-   if test ! -s _match.s || grep error < _match.s > /dev/null; then
-     :
diff --git a/app-arch/zip/files/zip-2.31-exec-stack.patch b/app-arch/zip/files/zip-2.31-exec-stack.patch
deleted file mode 100644
index d3efbd9..0000000
--- a/app-arch/zip/files/zip-2.31-exec-stack.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- zip-2.31/crc_i386.S
-+++ zip-2.31/crc_i386.S
-@@ -238,3 +238,7 @@
- #endif /* i386 || _i386 || _I386 || __i386 */
- 
- #endif /* !USE_ZLIB */
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- zip-2.31/match.S
-+++ zip-2.31/match.S
-@@ -405,3 +405,7 @@
- #endif /* i386 || _I386 || _i386 || __i386  */
- 
- #endif /* !USE_ZLIB */
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
diff --git a/app-arch/zip/files/zip-2.32-build.patch b/app-arch/zip/files/zip-2.32-build.patch
deleted file mode 100644
index 61a2bae..0000000
--- a/app-arch/zip/files/zip-2.32-build.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-respect build environment settings
-
---- zip/unix/Makefile
-+++ zip/unix/Makefile
-@@ -12,15 +12,15 @@
- 
- list:   all
- 
--MAKE = make -f unix/Makefile
-+MAKE := $(MAKE) -f unix/Makefile
- SHELL = /bin/sh
- LN = ln -s
- 
- # (to use the Gnu compiler, change cc to gcc in CC)
--CC = cc
-+CC ?= gcc
- BIND = $(CC)
- AS = $(CC) -c
--CPP = /lib/cpp
-+CPP ?= $(CC)
- EXE =
- 
- # probably can change this to 'install' if you have it
-@@ -47,7 +47,7 @@
- #   LFLAGS1   flags after output file spec, before obj file list
- #   LFLAGS2   flags after obj file list (libraries, etc)
- CFLAGS_NOOPT = -I. -DUNIX $(LOCAL_ZIP)
--CFLAGS = -O2 $(CFLAGS_NOOPT)
-+CFLAGS ?= -O2 $(CFLAGS_NOOPT)
- LFLAGS1 =
- LFLAGS2 = -s
- 
---- zip/unix/configure
-+++ zip/unix/configure
-@@ -13,52 +13,13 @@
- 
- CC=${1-cc}
--CFLAGS=${2-"-I. -DUNIX"}
--LFLAGS1=""
-+CFLAGS="${2--I. -DUNIX} ${CFLAGS} ${CPPFLAGS}"
-+LFLAGS1="${LDFLAGS}"
- LN="ln -s"
--echo "Check C compiler type (optimization option)"
--cat > conftest.c << _EOF_
--int main()
--{
--#ifndef __SUNPRO_C
--   bad code
--#endif
--   return 0;
--}
--_EOF_
--$CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null
--if test $? -eq 0; then
--  echo '  Sun C (-xO3)'
--  CFLAGS="${CFLAGS} -xO3"
--else
--  cat > conftest.c << _EOF_
--int main()
--{
--#ifndef __DECC
--   bad code
--#endif
--   return 0;
--}
--_EOF_
--  $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null
--  if test $? -eq 0; then
--    echo '  DEC C (-O3)'
--    CFLAGS="${CFLAGS} -O3"
--  else
--    echo '  Other (gcc?) (-O2)'
--    CFLAGS="${CFLAGS} -O2"
--  fi
--fi
- 
- echo Check for the C preprocessor
- # on SVR4, cc -E does not produce correct assembler files. Need /lib/cpp.
- CPP="${CC} -E"
- # solaris as(1) needs -P, maybe others as well ?
--[ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P"
--[ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp
--[ -f /lib/cpp ] && CPP=/lib/cpp
--[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp
--[ -f /xenix ] && CPP="${CC} -E"
--[ -f /lynx.os ] && CPP="${CC} -E"
- 
- echo "#include <stdio.h>" > conftest.c
- $CPP conftest.c >/dev/null 2>/dev/null || CPP="${CC} -E"
diff --git a/app-arch/zip/files/zip-3.0-format-security.patch b/app-arch/zip/files/zip-3.0-format-security.patch
index 1edc2d6..63188b5 100644
--- a/app-arch/zip/files/zip-3.0-format-security.patch
+++ b/app-arch/zip/files/zip-3.0-format-security.patch
@@ -1,5 +1,5 @@
---- zip.c
-+++ zip.c
+--- a/zip.c
++++ b/zip.c
 @@ -1028,7 +1028,7 @@
  
    for (i = 0; i < sizeof(text)/sizeof(char *); i++)
diff --git a/app-arch/zip/files/zip-3.0-natspec.patch b/app-arch/zip/files/zip-3.0-natspec.patch
index 1dfce09..29ed482 100644
--- a/app-arch/zip/files/zip-3.0-natspec.patch
+++ b/app-arch/zip/files/zip-3.0-natspec.patch
@@ -14,8 +14,8 @@
 pva@gentoo.org
 
 === modified file 'fileio.c'
---- fileio.c	2010-12-22 13:02:43 +0000
-+++ fileio.c	2010-12-22 13:03:00 +0000
+--- a/fileio.c
++++ b/fileio.c
 @@ -929,7 +929,7 @@
    }
    if ((zname = in2ex(iname)) == NULL)
@@ -27,8 +27,8 @@
  #else
 
 === modified file 'globals.c'
---- globals.c	2010-12-22 13:02:43 +0000
-+++ globals.c	2010-12-22 13:03:00 +0000
+--- a/globals.c
++++ b/globals.c
 @@ -32,7 +32,7 @@
  int scanimage = 1;      /* 1=scan through image files */
  #endif
@@ -40,8 +40,8 @@
  int filesync = 0;       /* 1=file sync, delete entries not on file system */
 
 === modified file 'unix/Makefile'
---- unix/Makefile	2010-12-22 13:02:43 +0000
-+++ unix/Makefile	2010-12-22 15:43:40 +0000
+--- a/unix/Makefile
++++ b/unix/Makefile
 @@ -38,7 +38,7 @@
  MANFLAGS = 644
  
@@ -73,8 +73,8 @@
  zipsplit$E: $(OBJS)
 
 === modified file 'unix/osdep.h'
---- unix/osdep.h	2010-12-22 13:02:43 +0000
-+++ unix/osdep.h	2010-12-22 15:45:29 +0000
+--- a/unix/osdep.h
++++ b/unix/osdep.h
 @@ -78,3 +78,6 @@
  #if !defined(NO_EF_UT_TIME) && !defined(USE_EF_UT_TIME)
  #  define USE_EF_UT_TIME
@@ -84,8 +84,8 @@
 +#  define OS_CODE  0xb00
 
 === modified file 'unix/unix.c'
---- unix/unix.c	2010-12-22 13:02:43 +0000
-+++ unix/unix.c	2010-12-22 13:03:00 +0000
+--- a/unix/unix.c
++++ b/unix/unix.c
 @@ -14,6 +14,11 @@
  
  #include <time.h>
@@ -153,8 +153,8 @@
  #else
 
 === modified file 'zip.c'
---- zip.c	2010-12-22 13:02:43 +0000
-+++ zip.c	2010-12-22 13:03:00 +0000
+--- a/zip.c
++++ b/zip.c
 @@ -2025,6 +2025,7 @@
  #endif /* ?MACOS */
      {"J",  "junk-sfx",    o_NO_VALUE,       o_NOT_NEGATABLE, 'J',  "strip self extractor from archive"},
@@ -183,8 +183,8 @@
          case o_ll:
 
 === modified file 'zipnote.c'
---- zipnote.c	2010-12-22 13:02:43 +0000
-+++ zipnote.c	2010-12-22 15:42:45 +0000
+--- a/zipnote.c
++++ b/zipnote.c
 @@ -21,6 +21,11 @@
  #include "revision.h"
  #include <signal.h>
diff --git a/app-arch/zip/files/zip-3.0-no-crypt.patch b/app-arch/zip/files/zip-3.0-no-crypt.patch
index 2858b51..9a1302c 100644
--- a/app-arch/zip/files/zip-3.0-no-crypt.patch
+++ b/app-arch/zip/files/zip-3.0-no-crypt.patch
@@ -4,8 +4,8 @@
 
 http://bugs.gentoo.org/238398
 
---- zip.c
-+++ zip.c
+--- a/zip.c
++++ b/zip.c
 @@ -3452,6 +3452,9 @@ char **argv;            /* command line tokens */
  
    /* Key not yet specified.  If needed, get/verify it now. */
@@ -24,8 +24,8 @@
    }
    if (key) {
      /* if -P "" could get here */
---- zipcloak.c
-+++ zipcloak.c
+--- a/zipcloak.c
++++ b/zipcloak.c
 @@ -744,6 +744,28 @@ struct option_struct far options[] = {
  
  int main OF((void));
diff --git a/app-arch/zip/files/zip-3.0-pic.patch b/app-arch/zip/files/zip-3.0-pic.patch
index b4c53de..89a52e2 100644
--- a/app-arch/zip/files/zip-3.0-pic.patch
+++ b/app-arch/zip/files/zip-3.0-pic.patch
@@ -1,15 +1,15 @@
 if our toolchain generates PIC by default, then do not use the hand written
 assembly files as none of it is PIC friendly.
 
---- unix/configure
-+++ unix/configure
+--- a/unix/configure
++++ b/unix/configure
 @@ -29,6 +29,9 @@
  echo Check if we can use asm code
  OBJA=""
  OCRCU8=""
 +piclib="$(echo | $CPP -dM $CFLAGS - | grep -i __pic__)"
 +echo "Checking if compiler wants to create pic code"
-+[ "$piclib" == "" ] && \
++[ "$piclib" = "" ] && \
  if eval "$CPP match.S > _match.s 2>/dev/null"; then
    if test ! -s _match.s || grep error < _match.s > /dev/null; then
      :
diff --git a/app-arch/zip/files/zip-3.0-zipnote-freeze.patch b/app-arch/zip/files/zip-3.0-zipnote-freeze.patch
index cfe78f0..28f47d0 100644
--- a/app-arch/zip/files/zip-3.0-zipnote-freeze.patch
+++ b/app-arch/zip/files/zip-3.0-zipnote-freeze.patch
@@ -1,6 +1,6 @@
 diff -dupr zip30-old/fileio.c zip30/fileio.c
---- zip30-old/fileio.c	2008-05-28 20:13:24.000000000 +0200
-+++ zip30/fileio.c	2012-06-12 17:30:29.794547493 +0200
+--- a/fileio.c
++++ b/fileio.c
 @@ -3502,7 +3502,7 @@ zwchar *local_to_wide_string(local_strin
    if ((wc_string = (wchar_t *)malloc((wsize + 1) * sizeof(wchar_t))) == NULL) {
      ZIPERR(ZE_MEM, "local_to_wide_string");
@@ -11,9 +11,9 @@
  
    /* in case wchar_t is not zwchar */
 diff -dupr zip30-old/zipfile.c zip30/zipfile.c
---- zip30/zipfile.c	2008-07-01 00:15:30.000000000 +0200
-+++ zip30/zipfile.c	2012-06-10 01:59:42.571706181 +0200
-@@ -5406,6 +5406,8 @@ int putlocal(z, rewrite)
+--- a/zipfile.c
++++ b/zipfile.c
+@@ -5406,7 +5406,9 @@ int putlocal(z, rewrite)
      if (z->flg & UTF8_BIT) {
        /* If this flag is set, then restore UTF-8 as path name */
        use_uname = 1;
@@ -34,8 +34,8 @@
        add_Unicode_Path_cen_extra_field(z);
      }
 diff -dupr zip30/zipnote.c zip30/zipnote.c
---- zip30/zipnote.c	2008-05-08 04:17:08.000000000 +0200
-+++ zip30/zipnote.c	2012-06-10 02:33:36.372663528 +0200
+--- a/zipnote.c
++++ b/zipnote.c
 @@ -575,6 +575,13 @@ char **argv;            /* command line
        strcpy(z->iname, a+2);
  #endif
diff --git a/app-arch/zip/metadata.xml b/app-arch/zip/metadata.xml
index 71d5234..564fd76 100644
--- a/app-arch/zip/metadata.xml
+++ b/app-arch/zip/metadata.xml
@@ -5,7 +5,6 @@
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
-	<longdescription>Application that supports the Info Zip series of encryption.</longdescription>
 	<use>
 		<flag name="natspec">Use <pkg>dev-libs/libnatspec</pkg> to correctly decode non-ascii file names archived in Windows.</flag>
 	</use>
diff --git a/app-arch/zip/zip-3.0-r3.ebuild b/app-arch/zip/zip-3.0-r3.ebuild
deleted file mode 100644
index b847edd..0000000
--- a/app-arch/zip/zip-3.0-r3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit toolchain-funcs eutils flag-o-matic
-
-MY_P="${PN}${PV//.}"
-DESCRIPTION="Info ZIP (encryption support)"
-HOMEPAGE="http://www.info-zip.org/"
-SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
-
-LICENSE="Info-ZIP"
-SLOT="0"
-KEYWORDS="*"
-IUSE="bzip2 crypt natspec unicode"
-
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	natspec? ( dev-libs/libnatspec )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-crypt.patch #238398
-	epatch "${FILESDIR}"/${P}-pic.patch
-	epatch "${FILESDIR}"/${P}-exec-stack.patch #122849
-	epatch "${FILESDIR}"/${P}-build.patch #200995
-	epatch "${FILESDIR}"/${P}-zipnote-freeze.patch #322047
-	epatch "${FILESDIR}"/${P}-format-security.patch #512414
-	use natspec && epatch "${FILESDIR}"/${PN}-3.0-natspec.patch #275244
-}
-
-src_configure() {
-	append-cppflags \
-		-DLARGE_FILE_SUPPORT \
-		-DUIDGID_NOT_16BIT \
-		-D$(usex bzip2 '' NO)BZIP2_SUPPORT \
-		-D$(usex crypt '' NO)CRYPT \
-		-D$(usex unicode '' NO)UNICODE_SUPPORT
-	# Third arg disables bzip2 logic as we handle it ourselves above.
-	sh ./unix/configure "$(tc-getCC)" "-I. -DUNIX ${CFLAGS} ${CPPFLAGS}" "${T}" || die
-	if use bzip2 ; then
-		sed -i -e "s:LFLAGS2=:&'-lbz2 ':" flags || die
-	fi
-}
-
-src_compile() {
-	emake \
-		CPP="$(tc-getCPP)" \
-		-f unix/Makefile generic
-}
-
-src_install() {
-	dobin zip zipnote zipsplit
-	doman man/zip{,note,split}.1
-	if use crypt ; then
-		dobin zipcloak
-		doman man/zipcloak.1
-	fi
-	dodoc BUGS CHANGES README* TODO WHATSNEW WHERE proginfo/*.txt
-}
diff --git a/app-arch/zip/zip-3.0-r4.ebuild b/app-arch/zip/zip-3.0-r4.ebuild
new file mode 100644
index 0000000..9f1c833
--- /dev/null
+++ b/app-arch/zip/zip-3.0-r4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs flag-o-matic
+
+MY_P="${PN}${PV//.}"
+DESCRIPTION="Info ZIP (encryption support)"
+HOMEPAGE="http://www.info-zip.org/"
+SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
+
+LICENSE="Info-ZIP"
+SLOT="0"
+KEYWORDS="*"
+IUSE="bzip2 crypt natspec unicode"
+
+DEPEND="${RDEPEND}"
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	natspec? ( dev-libs/libnatspec )"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-no-crypt.patch #238398
+	"${FILESDIR}/${P}"-pic.patch
+	"${FILESDIR}/${P}"-exec-stack.patch #122849
+	"${FILESDIR}/${P}"-build.patch #200995
+	"${FILESDIR}/${P}"-zipnote-freeze.patch #322047
+	"${FILESDIR}/${P}"-format-security.patch #512414
+)
+
+src_prepare() {
+	default
+	use natspec && eapply "${FILESDIR}/${PN}"-3.0-natspec.patch #275244
+}
+
+src_configure() {
+	append-cppflags \
+		-DLARGE_FILE_SUPPORT \
+		-DUIDGID_NOT_16BIT \
+		-D$(usex bzip2 '' NO)BZIP2_SUPPORT \
+		-D$(usex crypt '' NO)CRYPT \
+		-D$(usex unicode '' NO)UNICODE_SUPPORT
+	# Third arg disables bzip2 logic as we handle it ourselves above.
+	sh ./unix/configure "$(tc-getCC)" "-I. -DUNIX ${CFLAGS} ${CPPFLAGS}" "${T}" || die
+	if use bzip2 ; then
+		sed -i -e "s:LFLAGS2=:&'-lbz2 ':" flags || die
+	fi
+}
+
+src_compile() {
+	emake \
+		CPP="$(tc-getCPP)" \
+		-f unix/Makefile generic
+}
+
+src_install() {
+	dobin zip zipnote zipsplit
+	doman man/zip{,note,split}.1
+	if use crypt ; then
+		dobin zipcloak
+		doman man/zipcloak.1
+	fi
+	dodoc BUGS CHANGES README* TODO WHATSNEW WHERE proginfo/*.txt
+}
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index db5c9e0..284311c 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1 +1 @@
-DIST stress-ng-0.11.17.tar.xz 467156 BLAKE2B fab734e0dcd7633e6a47a3b6a41111dd900a2dfb2e3666d8fbf439d2d40ea6b7f5f25763aba5d774cf20ce43598e0bce2229e321c2a9512d5f26d8a795d70ce8 SHA512 8320e10fb2a2f224b23efe72af7d84e6beb73bbd54eff0a6c04afee14de5cbbf6584e1a6d936f52651467138e9647dfb0ff092aa7e73a9f8304627a603546f79
+DIST stress-ng-0.12.09.tar.xz 545756 BLAKE2B 72c5b1acf3f82f8d609da8b213f6321486cda9b8e05fd7390b846bea541610bab70bceb99c3684fbff732805eade7c37840d77e4ce901cc81a53ded0968bc6a1 SHA512 510b210a920b540c25e9f4cc0597924f72a80a85e6cd647346f7e91335e127e776bfa1bdcf0e67f557b7c154d2e6f2b2ed5abe9612b2552f53a8d21c920dc6c1
diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.11.17-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.11.17-makefile.patch
deleted file mode 100644
index d3c5e93..0000000
--- a/app-benchmarks/stress-ng/files/stress-ng-0.11.17-makefile.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- stress-ng-0.11.17.orig/Makefile	2020-07-27 13:38:23.000000000 +0200
-+++ stress-ng-0.11.17/Makefile	2020-08-09 13:43:30.919796477 +0200
-@@ -21,7 +21,7 @@
- # Codename "synthetic system strainer"
- #
- 
--CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99
-+CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -std=gnu99
- 
- #
- # Pedantic flags
-@@ -358,12 +358,10 @@
- .o: stress-ng.h Makefile
- 
- .c.o:
--	@echo "CC $<"
--	@$(CC) $(CFLAGS) -c -o $@ $<
-+	$(CC) $(CFLAGS) -c -o $@ $<
- 
- stress-ng: $(OBJS)
--	@echo "LD $@"
--	@$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -o $@
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -o $@
- 	@sync
- 
- makeconfig:
-@@ -384,7 +382,7 @@
- 		sed '$$ s/.$$//' >> apparmor-data.c
- 	@echo "};" >> apparmor-data.c
- 	@echo "const size_t g_apparmor_data_len = sizeof(g_apparmor_data);" >> apparmor-data.c
--	@echo "CC $<"
-+	echo "CC $<"
- 	@$(CC) -c apparmor-data.c -o apparmor-data.o
- 	@rm -rf apparmor-data.c apparmor-data.bin
- 
-@@ -401,12 +399,12 @@
- 	@$(CC) $(CFLAGS) -E core-perf-event.c | grep "PERF_COUNT" | \
- 	sed 's/,/ /' | sed s/'^ *//' | \
- 	awk {'print "#define _SNG_" $$1 " (1)"'} > core-perf-event.h
--	@echo CC $<
--	@$(CC) $(CFLAGS) -c -o $@ $<
-+	echo CC $<
-+	$(CC) $(CFLAGS) -c -o $@ $<
- 
- stress-vecmath.o: stress-vecmath.c
--	@echo CC $<
--	@$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
-+	echo CC $<
-+	$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
- 	@touch stress-ng.c
- 
- $(OBJS): stress-ng.h Makefile
-@@ -459,7 +457,7 @@
- 	mkdir -p ${DESTDIR}${BINDIR}
- 	cp stress-ng ${DESTDIR}${BINDIR}
- 	mkdir -p ${DESTDIR}${MANDIR}
--	cp stress-ng.1.gz ${DESTDIR}${MANDIR}
-+	cp stress-ng.1 ${DESTDIR}${MANDIR}
- 	mkdir -p ${DESTDIR}${JOBDIR}
- 	cp -rp example-jobs/*.job ${DESTDIR}${JOBDIR}
- 	mkdir -p ${DESTDIR}${BASHDIR}
diff --git a/app-benchmarks/stress-ng/stress-ng-0.11.17.ebuild b/app-benchmarks/stress-ng/stress-ng-0.11.17.ebuild
deleted file mode 100644
index 2a129f0..0000000
--- a/app-benchmarks/stress-ng/stress-ng-0.11.17.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Stress test for a computer system with various selectable ways"
-HOMEPAGE="https://kernel.ubuntu.com/~cking/stress-ng/"
-SRC_URI="https://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="*"
-
-DEPEND="
-	dev-libs/libaio
-	dev-libs/libbsd
-	dev-libs/libgcrypt:0=
-	sys-apps/attr
-	sys-apps/keyutils:=
-	sys-libs/libcap
-	sys-libs/zlib
-"
-
-RDEPEND="${DEPEND}"
-
-DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
-
-PATCHES=( "${FILESDIR}/${PN}-0.11.17-makefile.patch" )
-
-src_compile() {
-	tc-export CC
-
-	default
-}
-
-pkg_postinst() {
-	optfeature "AppArmor support" sys-libs/libapparmor
-	optfeature "SCTP support" net-misc/lksctp-tools
-}
diff --git a/app-benchmarks/stress-ng/stress-ng-0.12.09.ebuild b/app-benchmarks/stress-ng/stress-ng-0.12.09.ebuild
new file mode 100644
index 0000000..09c9d88
--- /dev/null
+++ b/app-benchmarks/stress-ng/stress-ng-0.12.09.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature toolchain-funcs
+
+DESCRIPTION="Stress test for a computer system with various selectable ways"
+HOMEPAGE="https://kernel.ubuntu.com/~cking/stress-ng/"
+SRC_URI="https://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="*"
+
+DEPEND="
+	dev-libs/libaio
+	dev-libs/libbsd
+	dev-libs/libgcrypt:0=
+	sys-apps/attr
+	sys-apps/keyutils:=
+	sys-libs/libcap
+	sys-libs/zlib
+"
+
+RDEPEND="${DEPEND}"
+
+DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
+
+src_prepare() {
+	default
+
+	# Don't reset build jobs to '-j0'
+	sed -e '/-f Makefile.config/s/-j//' -i Makefile || die
+}
+
+src_compile() {
+	export MAN_COMPRESS=0
+	export VERBOSE=1
+	tc-export CC
+
+	default
+}
+
+pkg_postinst() {
+	optfeature "AppArmor support" sys-libs/libapparmor
+	optfeature "SCTP support" net-misc/lksctp-tools
+}
diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest
index aced0dc..f6d9e82 100644
--- a/app-crypt/efitools/Manifest
+++ b/app-crypt/efitools/Manifest
@@ -1 +1,2 @@
+DIST efitools-1.8.1.tar.gz 115319 BLAKE2B 3aad65defc203055122027cc3a48f50912d2f08b592841780fdc1bf337d75774116e698c4270865275ce7fe64988cd84105138ca979d81818f0065d7ae90f1d0 SHA512 114ef8e52160f5a5239ec306dbd587610849bce771ba8145ed092afd79e44f3ecee93cc1d97e2d5fdb880cc825bbbe928b3ef6701fd3b1fa444053894be1098a
 DIST efitools-1.9.2.tar.gz 116037 BLAKE2B b3540932eb112e362fd0eed47090360603807dcaec8c6a10058618f8252eeb5dcbbd703d313cb6fadae62c1312815080cf2c77fc86f9dfc9f9afca24ad97f584 SHA512 77e0ad7e865814ed388ff6daabe0f4b49ba51672bf2cbb98b7905e209cbd28f9ede2f73213ce45af8a978c1e67dba24ec88a1188661317cc22317b47e575cde8
diff --git a/app-crypt/efitools/efitools-1.9.2-r2.ebuild b/app-crypt/efitools/efitools-1.9.2-r2.ebuild
new file mode 100644
index 0000000..6180e8c
--- /dev/null
+++ b/app-crypt/efitools/efitools-1.9.2-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="*"
+IUSE="static"
+
+LIB_DEPEND="dev-libs/openssl:0=[static-libs(+)]"
+
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	sys-apps/util-linux"
+
+DEPEND="${RDEPEND}
+	app-crypt/sbsigntools
+	dev-perl/File-Slurp
+	static? ( ${LIB_DEPEND} )
+	sys-apps/help2man
+	sys-boot/gnu-efi
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/1.7.0-Make.rules.patch"
+)
+
+src_prepare() {
+	if use static; then
+		append-ldflags -static
+		sed -i "s/-lcrypto\b/$($(tc-getPKG_CONFIG) --static --libs libcrypto)/g" \
+			Makefile || die
+	fi
+
+	if tc-is-clang; then
+		sed -i -e 's/-fno-toplevel-reorder//g' Make.rules || die
+	fi
+	# Respect users CFLAGS
+	sed -i -e 's/CFLAGS.*= -O2 -g/CFLAGS += /' Make.rules || die
+
+	# Respect users LDFLAGS
+	sed -i -e 's/LDFLAGS/LIBS/g' Make.rules || die
+	sed -i -e 's/\$(CC)/& $(LDFLAGS)/g' Makefile || die
+
+	# Run 'default', to apply user patches
+	default
+}
diff --git a/app-crypt/efitools/efitools-1.9.2.ebuild b/app-crypt/efitools/efitools-1.9.2.ebuild
deleted file mode 100644
index 32d11f0..0000000
--- a/app-crypt/efitools/efitools-1.9.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="*"
-IUSE="libressl static"
-
-LIB_DEPEND="!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-	libressl? ( dev-libs/libressl:0=[static-libs(+)] )"
-
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	sys-apps/util-linux"
-
-DEPEND="${RDEPEND}
-	app-crypt/sbsigntools
-	dev-perl/File-Slurp
-	static? ( ${LIB_DEPEND} )
-	sys-apps/help2man
-	sys-boot/gnu-efi
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/1.7.0-Make.rules.patch"
-	"${FILESDIR}/${P}-libressl-compatibility.patch"
-)
-
-src_prepare() {
-	if use static; then
-		append-ldflags -static
-		sed -i "s/-lcrypto\b/$($(tc-getPKG_CONFIG) --static --libs libcrypto)/g" \
-			Makefile || die
-	fi
-
-	# Respect users CFLAGS
-	sed -i -e 's/CFLAGS.*= -O2 -g/CFLAGS += /' Make.rules || die
-
-	# Respect users LDFLAGS
-	sed -i -e 's/LDFLAGS/LIBS/g' Make.rules || die
-	sed -i -e 's/\$(CC)/& $(LDFLAGS)/g' Makefile || die
-
-	# Run 'default', to apply user patches
-	default
-}
diff --git a/app-crypt/efitools/files/efitools-1.9.2-libressl-compatibility.patch b/app-crypt/efitools/files/efitools-1.9.2-libressl-compatibility.patch
deleted file mode 100644
index 876baae..0000000
--- a/app-crypt/efitools/files/efitools-1.9.2-libressl-compatibility.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cert-to-efi-hash-list.c	2018-04-21 20:59:24.814748503 +0200
-+++ b/cert-to-efi-hash-list.c	2018-04-21 20:59:51.868581307 +0200
-@@ -135,7 +135,7 @@
-         X509 *cert = PEM_read_bio_X509(cert_bio, NULL, NULL, NULL);
- 	unsigned char *cert_buf = NULL;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 	int cert_len = i2d_X509_CINF(cert->cert_info, &cert_buf);
- #else
- 	int cert_len = i2d_re_X509_tbs(cert, &cert_buf);
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
deleted file mode 100644
index eda9ba0..0000000
--- a/app-emulation/lxc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lxc-2.0.8.tar.gz 1308705 SHA256 0d8e34b302cfe4c40c6c9ae5097096aa5cc2c1dfceea3f0f22e3e16c4a4e8494 SHA512 ed9fd47e92007f433695cffea659180866a5ac2778712f4eb13b6629bb18292589f5b674b734853ca196ba1f6d38bdbf3cc8a2bb28e25d3540b06b945fcf9096 WHIRLPOOL 10485c76f43c6358fc09a7843f13d16b178b1fbc1c3741d04293e170716bd253d1f7b4c3d6529829d135b381debf857263aea6070f2157d3c095d49209b7113e
diff --git a/app-emulation/lxc/files/lxc-2.0.5-omit-sysconfig.patch b/app-emulation/lxc/files/lxc-2.0.5-omit-sysconfig.patch
deleted file mode 100644
index 3ec8135..0000000
--- a/app-emulation/lxc/files/lxc-2.0.5-omit-sysconfig.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- /config/Makefile.am.orig	2016-05-19 02:56:11.891113982 +0000
-+++ /config/Makefile.am	2016-05-19 02:56:32.596115476 +0000
-@@ -1 +1 @@
--SUBDIRS = apparmor bash etc init selinux templates yum sysconfig
-+SUBDIRS = apparmor bash etc init selinux templates yum
diff --git a/app-emulation/lxc/files/lxc-2.0.6-bash-completion.patch b/app-emulation/lxc/files/lxc-2.0.6-bash-completion.patch
deleted file mode 100644
index 6033e36..0000000
--- a/app-emulation/lxc/files/lxc-2.0.6-bash-completion.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/config/bash/lxc.in b/config/bash/lxc.in
-index 7dcf302..5927fe2 100644
---- a/config/bash/lxc.in
-+++ b/config/bash/lxc.in
-@@ -1,4 +1,3 @@
--_have lxc-start && {
-     _lxc_names() {
-         COMPREPLY=( $( compgen -W "$( lxc-ls )" "$cur" ) )
-     }
-@@ -100,4 +99,3 @@ _have lxc-start && {
- 
-     complete -o default -F _lxc_generic_o lxc-copy
-     complete -o default -F _lxc_generic_o lxc-start-ephemeral
--}
-diff --git a/configure.ac b/configure.ac
-index 4640c0d..14ccdd3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -478,7 +478,7 @@ AM_CONDITIONAL([ENABLE_BASH], [test "x$enable_bash" = "xyes"])
- AM_COND_IF([ENABLE_BASH],
- 	[AC_MSG_CHECKING([bash completion directory])
- 	PKG_CHECK_VAR(bashcompdir, [bash-completion], [completionsdir], ,
--		bashcompdir="${sysconfdir}/bash_completion.d")
-+		bashcompdir="$datadir/bash-completion/completions")
- 	AC_MSG_RESULT([$bashcompdir])
- 	AC_SUBST(bashcompdir)
- 	])
diff --git a/app-emulation/lxc/files/lxc.initd.5 b/app-emulation/lxc/files/lxc.initd.5
deleted file mode 100644
index b28d0bf..0000000
--- a/app-emulation/lxc/files/lxc.initd.5
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-CONTAINER=${SVCNAME#*.}
-
-LXC_PATH=`lxc-config lxc.lxcpath`
-
-lxc_get_configfile() {
-	if [ -f "${LXC_PATH}/${CONTAINER}.conf" ]; then
-		echo "${LXC_PATH}/${CONTAINER}.conf"
-	elif [ -f "${LXC_PATH}/${CONTAINER}/config" ]; then
-		echo "${LXC_PATH}/${CONTAINER}/config"
-	else
-		eerror "Unable to find a suitable configuration file."
-		eerror "If you set up the container in a non-standard"
-		eerror "location, please set the CONFIGFILE variable."
-		return 1
-	fi
-}
-
-[ $CONTAINER != $SVCNAME ] && CONFIGFILE=${CONFIGFILE:-$(lxc_get_configfile)}
-
-lxc_get_var() {
-	awk 'BEGIN { FS="[ \t]*=[ \t]*" } $1 == "'$1'" { print $2; exit }' ${CONFIGFILE}
-}
-
-lxc_get_net_link_type() {
-	awk 'BEGIN { FS="[ \t]*=[ \t]*"; _link=""; _type="" }
-		$1 == "lxc.network.type" {_type=$2;}
-		$1 == "lxc.network.link" {_link=$2;}
-		{if(_link != "" && _type != ""){
-			printf("%s:%s\n", _link, _type );
-			_link=""; _type="";
-		}; }' <${CONFIGFILE}
-}
-
-checkconfig() {
-	if [ ${CONTAINER} = ${SVCNAME} ]; then
-		eerror "You have to create an init script for each container:"
-		eerror " ln -s lxc /etc/init.d/lxc.container"
-		return 1
-	fi
-
-	# no need to output anything, the function takes care of that.
-	[ -z "${CONFIGFILE}" ] && return 1
-
-	utsname=$(lxc_get_var lxc.utsname)
-	if [ ${CONTAINER} != ${utsname} ]; then
-	    eerror "You should use the same name for the service and the"
-	    eerror "container. Right now the container is called ${utsname}"
-	    return 1
-	fi
-}
-
-depend() {
-	# be quiet, since we have to run depend() also for the
-	# non-muxed init script, unfortunately.
-	checkconfig 2>/dev/null || return 0
-
-	config ${CONFIGFILE}
-	need localmount
-	use lxcfs
-
-	local _x _if
-	for _x in $(lxc_get_net_link_type); do
-		_if=${_x%:*}
-		case "${_x##*:}" in
-			# when the network type is set to phys, we can make use of a
-			# network service (for instance to set it up before we disable
-			# the net_admin capability), but we might also not set it up
-			# at all on the host and leave the net_admin capable service
-			# to take care of it.
-			phys)	use net.${_if} ;;
-			*)	need net.${_if} ;;
-		esac
-	done
-}
-
-start() {
-	checkconfig || return 1
-	rm -f /var/log/lxc/${CONTAINER}.log
-
-	rootpath=$(lxc_get_var lxc.rootfs)
-
-	# Check the format of our init and the chroot's init, to see
-	# if we have to use linux32 or linux64; always use setarch
-	# when required, as that makes it easier to deal with
-	# x32-based containers.
-	case $(scanelf -BF '%a#f' ${rootpath}/sbin/init) in
-		EM_X86_64)	setarch=linux64;;
-		EM_386)		setarch=linux32;;
-	esac
-
-	ebegin "Starting ${CONTAINER}"
-	env -i ${setarch} $(which lxc-start) -l WARN -n ${CONTAINER} -f ${CONFIGFILE} -d -o /var/log/lxc/${CONTAINER}.log
-	sleep 0.5
-
-	# lxc-start -d will _always_ report a correct startup, even if it
-	# failed, so rather than trust that, check that the cgroup exists.
-	[ -d /sys/fs/cgroup/cpuset/lxc/${CONTAINER} ]
-	eend $?
-}
-
-stop() {
-	checkconfig || return 1
-
-
-	if ! [ -d /sys/fs/cgroup/cpuset/lxc/${CONTAINER} ]; then
-	    ewarn "${CONTAINER} doesn't seem to be started."
-	    return 0
-	fi
-
-	# 10s should be enough to shut everything down
-	ebegin "Stopping ${CONTAINER}"
-	lxc-stop -t 10 -n ${CONTAINER}
-	eend $?
-}
diff --git a/app-emulation/lxc/files/lxc_at.service.4 b/app-emulation/lxc/files/lxc_at.service.4
deleted file mode 100644
index 64ae745..0000000
--- a/app-emulation/lxc/files/lxc_at.service.4
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Linux Container %I
-After=network.target
-Wants=lxcfs.service
-
-[Service]
-Restart=always
-ExecStart=/usr/bin/lxc-start -n %i -F
-ExecReload=/usr/bin/lxc-restart -n %i
-ExecStop=/usr/bin/lxc-stop -n %i
-Delegate=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-emulation/lxc/lxc-2.0.8.ebuild b/app-emulation/lxc/lxc-2.0.8.ebuild
deleted file mode 100644
index 0ce9e44..0000000
--- a/app-emulation/lxc/lxc-2.0.8.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools bash-completion-r1 distutils-r1 linux-info versionator flag-o-matic systemd
-
-DESCRIPTION="LinuX Containers userspace utilities"
-HOMEPAGE="https://linuxcontainers.org/"
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
-
-KEYWORDS="*"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="cgmanager doc examples lua python seccomp selinux"
-
-RDEPEND="
-	net-libs/gnutls
-	sys-libs/libcap
-	cgmanager? ( app-admin/cgmanager )
-	lua? ( >=dev-lang/lua-5.1:= )
-	python? ( ${PYTHON_DEPS} )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sys-libs/libselinux )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-text/docbook-sgml-utils )
-	>=sys-kernel/linux-headers-3.2"
-
-RDEPEND="${RDEPEND}
-	sys-process/criu[selinux=]
-	sys-apps/util-linux
-	app-misc/pax-utils
-	virtual/awk"
-
-CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
-	~CPUSETS ~CGROUP_CPUACCT
-	~CGROUP_SCHED
-
-	~NAMESPACES
-	~IPC_NS ~USER_NS ~PID_NS
-
-	~NETLINK_DIAG ~PACKET_DIAG
-	~INET_UDP_DIAG ~INET_TCP_DIAG
-	~UNIX_DIAG ~CHECKPOINT_RESTORE
-
-	~CGROUP_FREEZER
-	~UTS_NS ~NET_NS
-	~VETH ~MACVLAN
-
-	~POSIX_MQUEUE
-	~!NETPRIO_CGROUP
-
-	~!GRKERNSEC_CHROOT_MOUNT
-	~!GRKERNSEC_CHROOT_DOUBLE
-	~!GRKERNSEC_CHROOT_PIVOT
-	~!GRKERNSEC_CHROOT_CHMOD
-	~!GRKERNSEC_CHROOT_CAPS
-	~!GRKERNSEC_PROC
-	~!GRKERNSEC_SYSFS_RESTRICT
-"
-
-ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES:  needed for pts inside container"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
-
-ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
-ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
-
-ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
-ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) networking"
-
-ERROR_NETLINK_DIAG="CONFIG_NETLINK_DIAG:  needed for lxc-checkpoint"
-ERROR_PACKET_DIAG="CONFIG_PACKET_DIAG:  needed for lxc-checkpoint"
-ERROR_INET_UDP_DIAG="CONFIG_INET_UDP_DIAG:  needed for lxc-checkpoint"
-ERROR_INET_TCP_DIAG="CONFIG_INET_TCP_DIAG:  needed for lxc-checkpoint"
-ERROR_UNIX_DIAG="CONFIG_UNIX_DIAG:  needed for lxc-checkpoint"
-ERROR_CHECKPOINT_RESTORE="CONFIG_CHECKPOINT_RESTORE:  needed for lxc-checkpoint"
-
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
-
-ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting."
-
-ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC:  this GRSEC feature is incompatible with unprivileged containers"
-ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT:  this GRSEC feature is incompatible with unprivileged containers"
-
-DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	kernel_is -lt 4 7 && CONFIG_CHECK="${CONFIG_CHECK} ~DEVPTS_MULTIPLE_INSTANCES"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.6-bash-completion.patch
-	#558854
-	epatch "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	if use python; then
-		#541932
-		python_setup "python3*"
-		export PKG_CONFIG_PATH="${T}/${EPYTHON}/pkgconfig:${PKG_CONFIG_PATH}"
-	fi
-
-	# I am not sure about the --with-rootfs-path
-	# /var/lib/lxc is probably more appropriate than
-	# /usr/lib/lxc.
-	# Note by holgersson: Why is apparmor disabled?
-	econf \
-		--localstatedir=/var \
-		--bindir=/usr/bin \
-		--sbindir=/usr/bin \
-		--with-config-path=/var/lib/lxc	\
-		--with-rootfs-path=/var/lib/lxc/rootfs \
-		--with-distro=gentoo \
-		--with-runtime-path=/run \
-		--disable-apparmor \
-		--disable-werror \
-		$(use_enable cgmanager) \
-		$(use_enable doc) \
-		$(use_enable examples) \
-		$(use_enable lua) \
-		$(use_enable python) \
-		$(use_enable seccomp) \
-		$(use_enable selinux)
-}
-
-python_compile() {
-	distutils-r1_python_compile build_ext -I ../ -L ../${PN}
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		pushd "${S}/src/python-${PN}" > /dev/null
-		distutils-r1_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	default
-
-	mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
-	# start-ephemeral is no longer a command but removing it here
-	# generates QA warnings (still in upstream completion script)
-	bashcomp_alias ${PN}-start \
-		${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait}
-
-	if use python; then
-		pushd "${S}/src/python-lxc" > /dev/null
-		# Unset DOCS. This has been handled by the default target
-		unset DOCS
-		distutils-r1_src_install
-		popd > /dev/null
-	fi
-
-	keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
-
-	find "${D}" -name '*.la' -delete
-
-	# Gentoo-specific additions!
-	newinitd "${FILESDIR}/${PN}.initd.5" ${PN}
-
-	# Remember to compare our systemd unit file with the upstream one
-	# config/init/systemd/lxc.service.in
-	systemd_newunit "${FILESDIR}"/${PN}_at.service.4 "lxc@.service"
-}
-
-pkg_postinst() {
-	elog ""
-	elog "Starting from version ${PN}-1.1.0-r3, the default lxc path has been"
-	elog "moved from /etc/lxc to /var/lib/lxc. If you still want to use /etc/lxc"
-	elog "please add the following to your /etc/lxc/default.conf"
-	elog "lxc.lxcpath = /etc/lxc"
-	elog ""
-	elog "There is an init script provided with the package now; no documentation"
-	elog "is currently available though, so please check out /etc/init.d/lxc ."
-	elog "You _should_ only need to symlink it to /etc/init.d/lxc.configname"
-	elog "to start the container defined into /etc/lxc/configname.conf ."
-	elog "For further information about LXC development see"
-	elog "http://blog.flameeyes.eu/tag/lxc" # remove once proper doc is available
-	elog ""
-}
diff --git a/app-emulation/lxc/metadata.xml b/app-emulation/lxc/metadata.xml
deleted file mode 100644
index b0c9c68..0000000
--- a/app-emulation/lxc/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>virtualization</herd>
-  <maintainer>
-    <email>flameeyes@gentoo.org</email>
-  </maintainer>
-  <maintainer>
-    <email>dev-zero@gentoo.org</email>
-  </maintainer>
-  <maintainer>
-    <email>hwoarang@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="seccomp">Use seccomp syscall filters using <pkg>sys-libs/libseccomp</pkg></flag>
-  </use>
-</pkgmetadata>
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index fa5828b..2157b27 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1 +1 @@
-DIST qemu-5.0.0.tar.xz 62426192 BLAKE2B 785d02ef79c95b5c4f0556186054885f9893d4e8a9f4b4f2d6199a4e1ae9c31d7c79dd900305469217f85d61bbe74134b601d5c6c1b0eee2b74792d010f1fd63 SHA512 21ef0cbe107c468a40f0fa2635db2a40048c8790b629dfffca5cd62bb1b502ea8eb133bfc40df5ecf1489e2bffe87f6829aee041cb8a380ff04a8afa23b39fcf
+DIST qemu-5.2.0.tar.xz 106902800 BLAKE2B 4413d5591cbabf80faba5b0b7347ee7749ff0a71af44bdf7f64b1995e17ecf1f3df539fa8e63959e0d50cd0502a41a2921e60cc6d078ed8ab5b09ab4b86d4ed7 SHA512 bddd633ce111471ebc651e03080251515178808556b49a308a724909e55dac0be0cc0c79c536ac12d239678ae94c60100dc124be9b9d9538340c03a2f27177f3
diff --git a/app-emulation/qemu/files/65-kvm.rules-r2 b/app-emulation/qemu/files/65-kvm.rules-r2
new file mode 100644
index 0000000..15c89b2
--- /dev/null
+++ b/app-emulation/qemu/files/65-kvm.rules-r2
@@ -0,0 +1,3 @@
+KERNEL=="kvm", GROUP="kvm", MODE="0660"
+KERNEL=="vhost-net", GROUP="kvm", MODE="0660", OPTIONS+="static_node=vhost-net"
+KERNEL=="vhost-vsock", GROUP="kvm", MODE="0660", OPTIONS+="static_node=vhost-vsock"
diff --git a/app-emulation/qemu/files/qemu-4.0.0-mkdir_systemtap.patch b/app-emulation/qemu/files/qemu-4.0.0-mkdir_systemtap.patch
deleted file mode 100644
index 95ccdd7..0000000
--- a/app-emulation/qemu/files/qemu-4.0.0-mkdir_systemtap.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 04a0d450..e0013a59 100644
---- a/Makefile
-+++ b/Makefile
-@@ -803,6 +802,7 @@
- 	$(call install-prog,$(HELPERS-y),$(DESTDIR)$(libexecdir))
- endif
- ifdef CONFIG_TRACE_SYSTEMTAP
-+	mkdir -p $(DESTDIR)$(bindir)
- 	$(INSTALL_PROG) "scripts/qemu-trace-stap" $(DESTDIR)$(bindir)
- endif
- ifneq ($(BLOBS),)
diff --git a/app-emulation/qemu/files/qemu-4.2.0-cflags.patch b/app-emulation/qemu/files/qemu-4.2.0-cflags.patch
deleted file mode 100644
index 1019265..0000000
--- a/app-emulation/qemu/files/qemu-4.2.0-cflags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git i/configure w/configure
-index a72a5def57..546d757603 100755
---- i/configure
-+++ w/configure
-@@ -6093,10 +6093,6 @@ write_c_skeleton
- if test "$gcov" = "yes" ; then
-   QEMU_CFLAGS="-fprofile-arcs -ftest-coverage -g $QEMU_CFLAGS"
-   QEMU_LDFLAGS="-fprofile-arcs -ftest-coverage $QEMU_LDFLAGS"
--elif test "$fortify_source" = "yes" ; then
--  CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"
--elif test "$debug" = "no"; then
--  CFLAGS="-O2 $CFLAGS"
- fi
- 
- if test "$have_asan" = "yes"; then
-
diff --git a/app-emulation/qemu/files/qemu-5.0.0-epoll-strace.patch b/app-emulation/qemu/files/qemu-5.0.0-epoll-strace.patch
deleted file mode 100644
index c0f9a2e..0000000
--- a/app-emulation/qemu/files/qemu-5.0.0-epoll-strace.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://lists.nongnu.org/archive/html/qemu-devel/2020-04/msg02643.html
-
-From 6bce23d8daf96a7faa9288e7414948cda31ddaa2 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Thu, 16 Apr 2020 18:55:49 +0100
-Subject: [PATCH] linux-user/strace.list: fix epoll_create{,1} -strace output
-
-Fix syscall name and parameters priinter.
-
-Before the change:
-
-```
-$ alpha-linux-user/qemu-alpha -strace -L /usr/alpha-unknown-linux-gnu/ /tmp/a
-...
-1274697 %s(%d)(2097152,274903156744,274903156760,274905840712,274877908880,274903235616) = 3
-1274697 exit_group(0)
-```
-
-After the change:
-
-```
-$ alpha-linux-user/qemu-alpha -strace -L /usr/alpha-unknown-linux-gnu/ /tmp/a
-...
-1273719 epoll_create1(2097152) = 3
-1273719 exit_group(0)
-```
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- linux-user/strace.list | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/linux-user/strace.list
-+++ b/linux-user/strace.list
-@@ -125,10 +125,10 @@
- { TARGET_NR_dup3, "dup3" , "%s(%d,%d,%d)", NULL, NULL },
- #endif
- #ifdef TARGET_NR_epoll_create
--{ TARGET_NR_epoll_create, "%s(%d)", NULL, NULL, NULL },
-+{ TARGET_NR_epoll_create, "epoll_create", "%s(%d)", NULL, NULL },
- #endif
- #ifdef TARGET_NR_epoll_create1
--{ TARGET_NR_epoll_create1, "%s(%d)", NULL, NULL, NULL },
-+{ TARGET_NR_epoll_create1, "epoll_create1", "%s(%d)", NULL, NULL },
- #endif
- #ifdef TARGET_NR_epoll_ctl
- { TARGET_NR_epoll_ctl, "epoll_ctl" , NULL, NULL, NULL },
--- 
-2.26.2
-
diff --git a/app-emulation/qemu/files/qemu-5.0.0-os_find_datadir-search.patch b/app-emulation/qemu/files/qemu-5.0.0-os_find_datadir-search.patch
deleted file mode 100644
index 2e72d04..0000000
--- a/app-emulation/qemu/files/qemu-5.0.0-os_find_datadir-search.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From mboxrd@z Thu Jan  1 00:00:00 1970
-From: Joe Slater <joe.slater@windriver.com>
-Subject: [PATCH 1/1] os_find_datadir:  search as in version 4.2
-Date: Mon, 15 Jun 2020 15:58:27 -0700
-Message-ID: <20200615225827.183062-1-joe.slater@windriver.com>
-Archived-At: <https://lore.kernel.org/qemu-devel/20200615225827.183062-1-joe.slater@windriver.com/>
-
-Always look for ../share/qemu then ../pc-bios when looking for datadir.
-
-Signed-off-by: Joe Slater <joe.slater@windriver.com>
----
-See also: https://crbug.com/1114204
-
- os-posix.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/os-posix.c b/os-posix.c
-index 3cd52e1e70..f77da94bf6 100644
---- a/os-posix.c
-+++ b/os-posix.c
-@@ -82,8 +82,9 @@ void os_setup_signal_handling(void)
- 
- /*
-  * Find a likely location for support files using the location of the binary.
-+ * Typically, this would be "$bindir/../share/qemu".
-  * When running from the build tree this will be "$bindir/../pc-bios".
-- * Otherwise, this is CONFIG_QEMU_DATADIR.
-+ * Otherwise, this is CONFIG_QEMU_DATADIR as constructed by configure.
-  */
- char *os_find_datadir(void)
- {
-@@ -93,6 +94,12 @@ char *os_find_datadir(void)
-     exec_dir = qemu_get_exec_dir();
-     g_return_val_if_fail(exec_dir != NULL, NULL);
- 
-+    dir = g_build_filename(exec_dir, "..", "share", "qemu", NULL);
-+    if (g_file_test(dir, G_FILE_TEST_IS_DIR)) {
-+        return g_steal_pointer(&dir);
-+    }
-+    g_free(dir);  /* no autofree this time */
-+
-     dir = g_build_filename(exec_dir, "..", "pc-bios", NULL);
-     if (g_file_test(dir, G_FILE_TEST_IS_DIR)) {
-         return g_steal_pointer(&dir);
--- 
-2.17.1
-
diff --git a/app-emulation/qemu/files/qemu-5.2.0-cleaner-werror.patch b/app-emulation/qemu/files/qemu-5.2.0-cleaner-werror.patch
new file mode 100644
index 0000000..33115f1
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-5.2.0-cleaner-werror.patch
@@ -0,0 +1,40 @@
+-Wall -Wextra compains about unused arguments,
+causes safe-stack to be mis-detected.
+--- a/configure
++++ b/configure
+@@ -2293,7 +2293,7 @@ fi
+ cat > $TMPC << EOF
+ #include <stdint.h>
+ #include <stdio.h>
+-int main(int argc, char *argv[]) {
++int main(void) {
+     return printf("%zu", SIZE_MAX);
+ }
+ EOF
+@@ -4911,7 +4911,7 @@ fi
+ 
+ if test "$safe_stack" = "yes"; then
+ cat > $TMPC << EOF
+-int main(int argc, char *argv[])
++int main(void)
+ {
+ #if ! __has_feature(safe_stack)
+ #error SafeStack Disabled
+@@ -4933,7 +4933,7 @@ EOF
+   fi
+ else
+ cat > $TMPC << EOF
+-int main(int argc, char *argv[])
++int main(void)
+ {
+ #if defined(__has_feature)
+ #if __has_feature(safe_stack)
+@@ -5283,7 +5283,7 @@ static const int Z = 1;
+ #define TAUT(X) ((X) == Z)
+ #define PAREN(X, Y) (X == Y)
+ #define ID(X) (X)
+-int main(int argc, char *argv[])
++int main(void)
+ {
+     int x = 0, y = 0;
+     x = ID(x);
diff --git a/app-emulation/qemu/files/qemu-5.2.0-dce-locks.patch b/app-emulation/qemu/files/qemu-5.2.0-dce-locks.patch
new file mode 100644
index 0000000..679a9f3
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-5.2.0-dce-locks.patch
@@ -0,0 +1,18 @@
+Fix CFLAGS=-Og build break. -Og fails because gcc does not enable dead
+code elimination (but does set __OPTIMIZE__ define).
+
+The fix avoids DCE reliance downstream entirely.
+
+Reported-by: Luke-Jr
+Bug: https://bugs.gentoo.org/782364
+--- a/include/qemu/lockable.h
++++ b/include/qemu/lockable.h
+@@ -28,7 +28,7 @@ struct QemuLockable {
+  * to QEMU_MAKE_LOCKABLE.  For optimized builds, we can rely on dead-code elimination
+  * from the compiler, and give the errors already at link time.
+  */
+-#if defined(__OPTIMIZE__) && !defined(__SANITIZE_ADDRESS__)
++#if defined(__OPTIMIZE__) && !defined(__SANITIZE_ADDRESS__) && defined(VALIDATE_LOCKS_VIA_DCE)
+ void unknown_lock_type(void *);
+ #else
+ static inline void unknown_lock_type(void *unused)
diff --git a/app-emulation/qemu/files/qemu-5.2.0-disable-keymap.patch b/app-emulation/qemu/files/qemu-5.2.0-disable-keymap.patch
new file mode 100644
index 0000000..4b5676b
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-5.2.0-disable-keymap.patch
@@ -0,0 +1,25 @@
+Do not use system's 'qemu-keymap' in native case.
+--- a/meson.build
++++ b/meson.build
+@@ -337,6 +337,8 @@ if 'CONFIG_LIBCAP_NG' in config_host
+ endif
+ if get_option('xkbcommon').auto() and not have_system and not have_tools
+   xkbcommon = not_found
++elif get_option('xkbcommon').disabled()
++  xkbcommon = not_found
+ else
+   xkbcommon = dependency('xkbcommon', required: get_option('xkbcommon'),
+                          method: 'pkg-config', static: enable_static)
+--- a/pc-bios/keymaps/meson.build
++++ b/pc-bios/keymaps/meson.build
+@@ -33,7 +33,9 @@ keymaps = {
+   'tr': '-l tr',
+ }
+ 
+-if meson.is_cross_build() or 'CONFIG_XKBCOMMON' not in config_host
++if meson.is_cross_build()
+   native_qemu_keymap = find_program('qemu-keymap', required: false, disabler: true)
++elif get_option('xkbcommon').disabled()
++  native_qemu_keymap = not_found
+ else
+   native_qemu_keymap = qemu_keymap
diff --git a/app-emulation/qemu/files/qemu-5.2.0-fix-firmware-path.patch b/app-emulation/qemu/files/qemu-5.2.0-fix-firmware-path.patch
new file mode 100644
index 0000000..5396983
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-5.2.0-fix-firmware-path.patch
@@ -0,0 +1,16 @@
+Se absolute filename in files like
+    /usr/share/qemu/firmware/50-edk2-x86_64-secure.json
+
+Bug: https://bugs.gentoo.org/766743
+Patch-by: Jannik Glückert
+--- a/pc-bios/descriptors/meson.build
++++ b/pc-bios/descriptors/meson.build
+@@ -8,7 +8,7 @@ foreach f: [
+ ]
+   configure_file(input: files(f),
+                  output: f,
+-                 configuration: {'DATADIR': qemu_datadir},
++                 configuration: {'DATADIR': get_option('prefix') / qemu_datadir},
+                  install: get_option('install_blobs'),
+                  install_dir: qemu_datadir / 'firmware')
+ endforeach
diff --git a/app-emulation/qemu/files/qemu-5.2.0-no-pie-ld.patch b/app-emulation/qemu/files/qemu-5.2.0-no-pie-ld.patch
new file mode 100644
index 0000000..f47a587
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-5.2.0-no-pie-ld.patch
@@ -0,0 +1,73 @@
+From bbd2d5a8120771ec59b86a80a1f51884e0a26e53 Mon Sep 17 00:00:00 2001
+From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+Date: Mon, 14 Dec 2020 16:09:38 +0100
+Subject: [PATCH] build: -no-pie is no functional linker flag
+
+Recent binutils changes dropping unsupported options [1] caused a build
+issue in regard to the optionroms.
+
+  ld -m elf_i386 -T /<<PKGBUILDDIR>>/pc-bios/optionrom//flat.lds -no-pie \
+    -s -o multiboot.img multiboot.o
+  ld.bfd: Error: unable to disambiguate: -no-pie (did you mean --no-pie ?)
+
+This isn't really a regression in ld.bfd, filing the bug upstream
+revealed that this never worked as a ld flag [2] - in fact it seems we
+were by accident setting --nmagic).
+
+Since it never had the wanted effect this usage of LDFLAGS_NOPIE, should be
+droppable without any effect. This also is the only use-case of LDFLAGS_NOPIE
+in .mak, therefore we can also remove it from being added there.
+
+[1]: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=983d925d
+[2]: https://sourceware.org/bugzilla/show_bug.cgi?id=27050#c5
+
+Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+Message-Id: <20201214150938.1297512-1-christian.ehrhardt@canonical.com>
+Cc: qemu-stable@nongnu.org
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+---
+ configure                  | 3 ---
+ pc-bios/optionrom/Makefile | 1 -
+ 2 files changed, 4 deletions(-)
+
+--- a/configure
++++ b/configure
+@@ -2137,7 +2137,6 @@ EOF
+ # Check we support --no-pie first; we will need this for building ROMs.
+ if compile_prog "-Werror -fno-pie" "-no-pie"; then
+   CFLAGS_NOPIE="-fno-pie"
+-  LDFLAGS_NOPIE="-no-pie"
+ fi
+ 
+ if test "$static" = "yes"; then
+@@ -2153,7 +2152,6 @@ if test "$static" = "yes"; then
+   fi
+ elif test "$pie" = "no"; then
+   CONFIGURE_CFLAGS="$CFLAGS_NOPIE $CONFIGURE_CFLAGS"
+-  CONFIGURE_LDFLAGS="$LDFLAGS_NOPIE $CONFIGURE_LDFLAGS"
+ elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then
+   CONFIGURE_CFLAGS="-fPIE -DPIE $CONFIGURE_CFLAGS"
+   CONFIGURE_LDFLAGS="-pie $CONFIGURE_LDFLAGS"
+@@ -6714,7 +6712,6 @@ echo "QEMU_CXXFLAGS=$QEMU_CXXFLAGS" >> $config_host_mak
+ echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak
+ echo "GLIB_LIBS=$glib_libs" >> $config_host_mak
+ echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak
+-echo "LDFLAGS_NOPIE=$LDFLAGS_NOPIE" >> $config_host_mak
+ echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak
+ echo "EXESUF=$EXESUF" >> $config_host_mak
+ echo "HOST_DSOSUF=$HOST_DSOSUF" >> $config_host_mak
+diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
+index 084fc10f05..30771f8d17 100644
+--- a/pc-bios/optionrom/Makefile
++++ b/pc-bios/optionrom/Makefile
+@@ -41,7 +41,6 @@ override CFLAGS += $(call cc-option, $(Wa)-32)
+ 
+ LD_I386_EMULATION ?= elf_i386
+ override LDFLAGS = -m $(LD_I386_EMULATION) -T $(SRC_DIR)/flat.lds
+-override LDFLAGS += $(LDFLAGS_NOPIE)
+ 
+ all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin
+ 
+-- 
+2.30.0
+
diff --git a/app-emulation/qemu/files/qemu-5.2.0-strings.patch b/app-emulation/qemu/files/qemu-5.2.0-strings.patch
new file mode 100644
index 0000000..0b3dcdc
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-5.2.0-strings.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/759310
+--- a/configure
++++ b/configure
+@@ -521,6 +521,7 @@ ld="${LD-${cross_prefix}ld}"
+ ranlib="${RANLIB-${cross_prefix}ranlib}"
+ nm="${NM-${cross_prefix}nm}"
+ strip="${STRIP-${cross_prefix}strip}"
++strings="${STRINGS-${cross_prefix}strings}"
+ windres="${WINDRES-${cross_prefix}windres}"
+ pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}"
+ query_pkg_config() {
+@@ -2265,9 +2266,9 @@ int main(int argc, char *argv[]) {
+ EOF
+ 
+ if compile_object ; then
+-    if strings -a $TMPO | grep -q BiGeNdIaN ; then
++    if $strings -a $TMPO | grep -q BiGeNdIaN ; then
+         bigendian="yes"
+-    elif strings -a $TMPO | grep -q LiTtLeEnDiAn ; then
++    elif $strings -a $TMPO | grep -q LiTtLeEnDiAn ; then
+         bigendian="no"
+     else
+         echo big/little test failed
diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index 0c30c45..ec3f45a 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -18,7 +18,7 @@
 		<flag name="aio">Enables support for Linux's Async IO</flag>
 		<flag name="alsa">Enable alsa output for sound emulation</flag>
 		<flag name="capstone">Enable disassembly support with <pkg>dev-libs/capstone</pkg></flag>
-		<flag name="curl">Support ISOs / -cdrom directives vis HTTP or HTTPS.</flag>
+		<flag name="curl">Support ISOs / -cdrom directives via HTTP or HTTPS.</flag>
 		<flag name="fdt">Enables firmware device tree support</flag>
 		<flag name="glusterfs">Enables GlusterFS cluster fileystem via
 			<pkg>sys-cluster/glusterfs</pkg></flag>
@@ -29,6 +29,8 @@
 		<pkg>net-libs/libiscsi</pkg> instead of indirectly via the Linux
 		block layer that <pkg>sys-block/open-iscsi</pkg> does.</flag>
 		<flag name="io-uring">Enable efficient I/O via <pkg>sys-libs/liburing</pkg>.</flag>
+		<flag name="multipath">Enable multipath persistent reservation passthrough via
+		<pkg>sys-fs/multipath-tools</pkg>.</flag>
 		<flag name="ncurses">Enable the ncurses-based console</flag>
 		<flag name="nfs">Enable NFS support</flag>
 		<flag name="numa">Enable NUMA support</flag>
@@ -40,12 +42,12 @@
 		<flag name="rbd">Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD</flag>
 		<flag name="sdl">Enable the SDL-based console</flag>
 		<flag name="sdl-image">SDL Image support for icons</flag>
+		<flag name="slirp">Enable TCP/IP in hypervisor via <pkg>net-libs/libslirp</pkg></flag>
 		<flag name="spice">Enable Spice protocol support via <pkg>app-emulation/spice</pkg></flag>
 		<flag name="ssh">Enable SSH based block device support via <pkg>net-libs/libssh2</pkg></flag>
 		<flag name="static-user">Build the User targets as static binaries</flag>
 		<flag name="static">Build the User and Software MMU (system) targets as well as tools as static binaries</flag>
 		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
-		<flag name="tci">Enable the TCG Interpreter which can speed up or slowdown workloads depending on the host and guest CPUs being emulated. In the future it will be a runtime option but for now its compile time.</flag>
 		<flag name="jemalloc">Enable jemalloc allocator support</flag>
 		<flag name="jpeg">Enable jpeg image support for the VNC console server</flag>
 		<flag name="png">Enable png image support for the VNC console server</flag>
@@ -58,11 +60,9 @@
 		<flag name="virtfs">Enable VirtFS via virtio-9p-pci / fsdev. See http://wiki.qemu.org/Documentation/9psetup</flag>
 		<flag name="vte">Enable terminal support (<pkg>x11-libs/vte</pkg>) in the GTK+ interface</flag>
 		<flag name="xattr">Add support for getting and setting POSIX extended attributes, through
-		<pkg>sys-apps/attr</pkg>. Requisite for the virtfs backend.
-	</flag>
+		<pkg>sys-apps/attr</pkg>. Requisite for the virtfs backend.</flag>
 		<flag name="xen">Enables support for Xen backends</flag>
 		<flag name="xfs">Support xfsctl() notification and syncing for XFS backed
 		virtual disks.</flag>
-		<flag name="xkb">Depend on x11-libs/libxkbcommon to build qemu-keymap tool for converting xkb keymaps</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-emulation/qemu/qemu-5.0.0.ebuild b/app-emulation/qemu/qemu-5.0.0.ebuild
deleted file mode 100644
index a4e4fe0..0000000
--- a/app-emulation/qemu/qemu-5.0.0.ebuild
+++ /dev/null
@@ -1,838 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-PYTHON_REQ_USE="ncurses,readline"
-
-PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
-
-FIRMWARE_ABI_VERSION="4.0.0-r50"
-
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
-	udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"
-	EGIT_SUBMODULES=(
-		slirp
-		tests/fp/berkeley-{test,soft}float-3
-		ui/keycodemapdb
-	)
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://download.qemu.org/${P}.tar.xz"
-	KEYWORDS="*"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-
-IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
-	+fdt glusterfs gnutls gtk infiniband iscsi io-uring
-	jemalloc +jpeg kernel_linux
-	kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs
-	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
-	smartcard snappy spice ssh static static-user systemtap tci test usb
-	usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
-	xfs +xkb zstd"
-
-COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel
-	mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x
-	sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS}
-	lm32 moxie rx tricore unicore32"
-IUSE_USER_TARGETS="${COMMON_TARGETS}
-	aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus
-	tilegx"
-
-use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
-use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
-IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
-
-RESTRICT="!test? ( test )"
-# Allow no targets to be built so that people can get a tools-only build.
-# Block USE flag configurations known to not work.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	qemu_softmmu_targets_arm? ( fdt )
-	qemu_softmmu_targets_microblaze? ( fdt )
-	qemu_softmmu_targets_mips64el? ( fdt )
-	qemu_softmmu_targets_ppc64? ( fdt )
-	qemu_softmmu_targets_ppc? ( fdt )
-	qemu_softmmu_targets_riscv32? ( fdt )
-	qemu_softmmu_targets_riscv64? ( fdt )
-	static? ( static-user !alsa !gtk !opengl !pulseaudio !plugins !rbd !snappy )
-	static-user? ( !plugins )
-	virtfs? ( xattr )
-	vte? ( gtk )
-	plugins? ( !static !static-user )
-"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# and user/softmmu targets (qemu-*, qemu-system-*).
-#
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-#
-# The attr lib isn't always linked in (although the USE flag is always
-# respected).  This is because qemu supports using the C library's API
-# when available rather than always using the external library.
-ALL_DEPEND="
-	>=dev-libs/glib-2.0[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	python? ( ${PYTHON_DEPS} )
-	systemtap? ( dev-util/systemtap )
-	xattr? ( sys-apps/attr[static-libs(+)] )"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# softmmu targets (qemu-system-*).
-SOFTMMU_TOOLS_DEPEND="
-	dev-libs/libxml2[static-libs(+)]
-	xkb? ( x11-libs/libxkbcommon[static-libs(+)] )
-	>=x11-libs/pixman-0.28.0[static-libs(+)]
-	accessibility? (
-		app-accessibility/brltty[api]
-		app-accessibility/brltty[static-libs(+)]
-	)
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bzip2? ( app-arch/bzip2[static-libs(+)] )
-	capstone? ( dev-libs/capstone:= )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
-	gnutls? (
-		dev-libs/nettle:=[static-libs(+)]
-		>=net-libs/gnutls-3.0:=[static-libs(+)]
-	)
-	gtk? (
-		x11-libs/gtk+:3
-		vte? ( x11-libs/vte:2.91 )
-	)
-	infiniband? (
-		sys-fabric/libibumad:=[static-libs(+)]
-		sys-fabric/libibverbs:=[static-libs(+)]
-		sys-fabric/librdmacm:=[static-libs(+)]
-	)
-	iscsi? ( net-libs/libiscsi )
-	io-uring? ( sys-libs/liburing[static-libs(+)] )
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
-	lzo? ( dev-libs/lzo:2[static-libs(+)] )
-	ncurses? (
-		sys-libs/ncurses:0=[unicode]
-		sys-libs/ncurses:0=[static-libs(+)]
-	)
-	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
-	numa? ( sys-process/numactl[static-libs(+)] )
-	opengl? (
-		virtual/opengl
-		media-libs/libepoxy[static-libs(+)]
-		media-libs/mesa[static-libs(+)]
-		media-libs/mesa[egl,gbm]
-	)
-	png? ( media-libs/libpng:0=[static-libs(+)] )
-	pulseaudio? ( media-sound/pulseaudio )
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? (
-		media-libs/libsdl2[video]
-		media-libs/libsdl2[static-libs(+)]
-	)
-	sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
-	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
-	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
-	snappy? ( app-arch/snappy:= )
-	spice? (
-		>=app-emulation/spice-protocol-0.12.3
-		>=app-emulation/spice-0.12.0[static-libs(+)]
-	)
-	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
-	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
-	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	virgl? ( media-libs/virglrenderer[static-libs(+)] )
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools:= )
-	xfs? ( sys-fs/xfsprogs[static-libs(+)] )
-	zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
-"
-
-X86_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/edk2-ovmf-201905[binary]
-		~sys-firmware/ipxe-1.0.0_p20190728[binary]
-		~sys-firmware/seabios-1.12.0[binary,seavgabios]
-		~sys-firmware/sgabios-0.1_pre8[binary]
-	)
-	!pin-upstream-blobs? (
-		sys-firmware/edk2-ovmf
-		sys-firmware/ipxe
-		>=sys-firmware/seabios-1.10.2[seavgabios]
-		sys-firmware/sgabios
-	)"
-PPC64_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/seabios-1.12.0[binary,seavgabios]
-	)
-	!pin-upstream-blobs? (
-		>=sys-firmware/seabios-1.10.2[seavgabios]
-	)
-"
-
-BDEPEND="
-	$(python_gen_impl_dep)
-	dev-lang/perl
-	sys-apps/texinfo
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-	gtk? ( nls? ( sys-devel/gettext ) )
-	test? (
-		dev-libs/glib[utils]
-		sys-devel/bc
-	)
-"
-CDEPEND="
-	!static? (
-		${ALL_DEPEND//\[static-libs(+)]}
-		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
-	)
-	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_ppc64? ( ${PPC64_FIRMWARE_DEPEND} )
-"
-DEPEND="${CDEPEND}
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static? (
-		${ALL_DEPEND}
-		${SOFTMMU_TOOLS_DEPEND}
-	)
-	static-user? ( ${ALL_DEPEND} )"
-RDEPEND="${CDEPEND}
-	acct-group/kvm
-	selinux? ( sec-policy/selinux-qemu )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
-	"${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902
-	"${FILESDIR}"/${PN}-4.2.0-cflags.patch
-	"${FILESDIR}"/${PN}-5.0.0-epoll-strace.patch
-	"${FILESDIR}"/${PN}-5.0.0-os_find_datadir-search.patch
-)
-
-QA_PREBUILT="
-	usr/share/qemu/hppa-firmware.img
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/palcode-clipper
-	usr/share/qemu/s390-ccw.img
-	usr/share/qemu/s390-netboot.img
-	usr/share/qemu/u-boot.e500"
-
-QA_WX_LOAD="usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-or1k
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
-kernel module loaded before running kvm. The easiest way to ensure that the
-kernel module is loaded is to load it on boot.
-	For AMD CPUs the module is called 'kvm-amd'.
-	For Intel CPUs the module is called 'kvm-intel'.
-Please review /etc/conf.d/modules for how to load these.
-
-Make sure your user is in the 'kvm' group. Just run
-	$ gpasswd -a <USER> kvm
-then have <USER> re-login.
-
-For brand new installs, the default permissions on /dev/kvm might not let
-you access it.  You can tell udev to reset ownership/perms:
-	$ udevadm trigger -c add /dev/kvm
-
-If you want to register binfmt handlers for qemu user targets:
-For openrc:
-	# rc-update add qemu-binfmt
-For systemd:
-	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				if grep -q AuthenticAMD /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_AMD"
-				elif grep -q GenuineIntel /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_INTEL"
-				fi
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-
-	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
-		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
-		eerror "instances are still pointing to it.  Please update your"
-		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
-		eerror "and the right system binary (e.g. qemu-system-x86_64)."
-		die "update your virt configs to not use qemu-kvm"
-	fi
-}
-
-# Sanity check to make sure target lists are kept up-to-date.
-check_targets() {
-	local var=$1 mak=$2
-	local detected sorted
-
-	pushd "${S}"/default-configs >/dev/null || die
-
-	# Force C locale until glibc is updated. #564936
-	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
-	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
-	if [[ ${sorted} != "${detected}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "${var}: ${sorted}"
-		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
-		die "sync ${var} to the list of targets"
-	fi
-
-	popd >/dev/null
-}
-
-handle_locales() {
-	# Make sure locale list is kept up-to-date.
-	local detected sorted
-	detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
-	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
-	if [[ ${sorted} != "${detected}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "PLOCALES: ${sorted}"
-		eerror " po/*.po: ${detected}"
-		die "sync PLOCALES"
-	fi
-
-	# Deal with selective install of locales.
-	if use nls ; then
-		# Delete locales the user does not want. #577814
-		rm_loc() { rm po/$1.po || die; }
-		l10n_for_each_disabled_locale_do rm_loc
-	else
-		# Cheap hack to disable gettext .mo generation.
-		rm -f po/*.po
-	fi
-}
-
-src_prepare() {
-	check_targets IUSE_SOFTMMU_TARGETS softmmu
-	check_targets IUSE_USER_TARGETS linux-user
-
-	default
-
-	# Use correct toolchain to fix cross-compiling
-	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB
-	export WINDRES=${CHOST}-windres
-
-	# Verbose builds
-	MAKEOPTS+=" V=1"
-
-	# Run after we've applied all patches.
-	handle_locales
-
-	# Remove bundled copy of libfdt
-	rm -r dtc || die
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local buildtype=$1
-	local builddir="${S}/${buildtype}-build"
-
-	mkdir "${builddir}"
-
-	local conf_opts=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--bindir=/usr/bin
-		--libdir=/usr/$(get_libdir)
-		--datadir=/usr/share
-		--docdir=/usr/share/doc/${PF}/html
-		--mandir=/usr/share/man
-		--with-confsuffix=/qemu
-		--localstatedir=/var
-		--disable-bsd-user
-		--disable-guest-agent
-		--disable-strip
-		--disable-werror
-		# We support gnutls/nettle for crypto operations.  It is possible
-		# to use gcrypt when gnutls/nettle are disabled (but not when they
-		# are enabled), but it's not really worth the hassle.  Disable it
-		# all the time to avoid automatically detecting it. #568856
-		--disable-gcrypt
-		--python="${PYTHON}"
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--host-cc="$(tc-getBUILD_CC)"
-		$(use_enable debug debug-info)
-		$(use_enable debug debug-tcg)
-		$(use_enable doc docs)
-		$(use_enable plugins)
-		$(use_enable tci tcg-interpreter)
-		$(use_enable xattr attr)
-	)
-
-	# Disable options not used by user targets. This simplifies building
-	# static user targets (USE=static-user) considerably.
-	conf_notuser() {
-		if [[ ${buildtype} == "user" ]] ; then
-			echo "--disable-${2:-$1}"
-		else
-			use_enable "$@"
-		fi
-	}
-	conf_opts+=(
-		$(conf_notuser accessibility brlapi)
-		$(conf_notuser aio linux-aio)
-		$(conf_notuser bzip2)
-		$(conf_notuser capstone)
-		$(conf_notuser caps cap-ng)
-		$(conf_notuser curl)
-		$(conf_notuser fdt)
-		$(conf_notuser glusterfs)
-		$(conf_notuser gnutls)
-		$(conf_notuser gnutls nettle)
-		$(conf_notuser gtk)
-		$(conf_notuser infiniband rdma)
-		$(conf_notuser iscsi libiscsi)
-		$(conf_notuser io-uring linux-io-uring)
-		$(conf_notuser jemalloc jemalloc)
-		$(conf_notuser jpeg vnc-jpeg)
-		$(conf_notuser kernel_linux kvm)
-		$(conf_notuser lzo)
-		$(conf_notuser ncurses curses)
-		$(conf_notuser nfs libnfs)
-		$(conf_notuser numa)
-		$(conf_notuser opengl)
-		$(conf_notuser png vnc-png)
-		$(conf_notuser rbd)
-		$(conf_notuser sasl vnc-sasl)
-		$(conf_notuser sdl)
-		$(conf_notuser sdl-image)
-		$(conf_notuser seccomp)
-		$(conf_notuser smartcard)
-		$(conf_notuser snappy)
-		$(conf_notuser spice)
-		$(conf_notuser ssh libssh)
-		$(conf_notuser usb libusb)
-		$(conf_notuser usbredir usb-redir)
-		$(conf_notuser vde)
-		$(conf_notuser vhost-net)
-		$(conf_notuser vhost-user-fs)
-		$(conf_notuser virgl virglrenderer)
-		$(conf_notuser virtfs)
-		$(conf_notuser vnc)
-		$(conf_notuser vte)
-		$(conf_notuser xen)
-		$(conf_notuser xen xen-pci-passthrough)
-		$(conf_notuser xfs xfsctl)
-		$(conf_notuser xkb xkbcommon)
-		$(conf_notuser zstd)
-	)
-
-	if [[ ${buildtype} == "user" ]] ; then
-		conf_opts+=( --disable-libxml2 )
-	else
-		conf_opts+=( --enable-libxml2 )
-	fi
-
-	if [[ ! ${buildtype} == "user" ]] ; then
-		# audio options
-		local audio_opts=(
-			# Note: backend order matters here: #716202
-			# We iterate from higher-level to lower level.
-			$(usex pulseaudio pa "")
-			$(usev sdl)
-			$(usev alsa)
-			$(usev oss)
-		)
-		conf_opts+=(
-			--audio-drv-list=$(printf "%s," "${audio_opts[@]}")
-		)
-	fi
-
-	case ${buildtype} in
-	user)
-		conf_opts+=(
-			--enable-linux-user
-			--disable-system
-			--disable-blobs
-			--disable-tools
-		)
-		local static_flag="static-user"
-		;;
-	softmmu)
-		conf_opts+=(
-			--disable-linux-user
-			--enable-system
-			--disable-tools
-		)
-		local static_flag="static"
-		;;
-	tools)
-		conf_opts+=(
-			--disable-linux-user
-			--disable-system
-			--disable-blobs
-			--enable-tools
-		)
-		local static_flag="static"
-		;;
-	esac
-
-	local targets="${buildtype}_targets"
-	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if use ${static_flag}; then
-		conf_opts+=( --static --disable-pie )
-	else
-		tc-enables-pie && conf_opts+=( --enable-pie )
-	fi
-
-	echo "../configure ${conf_opts[*]}"
-	cd "${builddir}"
-	../configure "${conf_opts[@]}" || die "configure failed"
-
-	# FreeBSD's kernel does not support QEMU assigning/grabbing
-	# host USB devices yet
-	use kernel_FreeBSD && \
-		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
-}
-
-src_configure() {
-	local target
-
-	python_setup
-
-	softmmu_targets= softmmu_bins=()
-	user_targets= user_bins=()
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		if use "qemu_softmmu_targets_${target}"; then
-			softmmu_targets+=",${target}-softmmu"
-			softmmu_bins+=( "qemu-system-${target}" )
-		fi
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		if use "qemu_user_targets_${target}"; then
-			user_targets+=",${target}-linux-user"
-			user_bins+=( "qemu-${target}" )
-		fi
-	done
-
-	softmmu_targets=${softmmu_targets#,}
-	user_targets=${user_targets#,}
-
-	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
-	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
-	qemu_src_configure "tools"
-}
-
-src_compile() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		default
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		default
-	fi
-
-	cd "${S}/tools-build"
-	default
-}
-
-src_test() {
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		pax-mark m */qemu-system-* #515550
-		emake check
-	fi
-}
-
-qemu_python_install() {
-	python_domodule "${S}/python/qemu"
-
-	python_doscript "${S}/scripts/kvm/vmxcap"
-	python_doscript "${S}/scripts/qmp/qmp-shell"
-	python_doscript "${S}/scripts/qmp/qemu-ga-client"
-}
-
-# Generate binfmt support files.
-#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
-#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
-generate_initd() {
-	local out="${T}/qemu-binfmt"
-	local out_systemd="${T}/qemu.conf"
-	local d="${T}/binfmt.d"
-
-	einfo "Generating qemu binfmt scripts and configuration files"
-
-	# Generate the debian fragments first.
-	mkdir -p "${d}"
-	"${S}"/scripts/qemu-binfmt-conf.sh \
-		--debian \
-		--exportdir "${d}" \
-		--qemu-path "${EPREFIX}/usr/bin" \
-		|| die
-	# Then turn the fragments into a shell script we can source.
-	sed -E -i \
-		-e 's:^([^ ]+) (.*)$:\1="\2":' \
-		"${d}"/* || die
-
-	# Generate the init.d script by assembling the fragments from above.
-	local f qcpu package interpreter magic mask
-	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
-	for f in "${d}"/qemu-* ; do
-		source "${f}"
-
-		# Normalize the cpu logic like we do in the init.d for the native cpu.
-		qcpu=${package#qemu-}
-		case ${qcpu} in
-		arm*)   qcpu="arm";;
-		mips*)  qcpu="mips";;
-		ppc*)   qcpu="ppc";;
-		s390*)  qcpu="s390";;
-		sh*)    qcpu="sh";;
-		sparc*) qcpu="sparc";;
-		esac
-
-		# we use 'printf' here to be portable across 'sh'
-		# implementations: #679168
-		cat <<EOF >>"${out}"
-	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
-		printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
-	fi
-EOF
-
-		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
-
-	done
-	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
-}
-
-src_install() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		emake DESTDIR="${ED}" install
-
-		# Install binfmt handler init script for user targets.
-		generate_initd
-		doinitd "${T}/qemu-binfmt"
-
-		# Install binfmt/qemu.conf.
-		insinto "/usr/share/qemu/binfmt.d"
-		doins "${T}/qemu.conf"
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		emake DESTDIR="${ED}" install
-
-		# This might not exist if the test failed. #512010
-		[[ -e check-report.html ]] && dodoc check-report.html
-
-		if use kernel_linux; then
-			udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
-		fi
-
-		if use python; then
-			python_foreach_impl qemu_python_install
-		fi
-	fi
-
-	cd "${S}/tools-build"
-	emake DESTDIR="${ED}" install
-
-	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
-	pushd "${ED}"/usr/bin >/dev/null
-	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
-	popd >/dev/null
-
-	# Install config file example for qemu-bridge-helper
-	insinto "/etc/qemu"
-	doins "${FILESDIR}/bridge.conf"
-
-	cd "${S}"
-	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-
-	# Disallow stripping of prebuilt firmware files.
-	dostrip -x ${QA_PREBUILT}
-
-	if [[ -n ${softmmu_targets} ]]; then
-		# Remove SeaBIOS since we're using the SeaBIOS packaged one
-		rm "${ED}/usr/share/qemu/bios.bin"
-		rm "${ED}/usr/share/qemu/bios-256k.bin"
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
-		fi
-
-		# Remove vgabios since we're using the seavgabios packaged one
-		rm "${ED}/usr/share/qemu/vgabios.bin"
-		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
-		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-		# PPC64 loads vgabios-stdvga
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then
-			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
-			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
-			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-		fi
-
-		# Remove sgabios since we're using the sgabios packaged one
-		rm "${ED}/usr/share/qemu/sgabios.bin"
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-		fi
-
-		# Remove iPXE since we're using the iPXE packaged one
-		rm "${ED}"/usr/share/qemu/pxe-*.rom
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
-			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
-		fi
-	fi
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-firmware_abi_change() {
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ver_test $pv -lt ${FIRMWARE_ABI_VERSION}; then
-			return 0
-		fi
-	done
-	return 1
-}
-
-pkg_postinst() {
-	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
-		udev_reload
-	fi
-
-	xdg_icon_cache_update
-
-	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
-		fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_print_elog
-
-	if use pin-upstream-blobs && firmware_abi_change; then
-		ewarn "This version of qemu pins new versions of firmware blobs:"
-		ewarn "	$(best_version sys-firmware/edk2-ovmf)"
-		ewarn "	$(best_version sys-firmware/ipxe)"
-		ewarn "	$(best_version sys-firmware/seabios)"
-		ewarn "	$(best_version sys-firmware/sgabios)"
-		ewarn "This might break resume of hibernated guests (started with a different"
-		ewarn "firmware version) and live migration to/from qemu versions with different"
-		ewarn "firmware. Please (cold) restart all running guests. For functional"
-		ewarn "guest migration ensure that all"
-		ewarn "hosts run at least"
-		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
-	fi
-}
-
-pkg_info() {
-	echo "Using:"
-	echo "  $(best_version app-emulation/spice-protocol)"
-	echo "  $(best_version sys-firmware/edk2-ovmf)"
-	if has_version 'sys-firmware/edk2-ovmf[binary]'; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/ipxe)"
-	echo "  $(best_version sys-firmware/seabios)"
-	if has_version 'sys-firmware/seabios[binary]'; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/sgabios)"
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-emulation/qemu/qemu-5.2.0-r50.ebuild b/app-emulation/qemu/qemu-5.2.0-r50.ebuild
new file mode 100644
index 0000000..db31eb7
--- /dev/null
+++ b/app-emulation/qemu/qemu-5.2.0-r50.ebuild
@@ -0,0 +1,871 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="5.2.0-r50"
+
+inherit eutils linux-info toolchain-funcs multilib python-r1
+inherit udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
+inherit flag-o-matic
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"
+	EGIT_SUBMODULES=(
+		meson
+		tests/fp/berkeley-softfloat-3
+		tests/fp/berkeley-testfloat-3
+		ui/keycodemapdb
+	)
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://download.qemu.org/${P}.tar.xz"
+	KEYWORDS="*"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc
+	+fdt glusterfs gnutls gtk infiniband iscsi io-uring
+	jack jemalloc +jpeg kernel_linux
+	kernel_FreeBSD lzo multipath
+	ncurses nfs nls numa opengl +oss +pin-upstream-blobs
+	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+	+slirp
+	smartcard snappy spice ssh static static-user systemtap test udev usb
+	usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
+	xfs zstd"
+
+COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel
+	mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x
+	sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS}
+	avr lm32 moxie rx tricore unicore32"
+IUSE_USER_TARGETS="${COMMON_TARGETS}
+	aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus
+	tilegx"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+RESTRICT="!test? ( test )"
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	qemu_softmmu_targets_arm? ( fdt )
+	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_mips64el? ( fdt )
+	qemu_softmmu_targets_ppc64? ( fdt )
+	qemu_softmmu_targets_ppc? ( fdt )
+	qemu_softmmu_targets_riscv32? ( fdt )
+	qemu_softmmu_targets_riscv64? ( fdt )
+	static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy )
+	static-user? ( !plugins )
+	vhost-user-fs? ( caps seccomp )
+	virtfs? ( caps xattr )
+	vte? ( gtk )
+	multipath? ( udev )
+	plugins? ( !static !static-user )
+"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# and user/softmmu targets (qemu-*, qemu-system-*).
+#
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected).  This is because qemu supports using the C library's API
+# when available rather than always using the external library.
+ALL_DEPEND="
+	>=dev-libs/glib-2.0[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	python? ( ${PYTHON_DEPS} )
+	systemtap? ( dev-util/systemtap )
+	xattr? ( sys-apps/attr[static-libs(+)] )"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# softmmu targets (qemu-system-*).
+SOFTMMU_TOOLS_DEPEND="
+	dev-libs/libxml2[static-libs(+)]
+	>=x11-libs/pixman-0.28.0[static-libs(+)]
+	accessibility? (
+		app-accessibility/brltty[api]
+		app-accessibility/brltty[static-libs(+)]
+	)
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bzip2? ( app-arch/bzip2[static-libs(+)] )
+	capstone? ( dev-libs/capstone:= )
+	caps? ( sys-libs/libcap-ng[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+	gnutls? (
+		dev-libs/nettle:=[static-libs(+)]
+		>=net-libs/gnutls-3.0:=[static-libs(+)]
+	)
+	gtk? (
+		x11-libs/gtk+:3
+		vte? ( x11-libs/vte:2.91 )
+	)
+	infiniband? (
+		sys-fabric/libibumad:=[static-libs(+)]
+		sys-fabric/libibverbs:=[static-libs(+)]
+		sys-fabric/librdmacm:=[static-libs(+)]
+	)
+	iscsi? ( net-libs/libiscsi )
+	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc )
+	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
+	multipath? ( sys-fs/multipath-tools )
+	ncurses? (
+		sys-libs/ncurses:0=[unicode]
+		sys-libs/ncurses:0=[static-libs(+)]
+	)
+	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	opengl? (
+		virtual/opengl
+		media-libs/libepoxy[static-libs(+)]
+		media-libs/mesa[static-libs(+)]
+		media-libs/mesa[egl,gbm]
+	)
+	png? ( media-libs/libpng:0=[static-libs(+)] )
+	pulseaudio? ( media-sound/pulseaudio )
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? (
+		media-libs/libsdl2[video]
+		media-libs/libsdl2[static-libs(+)]
+	)
+	sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
+	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	slirp? ( net-libs/libslirp[static-libs(+)] )
+	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
+	snappy? ( app-arch/snappy:= )
+	spice? (
+		>=app-emulation/spice-protocol-0.12.3
+		>=app-emulation/spice-0.12.0[static-libs(+)]
+	)
+	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
+	udev? ( virtual/libudev[static-libs(+)] )
+	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	virgl? ( media-libs/virglrenderer[static-libs(+)] )
+	virtfs? ( sys-libs/libcap )
+	xen? ( app-emulation/xen-tools:= )
+	xfs? ( sys-fs/xfsprogs[static-libs(+)] )
+	zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
+"
+
+SEABIOS_VERSION="1.14.0"
+
+X86_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/edk2-ovmf-202008[binary]
+		~sys-firmware/ipxe-1.21.1[binary,qemu]
+		~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios]
+		~sys-firmware/sgabios-0.1_pre10[binary]
+	)
+	!pin-upstream-blobs? (
+		sys-firmware/edk2-ovmf
+		sys-firmware/ipxe[qemu]
+		>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
+		sys-firmware/sgabios
+	)"
+PPC_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios]
+	)
+	!pin-upstream-blobs? (
+		>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
+	)
+"
+
+BDEPEND="
+	$(python_gen_impl_dep)
+	dev-lang/perl
+	sys-apps/texinfo
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+	gtk? ( nls? ( sys-devel/gettext ) )
+	test? (
+		dev-libs/glib[utils]
+		sys-devel/bc
+	)
+"
+CDEPEND="
+	!static? (
+		${ALL_DEPEND//\[static-libs(+)]}
+		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
+	)
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} )
+"
+DEPEND="${CDEPEND}
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	static? (
+		${ALL_DEPEND}
+		${SOFTMMU_TOOLS_DEPEND}
+	)
+	static-user? ( ${ALL_DEPEND} )"
+RDEPEND="${CDEPEND}
+	acct-group/kvm
+	selinux? ( sec-policy/selinux-qemu )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
+	"${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch
+	"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
+	"${FILESDIR}"/${PN}-5.2.0-strings.patch
+	"${FILESDIR}"/${PN}-5.2.0-fix-firmware-path.patch
+	"${FILESDIR}"/${PN}-5.2.0-no-pie-ld.patch
+	"${FILESDIR}"/${PN}-5.2.0-dce-locks.patch
+)
+
+QA_PREBUILT="
+	usr/share/qemu/hppa-firmware.img
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
+	usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
+	usr/share/qemu/palcode-clipper
+	usr/share/qemu/s390-ccw.img
+	usr/share/qemu/s390-netboot.img
+	usr/share/qemu/u-boot.e500
+"
+
+QA_WX_LOAD="usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-or1k
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32
+"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
+kernel module loaded before running kvm. The easiest way to ensure that the
+kernel module is loaded is to load it on boot.
+	For AMD CPUs the module is called 'kvm-amd'.
+	For Intel CPUs the module is called 'kvm-intel'.
+Please review /etc/conf.d/modules for how to load these.
+
+Make sure your user is in the 'kvm' group. Just run
+	$ gpasswd -a <USER> kvm
+then have <USER> re-login.
+
+For brand new installs, the default permissions on /dev/kvm might not let
+you access it.  You can tell udev to reset ownership/perms:
+	$ udevadm trigger -c add /dev/kvm
+
+If you want to register binfmt handlers for qemu user targets:
+For openrc:
+	# rc-update add qemu-binfmt
+For systemd:
+	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requires a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				if grep -q AuthenticAMD /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_AMD"
+				elif grep -q GenuineIntel /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_INTEL"
+				fi
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+
+	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+		eerror "instances are still pointing to it.  Please update your"
+		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+		eerror "and the right system binary (e.g. qemu-system-x86_64)."
+		die "update your virt configs to not use qemu-kvm"
+	fi
+}
+
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+	local var=$1 mak=$2
+	local detected sorted
+
+	pushd "${S}"/default-configs/targets/ >/dev/null || die
+
+	# Force C locale until glibc is updated. #564936
+	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "${var}: ${sorted}"
+		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+		die "sync ${var} to the list of targets"
+	fi
+
+	popd >/dev/null
+}
+
+src_prepare() {
+	# workaround -fcommon breakage: bug #726560
+	[[ ${PV} == 5.2.0 ]] || die "Check if -fcommon hack is needed"
+	filter-flags -fcommon
+
+	check_targets IUSE_SOFTMMU_TARGETS softmmu
+	check_targets IUSE_USER_TARGETS linux-user
+
+	default
+
+	# Use correct toolchain to fix cross-compiling
+	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
+	export WINDRES=${CHOST}-windres
+
+	# Verbose builds
+	MAKEOPTS+=" V=1"
+
+	# Remove bundled copy of libfdt
+	rm -r dtc || die
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local buildtype=$1
+	local builddir="${S}/${buildtype}-build"
+
+	mkdir "${builddir}"
+
+	local conf_opts=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--bindir=/usr/bin
+		--libdir=/usr/$(get_libdir)
+		--datadir=/usr/share
+		--docdir=/usr/share/doc/${PF}/html
+		--mandir=/usr/share/man
+		--localstatedir=/var
+		--disable-bsd-user
+		--disable-containers # bug #732972
+		--disable-guest-agent
+		--disable-strip
+
+		# bug #746752: TCG interpreter has a few limitations:
+		# - it does not support FPU
+		# - it's generally slower on non-self-modifying code
+		# It's advantage is support for host architectures
+		# where native codegeneration is not implemented.
+		# Gentoo has qemu keyworded only on targets with
+		# native code generation available. Avoid the interpreter.
+		--disable-tcg-interpreter
+
+		--disable-werror
+		# We support gnutls/nettle for crypto operations.  It is possible
+		# to use gcrypt when gnutls/nettle are disabled (but not when they
+		# are enabled), but it's not really worth the hassle.  Disable it
+		# all the time to avoid automatically detecting it. #568856
+		--disable-gcrypt
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+		$(use_enable debug debug-info)
+		$(use_enable debug debug-tcg)
+		$(use_enable doc docs)
+		$(use_enable nls gettext)
+		$(use_enable plugins)
+		$(use_enable xattr attr)
+	)
+
+	# Disable options not used by user targets. This simplifies building
+	# static user targets (USE=static-user) considerably.
+	conf_notuser() {
+		if [[ ${buildtype} == "user" ]] ; then
+			echo "--disable-${2:-$1}"
+		else
+			use_enable "$@"
+		fi
+	}
+	# Enable option only for softmmu build, but not 'user' or 'tools'
+	conf_softmmu() {
+		if [[ ${buildtype} == "softmmu" ]] ; then
+			use_enable "$@"
+		else
+			echo "--disable-${2:-$1}"
+		fi
+	}
+	# Enable option only for tools build, but not 'user' or 'softmmu'
+	conf_tools() {
+		if [[ ${buildtype} == "tools" ]] ; then
+			use_enable "$@"
+		else
+			echo "--disable-${2:-$1}"
+		fi
+	}
+	conf_opts+=(
+		$(conf_notuser accessibility brlapi)
+		$(conf_notuser aio linux-aio)
+		$(conf_notuser bzip2)
+		$(conf_notuser capstone)
+		$(conf_notuser caps cap-ng)
+		$(conf_notuser curl)
+		$(conf_notuser fdt)
+		$(conf_notuser glusterfs)
+		$(conf_notuser gnutls)
+		$(conf_notuser gnutls nettle)
+		$(conf_notuser gtk)
+		$(conf_notuser infiniband rdma)
+		$(conf_notuser iscsi libiscsi)
+		$(conf_notuser io-uring linux-io-uring)
+		$(conf_notuser jemalloc jemalloc)
+		$(conf_notuser jpeg vnc-jpeg)
+		$(conf_notuser kernel_linux kvm)
+		$(conf_notuser lzo)
+		$(conf_notuser multipath mpath)
+		$(conf_notuser ncurses curses)
+		$(conf_notuser nfs libnfs)
+		$(conf_notuser numa)
+		$(conf_notuser opengl)
+		$(conf_notuser png vnc-png)
+		$(conf_notuser rbd)
+		$(conf_notuser sasl vnc-sasl)
+		$(conf_notuser sdl)
+		$(conf_softmmu sdl-image)
+		$(conf_notuser seccomp)
+		$(conf_notuser slirp slirp system)
+		$(conf_notuser smartcard)
+		$(conf_notuser snappy)
+		$(conf_notuser spice)
+		$(conf_notuser ssh libssh)
+		$(conf_notuser udev libudev)
+		$(conf_notuser usb libusb)
+		$(conf_notuser usbredir usb-redir)
+		$(conf_notuser vde)
+		$(conf_notuser vhost-net)
+		$(conf_notuser vhost-user-fs)
+		$(conf_tools vhost-user-fs virtiofsd)
+		$(conf_notuser virgl virglrenderer)
+		$(conf_notuser virtfs)
+		$(conf_notuser vnc)
+		$(conf_notuser vte)
+		$(conf_notuser xen)
+		$(conf_notuser xen xen-pci-passthrough)
+		$(conf_notuser xfs xfsctl)
+		# use prebuilt keymaps, bug #759604
+		--disable-xkbcommon
+		$(conf_notuser zstd)
+	)
+
+	if [[ ${buildtype} == "user" ]] ; then
+		conf_opts+=( --disable-libxml2 )
+	else
+		conf_opts+=( --enable-libxml2 )
+	fi
+
+	if [[ ! ${buildtype} == "user" ]] ; then
+		# audio options
+		local audio_opts=(
+			# Note: backend order matters here: #716202
+			# We iterate from higher-level to lower level.
+			$(usex pulseaudio pa "")
+			$(usev jack)
+			$(usev sdl)
+			$(usev alsa)
+			$(usev oss)
+		)
+		conf_opts+=(
+			--audio-drv-list=$(printf "%s," "${audio_opts[@]}")
+		)
+	fi
+
+	case ${buildtype} in
+	user)
+		conf_opts+=(
+			--enable-linux-user
+			--disable-system
+			--disable-blobs
+			--disable-tools
+		)
+		local static_flag="static-user"
+		;;
+	softmmu)
+		conf_opts+=(
+			--disable-linux-user
+			--enable-system
+			--disable-tools
+		)
+		local static_flag="static"
+		;;
+	tools)
+		conf_opts+=(
+			--disable-linux-user
+			--disable-system
+			--disable-blobs
+			--enable-tools
+		)
+		local static_flag="static"
+		;;
+	esac
+
+	local targets="${buildtype}_targets"
+	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+	# Add support for SystemTAP
+	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if use ${static_flag}; then
+		conf_opts+=( --static --disable-pie )
+	else
+		tc-enables-pie && conf_opts+=( --enable-pie )
+	fi
+
+	# Meson will not use a cross-file unless cross_prefix is set.
+	tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" )
+
+	# Plumb through equivalent of EXTRA_ECONF to allow experiments
+	# like bug #747928.
+	conf_opts+=( ${EXTRA_CONF_QEMU} )
+
+	echo "../configure ${conf_opts[*]}"
+	cd "${builddir}"
+	../configure "${conf_opts[@]}" || die "configure failed"
+
+	# FreeBSD's kernel does not support QEMU assigning/grabbing
+	# host USB devices yet
+	use kernel_FreeBSD && \
+		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
+}
+
+src_configure() {
+	local target
+
+	python_setup
+
+	softmmu_targets= softmmu_bins=()
+	user_targets= user_bins=()
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		if use "qemu_softmmu_targets_${target}"; then
+			softmmu_targets+=",${target}-softmmu"
+			softmmu_bins+=( "qemu-system-${target}" )
+		fi
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		if use "qemu_user_targets_${target}"; then
+			user_targets+=",${target}-linux-user"
+			user_bins+=( "qemu-${target}" )
+		fi
+	done
+
+	softmmu_targets=${softmmu_targets#,}
+	user_targets=${user_targets#,}
+
+	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
+	qemu_src_configure "tools"
+}
+
+src_compile() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		default
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		default
+	fi
+
+	cd "${S}/tools-build"
+	default
+}
+
+src_test() {
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		pax-mark m */qemu-system-* #515550
+		emake check
+	fi
+}
+
+qemu_python_install() {
+	python_domodule "${S}/python/qemu"
+
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/scripts/qmp/qmp-shell"
+	python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+# Generate binfmt support files.
+#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
+#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
+generate_initd() {
+	local out="${T}/qemu-binfmt"
+	local out_systemd="${T}/qemu.conf"
+	local d="${T}/binfmt.d"
+
+	einfo "Generating qemu binfmt scripts and configuration files"
+
+	# Generate the debian fragments first.
+	mkdir -p "${d}"
+	"${S}"/scripts/qemu-binfmt-conf.sh \
+		--debian \
+		--exportdir "${d}" \
+		--qemu-path "${EPREFIX}/usr/bin" \
+		|| die
+	# Then turn the fragments into a shell script we can source.
+	sed -E -i \
+		-e 's:^([^ ]+) (.*)$:\1="\2":' \
+		"${d}"/* || die
+
+	# Generate the init.d script by assembling the fragments from above.
+	local f qcpu package interpreter magic mask
+	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
+	for f in "${d}"/qemu-* ; do
+		source "${f}"
+
+		# Normalize the cpu logic like we do in the init.d for the native cpu.
+		qcpu=${package#qemu-}
+		case ${qcpu} in
+		arm*)   qcpu="arm";;
+		mips*)  qcpu="mips";;
+		ppc*)   qcpu="ppc";;
+		s390*)  qcpu="s390";;
+		sh*)    qcpu="sh";;
+		sparc*) qcpu="sparc";;
+		esac
+
+		# we use 'printf' here to be portable across 'sh'
+		# implementations: #679168
+		cat <<EOF >>"${out}"
+	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
+		printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
+	fi
+EOF
+
+		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
+
+	done
+	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
+}
+
+src_install() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		emake DESTDIR="${ED}" install
+
+		# Install binfmt handler init script for user targets.
+		generate_initd
+		doinitd "${T}/qemu-binfmt"
+
+		# Install binfmt/qemu.conf.
+		insinto "/usr/share/qemu/binfmt.d"
+		doins "${T}/qemu.conf"
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		emake DESTDIR="${ED}" install
+
+		# This might not exist if the test failed. #512010
+		[[ -e check-report.html ]] && dodoc check-report.html
+
+		if use kernel_linux; then
+			udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules
+		fi
+
+		if use python; then
+			python_foreach_impl qemu_python_install
+		fi
+	fi
+
+	cd "${S}/tools-build"
+	emake DESTDIR="${ED}" install
+
+	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+	pushd "${ED}"/usr/bin >/dev/null
+	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
+	popd >/dev/null
+
+	# Install config file example for qemu-bridge-helper
+	insinto "/etc/qemu"
+	doins "${FILESDIR}/bridge.conf"
+
+	cd "${S}"
+	dodoc MAINTAINERS docs/specs/pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+
+	# Disallow stripping of prebuilt firmware files.
+	dostrip -x ${QA_PREBUILT}
+
+	if [[ -n ${softmmu_targets} ]]; then
+		# Remove SeaBIOS since we're using the SeaBIOS packaged one
+		rm "${ED}/usr/share/qemu/bios.bin"
+		rm "${ED}/usr/share/qemu/bios-256k.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
+		fi
+
+		# Remove vgabios since we're using the seavgabios packaged one
+		rm "${ED}/usr/share/qemu/vgabios.bin"
+		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
+		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+		# PPC/PPC64 loads vgabios-stdvga
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then
+			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
+			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
+			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+		fi
+
+		# Remove sgabios since we're using the sgabios packaged one
+		rm "${ED}/usr/share/qemu/sgabios.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+		fi
+
+		# Remove iPXE since we're using the iPXE packaged one
+		rm "${ED}"/usr/share/qemu/pxe-*.rom
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+		fi
+	fi
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+firmware_abi_change() {
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ver_test $pv -lt ${FIRMWARE_ABI_VERSION}; then
+			return 0
+		fi
+	done
+	return 1
+}
+
+pkg_postinst() {
+	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+		udev_reload
+	fi
+
+	xdg_icon_cache_update
+
+	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
+		fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_print_elog
+
+	if use pin-upstream-blobs && firmware_abi_change; then
+		ewarn "This version of qemu pins new versions of firmware blobs:"
+		ewarn "	$(best_version sys-firmware/edk2-ovmf)"
+		ewarn "	$(best_version sys-firmware/ipxe)"
+		ewarn "	$(best_version sys-firmware/seabios)"
+		ewarn "	$(best_version sys-firmware/sgabios)"
+		ewarn "This might break resume of hibernated guests (started with a different"
+		ewarn "firmware version) and live migration to/from qemu versions with different"
+		ewarn "firmware. Please (cold) restart all running guests. For functional"
+		ewarn "guest migration ensure that all"
+		ewarn "hosts run at least"
+		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
+	fi
+}
+
+pkg_info() {
+	echo "Using:"
+	echo "  $(best_version app-emulation/spice-protocol)"
+	echo "  $(best_version sys-firmware/edk2-ovmf)"
+	if has_version 'sys-firmware/edk2-ovmf[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/ipxe)"
+	echo "  $(best_version sys-firmware/seabios)"
+	if has_version 'sys-firmware/seabios[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/sgabios)"
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-misc/ckermit/Manifest b/app-misc/ckermit/Manifest
index 2a5442b..06e5efc 100644
--- a/app-misc/ckermit/Manifest
+++ b/app-misc/ckermit/Manifest
@@ -1 +1 @@
-DIST cku211.tar.gz 2878523 SHA256 39e7cd4892502344a635952843487d9b4bfa98e59d1e1acad5ef8aa969abba93 SHA512 470bf56d5b5f30721d0030ff89a5cd845f365dba81d097942524cc04dd620070678d278d1009fb67bae3cb875715808cbbfc7c0358b9671f30c65ce1d9bd35ad WHIRLPOOL 160aee04d5f5c425ebb2011b71923257deb154cf1ca7070208cd8a2253189ff5529940c3b1deb7fc5280f5d9ff8f699dff8ebab3881584439b96da251b0c9435
+DIST cku302.tar.gz 3122219 BLAKE2B 9f63261da2dc2b0fceb0af0fa81da63c87e68b7bf713037cf8675abeb81716fd0dd4cd1f84324562698d9b9126f26b8a651dc79deec37a056fa1047af2d9966e SHA512 2cfc264e5262d29618fdf218fd3407fd9049b16110972cdddb03d114703b7a0ea13c4b0a354f50c2a9f70d4727732fe4d1920b5c656f969bc56c1eb9dc3c43fa
diff --git a/app-misc/ckermit/ckermit-8.0.211-r4.ebuild b/app-misc/ckermit/ckermit-8.0.211-r4.ebuild
deleted file mode 100644
index 317dc61..0000000
--- a/app-misc/ckermit/ckermit-8.0.211-r4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ckermit/ckermit-8.0.211-r4.ebuild,v 1.5 2013/06/10 17:42:53 vapier Exp $
-
-EAPI="4"
-
-inherit versionator eutils flag-o-matic toolchain-funcs
-
-# Columbia University only uses the third component, e.g. cku211.tar.gz for
-# what we would call 8.0.211.
-MY_P="cku$( get_version_component_range 3 ${PV} )"
-
-DESCRIPTION="combined serial and network communication software package"
-SRC_URI="ftp://kermit.columbia.edu/kermit/archives/${MY_P}.tar.gz"
-HOMEPAGE="http://www.kermit-project.org/"
-
-LICENSE="Kermit"
-SLOT="0"
-KEYWORDS="*"
-IUSE="ncurses"
-
-DEPEND="ncurses? ( >=sys-libs/ncurses-5.2 )"
-RDEPEND="${DEPEND}
-	net-dialup/lrzsz"
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cleanup.patch
-	epatch "${FILESDIR}"/${P}-build-wart.patch
-	tc-export_build_env BUILD_CC
-	sed -i -r \
-		-e 's:"(CC2?) = gcc":"\1=$(CC)":g' \
-		-e 's:"CFLAGS = -O:"CFLAGS = $(CFLAGS):' \
-		makefile || die
-}
-
-src_compile() {
-	# we don't enable any of the telnet/ftp authentication stuff
-	# since there are other packages which do these things better
-	# USE="kerberos pam shadow ssl zlib"
-	append-cppflags -DNO_AUTHENTICATION -DNOLOGIN -DNOFTP
-
-	if use ncurses; then
-		append-cppflags "-DCK_NCURSES"
-		append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
-		append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
-	fi
-
-	append-cppflags -DHAVE_PTMX -D_XOPEN_SOURCE -D_BSD_SOURCE #202840
-	append-cppflags -DHAVE_CRYPT_H
-	emake \
-		CC="$(tc-getCC)" \
-		KFLAGS="${CPPFLAGS}" \
-		LIBS="-lcrypt -lresolv ${LIBS}" \
-		LNKFLAGS="${LDFLAGS}" \
-		linuxa
-}
-
-src_install() {
-	dodir /usr/bin /usr/share/man/man1
-	emake \
-		DESTDIR="${ED}" \
-		BINDIR=/usr/bin \
-		MANDIR="${ED}"/usr/share/man/man1 \
-		MANEXT=1 \
-		install
-	dodoc *.txt
-
-	# make the correct symlink
-	rm "${ED}"/usr/bin/kermit-sshsub || die
-	dosym /usr/bin/kermit /usr/bin/kermit-sshsub
-
-	# the ckermit.ini script is calling the wrong kermit binary --
-	# the one from ${D}
-	sed -i "s:${D}::g" "${ED}"/usr/bin/ckermit.ini
-}
diff --git a/app-misc/ckermit/ckermit-9.0.302.ebuild b/app-misc/ckermit/ckermit-9.0.302.ebuild
new file mode 100644
index 0000000..bbfa37c
--- /dev/null
+++ b/app-misc/ckermit/ckermit-9.0.302.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs
+
+# Columbia University only uses the third component, e.g. cku211.tar.gz for
+# what we would call 8.0.211.
+MY_P="cku$(ver_cut 3)"
+
+DESCRIPTION="combined serial and network communication software package"
+SRC_URI="ftp://kermit.columbia.edu/kermit/archives/${MY_P}.tar.gz"
+HOMEPAGE="http://www.kermitproject.org/"
+
+LICENSE="Kermit"
+SLOT="0"
+KEYWORDS="*"
+IUSE="ncurses"
+
+DEPEND="ncurses? ( >=sys-libs/ncurses-5.2:= )"
+RDEPEND="${DEPEND}
+	net-dialup/lrzsz"
+
+S=${WORKDIR}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cleanup.patch
+	"${FILESDIR}"/${PN}-8.0.211-build-wart.patch
+)
+
+src_prepare() {
+	default
+
+	tc-export_build_env BUILD_CC
+	sed -i -r \
+		-e 's:"(CC2?) = gcc":"\1=$(CC)":g' \
+		-e 's:"CFLAGS = -O:"CFLAGS = $(CFLAGS):' \
+		makefile || die
+}
+
+src_compile() {
+	# we don't enable any of the telnet/ftp authentication stuff
+	# since there are other packages which do these things better
+	# USE="kerberos pam shadow ssl zlib"
+	append-cppflags -DNO_AUTHENTICATION -DNOLOGIN -DNOFTP
+
+	if use ncurses; then
+		append-cppflags "-DCK_NCURSES"
+		append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
+		append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
+	fi
+
+	append-cppflags -DHAVE_PTMX -D_XOPEN_SOURCE -D_BSD_SOURCE -D_DEFAULT_SOURCE #202840
+	append-cppflags -DHAVE_CRYPT_H -DHAVE_OPENPTY
+	append-cppflags -DNOARROWKEYS # bug #669332
+	emake \
+		CC="$(tc-getCC)" \
+		KFLAGS="${CPPFLAGS}" \
+		LIBS="-lcrypt -lresolv -lutil ${LIBS}" \
+		LNKFLAGS="${LDFLAGS}" \
+		linuxa
+}
+
+src_install() {
+	emake DESTDIR="${ED}" prefix=/usr manroot=/usr/share install
+	dodoc *.txt
+
+	# make the correct symlink
+	rm "${ED}"/usr/bin/kermit-sshsub || die
+	dosym kermit /usr/bin/kermit-sshsub
+
+	# the ckermit.ini script is calling the wrong kermit binary --
+	# the one from ${D}
+	sed -i "s:${D}::g" "${ED}"/usr/bin/ckermit.ini
+}
diff --git a/app-misc/ckermit/files/ckermit-9.0.302-cleanup.patch b/app-misc/ckermit/files/ckermit-9.0.302-cleanup.patch
new file mode 100644
index 0000000..c645e75
--- /dev/null
+++ b/app-misc/ckermit/files/ckermit-9.0.302-cleanup.patch
@@ -0,0 +1,94 @@
+Various clean-ups and fix makefile dir creation.
+
+--- cku302/ckcmai.c
++++ cku302/ckcmai.c
+@@ -561,6 +561,8 @@
+ #include "ckntap.h"
+ #endif /* NT */
+ 
++#include <time.h>
++
+ #ifndef NOSERVER
+ /* Text message definitions.. each should be 256 chars long, or less. */
+ #ifdef MINIX
+--- cku302/ckuus5.c
++++ cku302/ckuus5.c
+@@ -7853,7 +7853,7 @@
+           printf(" --bannerfile=%s\n",bannerfile ? bannerfile : "(null)");
+           printf(" --cdfile:%s\n",cdmsgstr ? cdmsgstr : "(null)");
+           printf(" --cdmessage:%d\n",srvcdmsg);
+-          printf(" --helpfile:%d\n",helpfile);
++          printf(" --helpfile:%s\n",helpfile ? helpfile : "(null)");
+           if (inserver) {
+               printf("\n");
+               break;
+--- cku302/ckuusx.c
++++ cku302/ckuusx.c
+@@ -57,7 +57,6 @@
+ #include <termcap.h>
+ #endif /* NOHTERMCAP */
+ #endif /* BSD44 */
+-#else  /* !BSD44 */
+ #ifdef linux
+ #include <term.h>
+ #endif /* linux */
+--- cku302/makefile
++++ cku302/makefile
+@@ -1047,7 +1047,7 @@
+ 		else\
+ 			echo "Creating $(DESTDIR)...";\
+ 			DESTDIR=`echo $(DESTDIR) | sed 's!/*$$!!'`;\
+-			mkdir $$DESTDIR  || exit 1;\
++			mkdir -p $$DESTDIR  || exit 1;\
+ 		fi;\
+ 		chmod 755 $(DESTDIR) || exit 1;\
+ 	fi;\
+@@ -1066,7 +1066,7 @@
+ 		echo  "$(DESTDIR)$(BINDIR) exists...";\
+ 	else\
+ 		echo "Creating $(DESTDIR)$(BINDIR)/...";\
+-		mkdir     $(DESTDIR)$(BINDIR) || exit 1;\
++		mkdir -p  $(DESTDIR)$(BINDIR) || exit 1;\
+ 		chmod 755 $(DESTDIR)$(BINDIR);\
+ 	fi;\
+ 	rm -f $(DESTDIR)$(BINDIR)/kermit;\
+@@ -1104,9 +1104,9 @@
+ 		if test -d $(DESTDIR)$(MANDIR); then\
+ 			echo  "$(DESTDIR)$(MANDIR) exists...";\
+ 		else\
+-			echo "Creating $(MANDIR)...";\
+-			mkdir $(MANDIR) || exit 1;\
+-			chmod 755 $(MANDIR) || exit 1;\
++			echo "Creating $(DESTDIR)$(MANDIR)...";\
++			mkdir -p $(DESTDIR)$(MANDIR) || exit 1;\
++			chmod 755 $(DESTDIR)$(MANDIR) || exit 1;\
+ 		fi;\
+ 		rm -f $(DESTDIR)$(MANDIR)/kermit.$(MANEXT);\
+ 		cp ckuker.nr $(DESTDIR)$(MANDIR)/kermit.$(MANEXT) || exit 1;\
+@@ -1125,7 +1125,7 @@
+ 				echo  "$(CERTDIR) exists...";\
+ 			else\
+ 				echo "Creating $(CERTDIR)...";\
+-				mkdir $(CERTDIR) || exit 1;\
++				mkdir -p $(CERTDIR) || exit 1;\
+ 				chmod 755 $(CERTDIR) || exit 1;\
+ 			fi;\
+ 			echo "Installing certificates file...";\
+@@ -1146,7 +1146,7 @@
+ 			echo  "$(DESTDIR)$(SRCDIR) exists...";\
+ 		else\
+ 			echo "Creating $(DESTDIR)$(SRCDIR)/...";\
+-			mkdir     $(DESTDIR)$(SRCDIR) || exit 1;\
++			mkdir -p  $(DESTDIR)$(SRCDIR) || exit 1;\
+ 			chmod 755 $(DESTDIR)$(SRCDIR);\
+ 		fi;\
+ 		echo "Copying source files to $(DESTDIR)$(SRCDIR)...";\
+@@ -1168,7 +1168,7 @@
+ 			echo  "$(DESTDIR)$(INFODIR) exists...";\
+ 		else\
+ 			echo "Creating $(DESTDIR)$(INFODIR)/...";\
+-			mkdir     $(DESTDIR)$(INFODIR) || exit 1;\
++			mkdir -p  $(DESTDIR)$(INFODIR) || exit 1;\
+ 			chmod 755 $(DESTDIR)$(INFODIR);\
+ 		fi;\
+ 		echo "Copying text files to $(DESTDIR)$(INFODIR)...";\
diff --git a/app-misc/ckermit/metadata.xml b/app-misc/ckermit/metadata.xml
index 59e2b8f..e248196 100644
--- a/app-misc/ckermit/metadata.xml
+++ b/app-misc/ckermit/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
+	<maintainer type="project">
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 45fc7b9..dda9bbe 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,49 +1,24 @@
-DIST bash-4.3.tar.gz 7955839 SHA256 afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4 SHA512 a852b8e46ee55568dce9d23a30a9dbd1c770c2d2a4bc91e1c3177d723b31b32c5d69d19704a93f165891b409b9dd2cc65723372044e2bd0ee49ed59a11512651 WHIRLPOOL d82eb296b1bdee517b20e40d2231697dc41e2040d34e2da24c4fa40755c723d732929805ebef6f6923cd8ffecfb0db7063ec1dc3ab4e695a93916f2d872e236f
-DIST bash43-001 1617 SHA256 ecb3dff2648667513e31554b3ad054ccd89fce38e33367c9459ac3a285153742 SHA512 a1011392652180a28f9837af4a341a80beb929c1458e2384e282f0007713c5fe8d0b315abf1340b3707748d3caed322135dee87b59eeb7612ee5130f87d79888 WHIRLPOOL 94d34b6ae2496b4007bf9b3af69847828179dfa90528d7fc2f9a91facc451535e2fa46120cc3ea22156974c92f2633f91423f2d43b4733f8960cde69dfff81b9
-DIST bash43-002 1594 SHA256 eee7cd7062ab29a9e4f02924d9c367264dcb8b162703f74ff6eb8f175a91502b SHA512 e3178c85f553522d5d1c5fd39e76f015b680a8ccc84836a5e10283b2aed6e5b7cc3d23af0e67a270b7622dce0abf35dd8a95afa9bb6f89b73a9439f7435175a4 WHIRLPOOL 2d1b6679a1263f7a4325b692c3edac9f5daaa72e3f06dfa88958e70ad64c1fc74b92d8325becfff2c21dd28c002470bdaad50f57037c2676352078291bf0b0bc
-DIST bash43-003 1465 SHA256 000e6eac50cd9053ce0630db01239dcdead04a2c2c351c47e2b51dac1ac1087d SHA512 dc2c5fad8d357d1301e419afd959dfaf015a63172857080c11f77ab1bb7d1d737f411eb0e70a861f98a36bed1b19edb7217a4fa9f4773e21706b62dc56ec3464 WHIRLPOOL 1ef78321cfe3ca6e9f690ae3dd6a7c06bc72d2e6590bfdaa8543b0ac3ff84eae998e4a2aa44531423cab1137c974b09ac30baf5fa2746e2e5a2006cde03a2b32
-DIST bash43-004 1534 SHA256 5ea0a42c6506720d26e6d3c5c358e9a0d49f6f189d69a8ed34d5935964821338 SHA512 6a5177d5f4205ca9d3824601052dc6d0cd768638cdfc125501c5643dd51d537f5d075cbd11a10356caf4205e47a0287c72636065789ecce264129fc92fbda420 WHIRLPOOL 90c2f4f7752cf84a67b1f648137b6c25b8a6f5212fc5dde26d6f0fb6f316e923bec916368ba9ebc6b608bfa0fd82f86b6ac7ec6db32d06b83c3d22730788cfa1
-DIST bash43-005 2636 SHA256 1ac83044032b9f5f11aeca8a344ae3c524ec2156185d3adbb8ad3e7a165aa3fa SHA512 e201aa8ef0ce0d74fa5ee42e8171bbb5ba633d831d863a8e8afc5d5157581bb055d16c52b316cc945979a852b0eae7921244a24b89818acfb7c96572ed04d1f8 WHIRLPOOL fd4c6b03fb8b4344cc3833beb0310738af9826c56d2b0cf7c5262f3d2a99e83f700485dafe0e726e84a2dffcb1b907efcc860a685160ff22c99e40c8a2b659b0
-DIST bash43-006 1445 SHA256 a0648ee72d15e4a90c8b77a5c6b19f8d89e28c1bc881657d22fe26825f040213 SHA512 d1da3c9d3781482d87cdcbfd69ab3958ed4950f2a00e9d15228ecb4ad5ca8ae253eff378010b4908d04df2ecf658e08f7c2efc97d6a0b8dd2317552c1895d7b2 WHIRLPOOL 55e3c5e7be01f5928247a7677482dde1f0c89a0344ca23c947e9f84bf93d43ce1d7f621b39d74e09f0dd2de85ef304c5d34e68eb0af35cdf61c611e649dcbf68
-DIST bash43-007 1331 SHA256 1113e321c59cf6a8648a36245bbe4217cf8acf948d71e67886dad7d486f8f3a3 SHA512 c445b5cdd486d06991c78d4c88e2e44e49f74d1fc07b8e4bc9492cccfc4ff4045587bed6b24d745974c6339340e45b9756c27723fdb79e7591e7d6c5d350a86e WHIRLPOOL 0537006403347466536de5843d62725be75b6f5b4e6d9228c9f5671201de6a473ba04d8fcfa29894584b51f3ee35718bb46c2acc5c014713e03ee24828f10d43
-DIST bash43-008 4575 SHA256 9941a98a4987192cc5ce3d45afe879983cad2f0bec96d441a4edd9033767f95e SHA512 53bae88cd3341a4ef8c60d6a294c09402103d1b20f485cf85775e6730a3d2eec8e6ebe15aa6dd95336e4a1f540f21db394823b9d04b416e5af071a7a6c618900 WHIRLPOOL 94a3e9f004729490f70cb3a33de0605fc11f498b6bde2dc37bc08578283e47a3b625619de9d823b2796ce6fbd4982871fa2d428e94c892c863fc448ef2711482
-DIST bash43-009 2413 SHA256 c0226d6728946b2f53cdebf090bcd1c01627f01fee03295768605caa80bb40a5 SHA512 8d06fe612cd32cb414fdcdc34d4420b8991b268dd3ddd2dd47b3d01679954debd78e21f697a7f495d2340f0dcc8acdc3ad6809b8870bf5fd300afb1439788776 WHIRLPOOL 66e13efba99362a361e9e7d317773d51862f4c474f5c213654eba875a86b6d83b531b246bbd22c53e8a81fa7b67cb564c2de264ce28063967426fcf586ddda4d
-DIST bash43-010 5357 SHA256 ce05799c0137314c70c7b6ea0477c90e1ac1d52e113344be8e32fa5a55c9f0b7 SHA512 e36e550d749f52bab01256ed5f8f1b48fe53190c1a0a0a15c545328261c1f50b85f574b44188855858de1f2d045945770c4940bdecadd8381ea2cf174bde2fee WHIRLPOOL 830e7c82afd2650cbb00818928d22be0e0518aec2752736ff7a5085c5628bc8852c6c409f21684beec0c675d79898917efafb3f8dc1bc6bfcea41e1a8521d4fb
-DIST bash43-011 1533 SHA256 7c63402cdbc004a210f6c1c527b63b13d8bb9ec9c5a43d5c464a9010ff6f7f3b SHA512 678bbcd92b927c86631cd42d6d3ab7596a3ffd20b640f471a9783a7972f05d2d4fb15970c12e7645e90d407c5a2d2aadcad698113211724b0ef8d89eccd2cd66 WHIRLPOOL 1d0b84ff75d19db1bfbd60b37551978825902be2187b6407471a8810ebeb9136b2846e6c76505fec0c828a3e83ba8d4dd0950c5e6020b649da7ae530f7d5bf05
-DIST bash43-012 1365 SHA256 3e1379030b35fbcf314e9e7954538cf4b43be1507142b29efae39eef997b8c12 SHA512 169453248edb55baf761b0c9c7b296ed2c24543b80fcf4756b8dd398054b6317da285c5e9cd68828f2620b05874f21a08773844ee32416daef76b88d0ef3ee6d WHIRLPOOL 52b6c6d6c374b307ac562c1dfda730dc3ba322d3d6e9c7acb3f2a40461bb61ad5cb54dd65e2e4b72e492b55b436c323cae95ed63948df3b06bcd64a3487b3374
-DIST bash43-013 2151 SHA256 bfa8ca5336ab1f5ef988434a4bdedf71604aa8a3659636afa2ce7c7446c42c79 SHA512 536bbf0c9b23eb824579955e7fce892cfc1e1d9fbcfc66810353ac4ff238e9e57361c0a46b3f3573ca8ca563331070ce55442ffea38e2a632840b6a318db1c88 WHIRLPOOL 15fe2e97ac2a07a1d4c0f9946adc63e64b9141a3837391206fd5c934853f7e9ad9ede3baeecdd7a0dbb73e2bf007db8a5b57f0f8e2d03d693de09502dff32636
-DIST bash43-014 3533 SHA256 5a4d6fa2365b6eb725a9d4966248b5edf7630a4aeb3fa8d526b877972658ac13 SHA512 79fb50f62dbdca5e45a1359570e6d2173d442b3d4ddd4eb44809ed45ac022de4fe3f0aadd7672b4c8d9739405d51762486ee0c677b56f9c7d60e6224be84b87a WHIRLPOOL 10b6a2b7a7e5e6dfb3dd730b9ccc2ce3152bda1983a78745aa7367e9f5671695577d45070ad800158a36ffeb7db176e29f6b48d139075770ec773a478adfa1b2
-DIST bash43-015 1894 SHA256 13293e8a24e003a44d7fe928c6b1e07b444511bed2d9406407e006df28355e8d SHA512 38a7af22f13f1f45705ceadf3abb52be75f3239959c2b1d57f333d137f25f14ed92c4d209b35417d449b1ec4291bbd984bb5fd11ad40375b22d2668b33fb8efb WHIRLPOOL c06aa4977f891ec606f107157a0295d5025fbd24a620644547ee3f3a79582aae1ea4cd4be4254f92c6d2aee9322934839f01cc118148cea85af700e6f83c21cc
-DIST bash43-016 3674 SHA256 92d60bcf49f61bd7f1ccb9602bead6f2c9946d79dea0e5ec0589bb3bfa5e0773 SHA512 52ab2966ccd42554c8bd76041e07921388220b46c93c34190197cdda38a085fd499d71e2e0a10daea130e6782ada556f35b1a37d06d023e83c4c4d665d07cd3f WHIRLPOOL 9b7eb252291680d5db2596700774fddcab7e5c6c14ed5b1da7f8e23e1eaae85a927cf69d7662807b99c63fa083d2267f7e70076d4d4927a8bd4cb9273c416b4c
-DIST bash43-017 1565 SHA256 1267c25c6b5ba57042a7bb6c569a6de02ffd0d29530489a16666c3b8a23e7780 SHA512 88b11f324a780823b459b1e8a0904348c56079b4103cb86025d34dbba02543b0b7fbc2397bf043c24c1363f30539a6fe9b9f9fc717be9798f466071d1d420bb9 WHIRLPOOL 1aa1160771b98d393a2fb341e9025c2169aa43123f682bbe7648038e555b4f70eb1dbdba90492edb514c9621468f5005c2cf5fff82921e941ad3ca42534e7b1d
-DIST bash43-018 1315 SHA256 7aa8b40a9e973931719d8cc72284a8fb3292b71b522db57a5a79052f021a3d58 SHA512 f83d8e1d6d8fa8adf1715b8d4130730a13f5cd626f75e9e4b8c63244645a45a3f1fbac03081bb9d1e46864919d1b3189a9bb6d7a5e7a8854e6270ab3269c771f WHIRLPOOL 14a216257c3d1d3501dfc23d72ad8c085a216cdac83d5d909922d51b502ce83fb454c7e64a8d44e91a87a1a09237d965272fb563ae945c5d81688e9f0686264e
-DIST bash43-019 2610 SHA256 a7a91475228015d676cafa86d2d7aa9c5d2139aa51485b6bbdebfdfbcf0d2d23 SHA512 77e6dac3079d9282f6f85940a762b0da2473ac0d35e9bad2ebc2862bf0f3c4376a6220c746c1c37de0b4d492251ec9531a62c8a042a1be5e485f8f5ae6fa0704 WHIRLPOOL 5acde269ea62e2074ca5eb30750dbd67512b69658908f532165a90873f54de7705b0d41515ac6278e942f8ea66e0abe67c13b842e404a41cd7684ec0683928ef
-DIST bash43-020 2777 SHA256 ca5e86d87f178128641fe91f2f094875b8c1eb2de9e0d2e9154f5d5cc0336c98 SHA512 fa06563eb46609115750ffa88098b07c608cc8b13fc31356f33e1428a4da4d2610e122e0241356afcfadfecc5ccee5db4b7cf07f74005e7f30240ada4a81b5f7 WHIRLPOOL 9f05ce5028f20e7cbc11c1995d99a47274f782f228faa752919e0444afe1df748adb7837c0a3affa20633c63ad0175780327b9a02a39f5ada494736f0fd694dd
-DIST bash43-021 1623 SHA256 41439f06883e6bd11c591d9d5e9ae08afbc2abd4b935e1d244b08100076520a9 SHA512 90dc85302d9bc60e68fa8cce472b7e022d8a6ccee361f97aad4cbe5f1585b4870ab9997a3e6fac420aaf84c3dce9757716eb08f4fa6b38e14bac4f2d5d503731 WHIRLPOOL e7930992f6e2a1f5a07458eee74ed118fe93152ceb78fbdb41a4a3d799c5f9aa71fac52bc3cd43c321b983c5a4309e9884d37cac1facb54a2f38383527c8e765
-DIST bash43-022 1782 SHA256 fd4d47bb95c65863f634c4706c65e1e3bae4ee8460c72045c0a0618689061a88 SHA512 721b772349f9e0cc65975e419fabe4acdb23c77796a5d8fde01f110687ea1cb7d23fb706fc0452fb3c2082958a81c95b82f277e1f8f722b1156913efd59afc30 WHIRLPOOL 7387429460d85bffb9f7ce9cbd524f4b2c21b116beff30424db2cb66d48ec81707c7cb9479d5d72bcf36879248963a405dcdf87515fc0f5b6642568d9d236df2
-DIST bash43-023 3414 SHA256 9ac250c7397a8f53dbc84dfe790d2a418fbf1fe090bcece39b4a5c84a2d300d4 SHA512 d45b5f5dc4682c7260c8b6ef6faa99c929d2159cc34534931790f71f76e7324376e4a5d4a2a3bc21c16c25a8206554580943e7a3f672ec5a4af16cbccd216819 WHIRLPOOL 4cee4cdbe8525aff748a42a19d1d7cbc659cc8fe99b0bca3b2875ddfe5b8325f504cfdf09fb6edc70b1040f00eae3a4ab5fcda64cfa93ce96ce1e8d8c902b78f
-DIST bash43-024 1909 SHA256 3b505882a0a6090667d75824fc919524cd44cc3bd89dd08b7c4e622d3f960f6c SHA512 eada2b4839b81f28f63a874e08c72dfee9708c0982d2447347c17770a29c8fbb3d3f8c58c8a22b0d46a9d10abbd79dec11b5815257fb39af06420ef3602f8499 WHIRLPOOL 06059921dccb590aa7847ff5212bcb3e6a177aa96749eb19012d633ebf86badb83aad3b75ba8b304c620380d08395c0e37da4e2934a833ef1c0e1daf0f42ca72
-DIST bash43-025 3940 SHA256 1e5186f5c4a619bb134a1177d9e9de879f3bb85d9c5726832b03a762a2499251 SHA512 b4ea28ea0a24c8609d5c3a10114c5fec87ab978ec60700c36992d093e7afd976dbaee4a0d62c6e41e8ed6674c356fc26589f4c5168642dec8df8d727d7127822 WHIRLPOOL b3385e49dfbbf156bea9ebbd10f18dcb88c1d489c61c5bd6c16d1caac8a2ebf1ce057ec350d661ebd0307330a61f8c1088bef1cb133368919ccd0b5e81c3e7e3
-DIST bash43-026 1575 SHA256 2ecc12201b3ba4273b63af4e9aad2305168cf9babf6d11152796db08724c214d SHA512 d55620c86ab4835eaf53c18033a939e00ebbef7045d1429bd6fb212be6da167c368b4c03aec6c00ba60a1363b9cf8a4828e85c8108c5476b4a342e6c57f03897 WHIRLPOOL 3c21e3b21f1967d85b49386c05945859ee0fab2bbe0062052319876bbe3283bf3a7b50a9e160e36e9ee96fbe79ac13c90d86ffb4157ef0cb0641acd9dafb917e
-DIST bash43-027 6889 SHA256 1eb76ad28561d27f7403ff3c76a36e932928a4b58a01b868d663c165f076dabe SHA512 6941156db9a6ab35b2d6ddc63eec064e03da779e29f47e33b467711e3405c9adb58ad33be3ad3c77aea1e84a314d5404c8e1a8475408991f5f719b93c5a276b3 WHIRLPOOL 241a77807f142765fac71490987bd62a93bbd57c6ad2f83fbc645bf0618286fbfc3cd269eadf99e7f973a9e88ac08c5065868f8ad38727c17bb6056cedc83888
-DIST bash43-028 69606 SHA256 e8b0dbed4724fa7b9bd8ff77d12c7f03da0fbfc5f8251ef5cb8511eb082b469d SHA512 4317380539e3a93167f195eddd0acf0c75a5d86d5ef243cb7f7dca43e745badc3ebbc081b099678ac17dc03d9a3ed4a3ff3c6636bb1887e73e94b8ff9ced7c88 WHIRLPOOL f01e8fe2c09a7bdefacd7114cc8377f7ccd65de6c3bafac05595f1400f330ba0ba63ce97fe7b9b49957639c75438bb5ceb853890094cb0c4e43fadc1795b89b6
-DIST bash43-029 1824 SHA256 4cc4a397fe6bc63ecb97d030a4e44258ef2d4e076d0e90c77782968cc43d6292 SHA512 e25783c7557c1cda8344ba779d59f83e26b90b0aca393b5f7ee389e0583ccf81eba394589e992b33eb6c969083a8a4ff7fc8ce52059cab3b71289d085d381f07 WHIRLPOOL 857275184a8a449461b5aebba12d8231e1e33a2119693fa2c865ead18d4c462dea8151cfc3e0d121c2e5569d9984856ba69820aaa54399ddc77bb849ea9de890
-DIST bash43-030 63206 SHA256 85434f8a2f379d0c49a3ff6d9ffa12c8b157188dd739e556d638217d2a58385b SHA512 ae41a9a5326ceb8e7105e359be097e14876160f6357bfa7c5cd3c4a495a629be762c3db671754c2cffc6abb34998aad91dde4a449ba16a0c6da844bac53feca4 WHIRLPOOL 2184fa715fb90de89f18ba2b27dca612b684a85e9228d58ccf2d62a96a2e575929b3e1a47fbb5809e4c231a6657084be4a076271cfdd5b8b7dde493f2cb40a01
-DIST bash43-031 3689 SHA256 cd529f59dd0f2fdd49d619fe34691da6f0affedf87cc37cd460a9f3fe812a61d SHA512 3178b4ab48860ed284bb64ac9b36b6d4d1681c0d4bc37ceeb93e73c9dd140bd0a71e86a86ae595aab43babedae79d75a4b11c57e6ad6800f43ab5f7647f6c4c9 WHIRLPOOL 1e21f10a8ade1317e6672fc76e7b0e988d7c02feed3b1e553c60e4717df0b6036ce0822e9f9bf603abaf5b9b248ffa63421601a7f5c2dfcc9c60a98fe77b23dc
-DIST bash43-032 1734 SHA256 889357d29a6005b2c3308ca5b6286cb223b5e9c083219e5db3156282dd554f4a SHA512 47afc6308bd4bed20661a87761330854508a745a1c2a7f2d661fbe0d95b00d2d5707cc04f510fcd027b3fdb065d9414697715bff33c707a56955e27341d1bfd0 WHIRLPOOL 4b7ef4ac84269a292fa4527d2796508f4da16f9579726d90664305bbd3c2a3fa9002db6c0d60b022a54e756590a196f5dfcb86492a6d776476189546edb488c7
-DIST bash43-033 7038 SHA256 fb2a7787a13fbe027a7335aca6eb3c21cdbd813e9edc221274b6a9d8692eaa16 SHA512 3eed328960d77317e1742a9b53ccf40b304657cd535d7f283bdc24219c65ebdcb7aca3019fc8fd9e7152f42dc411625acb1b529f80e4a6c5b750b8f7cbd2e4d0 WHIRLPOOL bdfa9cd681ff499daa14b2c28e294b929f4c8526f11d555046158f035cc2c7a9c48f49aa0837c3ea80cdbc6d960119f40260da4a664944d7e599e40d6227254e
-DIST bash43-034 2392 SHA256 f1694f04f110defe1330a851cc2768e7e57ddd2dfdb0e3e350ca0e3c214ff889 SHA512 95d09b843287dc18845b75ac6657a2bd7bd71c31a62f922e7177368678ddf13c0f20498bc17bdf4cd5c1c34d40838174791d1e464ceca168957c68e789e34d06 WHIRLPOOL b9919bf7aabb11e6cc4dd17dd9433775320bc025a22e23b40edbc649e54dfae3e86a3670e30af4863ff8612ade43c91906d15acdb652ac2c37f84f731fba3279
-DIST bash43-035 1800 SHA256 370d85e51780036f2386dc18c5efe996eba8e652fc1973f0f4f2ab55a993c1e3 SHA512 1ea68e7ffb15356fdcf5eed08dd7fe0e16aea2928a4510fcfafe79e926d7ac25f013641bf547bfff0401bbb7e1476a802208e4f1ccb8b02ed20c094f99e450d2 WHIRLPOOL a5818ea98353c191210e8d66af0ea998c0b831e6af73035112405c228e18afc8ff243bdc2f3263728fc1d8aa2e7be43ae559cb02662b277478081e127b4fc37a
-DIST bash43-036 1539 SHA256 ac5f82445b36efdb543dbfae64afed63f586d7574b833e9aa9cd5170bc5fd27c SHA512 089a05879b8b65c9f11c55127364a3281b651e71cbedfad6221e31dc88eca15d813986f999a22921726873db9590b7b50afcd6162027fe516c2a94e8734e3ee7 WHIRLPOOL 3468783b0c10ae74c548e0d0cca3694c21775e6ea83ea1a071ae27b24542b67ffc785e17d6bc849c8030c667c7f531ba1a2de8e808f7820b19e88576e12e098c
-DIST bash43-037 1284 SHA256 33f170dd7400ab3418d749c55c6391b1d161ef2de7aced1873451b3a3fca5813 SHA512 7977c0fb9142cdea259b06322092aab3231b9773cc397519bedb6f731aea02a46441c67615b31fd19c886678eb1985687d07357d15fc7f08e946404efc564966 WHIRLPOOL fc3e010f065aa3087ac4e22352459dc2cdd5a232653749250dfebf17023a405ed78e0b2dd8ad66727aaa2645173dc14be111e32e8fb71a13786f4fe6ac6875ac
-DIST bash43-038 2354 SHA256 adbeaa500ca7a82535f0e88d673661963f8a5fcdc7ad63445e68bf5b49786367 SHA512 2ef2557b17867b5820a9e5619daa1cddb3fadcff7470504c148828a3007217767da4bf540dc835cf263f9c943b2c1aa909c845f8410f69e2d04c8b3d659efee3 WHIRLPOOL 66a2878b850cce96e532625cdcd88d0402c775dc585419c946ddebb206fbf8bee91846cbdce7a88b9caef09e1b02c144e3e71734c918c1b2c09cec67c68fa8d0
-DIST bash43-039 1531 SHA256 ab94dced2215541097691f60c3eb323cc28ef2549463e6a5334bbcc1e61e74ec SHA512 f9745a05bfbbe39f8e5af3865de3a32391d7ff291289977e23340c79a3783b4fad15bdcf8ce62478916b43fe18501c4d7c65cd54d3c20e8bb889919df48a9a19 WHIRLPOOL 3ee69bc81a25afe4998f76d43c9c2f4f6aca61f545a7304156fceda0f8a99c86379b673967bc7f72c26f5bde01248f77d7aee6372164c2e3b94c7781c7f6bd08
-DIST bash43-040 1532 SHA256 84bb396b9262992ca5424feab6ed3ec39f193ef5c76dfe4a62b551bd8dd9d76b SHA512 25a0696f1f0e78cb971afa404e0b7fe634b70d49d6a5a9d6ff5506c42063968e8ede83ad80bd0b79601363676fe3abfedc3b76984f6f9ad2e7798790682e21d0 WHIRLPOOL a435f25ae432161f676b4965cc20cc096fa18af8a191dca7cb311a41e3504e5d27c668fb3430fece1de45e0eed9cb34357dc887e83ace9819f24d585eddf6720
-DIST bash43-041 2362 SHA256 4ec432966e4198524a7e0cd685fe222e96043769c9613e66742ac475db132c1a SHA512 d75cdd6a1fb8aeb1a4e88f046cfea3ec493b994b96f60f27d5577b59408422bb7c51cc4525cadab821fd8c57f44fb07f811b087d077359242caff3b54cfc6819 WHIRLPOOL c88e754d694b69bcb3ce390ab3e29932b30a74f8f15b75b570cc46699c072b0f872824766c45bc2a98627529896bdf5aaf6493a493ffd33932d9ed6a362defb3
-DIST bash43-042 1535 SHA256 ac219322db2791da87a496ee6e8e5544846494bdaaea2626270c2f73c1044919 SHA512 01a6601029c0a55c9bf1a4ace3f387f9d094a9b9ee3511e2113c000123d85b1d5813c369e62d5a6dd329f515ef0d67d11394a6c0e4516956387556c13d13009a WHIRLPOOL 790b15282a81f5717fb675ea4ae752382ddb1b101766e32c68deb1ec1d64fcf8841b3da556b87ac685e18b528a1de31bc4b94900369f6386f8e3991ed76232c1
-DIST bash43-043 1942 SHA256 47a8a3c005b46e25821f4d8f5ccb04c1d653b1c829cb40568d553dc44f7a6180 SHA512 eb05e537fac08587d0755ad59218bb5a51685aefc1476d6e3feaf72acd1e08cbda512988d8c157425e7939863b313d1e36f51b32f8a8497655c6b0710a24b738 WHIRLPOOL 3c9a466b68ea5d94b5ad9d1868ad1ace80df6608a9bd1b77c1cd06f7edb588090061f7f4e2639dd7190763864511d573dec33aad77be722516a1300e8a45ce31
-DIST bash43-044 1658 SHA256 9338820630bf67373b44d8ea68409f65162ea7a47b9b29ace06a0aed12567f99 SHA512 2937ef80c99e93094e4aaa6a93d077efc3e433a4712c17e30590a0abeb5488293365cb8aa19e37d25b7d5c38d3ad26cdea12b904e5ffb2cdb16f18ab12f422fd WHIRLPOOL 488f567b900e49a9de9b92e9a8e29a92a087d390e9f24c3986bf1d89524878c88c7a3c2cae959844427fb20e6858a7b8eae112aac640f3d97ba1f79888f9f25d
-DIST bash43-045 1312 SHA256 ba6ec3978e9eaa1eb3fabdaf3cc6fdf8c4606ac1c599faaeb4e2d69864150023 SHA512 7b79dacff44e5358da736334d2277a2879ca1389e22e9dac50e139f30dab623bc89a56930d89e74efc468a00d051f6747ccaffcd1a30d7c737d49780b9830e3d WHIRLPOOL f361e523879ff1898574ac5eca480661bd787dc278fff204e7f27da89e85439b4e9d36a5f556046b760f3beb115302e745b5196bfa081b402d3f76fb44463558
-DIST bash43-046 1494 SHA256 b3b456a6b690cd293353f17e22d92a202b3c8bce587ae5f2667c20c9ab6f688f SHA512 c036b659fa681f8129110356bec33fad00fb8e469f3b4bcefd0b7ddf5e20030977716adf5c65f58f3ff68cd7af0bdd42392ee077100bc7f45ee123749d082f7d WHIRLPOOL d58384a2ca77f9a80a69a117221da51a701539cf5497d8e0fc634cd1cc0cb0024e02675bea810a0f42b873b557d479ba1b7aee6e6f73bd1422df2dbb29396477
-DIST bash43-047 4437 SHA256 c69248de7e78ba6b92f118fe1ef47bc86479d5040fe0b1f908ace1c9e3c67c4a SHA512 9332d680ac226491cf8e5986a3261eb76b53ef4b0b2a43405564b088afc0e8658077812c9177bdab7900e05394e69f3047d82ddb59553fc01ef721acfa9d5553 WHIRLPOOL 719fa31d0fb09a75d5abbb63ee5a485802c5eadd06720d6074c2282d117aa6e234f5f75cabd340643710bd14e99260047183386bd1df278c9715aed7b98232d7
-DIST bash43-048 1612 SHA256 5b8215451c5d096ca1e115307ffe6613553551a70369525a0778f216c3a4dfa2 SHA512 7c3963bfbc730b4592668460e86c166e727e9897c1a9235a6860a01bc90d365ef0707f0fac7ed62780dcc84e80dbe8484ec59e9e948def22f44ae03e8a169780 WHIRLPOOL e1a435c3b9fbc0deca80dd89bfd3adcbff1d5a3af50884d2aef54635b8ba1063903e2d99a5a23bd1c64c19c5e9c19de6b479ac777cecdb812555dc5683b8cf71
+DIST bash-4.4.tar.gz 9377313 BLAKE2B ac0e481dd4f2d5b91eea4f0156f1fc398ef8bd1ccd941366aa9b041be576114c51e1ff1431ec871e96fb72257c2a05a0ebcbd88c43c221610fef7dfdb2502fc0 SHA512 73de3b425faaac55e45456b0f6f6d8077b5dfa7bb76e0d1894a19361b4a2b6bd4fbbe182117ddbfe9b07b4d898fba03537c261badc9533dd3c0da891764c7f29
+DIST bash44-001 1896 BLAKE2B 1ff23656f2904385f34aa94c48bec2a8cd145223c74c4138bb857a6ef79ec6e5985521661170c46c5bd603ea4fb7c1d8058770b4da0165366aab7b2bbaf4709b SHA512 fa7a1b277eb3bad6ae7d2c7a2887cbf2c0eb75b7fee8ed03ec1e9d45879a2fb4b8c7cb16d6b029987493b01a461214bd9a24454a6837e7cfe180b1bc56f61caa
+DIST bash44-002 1946 BLAKE2B 2b7798375a629ba957c139ded809e53a43ab03258557669304441c04433693069d1fc1af03fe5516140097e5c71c07870bf8cda2309a8fd7ade4b169a8256739 SHA512 526f986057810f89080e283ff95b3a8fd24d37e4ad2f18c39f36d3a2d57956a6441d16220082157735e3c5ccf770d5016e761aa5f309129898e39277d576e6b5
+DIST bash44-003 1593 BLAKE2B f47eeb4d32108d6e889436ad72920c1749e13fb17439dffb8df72f334f570fcccc7956bd616ef1beec5c07c1479d9113047f8aaa21c19af3e4db21f00783dcbd SHA512 e61db89bdd1a7ae15013fe258046a343c9ea41e5a1c6d2c810947500a617fce7536b8d51194e14bb42499fe0de6d70cc9b2c81da0afdcb5a2278459f4f76d748
+DIST bash44-004 2350 BLAKE2B 245c88f4f7f7e0a4a571956c1a6363b8ba86b883897bd8c92297605811e418748709f9ffaa148173c9669b4dc8b71482fce9eb3b177920fd8d34b260465c72fd SHA512 7570cf15518f79230cfe91b3e58c795c16c7fb6ba6418d967355b36fb7982e7919a9eaaef9177fb605c7fb7d7efb8a8335e725c1bacffff69a098433f5adc9c7
+DIST bash44-005 1439 BLAKE2B 4d563b1a0b2d858a904b98fb52b38c8c806942b6c879b3a02480774b0806468f51a91ef0a26a4a9c5bc8f2a3242cd206afe786d0754449cb11adeed4ae97a90d SHA512 7546a6c90c8e8508567dde713722291477ca87c1116905b46432514a4fc632840a855b84f102591914cd4c44d5bf2eb7400866e26366fc94525fb401ea844a8f
+DIST bash44-006 1805 BLAKE2B aa187e52bc12dc5c34e52d6b487a0f260e3c54970ebb022c54293f409903baeb239417d671d85b16d30b327c6353ffa666dc7adb5c872ec500266339d8a9de0e SHA512 5edcd76cf97bfe289f71924ba279ff48a1167eb3cc36f811cbcc23732746f5c821d1d39d4b137b7d99d57809a4b7270a54f4a41176fcfde0708bf92ddc68b77f
+DIST bash44-007 4640 BLAKE2B 3b803e553ac117129db686818835ce6deb7574b38171f4c9262448e01e097933645311de003593ef3949a7ba5925172577a758b2edd281c4446f3bca62beadb8 SHA512 386c019debee414697abc648d9a77894e842bb0b7a2a71709e8b3398582f25065e68963405fa22fb77439c6b431ee94a2ecbb16734c2436af3dfb4d1b5f06fcf
+DIST bash44-008 2223 BLAKE2B 09c01c2821404ca8a89d9644cd7d55d2994ba4cdc15b928c1156e2a91c083b528340c27909bdd312a78f677cc94ded5888ec4eaff0d0070d575fbdde3bb326a0 SHA512 d9a8924f1c9263deab89153bb688a87f211913ebd72c8077e607db6fdddc7e5af05042dd22a9a2df593e518ea74b54ca79d20afc796e47d871827a2556e233d0
+DIST bash44-009 3117 BLAKE2B 1921a30e1f7c6d37cac048772f89322e2cfe6e77f3ec48d4a6bb3d7e82452b7471bef2e1fa31094a62d9a29589a8438dc875211dbab8ba204939e16810eca13b SHA512 3b01c080cf4a54658679b36c282a69a9ac48b900b19ceb42dbaf084abd395d50e5ff14db90a7fdf0c9856dad150897dca561160686c931634765782447fc076e
+DIST bash44-010 1670 BLAKE2B 6e0cab685ae2393a9ae7eeb91767f8ce3086e3921f2d69614e729e9bc26603b363a69083c57a43aa53669491deba663bd8c9de91571833312cc23efb05c43222 SHA512 54ff556b62fd88381e7a495db50957b016474973b3a566661c65b649a40960f2d3355221b3a71fb292128aad92a45d73d9816d63833bc416b4d15acdef391b98
+DIST bash44-011 1603 BLAKE2B 6bd978408140620c2d63277757c15bfe55d6b0ff5706b7b884b234308efb6cfa771888306840ce5cfd4ece5912924dbb6a321d823fa106c99ba573f47dbbb9ae SHA512 6b5b068b74978fc691749ccff5e094c768047f702430e97114f5bf342f078696f7d7616d0642d4061b062e9112dfe00a1c2309c65de4147e0e98fb52c593d844
+DIST bash44-012 5768 BLAKE2B 63c6f5ff2cf52a35e1bd7f0028d7cce5c2c87e65ca600d8d85bf9b197ac8dee16bed5dc1dba6b354ef560309022cfd427a08180b76effe4107b9dda2ed99b20e SHA512 4661c4c132f2ea7c9a70368301041c482d5820d8389334a7e3ae44c36fc16c171b20db2f194b7663c84d6c3dcef81aa90f050a48e205218fc7bd3395d09c6a51
+DIST bash44-013 1255 BLAKE2B f19be55c986bc60c395d24044c7edc67cd180d86047af59d173c1507de32534b2eed546f16164d799283d66c0d0460ff4771da6bc327bc87ebc4f01cb284f9eb SHA512 eac0a9abf59b65a59a0028d2f3c0a7dc8a0b3c04e2d2db642b69aa7c13a2dfa190f3c63f7d8a7c9400f01701e9ef84212ce668c4c44d0ccfd02cd1f8e723d831
+DIST bash44-014 2834 BLAKE2B 3a211d9916e16a996d709034523dc0f3775520736f481bdff8c737e1969da1719602bf0379befc685822e4931586482a30bbec69be4233da4f912c5b6333886e SHA512 11e16896aa66a1eafb12cdcea00515132789690e914c8894caefd8c80ed98c8e732428348ddbfb53495164ce4044596f5cdbc03e146dce364fc497f362a1859b
+DIST bash44-015 1233 BLAKE2B 5504d4a64f938ccfbb12f43455c11c6dc6a38397e5692da874a1b5de1865d19677c6f683073dbf9843869df67f96a87a6a60d2381338294d6750f2aba1580c55 SHA512 94d6fed30d4a376c29f8986d15f1b3fd65a04ee0f3d1844d010f3e51a2f9f875cd294a68fb6f0e1ffa481fb09f02055b21f2f298ebd9d88eb2f76d6c1f15de34
+DIST bash44-016 2069 BLAKE2B 5ac613c450d018edff4f82740655ed0e460e49b57ce1a817f0b7b0a101b9f1ab095c48904fc17789203d6bdcc1beb01dde23b4a097f36441eda5e11ab638e9bd SHA512 5acc704df3fe63b5b8055ba7bc14ae70cc23d15aefee8db6991e6c11cc8b0e10fcc67d516bc2d2fde84be26ed5c88dbf266fa164756218b60eccc2bfb4eed7d9
+DIST bash44-017 1143 BLAKE2B 64da515637109cd87b95e5f55857f25c2758b4a5c2620cd21250287e00767d5ca7a14fe331603cdef1ba02f622d97ee120bc0bfba463bccb113f16ebee56159f SHA512 c1d50aee953427ba0b95e48c10d2324e7413f3354ff65b9c3c1dfd14eedec55e619fcd12353e7b99b6e280f510e04d1c971b309c1a4efb97d48ddb30d69f14ac
+DIST bash44-018 1319 BLAKE2B abfd87f2cb5e9aeb0352bb0efbfd3ad95cbb26445e09edaa762cf1ea1fa01a00ab57c96d912ae5eaf653b66169bc54bba39fdf1d62ad45301c6599d21979ff14 SHA512 008ff44dbf916414d691c29cee29e7f636bbe79170463d76ef16ca63ecdc24a84ff4476078c28fb8788d9b1fb0572612a7e8cb30fceb55ad650f293db8361ad1
+DIST bash44-019 1671 BLAKE2B 3d917b1c2618b92d7a79d64a8282cda84098d7d83b8ab3e62c49ab259d6976ef953ab1bde98b9d2cd925cfbdff94b5fd5910876e8de85d40466cf5f3ceb377c4 SHA512 59984e221a7a6dbf72bf893b1b7c4a63fea34d6af1208a19f0e9e6cd59a09e4cf51890cb2d31c1502e2a2f644f584417bb59cf02c308d3250d2a98d41b63e893
+DIST bash44-020 5156 BLAKE2B 6f2bba1fe03eb49401af3925420ff5c090d0e7d83010c34e086f5da48fc2078ef649d775b45e3368e73fc1ebdd6f1860b33bf7021898cae158d478aa1dd18bca SHA512 e200fddd717fa33d2c56eb6713031d34891e5ebcd489a65a43ccfebf9728c1609b758ca3dffb1eed4abd3c62c6d7163ce88d8a1bb73b6d07bee99e0409365978
+DIST bash44-021 1810 BLAKE2B ce3f98e31aaa7db402cf2a2e571a72b9b91fad4571b35a5e8f59678485a631acf3885a19ee09ebdc6f79b39dbdafe72cc2cd91bf3c3b31ad7d3a65b5bc4bd9b3 SHA512 43a82d06a17bc30c2579a0944cb68f60bd9e3cddb9fff4a760fbf1f2f5104a99bb69c400cf63231b242c03a4684701455e603d96c9b588f2c69da02570042fec
+DIST bash44-022 1818 BLAKE2B 66c6e5fd33f0649ff886d1fd944cb10a06de06f0724c0cb7343c3afd50034821f1a4eeccbe9bc5c6815ce9bcdfacf5e6a83098fbd3712efc15e870928b3aa80e SHA512 385a0d1bbdff0dffec2a08021a84a5ac3695e44e1a90b0080b82737fc4a9ea924ee59b47fd5e288b69a540f4c976bf9da0db08ee2d20e170c868f802f75785fb
+DIST bash44-023 1557 BLAKE2B 95a21ade7e4be68d66f3862f26b574c5897055822471c8d2801b8e1f866d1d11ddd4000e967b567c3ef7949af8a88ca918ea066d52a67fc5fd4b266135f0dbbb SHA512 442efa78d365a728555ade77cc2f8501aed09f37ae10e1ac647d35299829b63caefbc5c30436d622bfef9300e9d929d7f4fafe85a59df15089881bc987fa12fd
diff --git a/app-shells/bash/bash-4.3_p48-r1.ebuild b/app-shells/bash/bash-4.3_p48-r1.ebuild
deleted file mode 100644
index 8d3f40e..0000000
--- a/app-shells/bash/bash-4.3_p48-r1.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
-	[[ ${plevel} -eq 0 ]] && return 1
-	eval set -- {1..${plevel}}
-	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
-			printf "${u}/${pn}-${pv}-patches/%s " "$@"
-		done
-	fi
-}
-
-# The version of readline this bash normally ships with.
-READLINE_VER="6.3"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
-[[ ${PV} == *_rc* ]] && SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="*"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2:0=
-	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	!<sys-apps/portage-2.1.6.7_p1
-	!<sys-apps/paludis-0.26.0_alpha5"
-# we only need yacc when the .y files get patched (bash42-005)
-DEPEND+=" virtual/yacc"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3-mapfile-improper-array-name-validation.patch
-	"${FILESDIR}"/${PN}-4.3-arrayfunc.patch
-	"${FILESDIR}"/${PN}-4.3-protos.patch
-	"${FILESDIR}"/${PN}-4.4-popd-offset-overflow.patch #600174
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if is-flag -malign-double ; then #7332
-		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
-		eerror "as it breaks LFS (struct stat64) on x86."
-		die "remove -malign-double from your CFLAGS mr ricer"
-	fi
-	if use bashlogger ; then
-		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
-		ewarn "This will log ALL output you enter into the shell, you have been warned."
-	fi
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-
-	# Clean out local libs so we know we use system ones w/releases.
-	if [[ ${PV} != *_rc* ]] ; then
-		rm -rf lib/{readline,termcap}/*
-		touch lib/{readline,termcap}/Makefile.in # for config.status
-		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
-	fi
-
-	# Avoid regenerating docs after patches #407985
-	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/*
-
-	epatch "${PATCHES[@]}"
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# For descriptions of these, see config-top.h
-	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
-	append-cppflags \
-		-DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
-		-DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
-		-DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
-		-DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
-		-DNON_INTERACTIVE_LOGIN_SHELLS \
-		-DSSH_SOURCE_BASHRC \
-		-DUSE_MKTEMP -DUSE_MKSTEMP \
-		$(use bashlogger && echo -DSYSLOG_HISTORY)
-
-	# Don't even think about building this statically without
-	# reading Bug 7714 first.  If you still build it statically,
-	# don't come crying to us with bugs ;).
-	#use static && export LDFLAGS="${LDFLAGS} -static"
-	use nls || myconf+=( --disable-nls )
-
-	# Historically, we always used the builtin readline, but since
-	# our handling of SONAME upgrades has gotten much more stable
-	# in the PM (and the readline ebuild itself preserves the old
-	# libs during upgrades), linking against the system copy should
-	# be safe.
-	# Exact cached version here doesn't really matter as long as it
-	# is at least what's in the DEPEND up above.
-	export ac_cv_rl_version=${READLINE_VER}
-
-	# Force linking with system curses ... the bundled termcap lib
-	# sucks bad compared to ncurses.  For the most part, ncurses
-	# is here because readline needs it.  But bash itself calls
-	# ncurses in one or two small places :(.
-
-	if [[ ${PV} != *_rc* ]] ; then
-		# Use system readline only with released versions.
-		myconf+=( --with-installed-readline=. )
-	fi
-
-	if use plugins; then
-		append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
-	else
-		# Disable the plugins logic by hand since bash doesn't
-		# provide a way of doing it.
-		export ac_cv_func_dl{close,open,sym}=no \
-			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
-		sed -i \
-			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
-			configure || die
-	fi
-	tc-export AR #444070
-	econf \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		--htmldir='$(docdir)/html' \
-		--with-curses \
-		$(use_with afs) \
-		$(use_enable net net-redirections) \
-		--disable-profiling \
-		$(use_enable mem-scramble) \
-		$(use_with mem-scramble bash-malloc) \
-		$(use_enable readline) \
-		$(use_enable readline history) \
-		$(use_enable readline bang-history) \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	emake
-
-	if use plugins ; then
-		emake -C examples/loadables all others
-	fi
-}
-
-src_install() {
-	local d f
-
-	default
-
-	dodir /bin
-	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
-	dosym bash /bin/rbash
-
-	insinto /etc/bash
-	doins "${FILESDIR}"/bash_logout
-	doins "${FILESDIR}"/bashrc
-	keepdir /etc/bash/bashrc.d
-	insinto /etc/skel
-	for f in bash{_logout,_profile,rc} ; do
-		newins "${FILESDIR}"/dot-${f} .${f}
-	done
-
-	local sed_args=(
-		-e "s:#${USERLAND}#@::"
-		-e '/#@/d'
-	)
-	if ! use readline ; then
-		sed_args+=( #432338
-			-e '/^shopt -s histappend/s:^:#:'
-			-e 's:use_color=true:use_color=false:'
-		)
-	fi
-	sed -i \
-		"${sed_args[@]}" \
-		"${ED}"/etc/skel/.bashrc \
-		"${ED}"/etc/bash/bashrc || die
-
-	if use plugins ; then
-		exeinto /usr/$(get_libdir)/bash
-		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
-		insinto /usr/include/bash-plugins
-		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
-	fi
-
-	if use examples ; then
-		for d in examples/{functions,misc,scripts,startup-files} ; do
-			exeinto /usr/share/doc/${PF}/${d}
-			insinto /usr/share/doc/${PF}/${d}
-			for f in ${d}/* ; do
-				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
-					doexe ${f}
-				else
-					doins ${f}
-				fi
-			done
-		done
-	fi
-
-	doman doc/*.1
-	newdoc CWRU/changelog ChangeLog
-	dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
-	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
-		mkdir -p "${EROOT}"/etc/bash
-		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
-	fi
-
-	if [[ -L ${EROOT}/bin/sh ]] ; then
-		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
-		# missing even temporarily causes a fatal error with paludis.
-		local target=$(readlink "${EROOT}"/bin/sh)
-		local tmp=$(emktemp "${EROOT}"/bin)
-		ln -sf "${target}" "${tmp}"
-		mv -f "${tmp}" "${EROOT}"/bin/sh
-	fi
-}
-
-pkg_postinst() {
-	# If /bin/sh does not exist, provide it
-	if [[ ! -e ${EROOT}/bin/sh ]] ; then
-		ln -sf bash "${EROOT}"/bin/sh
-	fi
-}
diff --git a/app-shells/bash/bash-4.3_p48-r4.ebuild b/app-shells/bash/bash-4.3_p48-r4.ebuild
deleted file mode 120000
index 72030ae..0000000
--- a/app-shells/bash/bash-4.3_p48-r4.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-bash-4.3_p48-r1.ebuild
\ No newline at end of file
diff --git a/app-shells/bash/bash-4.4_p23-r1.ebuild b/app-shells/bash/bash-4.4_p23-r1.ebuild
new file mode 100644
index 0000000..291c9fb
--- /dev/null
+++ b/app-shells/bash/bash-4.4_p23-r1.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic toolchain-funcs multilib prefix
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/
+PLEVEL=${PV##*_p}
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
+is_release() {
+	case ${PV} in
+	*_alpha*|*_beta*|*_rc*) return 1 ;;
+	*) return 0 ;;
+	esac
+}
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	[[ ${plevel} -eq 0 ]] && return 1
+	eval set -- {1..${plevel}}
+	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
+	if [[ ${opt} == -s ]] ; then
+		echo "${@/#/${DISTDIR}/}"
+	else
+		local u
+		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
+			printf "${u}/${pn}-${pv}-patches/%s " "$@"
+		done
+	fi
+}
+
+# The version of readline this bash normally ships with.
+READLINE_VER="7.0"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
+if is_release ; then
+	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
+else
+	SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="*"
+IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
+
+DEPEND="
+	>=sys-libs/ncurses-5.2-r2:0=
+	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
+	nls? ( virtual/libintl )
+"
+RDEPEND="
+	${DEPEND}
+"
+# we only need yacc when the .y files get patched (bash42-005)
+#DEPEND+=" virtual/yacc"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if is-flag -malign-double ; then #7332
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+	if use bashlogger ; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
+}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+	# Include official patches
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
+
+	eapply "${FILESDIR}/${PN}-4.4-jobs_overflow.patch" #644720
+	eapply "${FILESDIR}/${PN}-4.4-set-SHOBJ_STATUS.patch" #644720
+
+	# Clean out local libs so we know we use system ones w/releases.
+	if is_release ; then
+		rm -rf lib/{readline,termcap}/*
+		touch lib/{readline,termcap}/Makefile.in # for config.status
+		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
+	fi
+
+	# Prefixify hardcoded path names. No-op for non-prefix.
+	hprefixify pathnames.h.in
+
+	# Avoid regenerating docs after patches #407985
+	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+	touch -r . doc/*
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=(
+		--disable-profiling
+		--with-curses
+		$(use_enable mem-scramble)
+		$(use_enable net net-redirections)
+		$(use_enable readline)
+		$(use_enable readline bang-history)
+		$(use_enable readline history)
+		$(use_with afs)
+		$(use_with mem-scramble bash-malloc)
+	)
+
+	# For descriptions of these, see config-top.h
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
+
+	# Don't even think about building this statically without
+	# reading Bug 7714 first.  If you still build it statically,
+	# don't come crying to us with bugs ;).
+	#use static && export LDFLAGS="${LDFLAGS} -static"
+	use nls || myconf+=( --disable-nls )
+
+	# Historically, we always used the builtin readline, but since
+	# our handling of SONAME upgrades has gotten much more stable
+	# in the PM (and the readline ebuild itself preserves the old
+	# libs during upgrades), linking against the system copy should
+	# be safe.
+	# Exact cached version here doesn't really matter as long as it
+	# is at least what's in the DEPEND up above.
+	export ac_cv_rl_version=${READLINE_VER%%_*}
+
+	# Force linking with system curses ... the bundled termcap lib
+	# sucks bad compared to ncurses.  For the most part, ncurses
+	# is here because readline needs it.  But bash itself calls
+	# ncurses in one or two small places :(.
+
+	if is_release ; then
+		# Use system readline only with released versions.
+		myconf+=( --with-installed-readline=. )
+	fi
+
+	if use plugins; then
+		append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
+	else
+		# Disable the plugins logic by hand since bash doesn't
+		# provide a way of doing it.
+		export ac_cv_func_dl{close,open,sym}=no \
+			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+		sed -i \
+			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
+			configure || die
+	fi
+	tc-export AR #444070
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use plugins ; then
+		emake -C examples/loadables all others
+	fi
+}
+
+src_install() {
+	local d f
+
+	default
+
+	dodir /bin
+	mv "${ED%/}"/usr/bin/bash "${ED%/}"/bin/ || die
+	dosym bash /bin/rbash
+
+	insinto /etc/bash
+	doins "${FILESDIR}"/bash_logout
+	doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
+	keepdir /etc/bash/bashrc.d
+	insinto /etc/skel
+	for f in bash{_logout,_profile,rc} ; do
+		newins "${FILESDIR}"/dot-${f} .${f}
+	done
+
+	local sed_args=(
+		-e "s:#${USERLAND}#@::"
+		-e '/#@/d'
+	)
+	if ! use readline ; then
+		sed_args+=( #432338
+			-e '/^shopt -s histappend/s:^:#:'
+			-e 's:use_color=true:use_color=false:'
+		)
+	fi
+	sed -i \
+		"${sed_args[@]}" \
+		"${ED%/}"/etc/skel/.bashrc \
+		"${ED%/}"/etc/bash/bashrc || die
+
+	if use plugins ; then
+		exeinto /usr/$(get_libdir)/bash
+		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
+		insinto /usr/include/bash-plugins
+		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+	fi
+
+	if use examples ; then
+		for d in examples/{functions,misc,scripts,startup-files} ; do
+			exeinto /usr/share/doc/${PF}/${d}
+			docinto ${d}
+			for f in ${d}/* ; do
+				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
+					doexe ${f}
+				else
+					dodoc ${f}
+				fi
+			done
+		done
+	fi
+
+	doman doc/*.1
+	newdoc CWRU/changelog ChangeLog
+	dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
+		mkdir -p "${EROOT}"/etc/bash
+		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
+	fi
+
+	if [[ -L ${EROOT}/bin/sh ]] ; then
+		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
+		# missing even temporarily causes a fatal error with paludis.
+		local target=$(readlink "${EROOT}"/bin/sh)
+		local tmp=$(emktemp "${EROOT}"/bin)
+		ln -sf "${target}" "${tmp}"
+		mv -f "${tmp}" "${EROOT}"/bin/sh
+	fi
+}
+
+pkg_postinst() {
+	# If /bin/sh does not exist, provide it
+	if [[ ! -e ${EROOT}/bin/sh ]] ; then
+		ln -sf bash "${EROOT}"/bin/sh
+	fi
+}
diff --git a/app-shells/bash/files/bash-4.3-arrayfunc.patch b/app-shells/bash/files/bash-4.3-arrayfunc.patch
deleted file mode 100644
index f44d184..0000000
--- a/app-shells/bash/files/bash-4.3-arrayfunc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://lists.gnu.org/archive/html/bug-bash/2014-11/msg00178.html
-
-diff --git a/arrayfunc.c b/arrayfunc.c
-index 804e6da..0f900aa 100644
---- a/arrayfunc.c
-+++ b/arrayfunc.c
-@@ -498,7 +498,7 @@ assign_compound_array_list (var, nlist, flags)
- 
-   for (list = nlist; list; list = list->next)
-     {
--      iflags = flags;
-+      iflags = (flags & ~ASS_APPEND);
-       w = list->word->word;
- 
-       /* We have a word of the form [ind]=value */
diff --git a/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch b/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch
deleted file mode 100644
index 20bf340..0000000
--- a/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://lists.gnu.org/archive/html/bug-bash/2014-11/msg00097.html
-
---- bash-4.3/builtins/mapfile.def
-+++ bash-4.3/builtins/mapfile.def
-@@ -339,7 +339,7 @@
-   else
-     array_name = list->word->word;
-   
--  if (legal_identifier (array_name) == 0 && valid_array_reference (array_name) == 0)
-+  if (legal_identifier (array_name) == 0)
-     {
-       sh_invalidid (array_name);
-       return (EXECUTION_FAILURE);
diff --git a/app-shells/bash/files/bash-4.3-protos.patch b/app-shells/bash/files/bash-4.3-protos.patch
deleted file mode 100644
index 7af84ff..0000000
--- a/app-shells/bash/files/bash-4.3-protos.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/redir.c
-+++ b/redir.c
-@@ -31,6 +31,7 @@
- #endif
- #include "filecntl.h"
- #include "posixstat.h"
-+#include "trap.h"
- 
- #if defined (HAVE_UNISTD_H)
- #  include <unistd.h>
diff --git a/app-shells/bash/files/bash-4.4-jobs_overflow.patch b/app-shells/bash/files/bash-4.4-jobs_overflow.patch
new file mode 100644
index 0000000..8753d62
--- /dev/null
+++ b/app-shells/bash/files/bash-4.4-jobs_overflow.patch
@@ -0,0 +1,14 @@
+https://lists.gnu.org/archive/html/bug-bash/2017-12/msg00025.html
+https://bugs.gentoo.org/644720
+
+--- bash-4.4/jobs.c
++++ bash-4.4/jobs.c
+@@ -750,7 +750,7 @@
+   else
+     nsize = bgpids.nalloc;
+ 
+-  while (nsize < js.c_childmax)
++  while (nsize < (ps_index_t)js.c_childmax)
+     nsize *= 2;
+ 
+   if (bgpids.nalloc < js.c_childmax)
diff --git a/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch b/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch
deleted file mode 100644
index c6ef19d..0000000
--- a/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/600174
-https://lists.gnu.org/archive/html/bug-bash/2016-11/msg00099.html
-
-*** ../bash-4.4-patched/builtins/pushd.def	2016-01-25 13:31:49.000000000 -0500
---- builtins/pushd.def	2016-10-28 10:46:49.000000000 -0400
-***************
-*** 366,370 ****
-      }
-  
-!   if (which > directory_list_offset || (directory_list_offset == 0 && which == 0))
-      {
-        pushd_error (directory_list_offset, which_word ? which_word : "");
---- 366,370 ----
-      }
-  
-!   if (which > directory_list_offset || (which < -directory_list_offset) || (directory_list_offset == 0 && which == 0))
-      {
-        pushd_error (directory_list_offset, which_word ? which_word : "");
-***************
-*** 388,391 ****
---- 388,396 ----
-  	 of the list into place. */
-        i = (direction == '+') ? directory_list_offset - which : which;
-+       if (i < 0 || i > directory_list_offset)
-+ 	{
-+ 	  pushd_error (directory_list_offset, which_word ? which_word : "");
-+ 	  return (EXECUTION_FAILURE);
-+ 	}
-        free (pushd_directory_list[i]);
-        directory_list_offset--;
diff --git a/app-shells/bash/files/bash-4.4-set-SHOBJ_STATUS.patch b/app-shells/bash/files/bash-4.4-set-SHOBJ_STATUS.patch
new file mode 100644
index 0000000..96302c2
--- /dev/null
+++ b/app-shells/bash/files/bash-4.4-set-SHOBJ_STATUS.patch
@@ -0,0 +1,14 @@
+http://lists.gnu.org/archive/html/bug-bash/2016-10/msg00004.html
+
+--- a/configure
++++ b/configure
+@@ -16124,6 +16124,9 @@ $as_echo_n "checking shared object configuration for loadable builtins... " >&6;
+ 
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHOBJ_STATUS" >&5
+ $as_echo "$SHOBJ_STATUS" >&6; }
++else
++	SHOBJ_STATUS=unsupported
++
+ fi
+ 
+ # try to create a directory tree if the source is elsewhere
diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc
index 8d9c297..2f3dc77 100644
--- a/app-shells/bash/files/bashrc
+++ b/app-shells/bash/files/bashrc
@@ -38,7 +38,7 @@
 
 # Change the window title of X terminals 
 case ${TERM} in
-	[aEkx]term*|rxvt*|gnome*|konsole*|interix)
+	[aEkx]term*|rxvt*|gnome*|konsole*|interix|tmux*)
 		PS1='\[\033]0;\u@\h:\w\007\]'
 		;;
 	screen*)
@@ -80,7 +80,7 @@
 	# Some systems (e.g. BSD & embedded) don't typically come with
 	# dircolors so we need to hardcode some terminals in here.
 	case ${TERM} in
-	[aEkx]term*|rxvt*|gnome*|konsole*|screen|cons25|*color) use_color=true;;
+	[aEkx]term*|rxvt*|gnome*|konsole*|screen|tmux|cons25|*color) use_color=true;;
 	esac
 fi
 
diff --git a/app-text/poppler-data/Manifest b/app-text/poppler-data/Manifest
index 4e09bee..050e04d 100644
--- a/app-text/poppler-data/Manifest
+++ b/app-text/poppler-data/Manifest
@@ -1 +1 @@
-DIST poppler-data-0.4.7.tar.gz 4182339 SHA256 e752b0d88a7aba54574152143e7bf76436a7ef51977c55d6bd9a48dccde3a7de SHA512 9a865f077f8760a106c6b28302357253c6d63a8f4f10a9506724d1f0ba42e3481bd790ca07e7ee245c63de3650a33c12e80e20e94415a0e37b05225cfe0efce2 WHIRLPOOL 4e939252767112723678fe8771f958eeef6d3fd26224c26ecf54feb2a7a29510d86f183f1b8267fcf56848a24fb6e3e3c4c001145edd9751d953cb882585b827
+DIST poppler-data-0.4.10.tar.gz 4497684 BLAKE2B 2c262223a971fe49b7f9848e424ba78a6d96e193d18b0bbad4eb343deea7808a6d9e234ebbb252c5becd40840221ba86d2b87ad36595fe982546b32ea6201f0b SHA512 4bebad0791b55b5e2805cf864393d1f777a7996c962398fc178211d2abbf110f75ef2fa6699e275b126aca0540eabb89542a672e0587248db9414e357a32bfd3
diff --git a/app-text/poppler-data/poppler-data-0.4.10.ebuild b/app-text/poppler-data/poppler-data-0.4.10.ebuild
new file mode 100644
index 0000000..a355efe
--- /dev/null
+++ b/app-text/poppler-data/poppler-data-0.4.10.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Data files for poppler to support uncommon encodings without xpdfrc"
+HOMEPAGE="https://poppler.freedesktop.org/"
+SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
+
+LICENSE="BSD GPL-2 MIT"
+KEYWORDS="*"
+SLOT="0"
+IUSE=""
+
+src_install() {
+	emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install
+
+	# bug 409361
+	dodir /usr/share/poppler/cMaps
+	cd "${D}/${EPREFIX}"/usr/share/poppler/cMaps || die
+	find ../cMap -type f -exec ln -s {} . \; || die
+}
diff --git a/app-text/poppler-data/poppler-data-0.4.7.ebuild b/app-text/poppler-data/poppler-data-0.4.7.ebuild
deleted file mode 100644
index 4e89904..0000000
--- a/app-text/poppler-data/poppler-data-0.4.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-data/poppler-data-0.4.7.ebuild,v 1.10 2015/02/28 14:10:43 ago Exp $
-
-EAPI=5
-
-DESCRIPTION="Data files for poppler to support uncommon encodings without xpdfrc"
-HOMEPAGE="http://poppler.freedesktop.org/"
-SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
-
-LICENSE="BSD GPL-2 MIT"
-KEYWORDS="*"
-SLOT="0"
-IUSE=""
-
-src_install() {
-	emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install
-
-	# bug 409361
-	dodir /usr/share/poppler/cMaps
-	cd "${D}/${EPREFIX}"/usr/share/poppler/cMaps || die
-	find ../cMap -type f -exec ln -s {} . \; || die
-}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index f43d0b5..ce1163b 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1 +1 @@
-DIST poppler-0.80.0.tar.xz 1548908 BLAKE2B 09a3b10b1ee6a9de900f7a6ca105e98ec266995c3f6a3d56fbefb7b57851462caa4a16a55081efd8b70d02107d8b7a13a74e316d448290bb3b02286c1778ad86 SHA512 0a0d68168ba4d560941de31cb9e32c6cd7b44025e93cd84ace863ffab5b9ff0356524626cb16fb99c29a897738f2ac5862480fc54d42f8aecd2e3457f11c642f
+DIST poppler-21.01.0.tar.xz 1680536 BLAKE2B 5f8d283cd26f4713c09b0c102dd3295bc7ae1c2ad2ba0f51d12fdaed5f89a864d98d10be7176e17c5613aa4579da3bea1aca56aff3cec4e5c53e977a1e84659f SHA512 aec130446df73a2fc66851a563a14cb40299212a2de4a0d03668b0fecb28312fffa70d0a82431c774d0c0e3f7293788bd2bdf28c8136aa09ad80edbca4cf0ddd
diff --git a/app-text/poppler/files/poppler-0.78.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.78.0-respect-cflags.patch
deleted file mode 100644
index 137af0d..0000000
--- a/app-text/poppler/files/poppler-0.78.0-respect-cflags.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- poppler-0.78.0/cmake/modules/PopplerMacros.cmake
-+++ poppler-0.78.0/cmake/modules/PopplerMacros.cmake
-@@ -145,28 +145,6 @@
-   endif(GCC_HAS_AS_NEEDED)
- endif (CMAKE_COMPILER_IS_GNUCXX)
- 
--if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
--# set the default compile warnings
--  set(_warn "-Wall -Wextra -Wpedantic")
--  set(_warn "${_warn} -Wno-unused-parameter")
--  set(_warn "${_warn} -Wcast-align")
--  set(_warn "${_warn} -Wformat-security")
--  set(_warn "${_warn} -Wframe-larger-than=65536")
--  set(_warn "${_warn} -Wmissing-format-attribute")
--  set(_warn "${_warn} -Wnon-virtual-dtor")
--  set(_warn "${_warn} -Woverloaded-virtual")
--  set(_warn "${_warn} -Wmissing-declarations")
--  set(_warn "${_warn} -Wundef")
--  set(_warn "${_warn} -Wzero-as-null-pointer-constant")
--  set(_warn "${_warn} -Wshadow")
--
--  # set extra warnings
--  set(_warnx "${_warnx} -Wconversion")
--
--  set(DEFAULT_COMPILE_WARNINGS "${_warn}")
--  set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
--endif()
--
- if(CMAKE_C_COMPILER MATCHES "icc")
-   set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
-   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
diff --git a/app-text/poppler/files/poppler-20.11.0-respect-cflags.patch b/app-text/poppler/files/poppler-20.11.0-respect-cflags.patch
new file mode 100644
index 0000000..9845c09
--- /dev/null
+++ b/app-text/poppler/files/poppler-20.11.0-respect-cflags.patch
@@ -0,0 +1,64 @@
+From 083bc159ce35e21ab5bb942e91e98a95ce1f8f99 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Mon, 2 Nov 2020 14:30:22 +0100
+Subject: [PATCH] build: respect cflags
+
+---
+ cmake/modules/PopplerMacros.cmake | 41 -------------------------------
+ 1 file changed, 41 deletions(-)
+
+diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
+index 6e5f0050..1a3d0f9f 100644
+--- a/cmake/modules/PopplerMacros.cmake
++++ b/cmake/modules/PopplerMacros.cmake
+@@ -145,47 +145,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+   endif(GCC_HAS_AS_NEEDED)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ 
+-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+-# set the default compile warnings
+-  set(_warn "-Wall -Wextra -Wpedantic")
+-  set(_warn "${_warn} -Wno-unused-parameter")
+-  set(_warn "${_warn} -Wcast-align")
+-  set(_warn "${_warn} -Wformat-security")
+-  set(_warn "${_warn} -Wframe-larger-than=65536")
+-  set(_warn "${_warn} -Wmissing-format-attribute")
+-  set(_warn "${_warn} -Wnon-virtual-dtor")
+-  set(_warn "${_warn} -Woverloaded-virtual")
+-  set(_warn "${_warn} -Wmissing-declarations")
+-  set(_warn "${_warn} -Wundef")
+-  set(_warn "${_warn} -Wzero-as-null-pointer-constant")
+-  set(_warn "${_warn} -Wshadow")
+-  set(_warn "${_warn} -Wweak-vtables")
+-
+-  # set extra warnings
+-  set(_warnx "${_warnx} -Wconversion")
+-
+-  set(DEFAULT_COMPILE_WARNINGS "${_warn}")
+-  set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
+-
+-  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
+-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
+-  # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
+-  set(CMAKE_CXX_FLAGS_DEBUG          "-g ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
+-  set(_save_cflags "${CMAKE_C_FLAGS}")
+-  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE")
+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
+-  # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
+-  set(CMAKE_C_FLAGS_DEBUG            "-g ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
+-
+-endif()
+-
+ if(CMAKE_C_COMPILER MATCHES "icc")
+   set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
+-- 
+2.29.2
+
diff --git a/app-text/poppler/files/poppler-20.12.0-respect-cflags.patch b/app-text/poppler/files/poppler-20.12.0-respect-cflags.patch
new file mode 100644
index 0000000..4b389fa
--- /dev/null
+++ b/app-text/poppler/files/poppler-20.12.0-respect-cflags.patch
@@ -0,0 +1,108 @@
+From 37f8326557eeb291d78a866d5ff78d79b32f6f8b Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 2 Dec 2020 09:29:33 +0100
+Subject: [PATCH] build: respect cflags
+
+---
+ cmake/modules/PopplerMacros.cmake | 81 +------------------------------
+ 1 file changed, 2 insertions(+), 79 deletions(-)
+
+diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
+index 707e7497..882cf11b 100644
+--- a/cmake/modules/PopplerMacros.cmake
++++ b/cmake/modules/PopplerMacros.cmake
+@@ -79,8 +79,6 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+   set(CMAKE_BUILD_TYPE RelWithDebInfo)
+ endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+ 
+-if(CMAKE_COMPILER_IS_GNUCXX)
+-  # set the default compile warnings
+   set(_warn "-Wall -Wextra -Wpedantic")
+   set(_warn "${_warn} -Wno-unused-parameter")
+   set(_warn "${_warn} -Wcast-align")
+@@ -105,80 +103,5 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+   set(DEFAULT_COMPILE_WARNINGS "${_warn}")
+   set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
+ 
+-  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE")
+-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
+-  set(_save_cflags "${CMAKE_C_FLAGS}")
+-  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE")
+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
+-
+-  poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
+-  if(GCC_HAS_AS_NEEDED)
+-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
+-    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed")
+-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
+-  endif(GCC_HAS_AS_NEEDED)
+-endif (CMAKE_COMPILER_IS_GNUCXX)
+-
+-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+-# set the default compile warnings
+-  set(_warn "-Wall -Wextra -Wpedantic")
+-  set(_warn "${_warn} -Wno-unused-parameter")
+-  set(_warn "${_warn} -Wcast-align")
+-  set(_warn "${_warn} -Wformat-security")
+-  set(_warn "${_warn} -Wframe-larger-than=65536")
+-  set(_warn "${_warn} -Wmissing-format-attribute")
+-  set(_warn "${_warn} -Wnon-virtual-dtor")
+-  set(_warn "${_warn} -Woverloaded-virtual")
+-  set(_warn "${_warn} -Wmissing-declarations")
+-  set(_warn "${_warn} -Wundef")
+-  set(_warn "${_warn} -Wzero-as-null-pointer-constant")
+-  set(_warn "${_warn} -Wshadow")
+-  set(_warn "${_warn} -Wweak-vtables")
+-
+-  # set extra warnings
+-  set(_warnx "${_warnx} -Wconversion")
+-
+-  set(DEFAULT_COMPILE_WARNINGS "${_warn}")
+-  set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
+-
+-  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
+-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
+-  # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
+-  set(CMAKE_CXX_FLAGS_DEBUG          "-g ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
+-  set(_save_cflags "${CMAKE_C_FLAGS}")
+-  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE")
+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
+-  # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
+-  set(CMAKE_C_FLAGS_DEBUG            "-g ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
+-
+-endif()
+-
+-if(CMAKE_C_COMPILER MATCHES "icc")
+-  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUG          "-O2 -g -0b0 -noalign ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g -Ob0 -noalign ${_save_cxxflags}")
+-  set(_save_cflags "${CMAKE_C_FLAGS}")
+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUG            "-O2 -g -Ob0 -noalign ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUGFULL        "-g -Ob0 -noalign ${_save_cflags}")
+-endif(CMAKE_C_COMPILER MATCHES "icc")
+-
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+-- 
+2.29.2
+
diff --git a/app-text/poppler/files/poppler-20.12.1-qt5-deps.patch b/app-text/poppler/files/poppler-20.12.1-qt5-deps.patch
new file mode 100644
index 0000000..234be82
--- /dev/null
+++ b/app-text/poppler/files/poppler-20.12.1-qt5-deps.patch
@@ -0,0 +1,49 @@
+From e5927c7250afd6b715a9de520851b26e41b7f422 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 9 Dec 2020 01:28:25 +0100
+Subject: [PATCH] Move Qt5 test dependencies into test dir
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt     |  6 ++----
+ qt5/CMakeLists.txt | 10 ++++++++--
+ 2 files changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1573249a..ab91d537 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -157,10 +157,8 @@ if (ENABLE_QT5)
+   find_package(Qt5Core 5.5)  # Update QT_DISABLE_DEPRECATED_BEFORE in qt5/CMakeLists.txt when increasing this
+   find_package(Qt5Gui)
+   find_package(Qt5Xml)
+-  find_package(Qt5Widgets)
+-  find_package(Qt5Test)
+-  if (NOT (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND))
+-    message("-- Package Qt5Core or Qt5Gui or Qt5Xml or Qt5Widgets or Qt5Test not found")
++  if (NOT (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND))
++    message("-- Package Qt5Core or Qt5Gui or Qt5Xml not found")
+     set(ENABLE_QT5 OFF)
+   endif()
+ endif()
+diff --git a/qt5/CMakeLists.txt b/qt5/CMakeLists.txt
+index 58b42f5e..e3b26cc2 100644
+--- a/qt5/CMakeLists.txt
++++ b/qt5/CMakeLists.txt
+@@ -9,5 +9,11 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050500)
+ add_definitions(-DQT_NO_DEPRECATED_WARNINGS)
+ 
+ add_subdirectory(src)
+-add_subdirectory(tests)
+-add_subdirectory(demos)
++
++if(BUILD_QT5_TESTS)
++  find_package(Qt5Widgets REQUIRED)
++  find_package(Qt5Test REQUIRED)
++
++  add_subdirectory(tests)
++  add_subdirectory(demos)
++endif()
+-- 
+2.29.2
+
diff --git a/app-text/poppler/poppler-0.80.0.ebuild b/app-text/poppler/poppler-0.80.0.ebuild
deleted file mode 100644
index 6dd4201..0000000
--- a/app-text/poppler/poppler-0.80.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
-	SLOT="0/9999"
-else
-	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="*"
-	SLOT="0/90"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-DEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		x11-libs/cairo
-		introspection? ( dev-libs/gobject-introspection:= )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
-	lcms? ( media-libs/lcms:2 )
-	nss? ( >=dev-libs/nss-3.19:0 )
-	png? ( media-libs/libpng:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
-	cjk? ( app-text/poppler-data )
-"
-
-DOCS=( AUTHORS NEWS README.md README-XPDF )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
-	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-	"${FILESDIR}/${PN}-0.78.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if [[ ${CC} == clang ]] ; then
-		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
-	fi
-
-	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
-		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
-			-i CMakeLists.txt || die
-	else
-		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
-	fi
-
-	# we need to up the C++ version, bug #622526, #643278
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	xdg_environment_reset
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
-		-DSPLASH_CMYK=OFF
-		-DUSE_FIXEDPOINT=OFF
-		-DUSE_FLOAT=OFF
-		-DWITH_Cairo=$(usex cairo)
-		-DENABLE_LIBCURL=$(usex curl)
-		-DENABLE_CPP=$(usex cxx)
-		-DWITH_JPEG=$(usex jpeg)
-		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
-		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
-		-DENABLE_CMS=$(usex lcms lcms2 none)
-		-DWITH_NSS3=$(usex nss)
-		-DWITH_PNG=$(usex png)
-		$(cmake-utils_use_find_package qt5 Qt5Core)
-		-DWITH_TIFF=$(usex tiff)
-		-DENABLE_UTILS=$(usex utils)
-	)
-	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}
diff --git a/app-text/poppler/poppler-21.01.0.ebuild b/app-text/poppler/poppler-21.01.0.ebuild
new file mode 100644
index 0000000..5ef1a58
--- /dev/null
+++ b/app-text/poppler/poppler-21.01.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 2005-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+else
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="*"
+	SLOT="0/106"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+DEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		introspection? ( dev-libs/gobject-introspection:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
+	"${FILESDIR}/${PN}-20.12.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DRUN_GPERF_IF_PRESENT=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+		-DENABLE_QT6=OFF
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest
index 28ed48a..22f9056 100644
--- a/app-text/tree/Manifest
+++ b/app-text/tree/Manifest
@@ -1 +1 @@
-DIST tree-1.5.3.tgz 34494 RMD160 72ca2be3ea05bd18819973ad0dfc60a3b9247d90 SHA1 329e05e500754109ff1f648c14924d8cac42c6ea SHA256 1128755ea9455615188212bb04319cf103114fb78f687aa887ce29ef184ffb8d
+DIST tree-1.8.0.tgz 50286 BLAKE2B 51a27500b89a46add6e792d446b465696d2b34339bbd06f03baff9ce589131b5d82c414849f891dbb79a3f3cfb23b89336e783ad23b84c1fb5415a13fb9488cd SHA512 3f657a6278ec5eab2fccab39dfd69bf9376811189a368b5e3213dc900b90a4e7a4961fc58eb80ad2efd5b40d2fbd0146ec59f30fe0bba576f93519214f240695
diff --git a/app-text/tree/files/tree.bashcomp b/app-text/tree/files/tree.bashcomp
index b5da3ee..fed4935 100644
--- a/app-text/tree/files/tree.bashcomp
+++ b/app-text/tree/files/tree.bashcomp
@@ -1,6 +1,5 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tree/files/tree.bashcomp,v 1.1 2005/08/30 14:15:49 ka0ttic Exp $
 
 # bash command-line completion for tree
 # Author: Aaron Walker <ka0ttic@gentoo.org>
@@ -15,7 +14,7 @@
     --dirsfirst --charset --help"
 
     if [[ ${cur} == -* ]] ; then
-        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+        COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
         return 0
     fi
 
@@ -23,10 +22,10 @@
         -L|-P|-I|-H|-T|--charset|--help)
             ;;
         -o)
-            COMPREPLY=( $(compgen -f -- ${cur}) )
+	    _filedir
             ;;
         *)
-            COMPREPLY=( $(compgen -d -- ${cur}) )
+	    _filedir -d
             ;;
     esac
 }
diff --git a/app-text/tree/metadata.xml b/app-text/tree/metadata.xml
index 3e22333..c30fee7 100644
--- a/app-text/tree/metadata.xml
+++ b/app-text/tree/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>mr_bones_@gentoo.org</email>
-    <name>Michael Sterrett</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>jstein@gentoo.org</email>
+		<name>Jonas Stein</name>
+	</maintainer>
+	<upstream>
+		<changelog>http://mama.indstate.edu/users/ice/tree/changes.html</changelog>
+	</upstream>
+	<longdescription>Tree is a recursive directory listing command that
+produces a depth indented listing of files, which is colorized ala 
+dircolors if the LS_COLORS environment variable is set and output is to tty.
+	</longdescription>
 </pkgmetadata>
diff --git a/app-text/tree/tree-1.5.3.ebuild b/app-text/tree/tree-1.5.3.ebuild
deleted file mode 100644
index 1be8e70..0000000
--- a/app-text/tree/tree-1.5.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tree/tree-1.5.3.ebuild,v 1.6 2010/03/08 15:25:58 pacho Exp $
-
-EAPI=2
-inherit toolchain-funcs flag-o-matic bash-completion
-
-DESCRIPTION="Lists directories recursively, and produces an indented listing of files."
-HOMEPAGE="http://mama.indstate.edu/users/ice/tree/"
-SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-src_prepare() {
-	sed -i \
-		-e 's:LINUX:__linux__:' tree.c \
-		|| die "sed failed"
-}
-
-src_compile() {
-	append-lfs-flags
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		XOBJS="$(use elibc_uclibc && echo strverscmp.o)" \
-		|| die "emake failed"
-}
-
-src_install() {
-	dobin tree || die "dobin failed"
-	doman man/tree.1
-	dodoc CHANGES README*
-	dobashcompletion "${FILESDIR}"/${PN}.bashcomp
-}
diff --git a/app-text/tree/tree-1.8.0.ebuild b/app-text/tree/tree-1.8.0.ebuild
new file mode 100644
index 0000000..4ce51e3
--- /dev/null
+++ b/app-text/tree/tree-1.8.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs flag-o-matic bash-completion-r1
+
+DESCRIPTION="Lists directories recursively, and produces an indented listing of files"
+HOMEPAGE="http://mama.indstate.edu/users/ice/tree/"
+SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="*"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+src_prepare() {
+	sed -i -e 's:LINUX:__linux__:' tree.c || die
+	mv doc/tree.1.fr doc/tree.fr.1
+	if use !elibc_glibc ; then
+		# 433972, also previously done only for elibc_uclibc
+		sed -i -e '/^OBJS=/s/$/ strverscmp.o/' Makefile || die
+	fi
+	default
+}
+
+src_compile() {
+	append-lfs-flags
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin tree
+	doman doc/tree*.1
+	einstalldocs
+	newbashcomp "${FILESDIR}"/${PN}.bashcomp ${PN}
+}
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index ddeb94a..2ac9943 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -1,2 +1 @@
-DIST xmlto-0.0.24-mans.tar.bz2 4575 RMD160 6687bf4d59b823f416b37b179a24ed6d9a315227 SHA1 e5c44ec88dd3e473d0be5151008b00d5fe190dc1 SHA256 1a5b78cf9b349023aaed17c2b39d94e123da58d9b682693013fb3bcdaac7735b
-DIST xmlto-0.0.24.tar.bz2 111860 RMD160 c3aa05569571aa7c2acbe0cc93c136a0d77a7d80 SHA1 68b1664e9ba4d76c37c373f2f0082d62c41506c8 SHA256 30f59f4cc87a5e86f74fc1d2e63ceb6adc7a260d438e0439689efc2588976e13
+DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
diff --git a/app-text/xmlto/files/xmlto-0.0.24-parallelmake.patch b/app-text/xmlto/files/xmlto-0.0.24-parallelmake.patch
deleted file mode 100644
index 6d18724..0000000
--- a/app-text/xmlto/files/xmlto-0.0.24-parallelmake.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From f2ada08ce5b92de1869419f1ed50aa1190a8bfb4 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 19 Aug 2011 10:47:10 -0400
-Subject: [PATCH] fix building manpages in parallel
-
-The current man page rules allow make to fire off two children (1 per
-man page), but each child will attempt to create all the required man
-pages.  So it's possible for the children to collide on their outputs.
-Rewrite the rules so that each man page will fire off one child and
-only process its specific man page.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- Makefile.am |    8 +++-----
- 1 files changed, 3 insertions(+), 5 deletions(-)
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -68,11 +68,9 @@ EXTRA_DIST = xmlto.spec \
- 	doc/xmlif.xml \
- 	xmlto.mak
- 
--$(man1_MANS): $(top_srcdir)/doc/xmlto.xml $(top_srcdir)/doc/xmlif.xml
--	for xml in xmlif.xml xmlto.xml; do \
--	  FORMAT_DIR=$(top_srcdir)/format \
--	   $(BASH) ./xmlto -o man/man1 man $(top_srcdir)/doc/$$xml ; \
--	done || ( RC=$$?; exit $$RC )
-+GEN_MANPAGE = FORMAT_DIR=$(top_srcdir)/format $(BASH) ./xmlto -o $(@D) man $<
-+man/man1/xmlto.1: doc/xmlto.xml ; $(GEN_MANPAGE)
-+man/man1/xmlif.1: doc/xmlif.xml ; $(GEN_MANPAGE)
- 
- TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) top_builddir=$(top_builddir)
- TESTS = xmlif/test/run-test
-
-The Makefile.in patch is trivial, so avoid autotools just for this
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -959,11 +959,9 @@
- 	uninstall-man uninstall-man1 uninstall-nobase_pkgdataDATA
- 
- 
--$(man1_MANS): $(top_srcdir)/doc/xmlto.xml $(top_srcdir)/doc/xmlif.xml
--	for xml in xmlif.xml xmlto.xml; do \
--	  FORMAT_DIR=$(top_srcdir)/format \
--	   $(BASH) ./xmlto -o man/man1 man $(top_srcdir)/doc/$$xml ; \
--	done || ( RC=$$?; exit $$RC )
-+GEN_MANPAGE = FORMAT_DIR=$(top_srcdir)/format $(BASH) ./xmlto -o $(@D) man $<
-+man/man1/xmlto.1: doc/xmlto.xml ; $(GEN_MANPAGE)
-+man/man1/xmlif.1: doc/xmlif.xml ; $(GEN_MANPAGE)
- 
- tag:
- 	cvs tag -c `echo V@VERSION@ | tr . _`
--- 
-1.7.6
-
diff --git a/app-text/xmlto/files/xmlto-0.0.28-allow-links.patch b/app-text/xmlto/files/xmlto-0.0.28-allow-links.patch
new file mode 100644
index 0000000..b35b492
--- /dev/null
+++ b/app-text/xmlto/files/xmlto-0.0.28-allow-links.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/679626
+Thanks-to: dolphinling
+--- a/configure.in
++++ b/configure.in
+@@ -100,8 +100,8 @@ dnl
+ AC_ARG_VAR([LYNX], [Name and path of the `lynx' browser.])
+ AC_PATH_PROG([LYNX], [lynx], [lynx])
+ 
+-AC_ARG_VAR([LINKS], [Name and path of the `elinks' browser.])
+-AC_PATH_PROG([LINKS], [elinks], [elinks])
++AC_ARG_VAR([LINKS], [Name and path of the `links/elinks' browser.])
++AC_PATH_PROGS([LINKS], [links elinks], [links])
+ 
+ AC_ARG_VAR([W3M], [Name and path of the `w3m' browser.])
+ AC_PATH_PROG([W3M], [w3m], [w3m])
diff --git a/app-text/xmlto/metadata.xml b/app-text/xmlto/metadata.xml
index e960864..d52af1c 100644
--- a/app-text/xmlto/metadata.xml
+++ b/app-text/xmlto/metadata.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sgml</herd>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<use>
+		<flag name="text">Support conversion from XML to plain text</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-text/xmlto/xmlto-0.0.24-r1.ebuild b/app-text/xmlto/xmlto-0.0.24-r1.ebuild
deleted file mode 100644
index eb51c0b..0000000
--- a/app-text/xmlto/xmlto-0.0.24-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.24-r1.ebuild,v 1.1 2011/08/19 15:23:41 vapier Exp $
-
-EAPI="3"
-
-inherit eutils
-
-DESCRIPTION="script for converting XML and DocBook formatted documents to a variety of output formats"
-HOMEPAGE="https://fedorahosted.org/xmlto/"
-SRC_URI="https://fedorahosted.org/releases/x/m/xmlto/${P}.tar.bz2
-	mirror://gentoo/${P}-mans.tar.bz2
-	http://dev.gentoo.org/~vapier/dist/${P}-mans.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE="latex"
-
-RDEPEND="app-shells/bash
-	|| ( sys-apps/which sys-freebsd/freebsd-ubin )
-	dev-libs/libxslt
-	>=app-text/docbook-xsl-stylesheets-1.62.0-r1
-	~app-text/docbook-xml-dtd-4.2
-	|| ( sys-apps/util-linux app-misc/getopt )
-	|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
-	latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )"
-DEPEND="${RDEPEND}
-	sys-devel/flex"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
-	epatch "${FILESDIR}"/${PN}-0.0.24-parallelmake.patch
-}
-
-src_configure() {
-	export BASH
-	has_version sys-apps/util-linux || export GETOPT="getopt-long"
-	econf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog FAQ NEWS README THANKS
-	insinto /usr/share/doc/${PF}/xml
-	doins doc/*.xml
-}
diff --git a/app-text/xmlto/xmlto-0.0.28-r6.ebuild b/app-text/xmlto/xmlto-0.0.28-r6.ebuild
new file mode 100644
index 0000000..bf9de2c
--- /dev/null
+++ b/app-text/xmlto/xmlto-0.0.28-r6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Script for converting XML and DocBook documents to a variety of output formats"
+HOMEPAGE="https://pagure.io/xmlto"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="*"
+IUSE="latex text"
+
+RDEPEND="
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	|| ( sys-apps/util-linux app-misc/getopt )
+	text? ( || ( virtual/w3m www-client/elinks www-client/links www-client/lynx ) )
+	latex? ( dev-texlive/texlive-formatsextra )
+"
+# We only depend on flex when we patch the input lexer.
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
+	"${FILESDIR}"/${PN}-0.0.28-allow-links.patch
+)
+
+src_prepare() {
+	default
+
+	# fix symbol clash on Solaris
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/\(attrib\|val\)/XMLTO\1/g' xmlif/xmlif.l || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	# We don't want the script to detect /bin/sh if it is bash.
+	export ac_cv_path_BASH="${BASH}"
+	has_version sys-apps/util-linux || export GETOPT=getopt-long
+
+	econf
+}
diff --git a/dev-embedded/jlink/Manifest b/dev-embedded/jlink/Manifest
new file mode 100644
index 0000000..49f4d04
--- /dev/null
+++ b/dev-embedded/jlink/Manifest
@@ -0,0 +1 @@
+DIST JLink_Linux_V694a_x86_64.tgz 45116062 BLAKE2B b1cf94edce42fc697eb25c361d0edaefee9720a8a76596eef6ee74c78f29150b761693847d1f14814525187ef7a5fb582d4a03a03180bdbf42dd486a14943bda SHA512 9512816abf0ae7b6bd19804e97ac6e2928b8adfd3a2486105ae0de87c3693669ab4d1901c3be2a1e1a5ab8461ab5a83ba9465aa91f0086933d27453d2a1a7e89
diff --git a/dev-embedded/jlink/OWNERS b/dev-embedded/jlink/OWNERS
new file mode 100644
index 0000000..2add3e8
--- /dev/null
+++ b/dev-embedded/jlink/OWNERS
@@ -0,0 +1 @@
+tomhughes@chromium.org
diff --git a/dev-embedded/jlink/jlink-6.94a.ebuild b/dev-embedded/jlink/jlink-6.94a.ebuild
new file mode 100644
index 0000000..a0a3b72
--- /dev/null
+++ b/dev-embedded/jlink/jlink-6.94a.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils udev
+
+INSTALLDIR="/opt/${PN}"
+
+DESCRIPTION="Tools for Segger J-Link JTAG adapters"
+HOMEPAGE="https://www.segger.com/jlink-software.html"
+SRC_URI="https://www.segger.com/downloads/jlink/JLink_Linux_V${PV/./}_x86_64.tgz"
+LICENSE="SEGGER"
+SLOT="0"
+KEYWORDS="-* amd64"
+IUSE=""
+QA_PREBUILT="*"
+
+RESTRICT="fetch strip"
+RDEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-devel/gcc
+	sys-libs/glibc
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+"
+
+S="${WORKDIR}/JLink_Linux_V${PV/./}_x86_64"
+
+pkg_nofetch() {
+	einfo "Segger requires you to accept their license agreement before downloading."
+	einfo "Download ${SRC_URI}"
+	einfo "with your browser and place it in DISTDIR (usually /var/cache/distfiles/)"
+}
+
+src_install() {
+	local bins=(
+		JFlashExe
+		JFlashLiteExe
+		JFlashSPI_CL
+		JFlashSPIExe
+		JLinkConfigExe
+		JLinkExe
+		JLinkGDBServerCLExe
+		JLinkGDBServer
+		JLinkGUIServerExe
+		JLinkLicenseManager
+		JLinkRegistration
+		JLinkRemoteServerCLExe
+		JLinkRemoteServer
+		JLinkRTTClient
+		JLinkRTTLogger
+		JLinkRTTViewerExe
+		JLinkSTM32
+		JLinkSWOViewerCLExe
+		JLinkSWOViewer
+		JMemExe
+		JRunExe
+		JTAGLoadExe
+	)
+	local wrapper
+	for wrapper in "${bins[@]}"; do
+		make_wrapper "${wrapper}" ./"${wrapper}" "${INSTALLDIR}"
+	done
+
+	exeinto "${INSTALLDIR}"
+	doexe "${bins[@]}"
+
+	insinto "${INSTALLDIR}"
+	local libs=(
+		libjlinkarm.so*
+		libQtCore.so*
+		libQtGui.so*
+	)
+
+	local lib
+	for lib in "${libs[@]}"; do
+		# Use doins for symlinks to avoid making unnecessary copies of the libs.
+		if [[ -L "${lib}" ]]; then
+			doins "${lib}"
+		else
+			doexe "${lib}"
+		fi
+	done
+
+	doins -r \
+		README.txt \
+		Doc \
+		Samples \
+		Devices \
+		ETC \
+		GDBServer
+
+	udev_dorules 99-jlink.rules
+}
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index f2468fa..6e7ec45 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1 +1 @@
-DIST fribidi-1.0.5.tar.bz2 2082617 BLAKE2B 99b088a37600d1b3e556b4dd978cafb04af0fea9c7db8ed9b0aa90d6a6a60f8ca312c214151ce386d2d61ae382d6ff0e6ae240bd44dfde28eb8c25a5c5f4cd1e SHA512 c8fb32468be4c461832d586d6c6af65fad1cfe9d5b2fed405f247d6974425ccedeb21ad11609fbcabc3ae5d635d78d88c12d201a4d19ef997e9497054afcdeb2
+DIST fribidi-1.0.9.tar.xz 1141684 BLAKE2B 6c9e9866ad900c041968f96ffc93e118715a319fbc47a5fe09b4a68daa5096e8c3cc1f0be1f8754ecf60b265f51fada75ac71f8bf1853f59e891644a97eaf644 SHA512 e66989830941172fa003c8b9376719282fa1039592a1e158e975cab81ce8dcb2755453c64906a8464c047f9e9154e012d9bd37256b1f463e235648a13e4601ed
diff --git a/dev-libs/fribidi/fribidi-1.0.5.ebuild b/dev-libs/fribidi/fribidi-1.0.5.ebuild
deleted file mode 100644
index 26c9254..0000000
--- a/dev-libs/fribidi/fribidi-1.0.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
-HOMEPAGE="https://fribidi.org/"
-SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="*"
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]"
-
-DOCS=( AUTHORS NEWS README ChangeLog THANKS )
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		$(use_enable static-libs static)
-		--disable-debug
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/fribidi/fribidi-1.0.9.ebuild b/dev-libs/fribidi/fribidi-1.0.9.ebuild
new file mode 100644
index 0000000..68d40eb
--- /dev/null
+++ b/dev-libs/fribidi/fribidi-1.0.9.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
+HOMEPAGE="https://fribidi.org/"
+SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="*"
+IUSE="static-libs"
+
+RDEPEND=""
+DEPEND=""
+BDEPEND="
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS NEWS ChangeLog THANKS ) # README points at README.md which wasn't disted with EAPI-7
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable static-libs static)
+		--disable-debug
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/fribidi/metadata.xml b/dev-libs/fribidi/metadata.xml
index 996e7ca..8cfcbe7 100644
--- a/dev-libs/fribidi/metadata.xml
+++ b/dev-libs/fribidi/metadata.xml
@@ -5,4 +5,7 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:fribidi:gnu_fribidi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index c3d1995..5a70770 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -1 +1 @@
-DIST libbsd-0.9.1.tar.xz 387180 SHA256 56d835742327d69faccd16955a60b6dcf30684a8da518c4eca0ac713b9e0a7a4 SHA512 435822b8f2495a5e2705e5ab5c834a4f0f3a177b3e5c46a7c6162924507ca984e957e94a512b5ebd0067ecb413bac458fade357709ef199e9b75edf0315de91c WHIRLPOOL b1acda2e73388eed88cd18c371f18124e2921272a85d65ef0d8c679e10c418ed0cec35ef30fe3b893e7ca6e93f0577c344b0b19f167aec37b1f94914f9bff2ed
+DIST libbsd-0.10.0.tar.xz 393576 BLAKE2B 66005a511dae7fb799322c813b8ea058ab460e3b9044756d6efad5de741d8f70270496f09803bbce8cd0000ff37e998f18e092037c850826c3c8e3f47ddfdb28 SHA512 b75529785b16c93d31401187f8a58258fbebe565dac071c8311775c913af989f62cd29d5ce2651af3ea6221cffd31cf04826577d3e546ab9ca14340f297777b9
diff --git a/dev-libs/libbsd/files/libbsd-0.8.6-sparc.patch b/dev-libs/libbsd/files/libbsd-0.8.6-sparc.patch
deleted file mode 100644
index d2c35d8..0000000
--- a/dev-libs/libbsd/files/libbsd-0.8.6-sparc.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0b65d43963fc1bea195e94e3af922a7893bf6fcd Mon Sep 17 00:00:00 2001
-From: James Clarke <jrtc27@jrtc27.com>
-Date: Sun, 4 Mar 2018 23:44:52 +0100
-Subject: Add support for ELF machine EM_SPARC32PLUS
-
-32-bit SPARC on V8+ uses a different ELF machine type.
-
-Fixes: https://bugs.gentoo.org/634550
-Signed-off-by: Guillem Jover <guillem@hadrons.org>
----
- src/local-elf.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/local-elf.h b/src/local-elf.h
-index 1faf182..f7cbd83 100644
---- a/src/local-elf.h
-+++ b/src/local-elf.h
-@@ -186,7 +186,11 @@
- #define ELF_TARG_MACH	EM_SPARCV9
- #define ELF_TARG_CLASS	ELFCLASS64
- #else
-+#if defined(__sparc_v9__)
-+#define ELF_TARG_MACH	EM_SPARC32PLUS
-+#else
- #define ELF_TARG_MACH	EM_SPARC
-+#endif
- #define ELF_TARG_CLASS	ELFCLASS32
- #endif
- #define ELF_TARG_DATA	ELFDATA2MSB
--- 
-cgit v1.1
-
diff --git a/dev-libs/libbsd/libbsd-0.10.0.ebuild b/dev-libs/libbsd/libbsd-0.10.0.ebuild
new file mode 100644
index 0000000..d758bf3
--- /dev/null
+++ b/dev-libs/libbsd/libbsd-0.10.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-minimal
+
+DESCRIPTION="An library to provide useful functions commonly found on BSD systems"
+HOMEPAGE="https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd"
+SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
+
+LICENSE="BSD BSD-2 BSD-4 ISC"
+SLOT="0"
+KEYWORDS="*"
+IUSE="static-libs"
+
+DEPEND=">=sys-kernel/linux-headers-3.17"
+RDEPEND=""
+
+pkg_setup() {
+	local f="${EROOT}/usr/$(get_libdir)/${PN}.a"
+	local m="You need to remove ${f} by hand or re-emerge sys-libs/glibc first."
+	if ! has_version ${CATEGORY}/${PN}; then
+		if [[ -e ${f} ]]; then
+			eerror "${m}"
+			die "${m}"
+		fi
+	fi
+}
+
+multilib_src_configure() {
+	# The build system will install libbsd-ctor.a despite of USE="-static-libs"
+	# which is correct, see:
+	# https://gitlab.freedesktop.org/libbsd/libbsd/commit/c5b959028734ca2281250c85773d9b5e1d259bc8
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/libbsd/libbsd-0.9.1.ebuild b/dev-libs/libbsd/libbsd-0.9.1.ebuild
deleted file mode 100644
index e48ae2b..0000000
--- a/dev-libs/libbsd/libbsd-0.9.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib-minimal
-
-DESCRIPTION="An library to provide useful functions commonly found on BSD systems"
-HOMEPAGE="https://libbsd.freedesktop.org/wiki/"
-SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
-
-LICENSE="BSD BSD-2 BSD-4 ISC"
-SLOT="0"
-KEYWORDS="*"
-IUSE="static-libs"
-
-DEPEND=">=sys-kernel/linux-headers-3.17"
-RDEPEND=""
-
-pkg_setup() {
-	local f="${EROOT}/usr/$(get_libdir)/${PN}.a"
-	local m="You need to remove ${f} by hand or re-emerge sys-libs/glibc first."
-	if ! has_version ${CATEGORY}/${PN}; then
-		if [[ -e ${f} ]]; then
-			eerror "${m}"
-			die "${m}"
-		fi
-	fi
-}
-
-multilib_src_configure() {
-	# The build system will install libbsd-ctor.a despite of USE="-static-libs"
-	# which is correct, see:
-	# https://cgit.freedesktop.org/libbsd/commit/?id=c5b959028734ca2281250c85773d9b5e1d259bc8
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/libev/Manifest b/dev-libs/libev/Manifest
index a5c3b89..88ac5d5 100644
--- a/dev-libs/libev/Manifest
+++ b/dev-libs/libev/Manifest
@@ -1 +1 @@
-DIST libev-4.23.tar.gz 524184 BLAKE2B bb8c15665e0ff59322bc2f076f4256ca8f5acff5bc55bb3f5f10ac9704f9311ad90f581e4ced25dcc22c39988ffacce1958f195234a60039d33ba7b7beb9aee2 SHA512 e3d98364b3788a7f5c56be49b99cecc98da6323fc7e6d47aff808580653ab9effffe88636a2f5d357d596a9a580e778c20139cc162467e3e2c5fc736713c6e39
+DIST libev-4.33.tar.gz 569527 BLAKE2B 8a6cae25ffde10b24a5bbf084f6a8559af326b37acdbdf47dda34b7f0c7955f3ebd26958594444a574cfa3e2b4011e4be93ad2bd994ffd4c094bf36620e67ba5 SHA512 c662a65360115e0b2598e3e8824cf7b33360c43a96ac9233f6b6ea2873a10102551773cad0e89e738541e75af9fd4f3e3c11cd2f251c5703aa24f193128b896b
diff --git a/dev-libs/libev/files/libev-4.25-pc.patch b/dev-libs/libev/files/libev-4.25-pc.patch
new file mode 100644
index 0000000..a5e3624
--- /dev/null
+++ b/dev-libs/libev/files/libev-4.25-pc.patch
@@ -0,0 +1,49 @@
+diff --git a/Makefile.am b/Makefile.am
+index 059305b..76d9852 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -16,5 +16,8 @@ lib_LTLIBRARIES = libev.la
+ libev_la_SOURCES = ev.c event.c
+ libev_la_LDFLAGS = -version-info $(VERSION_INFO)
+ 
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = libev.pc
++
+ ev.3: ev.pod
+ 	pod2man -n LIBEV -r "libev-$(VERSION)" -c "libev - high performance full featured event loop" -s3 <$< >$@
+diff --git a/configure.ac b/configure.ac
+index b004dda..6ba3f5c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,6 +4,7 @@ AC_INIT([libev], [4.25])
+ orig_CFLAGS="$CFLAGS"
+ 
+ AC_CONFIG_SRCDIR([ev_epoll.c])
++AC_CONFIG_MACRO_DIR([m4])
+ AM_INIT_AUTOMAKE
+ 
+ AC_CONFIG_HEADERS([config.h])
+@@ -23,5 +24,5 @@ AC_PROG_LIBTOOL
+ 
+ m4_include([libev.m4])
+ 
+-AC_CONFIG_FILES([Makefile])
++AC_CONFIG_FILES([Makefile libev.pc])
+ AC_OUTPUT
+diff --git a/libev.pc.in b/libev.pc.in
+new file mode 100644
+index 0000000..8bc8681
+--- /dev/null
++++ b/libev.pc.in
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: libev
++Description: A high-performance event loop/event model with lots of features
++Version: @VERSION@
++Libs: -L${libdir} -lev
++Libs.private:
++Cflags: -I${includedir}
diff --git a/dev-libs/libev/files/libev-pc.patch b/dev-libs/libev/files/libev-pc.patch
deleted file mode 100644
index a2a4c62..0000000
--- a/dev-libs/libev/files/libev-pc.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- /dev/null
-+++ b/libev.pc.in
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: libev
-+Description: A high-performance event loop/event model with lots of features
-+Version: @VERSION@
-+Libs: -L${libdir} -lev
-+Libs.private:
-+Cflags: -I${includedir}
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -16,5 +16,8 @@ lib_LTLIBRARIES = libev.la
- libev_la_SOURCES = ev.c event.c
- libev_la_LDFLAGS = -version-info $(VERSION_INFO)
- 
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = libev.pc
-+
- ev.3: ev.pod
- 	pod2man -n LIBEV -r "libev-$(VERSION)" -c "libev - high performance full featured event loop" -s3 <$< >$@
---- a/configure.ac
-+++ b/configure.ac
-@@ -2,6 +2,7 @@ orig_CFLAGS="$CFLAGS"
- 
- AC_INIT
- AC_CONFIG_SRCDIR([ev_epoll.c])
-+AC_CONFIG_MACRO_DIR([m4])
- 
- AM_INIT_AUTOMAKE(libev,4.11) dnl also update ev.h!
- AC_CONFIG_HEADERS([config.h])
-@@ -21,5 +22,5 @@ AC_PROG_LIBTOOL
- 
- m4_include([libev.m4])
- 
--AC_CONFIG_FILES([Makefile])
-+AC_CONFIG_FILES([Makefile libev.pc])
- AC_OUTPUT
diff --git a/dev-libs/libev/libev-4.23.ebuild b/dev-libs/libev/libev-4.23.ebuild
deleted file mode 100644
index df7ea63..0000000
--- a/dev-libs/libev/libev-4.23.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib-minimal
-
-DESCRIPTION="A high-performance event loop/event model with lots of feature"
-HOMEPAGE="http://software.schmorp.de/pkg/libev.html"
-SRC_URI="http://dist.schmorp.de/libev/${P}.tar.gz
-	http://dist.schmorp.de/libev/Attic/${P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="*"
-IUSE="static-libs"
-
-DOCS=( Changes README )
-
-src_prepare() {
-	sed -i -e "/^include_HEADERS/s/ event.h//" Makefile.am || die
-
-	# bug #411847
-	epatch "${FILESDIR}/${PN}-pc.patch"
-
-	epatch_user
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		--disable-maintainer-mode \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	use static-libs || prune_libtool_files
-	einstalldocs
-}
diff --git a/dev-libs/libev/libev-4.33.ebuild b/dev-libs/libev/libev-4.33.ebuild
new file mode 100644
index 0000000..1ede07a
--- /dev/null
+++ b/dev-libs/libev/libev-4.33.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="A high-performance event loop/event model with lots of feature"
+HOMEPAGE="http://software.schmorp.de/pkg/libev.html"
+SRC_URI="http://dist.schmorp.de/libev/${P}.tar.gz
+	http://dist.schmorp.de/libev/Attic/${P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="*"
+IUSE="static-libs"
+
+DOCS=( Changes README )
+
+# bug #411847
+PATCHES=( "${FILESDIR}/${PN}-4.25-pc.patch" )
+
+src_prepare() {
+	default
+	sed -i -e "/^include_HEADERS/s/ event.h//" Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-maintainer-mode \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -type f -delete || die
+	fi
+	einstalldocs
+}
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
new file mode 100644
index 0000000..38a0b4d
--- /dev/null
+++ b/dev-libs/libevdev/Manifest
@@ -0,0 +1 @@
+DIST libevdev-1.11.0.tar.xz 445316 BLAKE2B f3c1aa688d83f4a27abec23f18817bbdb7a5911cc30fab694271f620c23273cf20109598edb0049239e78a173baa20471ad1f25266eff34a50ed8898d7b86080 SHA512 b3c6b4a1532c5142f3684b920dcdd497a5368aec516e8c389e2c8f9d1eaba16c907b2a7f2c82a3c3ff89bb4d0ae5503c736098c095f9f1bc98f0668e99bf639d
diff --git a/dev-libs/libevdev/OWNERS b/dev-libs/libevdev/OWNERS
new file mode 100644
index 0000000..a8a0a62
--- /dev/null
+++ b/dev-libs/libevdev/OWNERS
@@ -0,0 +1,3 @@
+# These projects use this library.
+include chromiumos/platform2/vm_tools:/OWNERS
+
diff --git a/dev-libs/libevdev/libevdev-1.11.0.ebuild b/dev-libs/libevdev/libevdev-1.11.0.ebuild
new file mode 100644
index 0000000..e0c855d
--- /dev/null
+++ b/dev-libs/libevdev/libevdev-1.11.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit meson-multilib python-any-r1
+
+DESCRIPTION="Handler library for evdev events"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev"
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/libevdev/libevdev.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
+	KEYWORDS="*"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc test"
+
+DEPEND="test? ( dev-libs/check[${MULTILIB_USEDEP}] )"
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+"
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature doc documentation)
+		$(meson_feature test tests)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test -t 100
+}
+
+multilib_src_install_all() {
+	if use doc; then
+		local HTML_DOCS=( doc/html/. )
+		einstalldocs
+	fi
+}
diff --git a/x11-libs/libXmu/metadata.xml b/dev-libs/libevdev/metadata.xml
similarity index 100%
rename from x11-libs/libXmu/metadata.xml
rename to dev-libs/libevdev/metadata.xml
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
new file mode 100644
index 0000000..82e92ce
--- /dev/null
+++ b/dev-libs/libfmt/Manifest
@@ -0,0 +1 @@
+DIST libfmt-7.0.3.tar.gz 740047 BLAKE2B d12d6f59bcea5b4385c4d9ff5c563860cb9275d34d5747d9f8b95664aaa499661500b630d1f621698a7a3f8431326ac5a5273e6883d070aab7cb9aa84b0bcd41 SHA512 26afe55255414e27d58c2389fcc8643b64adc04ecc3604f87024e6421706833cbad8ee4caf514dfb7e88da4162ab3e5ff8ff81b83b5f2fb66e9959e4d1bf0f9a
diff --git a/dev-libs/libfmt/OWNERS b/dev-libs/libfmt/OWNERS
new file mode 100644
index 0000000..fe7a0cd
--- /dev/null
+++ b/dev-libs/libfmt/OWNERS
@@ -0,0 +1,3 @@
+include chromiumos/overlays/chromiumos-overlay
+
+pwang@chromium.org
diff --git a/dev-libs/libfmt/libfmt-7.0.3.ebuild b/dev-libs/libfmt/libfmt-7.0.3.ebuild
new file mode 100644
index 0000000..16f013b
--- /dev/null
+++ b/dev-libs/libfmt/libfmt-7.0.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Small, safe and fast formatting library"
+HOMEPAGE="https://github.com/fmtlib/fmt"
+
+LICENSE="MIT"
+IUSE="test"
+SLOT="0/$(ver_cut 1)"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="*"
+	S="${WORKDIR}/fmt-${PV}"
+fi
+
+DEPEND=""
+RDEPEND=""
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
+		-DFMT_LIB_DIR="$(get_libdir)"
+		-DFMT_TEST=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/libfmt/libfmt-9999.ebuild b/dev-libs/libfmt/libfmt-9999.ebuild
new file mode 100644
index 0000000..6b6db65
--- /dev/null
+++ b/dev-libs/libfmt/libfmt-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Small, safe and fast formatting library"
+HOMEPAGE="https://github.com/fmtlib/fmt"
+
+LICENSE="MIT"
+IUSE="test"
+SLOT="0/$(ver_cut 1)"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~*"
+	S="${WORKDIR}/fmt-${PV}"
+fi
+
+DEPEND=""
+RDEPEND=""
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
+		-DFMT_LIB_DIR="$(get_libdir)"
+		-DFMT_TEST=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/libfmt/metadata.xml b/dev-libs/libfmt/metadata.xml
new file mode 100644
index 0000000..8c4896c
--- /dev/null
+++ b/dev-libs/libfmt/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>candrews@gentoo.org</email>
+		<name>Craig Andrews</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/fmtlib/fmt/issues</bugs-to>
+		<remote-id type="github">fmtlib/fmt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
new file mode 100644
index 0000000..698014b
--- /dev/null
+++ b/dev-libs/libmspack/Manifest
@@ -0,0 +1 @@
+DIST libmspack-0.10.1alpha.tar.gz 963274 BLAKE2B 39bcb3b7ea419d6d00850b70c217c802a2095dd4398038e594ae7c01ca12e71508218c1cfca5ae8b102636ab9517b13d55c1e411b31e87d28aa46331cd0127e6 SHA512 a7b5f7caa49190c5021f3e768b92f2e51cc0ce685c9ab6ed6fb36de885c73231b58d47a8a3b5c5aa5c9ac56c25c500eb683d84dbf11f09f97f6cb4fff5adc245
diff --git a/dev-libs/libmspack/OWNERS b/dev-libs/libmspack/OWNERS
new file mode 100644
index 0000000..4d331e8
--- /dev/null
+++ b/dev-libs/libmspack/OWNERS
@@ -0,0 +1 @@
+include /app-arch/cabextract/OWNERS
diff --git a/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild b/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild
new file mode 100644
index 0000000..1139211
--- /dev/null
+++ b/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/kyz/libmspack.git"
+	inherit git-r3
+	MY_P="${PN}-9999"
+else
+	KEYWORDS="*"
+	MY_PV="${PV/_alpha/alpha}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
+fi
+
+DESCRIPTION="A library for Microsoft compression formats"
+HOMEPAGE="https://www.cabextract.org.uk/libmspack/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="debug doc static-libs"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		# Re-create file layout from release tarball
+		pushd "${WORKDIR}" &>/dev/null || die
+		cp -aL "${S}"/${PN} "${WORKDIR}"/${PN}-source || die
+		rm -r "${S}" || die
+		mv "${WORKDIR}"/${PN}-source "${S}" || die
+		popd &>/dev/null || die
+	fi
+
+	default
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable debug) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		default
+		cd "${S}"/test && "${BUILD_DIR}"/test/cabd_test || die
+	fi
+}
+
+multilib_src_install_all() {
+	DOCS=(AUTHORS ChangeLog NEWS README TODO)
+	use doc && HTML_DOCS=(doc/*)
+	default_src_install
+	if use doc; then
+		rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
diff --git a/dev-libs/libmspack/metadata.xml b/dev-libs/libmspack/metadata.xml
new file mode 100644
index 0000000..613d45e
--- /dev/null
+++ b/dev-libs/libmspack/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>reavertm@gentoo.org</email>
+		<name>Maciej Mrozowski</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-libs/libunistring/Manifest b/dev-libs/libunistring/Manifest
index 3433452..4cfebed 100644
--- a/dev-libs/libunistring/Manifest
+++ b/dev-libs/libunistring/Manifest
@@ -1 +1 @@
-DIST libunistring-0.9.7.tar.gz 3589989 BLAKE2B 5ba029be96adf3804e9591ee0c271f41111a9c48c773d50adbf2408577e98ddd06d54dc665d3791a835698012021384c9290da0e3ce3d331f20283462c6a3c75 SHA512 43cb60163299a781b57bca326ddeb6333cde0b12d274fcd2b176971c8080ee8868f8c11bf9c524596d3a56dc0213ed1d3246fb805db1de950257c3764eb34ae0
+DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21dbbf10bbb866747f64e060df3ab822a4143528855e1ce6a13144630bc8daa14f1fa830db77fb605e57cae21d46de804d6 SHA512 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9
diff --git a/dev-libs/libunistring/libunistring-0.9.10.ebuild b/dev-libs/libunistring/libunistring-0.9.10.ebuild
new file mode 100644
index 0000000..31f8ba5
--- /dev/null
+++ b/dev-libs/libunistring/libunistring-0.9.10.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib-minimal libtool ltprune
+
+DESCRIPTION="Library for manipulating Unicode and C strings according to Unicode standard"
+HOMEPAGE="https://www.gnu.org/software/libunistring/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3 GPL-3"
+SLOT="0/2"
+KEYWORDS="*"
+IUSE="doc static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-nodocs.patch
+)
+
+src_prepare() {
+	default
+	elibtoolize  # for Solaris shared libraries
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	default
+
+	prune_libtool_files
+}
+
+multilib_src_install_all() {
+	default
+
+	if use doc; then
+		dohtml doc/*.html
+		doinfo doc/*.info
+	fi
+}
diff --git a/dev-libs/libunistring/libunistring-0.9.7.ebuild b/dev-libs/libunistring/libunistring-0.9.7.ebuild
deleted file mode 100644
index bbb029c..0000000
--- a/dev-libs/libunistring/libunistring-0.9.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib-minimal libtool
-
-DESCRIPTION="Library for manipulating Unicode and C strings according to Unicode standard"
-HOMEPAGE="https://www.gnu.org/software/libunistring/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0/2"
-KEYWORDS="*"
-IUSE="doc static-libs"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-nodocs.patch
-)
-
-src_prepare() {
-	default
-	elibtoolize  # for Solaris shared libraries
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf $(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	default
-
-	prune_libtool_files
-}
-
-multilib_src_install_all() {
-	default
-
-	if use doc; then
-		dohtml doc/*.html
-		doinfo doc/*.info
-	fi
-}
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 3a2bba6..8aa7d9f 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,5 +1,9 @@
+DIST libxml2-2.9.10-r1-patchset.tar.xz 72088 BLAKE2B 4d5f8aed35d6c0232089e09f22a77cbd25cbd2007c1330538e1c7acc4398ec3ef9023289129677cf5499dbacde4c2f28850ae81acab351d02625d3452aedaede SHA512 a63032d1e85128f637c2b54356aab06a17e31eb1f5facd8fdf88463eb21df6a1d9fd8cc751fa94b8d322fa4f796be4e1d9aa071cbd0826ab31fae46525fde952
+DIST libxml2-2.9.10.tar.gz 5624761 BLAKE2B a9958bd7db17fbfb8259b64d66548eb19d28f1aecf40cf66752fcec5720855d31cea9941d52963badd8c18ea1770485f1c11da6213149458336ce0273418f421 SHA512 0adfd12bfde89cbd6296ba6e66b6bed4edb814a74b4265bda34d95c41d9d92c696ee7adb0c737aaf9cc6e10426a31a35079b2a23d26c074e299858da12c072ed
+DIST libxml2-2.9.12-r1-patchset.tar.bz2 5497 BLAKE2B fda8ad166c89209abaf8f94a5dfbff84e5a6c89cca36350a2f0b9b8db42c6f348b6cb8c7738a35aed8421ca994cc6ad76c3aa02a8a9899fa969b493ca1761b01 SHA512 469befb393430d2532e27f9ed834e0ab5473fc371c89582c3b1434ab1c370140f132d4acf315f7c2b9d1841ab3e78ef04069cca78d66917269b5112ab42127df
 DIST libxml2-2.9.12.tar.gz 5681632 BLAKE2B ab93633140e9fd119d3a48ed829a91213c3d7956a00d181203f5188fb0ed0d3a7150d3128fe986b13efadf6fe484393262a3de575527f38f74aa6c0067a6d934 SHA512 df1c6486e80f0fcf3c506f3599bcfb94b620c00d0b5d26831bc983daa78d58ec58b5057b1ec7c1a26c694f40199c6234ee2a6dcabf65abfa10c447cb5705abbd
 DIST libxml2-2.9.12.tar.gz.asc 488 BLAKE2B 48ec86ec373d94de73bdb52141fc77fccd0ca296a35ed97aa3479ecdcf82b15422dd7d751359b5b1ca477e24b8eee9226784cfbfd861236e10eed2519e7959bf SHA512 69ca6ab7170cad467724e19eff99a3544966a26069e78a7b7cc27ae93a9077b11cc8dad2536bd0b27c3b45f4ea7520c813fe5a018cd65f103059f7f75147a656
+DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
 DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 0c39483..69d0fad 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1 +1,2 @@
 DIST libxslt-1.1.34.tar.gz 3552258 BLAKE2B f043a0357e0705ab68041adf4031a6b3e0b5c3d396691c988a34963a0ee0ebe3bede2d1d7a0c5f0c42c046183653c94f4b51e10e35980a039c8cad446e84ad86 SHA512 1516a11ad608b04740674060d2c5d733b88889de5e413b9a4e8bf8d1a90d712149df6d2b1345b615f529d7c7d3fa6dae12e544da828b39c7d415e54c0ee0776b
+DIST libxslt-1.1.34.tar.gz.asc 488 BLAKE2B fff407ab2c2bbafa804e5a1f84ca447c706d75fd7489c99ac6040b625d0417a0e6c189be3457e6cc6ecd6b7860829875ea95a132fef24f8a532156361f8a5308 SHA512 9b155d4571daede99cdbf2813a85fb04812737b5e23d3f7c9840225b38f3dbf171623a21645daaee190e7ff9ba38bde932922e96a2a2312c203ffa9917c3baea
diff --git a/dev-libs/libxslt/files/libxslt-1.1.28-disable-static-modules.patch b/dev-libs/libxslt/files/libxslt-1.1.28-disable-static-modules.patch
deleted file mode 100644
index b30a084..0000000
--- a/dev-libs/libxslt/files/libxslt-1.1.28-disable-static-modules.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 06c9dba42097b06a18c81bb54a8da8b2bfaf991d Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 11 Nov 2015 20:01:14 +0100
-Subject: [PATCH 3/3] Disable static module for python module
-
----
- python/Makefile.am | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/python/Makefile.am b/python/Makefile.am
-index cc13c62..62afd1b 100644
---- a/python/Makefile.am
-+++ b/python/Makefile.am
-@@ -27,6 +27,7 @@ python_PYTHON = libxslt.py
- pyexec_LTLIBRARIES = libxsltmod.la
- 
- libxsltmod_la_CPPFLAGS = \
-+	-shared \
- 	-I$(top_srcdir)/libxslt \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/libexslt \
-@@ -34,7 +35,7 @@ libxsltmod_la_CPPFLAGS = \
- libxsltmod_la_SOURCES = libxslt.c types.c
- nodist_libxsltmod_la_SOURCES = libxslt-py.c
- libxsltmod_la_LIBADD = $(mylibs) $(PYTHON_LIBS)
--libxsltmod_la_LDFLAGS =  $(WIN32_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -avoid-version
-+libxsltmod_la_LDFLAGS =  $(WIN32_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -avoid-version -shared
- 
- libxslt.py: $(srcdir)/libxsl.py libxsltclass.py
- 	cat $(srcdir)/libxsl.py libxsltclass.py > $@
--- 
-2.6.3
-
diff --git a/dev-libs/libxslt/files/libxslt-1.1.34-simplify-python.patch b/dev-libs/libxslt/files/libxslt-1.1.34-simplify-python.patch
deleted file mode 100644
index ff7e263..0000000
--- a/dev-libs/libxslt/files/libxslt-1.1.34-simplify-python.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-From aa0f7a8d59a9bbd646203d3f14e39e217961f725 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 11 Nov 2015 17:49:07 +0100
-Subject: [PATCH] Simplify python setup in autoconf
-
-AM_PATH_PYTHON does most of the job without using pkg-config as expected
-from the rest of the autoconf script.
-diff --git a/Makefile.am b/Makefile.am
-index 2c417d0..a65a2b7 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,9 +2,14 @@ SUBDIRS = \
- 	libxslt \
- 	libexslt \
- 	xsltproc \
--	doc \
--	$(PYTHON_SUBDIR) \
--	tests
-+	doc
-+
-+
-+if WITH_PYTHON
-+	SUBDIRS += python
-+endif
-+
-+SUBDIRS += tests
- 
- DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests
- 
-@@ -52,7 +57,9 @@ tests: dummy
- 	@echo '## Running the regression test suite'
- 	@(cd tests ; $(MAKE) -s tests)
- 	@(cd xsltproc ; $(MAKE) -s tests)
--	@(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; $(MAKE) -s tests ; fi)
-+if WITH_PYTHON
-+	@(cd python ; $(MAKE) -s tests)
-+endif
- 
- valgrind:
- 	@echo '## Running the regression tests under Valgrind'
-diff --git a/configure.ac b/configure.ac
-index 325a7be..ee1eabd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -227,90 +227,37 @@ dnl
- dnl check for python
- dnl
- 
--PYTHON_VERSION=
--PYTHON_INCLUDES=
--PYTHON_SITE_PACKAGES=
--pythondir=
--AC_ARG_WITH(python, [  --with-python[=DIR]    Build Python bindings if found])
--if test "$with_python" != "no" ; then
--    if test -x "$with_python/bin/python"
--    then
--        echo Found python in $with_python/bin/python
--        PYTHON="$with_python/bin/python"
--    else
--	if test -x "$with_python"
--	then
--	    echo Found python in $with_python
--	    PYTHON="$with_python"
--	else
--            if test -x "$PYTHON"
--            then
--                echo Found python in environment PYTHON=$PYTHON
--                with_python=`$PYTHON -c "import sys; print sys.exec_prefix"`
--	    else
--	        AC_PATH_PROG(PYTHON, python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5)
--	    fi
--	fi
--    fi
--    if test "$PYTHON" != ""
--    then
--        echo "PYTHON is pointing at $PYTHON"
--        PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[[0:3]]"`
--	echo Found Python version $PYTHON_VERSION
--	LIBXML2_PYTHON=`$PYTHON -c "try : import libxml2 ; print 1
--except: print 0"`
--	if test "$LIBXML2_PYTHON" = "1"
--	then
--	    echo Found libxml2-python module
--	else
--	    echo Warning: Missing libxml2-python
--	fi
--    fi
--    if test "$PYTHON_VERSION" != ""
--    then
--	if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \
--	   -d $with_python/lib/python$PYTHON_VERSION/site-packages
--	then
--	    PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION
--	    PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
--	else
--	    if test -r $prefix/include/python$PYTHON_VERSION/Python.h
--	    then
--	        PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION
--		PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
--	    else
--		if test -r /usr/include/python$PYTHON_VERSION/Python.h
--		then
--		    PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION
--		    PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
--		else
--		    echo could not find python$PYTHON_VERSION/Python.h
--		fi
--	    fi
--	    if test ! -d "$PYTHON_SITE_PACKAGES"
--	    then
--		    PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"`
--	    fi
--	fi
--        PYTHON_LIBS=`python$PYTHON_VERSION-config --libs`
--    fi
--    if test "$with_python" != ""
--    then
--        pythondir='$(PYTHON_SITE_PACKAGES)'
--    else
--        pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages'
--    fi
--fi
--AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "")
--if test "$PYTHON_INCLUDES" != ""
--then
--    PYTHON_SUBDIR=python
--else
--    PYTHON_SUBDIR=
--fi
--AC_SUBST(pythondir)
--AC_SUBST(PYTHON_SUBDIR)
--AC_SUBST(PYTHON_LIBS)
-+AC_ARG_WITH([python],
-+    AS_HELP_STRING([--with-python], [Build Python bindings if found])
-+)
-+
-+AS_IF([test "$with_python" = "yes"],
-+      [AM_PATH_PYTHON
-+       AC_PATH_TOOL([PYTHON_CONFIG], [python$PYTHON_VERSION-config], [no])
-+       AS_IF([test "$PYTHON_CONFIG" = "no"],
-+             [AC_PATH_TOOL([PYTHON_CONFIG], [python-config], [no])])
-+       AS_IF([test "$PYTHON_CONFIG" != "no"],
-+             [PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags`
-+              PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
-+              PYTHON_LIBS=`$PYTHON_CONFIG --libs`],
-+             [AC_MSG_ERROR([Missing python development files.])])
-+       AC_MSG_CHECKING([libxml2 module in $PYTHON])
-+	   LIBXML2_PYTHON=`$PYTHON -c "import sys;
-+try:
-+    import libxml2
-+    sys.stdout.write('1')
-+except:
-+    sys.stdout.write('0')"`
-+       AS_IF([test "$LIBXML2_PYTHON" = "1"],
-+             [AC_MSG_RESULT([yes])],
-+             [AC_MSG_RESULT([no])
-+              AC_MSG_WARN([libxml2 python module not found, expect runtime errors])])
-+      ])
-+
-+AM_CONDITIONAL([WITH_PYTHON], [test "$with_python" = "yes"])
-+AC_SUBST([PYTHON_CFLAGS])
-+AC_SUBST([PYTHON_LDFLAGS])
-+AC_SUBST([PYTHON_LIBS])
- 
- AC_ARG_WITH(crypto, [  --with-crypto           Add crypto support to exslt (on)])
- WITH_CRYPTO=0
-@@ -634,10 +581,6 @@ AC_SUBST(PYTHONSODV)
- AC_SUBST(XML_CONFIG)
- AC_SUBST(LIBXML_LIBS)
- AC_SUBST(LIBXML_CFLAGS)
--AC_SUBST(PYTHON)
--AC_SUBST(PYTHON_VERSION)
--AC_SUBST(PYTHON_INCLUDES)
--AC_SUBST(PYTHON_SITE_PACKAGES)
- 
- XSLT_LIBDIR='-L${libdir}'
- XSLT_INCLUDEDIR='-I${includedir}'
-diff --git a/python/Makefile.am b/python/Makefile.am
-index 17a0d17..1c57a63 100644
---- a/python/Makefile.am
-+++ b/python/Makefile.am
-@@ -5,7 +5,7 @@ SUBDIRS= . tests
- 
- AM_CFLAGS = $(LIBXML_CFLAGS)
- 
--DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)
-+docsdir = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)
- # libxsltclass.txt is generated
- DOCS=
- 
-@@ -16,10 +16,7 @@ EXTRA_DIST = 			\
- 	libxml_wrap.h		\
- 	libxslt_wrap.h		\
- 	libxsl.py		\
--	libxslt-python-api.xml	\
--	$(DOCS)
--
--libxsltmod_la_LDFLAGS =  -module -avoid-version
-+	libxslt-python-api.xml
- 
- if WITH_PYTHON
- mylibs = \
-@@ -28,31 +25,22 @@ mylibs = \
- 
- all-local: libxslt.py
- 
--python_LTLIBRARIES = libxsltmod.la
-+python_PYTHON = libxslt.py
-+pyexec_LTLIBRARIES = libxsltmod.la
- 
- libxsltmod_la_CPPFLAGS = \
--	-I$(PYTHON_INCLUDES) \
- 	-I$(top_srcdir)/libxslt \
- 	-I$(top_srcdir) \
--	-I../libexslt
-+	-I$(top_srcdir)/libexslt \
-+	$(PYTHON_CFLAGS)
- libxsltmod_la_SOURCES = libxslt.c types.c
- nodist_libxsltmod_la_SOURCES = libxslt-py.c
- libxsltmod_la_LIBADD = $(mylibs) $(PYTHON_LIBS)
-+libxsltmod_la_LDFLAGS =  $(WIN32_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -avoid-version
- 
- libxslt.py: $(srcdir)/libxsl.py libxsltclass.py
- 	cat $(srcdir)/libxsl.py libxsltclass.py > $@
- 
--install-data-local:
--	$(MKDIR_P) $(DESTDIR)$(pythondir)
--	$(INSTALL) -m 0644 libxslt.py $(DESTDIR)$(pythondir)
--	$(MKDIR_P) $(DESTDIR)$(DOCS_DIR)
--	@(for doc in $(DOCS) ; \
--	   do $(INSTALL) -m 0644 $(srcdir)/$$doc $(DESTDIR)$(DOCS_DIR) ; done)
--
--uninstall-local:
--	rm -f $(DESTDIR)$(pythondir)/libxslt.py
--	rm -rf $(DESTDIR)$(DOCS_DIR)
--
- GENERATE = generator.py
- API_DESC = $(top_srcdir)/doc/libxslt-api.xml $(srcdir)/libxslt-python-api.xml
- GENERATED= libxsltclass.py \
diff --git a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
new file mode 100644
index 0000000..ef9ca3a
--- /dev/null
+++ b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielveillard.asc
+inherit libtool multilib-minimal verify-sig
+
+# Note: Please bump this in sync with dev-libs/libxml2.
+DESCRIPTION="XSLT libraries and tools"
+HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxslt"
+SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
+SRC_URI+=" verify-sig? ( ftp://xmlsoft.org/${PN}/${P}.tar.gz.asc )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="*"
+IUSE="crypt debug examples static-libs elibc_Darwin"
+
+BDEPEND=">=virtual/pkgconfig-1
+	verify-sig? ( app-crypt/openpgp-keys-danielveillard )"
+RDEPEND="
+	>=dev-libs/libxml2-2.9.10:2[${MULTILIB_USEDEP}]
+	crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xslt-config
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libxslt/xsltconfig.h
+)
+
+src_prepare() {
+	default
+
+	DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO )
+
+	# Prefix always needs elibtoolize if not eautoreconf'd.
+	elibtoolize
+}
+
+multilib_src_configure() {
+	# Python bindings were dropped as they were Python 2 only at the time
+	ECONF_SOURCE="${S}" econf \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-html-subdir=html \
+		--without-python \
+		$(use_with crypt crypto) \
+		$(use_with debug) \
+		$(use_with debug mem-debug) \
+		$(use_enable static-libs static) \
+		"$@"
+}
+
+multilib_src_install() {
+	# "default" does not work here - docs are installed by multilib_src_install_all
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/libxslt/libxslt-1.1.34-r2.ebuild b/dev-libs/libxslt/libxslt-1.1.34-r2.ebuild
deleted file mode 120000
index ceef441..0000000
--- a/dev-libs/libxslt/libxslt-1.1.34-r2.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-libxslt-1.1.34.ebuild
\ No newline at end of file
diff --git a/dev-libs/libxslt/libxslt-1.1.34-r3.ebuild b/dev-libs/libxslt/libxslt-1.1.34-r3.ebuild
new file mode 120000
index 0000000..e7a1943
--- /dev/null
+++ b/dev-libs/libxslt/libxslt-1.1.34-r3.ebuild
@@ -0,0 +1 @@
+libxslt-1.1.34-r1.ebuild
\ No newline at end of file
diff --git a/dev-libs/libxslt/libxslt-1.1.34.ebuild b/dev-libs/libxslt/libxslt-1.1.34.ebuild
deleted file mode 100644
index b67cba0..0000000
--- a/dev-libs/libxslt/libxslt-1.1.34.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit autotools multilib-minimal python-r1 toolchain-funcs
-
-DESCRIPTION="XSLT libraries and tools"
-HOMEPAGE="http://www.xmlsoft.org/"
-SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="*"
-
-IUSE="crypt debug examples python static-libs elibc_Darwin"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/libxml2-2.9.10:2[${MULTILIB_USEDEP}]
-	crypt?  ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/libxml2:2[python,${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-1
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xslt-config
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libxslt/xsltconfig.h
-)
-
-src_prepare() {
-	default
-
-	DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO )
-
-	# Simplify python setup
-	# https://bugzilla.gnome.org/show_bug.cgi?id=758095
-	eapply "${FILESDIR}"/${PN}-1.1.34-simplify-python.patch
-	eapply "${FILESDIR}"/${PN}-1.1.28-disable-static-modules.patch
-
-	eautoreconf
-	# If eautoreconf'd with new autoconf, then epunt_cxx is not necessary
-	# and it is propably otherwise too if upstream generated with new
-	# autoconf
-#	epunt_cxx
-	# But Prefix always needs elibtoolize if not eautoreconf'd.
-#	elibtoolize
-}
-
-multilib_src_configure() {
-	libxslt_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \
-			--with-html-subdir=html \
-			$(use_with crypt crypto) \
-			$(use_with debug) \
-			$(use_with debug mem-debug) \
-			$(use_enable static-libs static) \
-			"$@"
-	}
-
-	libxslt_py_configure() {
-		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
-		run_in_build_dir libxslt_configure --with-python
-	}
-
-	libxslt_configure --without-python # build python bindings separately
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxslt_py_configure
-	fi
-}
-
-multilib_src_compile() {
-	default
-	multilib_is_native_abi && use python && libxslt_foreach_py_emake all
-}
-
-multilib_src_test() {
-	default
-	multilib_is_native_abi && use python && libxslt_foreach_py_emake test
-}
-
-multilib_src_install() {
-	# "default" does not work here - docs are installed by multilib_src_install_all
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use python; then
-		libxslt_foreach_py_emake \
-			DESTDIR="${D}" \
-			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
-			EXAMPLE_DIR="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
-			install
-		python_foreach_impl python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if ! use examples && use python; then
-		rm -r "${ED}"/usr/share/doc/${PF}/python/examples || die
-	fi
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-libxslt_foreach_py_emake() {
-	libxslt_py_emake() {
-		pushd "${BUILD_DIR}/python" > /dev/null || die
-		emake "$@"
-		popd > /dev/null
-	}
-	local native_builddir=${BUILD_DIR}
-	python_foreach_impl libxslt_py_emake top_builddir="${native_builddir}" "$@"
-}
diff --git a/dev-libs/libxslt/metadata.xml b/dev-libs/libxslt/metadata.xml
index 4073f76..e7dd72d 100644
--- a/dev-libs/libxslt/metadata.xml
+++ b/dev-libs/libxslt/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>sam@gentoo.org</email>
+    <name>Sam James</name>
+  </maintainer>
   <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
   </maintainer>
   <upstream>
     <remote-id type="cpe">cpe:/a:xmlsoft:libxslt</remote-id>
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 5ba2fe2..6f8f0a9 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1 +1 @@
-DIST libzip-1.7.1.tar.xz 737496 BLAKE2B bd4c73bf317fa767ff0ea3c10b7f2e96699dc7ed7bd05fdaf3c5d477cd42aa18b40627569498697be1b5360d43471a9b8132909781f8bd32bda6f46534e4a61b SHA512 e924749274e5e45b83ba4bc961bfd299b9dd05829c1f42880a9814f942dbf7afe79aa1ea4e2b33d6db1dba1f7f948c0de40517f2ef90cc8725650b8cb88d9a14
+DIST libzip-1.7.3.tar.xz 747372 BLAKE2B c0fbdcd5f5592b0aa828c47b6d90c4c84addfb037cd3280195ab83ebc9d586a6de32d833774175a24e0c6fed55b7d9e47931867721e6e7be7e61d8e5bec2dc9d SHA512 488866348a0c859f6f995c50e956bd51b4105278f07b63fe019cb44ab36c09ef958cc0684fd5444c474d83874b999e8ed1aa9b2da51b74caa37bbe7934b9c870
diff --git a/dev-libs/libzip/files/libzip-1.7.3-missing-header.patch b/dev-libs/libzip/files/libzip-1.7.3-missing-header.patch
new file mode 100644
index 0000000..bebe380
--- /dev/null
+++ b/dev-libs/libzip/files/libzip-1.7.3-missing-header.patch
@@ -0,0 +1,43 @@
+From fd89e242d16128dedef08f47d99ae56aa19b0591 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=98rjan=20Malde?= <red@foxi.me>
+Date: Wed, 15 Jul 2020 12:16:16 +0200
+Subject: [PATCH] Include limits.h for INT_MAX
+
+---
+ lib/zip_crypto_openssl.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/zip_crypto_openssl.c b/lib/zip_crypto_openssl.c
+index 1cb00479..60f92758 100644
+--- a/lib/zip_crypto_openssl.c
++++ b/lib/zip_crypto_openssl.c
+@@ -38,6 +38,7 @@
+ #include "zip_crypto.h"
+ 
+ #include <openssl/rand.h>
++#include <limits.h>
+ 
+ #if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER)
+ #define USE_OPENSSL_1_0_API
+
+From b4a4f778806fe2c3ca9ec57c0411a8dcf462e655 Mon Sep 17 00:00:00 2001
+From: Thomas Klausner <tk@giga.or.at>
+Date: Wed, 15 Jul 2020 12:38:07 +0200
+Subject: [PATCH] Include limits.h for INT_MAX.
+
+---
+ lib/zip_crypto_mbedtls.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/zip_crypto_mbedtls.c b/lib/zip_crypto_mbedtls.c
+index c348ad2a..7063c6b6 100644
+--- a/lib/zip_crypto_mbedtls.c
++++ b/lib/zip_crypto_mbedtls.c
+@@ -41,6 +41,7 @@
+ #include <mbedtls/entropy.h>
+ #include <mbedtls/pkcs5.h>
+ 
++#include <limits.h>
+ 
+ _zip_crypto_aes_t *
+ _zip_crypto_aes_new(const zip_uint8_t *key, zip_uint16_t key_size, zip_error_t *error) {
diff --git a/dev-libs/libzip/libzip-1.7.1.ebuild b/dev-libs/libzip/libzip-1.7.1.ebuild
deleted file mode 100644
index 531d17e..0000000
--- a/dev-libs/libzip/libzip-1.7.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multibuild
-
-DESCRIPTION="Library for manipulating zip archives"
-HOMEPAGE="https://nih.at/libzip/"
-SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0/5"
-KEYWORDS="*"
-IUSE="bzip2 gnutls libressl lzma mbedtls ssl static-libs test tools"
-REQUIRED_USE="test? ( tools )"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2:= )
-	lzma? ( app-arch/xz-utils )
-	ssl? (
-		gnutls? (
-			dev-libs/nettle:0=
-			>=net-libs/gnutls-3.6.5:=
-		)
-		!gnutls? (
-			mbedtls? ( net-libs/mbedtls:= )
-			!mbedtls? (
-				!libressl? ( dev-libs/openssl:0= )
-				libressl? ( dev-libs/libressl:0= )
-			)
-		)
-	)
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	# Upstream doesn't support building dynamic & static
-	# simultaneously: https://github.com/nih-at/libzip/issues/76
-	MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DBUILD_EXAMPLES=OFF # nothing is installed
-			-DENABLE_COMMONCRYPTO=OFF # not in tree
-			-DENABLE_BZIP2=$(usex bzip2)
-			-DENABLE_LZMA=$(usex lzma)
-		)
-		if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
-			mycmakeargs+=(
-				-DBUILD_DOC=OFF
-				-DBUILD_EXAMPLES=OFF
-				-DBUILD_SHARED_LIBS=OFF
-				-DBUILD_TOOLS=OFF
-			)
-		else
-			mycmakeargs+=(
-				-DBUILD_DOC=ON
-				-DBUILD_REGRESS=$(usex test)
-				-DBUILD_TOOLS=$(usex tools)
-			)
-		fi
-
-		if use ssl; then
-			if use gnutls; then
-				mycmakeargs+=(
-					-DENABLE_GNUTLS=$(usex gnutls)
-					-DENABLE_MBEDTLS=OFF
-					-DENABLE_OPENSSL=OFF
-				)
-			elif use mbedtls; then
-				mycmakeargs+=(
-					-DENABLE_GNUTLS=OFF
-					-DENABLE_MBEDTLS=$(usex mbedtls)
-					-DENABLE_OPENSSL=OFF
-				)
-			else
-				mycmakeargs+=(
-					-DENABLE_GNUTLS=OFF
-					-DENABLE_MBEDTLS=OFF
-					-DENABLE_OPENSSL=ON
-				)
-			fi
-		else
-			mycmakeargs+=(
-				-DENABLE_GNUTLS=OFF
-				-DENABLE_MBEDTLS=OFF
-				-DENABLE_OPENSSL=OFF
-			)
-		fi
-		cmake_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake_src_compile
-}
-
-src_test() {
-	[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant cmake_src_install
-}
diff --git a/dev-libs/libzip/libzip-1.7.3-r1.ebuild b/dev-libs/libzip/libzip-1.7.3-r1.ebuild
new file mode 100644
index 0000000..5d80554
--- /dev/null
+++ b/dev-libs/libzip/libzip-1.7.3-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake multibuild flag-o-matic
+
+DESCRIPTION="Library for manipulating zip archives"
+HOMEPAGE="https://nih.at/libzip/"
+SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0/5"
+KEYWORDS="*"
+IUSE="bzip2 gnutls libressl lzma mbedtls ssl static-libs test tools"
+REQUIRED_USE="test? ( tools )"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2:= )
+	lzma? ( app-arch/xz-utils )
+	ssl? (
+		gnutls? (
+			dev-libs/nettle:0=
+			>=net-libs/gnutls-3.6.5:=
+		)
+		!gnutls? (
+			mbedtls? ( net-libs/mbedtls:= )
+			!mbedtls? (
+				!libressl? ( dev-libs/openssl:0= )
+				libressl? ( dev-libs/libressl:0= )
+			)
+		)
+	)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-missing-header.patch ) # bug 733326
+
+pkg_setup() {
+	# Upstream doesn't support building dynamic & static
+	# simultaneously: https://github.com/nih-at/libzip/issues/76
+	MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
+}
+
+src_configure() {
+	append-lfs-flags
+	myconfigure() {
+		local mycmakeargs=(
+			-DBUILD_EXAMPLES=OFF # nothing is installed
+			-DENABLE_COMMONCRYPTO=OFF # not in tree
+			-DENABLE_BZIP2=$(usex bzip2)
+			-DENABLE_LZMA=$(usex lzma)
+		)
+		if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
+			mycmakeargs+=(
+				-DBUILD_DOC=OFF
+				-DBUILD_EXAMPLES=OFF
+				-DBUILD_SHARED_LIBS=OFF
+				-DBUILD_TOOLS=OFF
+			)
+		else
+			mycmakeargs+=(
+				-DBUILD_DOC=ON
+				-DBUILD_REGRESS=$(usex test)
+				-DBUILD_TOOLS=$(usex tools)
+			)
+		fi
+
+		if use ssl; then
+			if use gnutls; then
+				mycmakeargs+=(
+					-DENABLE_GNUTLS=$(usex gnutls)
+					-DENABLE_MBEDTLS=OFF
+					-DENABLE_OPENSSL=OFF
+				)
+			elif use mbedtls; then
+				mycmakeargs+=(
+					-DENABLE_GNUTLS=OFF
+					-DENABLE_MBEDTLS=$(usex mbedtls)
+					-DENABLE_OPENSSL=OFF
+				)
+			else
+				mycmakeargs+=(
+					-DENABLE_GNUTLS=OFF
+					-DENABLE_MBEDTLS=OFF
+					-DENABLE_OPENSSL=ON
+				)
+			fi
+		else
+			mycmakeargs+=(
+				-DENABLE_GNUTLS=OFF
+				-DENABLE_MBEDTLS=OFF
+				-DENABLE_OPENSSL=OFF
+			)
+		fi
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_test() {
+	[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+}
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 725cd7d..2046638 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1 +1 @@
-DIST nettle-3.4.1.tar.gz 1947053 BLAKE2B 354318c46c28aeaaca611abe70298024ec12ff70aed53c741e43c1b5373361e5cffb03df7b8e86ef103a3b7770b2b4fe39fbca00b128f2b7ec810b3a4d9fd0fd SHA512 26aefbbe9927e90e28f271e56d2ba876611831222d0e1e1a58bdb75bbd50934fcd84418a4fe47b845f557e60a9786a72a4de2676c930447b104f2256aca7a54f
+DIST nettle-3.7.2.tar.gz 2382309 BLAKE2B 0195f973afd76d33805de4621cd340a041144b24a20ccab03a58749dba82ea12b063f779aeeeb3f063be5e1bb74dec4c8c8f72b3dd01aff033e908a9f534ad01 SHA512 5f6edcc24ff620885b24394b31e55b494418c35dd63e6ece222ddabc58e793c44a82155051cc5759896ed5f014a8efd547f0aef6736a131e41651c5cab7c7211
diff --git a/dev-libs/nettle/metadata.xml b/dev-libs/nettle/metadata.xml
index 2e7d72a..1762d33 100644
--- a/dev-libs/nettle/metadata.xml
+++ b/dev-libs/nettle/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>crypto@gentoo.org</email>
-	<name>Crypto</name>
-</maintainer>
-<upstream>
-	<remote-id type="cpe">cpe:/a:nettle_project:nettle</remote-id>
-</upstream>
+	<maintainer type="project">
+		<name>Gentoo Base System</name>
+		<email>base-system@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:nettle_project:nettle</remote-id>
+	</upstream>
+	<use>
+		<flag name="asm">Support assembly hand optimized crypto functions (i.e. faster run time)</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-libs/nettle/nettle-3.4.1-r1.ebuild b/dev-libs/nettle/nettle-3.4.1-r1.ebuild
deleted file mode 100644
index f557ceb..0000000
--- a/dev-libs/nettle/nettle-3.4.1-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-build multilib-minimal multilib toolchain-funcs
-
-DESCRIPTION="Low-level cryptographic library"
-HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-3 LGPL-2.1 )"
-SLOT="0/6.2" # subslot = libnettle soname version, .2 as broke ABI bug#601512 then fixed
-KEYWORDS="*"
-IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes"
-
-DEPEND="gmp? ( >=dev-libs/gmp-6.0:0=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/nettle/nettle-stdint.h
-	/usr/include/nettle/version.h
-)
-
-DOCS=()
-HTML_DOCS=()
-
-pkg_setup() {
-	use doc && DOCS+=(
-		nettle.pdf
-	)
-	use doc && HTML_DOCS+=(
-		nettle.html
-	)
-}
-
-src_prepare() {
-	default
-
-	sed -e '/CFLAGS=/s: -ggdb3::' \
-		-e 's/solaris\*)/sunldsolaris*)/' \
-		-i configure.ac || die
-
-	# conditionally build tests and examples required by tests
-	use test || sed -i '/SUBDIRS/s/testsuite examples//' Makefile.in || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# --disable-openssl bug #427526
-	ECONF_SOURCE="${S}" econf \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--disable-openssl \
-		--disable-fat \
-		$(use_enable gmp public-key) \
-		$(use_enable static-libs static) \
-		$(tc-is-static-only && echo --disable-shared) \
-		$(use_enable doc documentation) \
-		$(use_enable neon arm-neon) \
-		$(use_enable cpu_flags_x86_aes x86-aesni)
-}
diff --git a/dev-libs/nettle/nettle-3.7.2.ebuild b/dev-libs/nettle/nettle-3.7.2.ebuild
new file mode 100644
index 0000000..29a3e89
--- /dev/null
+++ b/dev-libs/nettle/nettle-3.7.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-build multilib-minimal multilib toolchain-funcs
+
+DESCRIPTION="Low-level cryptographic library"
+HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-3 LGPL-2.1 )"
+SLOT="0/8-6" # subslot = libnettle - libhogweed soname version
+KEYWORDS="*"
+IUSE="+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha"
+RESTRICT="!test? ( test )"
+
+DEPEND="gmp? ( >=dev-libs/gmp-6.1:0=[static-libs?,${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+BDEPEND="doc? ( sys-apps/texinfo )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/nettle/version.h
+)
+
+DOCS=()
+HTML_DOCS=()
+
+pkg_setup() {
+	use doc && DOCS+=(
+		nettle.pdf
+	)
+	use doc && HTML_DOCS+=(
+		nettle.html
+	)
+}
+
+src_prepare() {
+	default
+
+	# I do not see in config.sub reference to sunldsolaris.
+	# if someone complains readd
+	# -e 's/solaris\*)/sunldsolaris*)/' \
+	sed -e '/CFLAGS=/s: -ggdb3::' \
+		-i configure.ac || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+		$(tc-is-static-only && echo --disable-shared)
+		$(use_enable cpu_flags_x86_aes x86-aesni)
+		$(use_enable cpu_flags_x86_sha x86-sha-ni)
+		$(use_enable asm assembler)
+		$(use_enable doc documentation)
+		$(use_enable gmp public-key)
+		$(use_enable cpu_flags_arm_neon arm-neon)
+		$(use_enable static-libs static)
+		--disable-fat
+		# --disable-openssl bug #427526
+		--disable-openssl
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 0ac21a4..c25c8a7 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1 +1 @@
-DIST opensc-0.19.0.tar.gz 2080320 BLAKE2B c07df317f26562107680ed586e9a1ea83252c10a7dd227cffe51de709d9c888874963f6835a68f83f212d83f264b0231ea7428ed8d3ecce74cb9265d8191040a SHA512 90659133fb593cbf82ed6502e3858f34119bff051e3090489b7622659dcb1c26d389a4715892aa60a5606bc0ce115bd6c504521abfb965de9ad46441e4ed2b8e
+DIST opensc-0.21.0.tar.gz 2210878 BLAKE2B 22b63ca59cb721cdbbda755fa90f5b46fd9e5b6d7768cddbfeaffd58d68adcb145d6d604b334cf778608be9ee5fc98109f98d131d2536e61f79705aa3dbafa6c SHA512 3511b0a04a96e62011c48667e3fd36a1611fe67a89f7626ff056c9c3614f8cabc91c9924a6ca7a8ea50076a128e3967277a0dd624b4fa27c62cefee9fab22646
diff --git a/dev-libs/opensc/files/opensc-0.19.0-p11test_common.h.patch b/dev-libs/opensc/files/opensc-0.19.0-p11test_common.h.patch
deleted file mode 100644
index ca27c70..0000000
--- a/dev-libs/opensc/files/opensc-0.19.0-p11test_common.h.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From d1e4f4879b8d0a7423afc1c9a3632da4763ee31c Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 15 Sep 2018 11:04:13 +0300
-Subject: [PATCH] missing include
-
----
- src/tests/p11test/p11test_common.h | 89 ++++++++++++++++++++++++++++++++++++++
- 1 file changed, 89 insertions(+)
- create mode 100644 src/tests/p11test/p11test_common.h
-
-diff --git a/src/tests/p11test/p11test_common.h b/src/tests/p11test/p11test_common.h
-new file mode 100644
-index 0000000..d3ca304
---- /dev/null
-+++ b/src/tests/p11test/p11test_common.h
-@@ -0,0 +1,89 @@
-+/*
-+ * p11test_common.h: Test suite shared declarations for PKCS#11 API
-+ *
-+ * Copyright (C) 2016 Martin Strhársky <strharsky.martin@gmail.com>
-+ * Copyright (C) 2016, 2017 Red Hat, Inc.
-+ *
-+ * Author: Jakub Jelen <jjelen@redhat.com>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#ifndef P11TEST_COMMON_H
-+#define P11TEST_COMMON_H
-+#include "config.h"
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <setjmp.h>
-+#include <cmocka.h>
-+#include "pkcs11/pkcs11.h"
-+#include "libopensc/sc-ossl-compat.h"
-+
-+#define MAX_MECHS 200
-+
-+#ifndef NDEBUG
-+	#define debug_print(fmt, ...) \
-+		{ fprintf(stderr, fmt "\n", ##__VA_ARGS__); } while (0)
-+#else
-+	#define debug_print(fmt, ...)
-+#endif
-+
-+#define FLAGS_SIGN		0x01
-+#define FLAGS_SIGN_OPENSSL	0x02
-+#define FLAGS_SIGN_ANY		( FLAGS_SIGN | FLAGS_SIGN_OPENSSL )
-+#define FLAGS_DECRYPT		0x04
-+#define FLAGS_DECRYPT_OPENSSL	0x08
-+#define FLAGS_DECRYPT_ANY	( FLAGS_DECRYPT | FLAGS_DECRYPT_OPENSSL )
-+
-+typedef struct {
-+	char *outfile;
-+	FILE *fd;
-+	int in_test;
-+	int first;
-+	int in_data;
-+	int first_data;
-+} log_context_t;
-+
-+typedef struct {
-+	CK_MECHANISM_TYPE mech;
-+	CK_MECHANISM_TYPE hash;
-+	CK_RSA_PKCS_MGF_TYPE mgf;
-+	int salt;
-+	int usage_flags;
-+	int result_flags;
-+} test_mech_t;
-+
-+typedef struct {
-+	CK_FUNCTION_LIST_PTR function_pointer;
-+	CK_SLOT_ID slot_id;
-+	CK_SESSION_HANDLE session_handle;
-+	CK_UTF8CHAR* pin;
-+	size_t pin_length;
-+	char *library_path;
-+	unsigned int interactive;
-+	log_context_t log;
-+
-+	test_mech_t rsa_mechs[MAX_MECHS];
-+	size_t  num_rsa_mechs;
-+	test_mech_t	ec_mechs[MAX_MECHS];
-+	size_t  num_ec_mechs;
-+	test_mech_t	keygen_mechs[MAX_MECHS];
-+	size_t  num_keygen_mechs;
-+} token_info_t;
-+
-+token_info_t token;
-+
-+#endif /* P11TEST_COMMON_H */
-+
--- 
-2.16.4
-
diff --git a/dev-libs/opensc/files/opensc-0.20.0-gcc10.patch b/dev-libs/opensc/files/opensc-0.20.0-gcc10.patch
new file mode 100644
index 0000000..f96a114
--- /dev/null
+++ b/dev-libs/opensc/files/opensc-0.20.0-gcc10.patch
@@ -0,0 +1,37 @@
+From 5450f61681d0c46c587dbe789bf19f1cb573e794 Mon Sep 17 00:00:00 2001
+From: Jakub Jelen <jjelen@redhat.com>
+Date: Mon, 10 Feb 2020 15:09:17 +0100
+Subject: [PATCH] Unbreak build with -fno-common (default in gcc10)
+
+---
+ src/tests/p11test/p11test.c        | 3 +++
+ src/tests/p11test/p11test_common.h | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/tests/p11test/p11test.c b/src/tests/p11test/p11test.c
+index feecf6fb42..a16282cba3 100644
+--- a/src/tests/p11test/p11test.c
++++ b/src/tests/p11test/p11test.c
+@@ -34,6 +34,9 @@
+ 
+ #define DEFAULT_P11LIB	"../../pkcs11/.libs/opensc-pkcs11.so"
+ 
++/* Global variable keeping information about token we are using */
++token_info_t token;
++
+ void display_usage() {
+ 	fprintf(stdout,
+ 		" Usage:\n"
+diff --git a/src/tests/p11test/p11test_common.h b/src/tests/p11test/p11test_common.h
+index 2f3b238de0..9eb5cedecb 100644
+--- a/src/tests/p11test/p11test_common.h
++++ b/src/tests/p11test/p11test_common.h
+@@ -84,7 +84,7 @@ typedef struct {
+ 	size_t  num_keygen_mechs;
+ } token_info_t;
+ 
+-token_info_t token;
++extern token_info_t token;
+ 
+ #endif /* P11TEST_COMMON_H */
+ 
diff --git a/dev-libs/opensc/metadata.xml b/dev-libs/opensc/metadata.xml
index 7c8bf05..6495f8b 100644
--- a/dev-libs/opensc/metadata.xml
+++ b/dev-libs/opensc/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
 	</maintainer>
 	<longdescription>
 		OpenSC is a library for accessing SmartCard devices. It is also
diff --git a/dev-libs/opensc/opensc-0.19.0-r4.ebuild b/dev-libs/opensc/opensc-0.19.0-r4.ebuild
deleted file mode 100644
index 7077a31..0000000
--- a/dev-libs/opensc/opensc-0.19.0-r4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 libtool
-
-DESCRIPTION="Libraries and applications to access smartcards"
-HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki"
-SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="*"
-IUSE="ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib"
-
-RDEPEND="zlib? ( sys-libs/zlib )
-	readline? ( sys-libs/readline:0= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( >=dev-libs/libressl-2.7.0:0= )
-	)
-	openct? ( >=dev-libs/openct-0.5.0 )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
-	notify? ( dev-libs/glib:2= )"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="
-	pcsc-lite? ( !openct !ctapi )
-	openct? ( !pcsc-lite !ctapi )
-	ctapi? ( !pcsc-lite !openct )
-	|| ( pcsc-lite openct ctapi )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-p11test_common.h.patch"
-)
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--with-completiondir="$(get_bashcompdir)" \
-		--disable-openpace \
-		--disable-static \
-		--enable-man \
-		$(use_enable ctapi) \
-		$(use_enable doc) \
-		$(use_enable notify ) \
-		$(use_enable openct) \
-		$(use_enable openct) \
-		$(use_enable pcsc-lite pcsc) \
-		$(use_enable readline) \
-		$(use_enable secure-messaging sm) \
-		$(use_enable ssl openssl) \
-		$(use_enable test tests) \
-		$(use_enable zlib)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/opensc/opensc-0.21.0.ebuild b/dev-libs/opensc/opensc-0.21.0.ebuild
new file mode 100644
index 0000000..5f0e0e8
--- /dev/null
+++ b/dev-libs/opensc/opensc-0.21.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 libtool
+
+DESCRIPTION="Libraries and applications to access smartcards"
+HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki"
+SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="*"
+IUSE="ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="zlib? ( sys-libs/zlib )
+	readline? ( sys-libs/readline:0= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( >=dev-libs/libressl-3.1.0:0= )
+	)
+	openct? ( >=dev-libs/openct-0.5.0 )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
+	notify? ( dev-libs/glib:2 )"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="
+	pcsc-lite? ( !openct !ctapi )
+	openct? ( !pcsc-lite !ctapi )
+	ctapi? ( !pcsc-lite !openct )
+	|| ( pcsc-lite openct ctapi )"
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--with-completiondir="$(get_bashcompdir)" \
+		--disable-openpace \
+		--disable-static \
+		--disable-strict \
+		--enable-man \
+		$(use_enable ctapi) \
+		$(use_enable doc) \
+		$(use_enable notify ) \
+		$(use_enable openct) \
+		$(use_enable pcsc-lite pcsc) \
+		$(use_enable readline) \
+		$(use_enable secure-messaging sm) \
+		$(use_enable ssl openssl) \
+		$(use_enable test cmocka) \
+		$(use_enable zlib)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest
index 68738a9..650e16e 100644
--- a/dev-libs/popt/Manifest
+++ b/dev-libs/popt/Manifest
@@ -1 +1 @@
-DIST popt-1.16.tar.gz 702769 SHA256 e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8
+DIST popt-1.18.tar.gz 580569 BLAKE2B c9c42eb12aa21764cde5e9b4a8b30125b547ae690b4d9d0d40b45bd3c1f7ae0b09d5086a588cf37e7bed71fe770ff840c0fd40ecf4ce5b7c1e874b938b6e0324 SHA512 86422e8762adda3d02d46c20ac74ffe389d4f991d552b6fea729f007345b6426cbeb71160284e2deaa2ce44ce754a9e6cf6ccbd64bff9bc2253df40cdc2f79a5
diff --git a/dev-libs/popt/metadata.xml b/dev-libs/popt/metadata.xml
index daddb6b..ead9990 100644
--- a/dev-libs/popt/metadata.xml
+++ b/dev-libs/popt/metadata.xml
@@ -5,7 +5,7 @@
     <email>base-system@gentoo.org</email>
     <name>Gentoo Base System</name>
   </maintainer>
-        <upstream>
-                <remote-id type="cpe">cpe:/a:popt_project:popt</remote-id>
-        </upstream>
+<upstream>
+  <remote-id type="cpe">cpe:/a:popt_project:popt</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-libs/popt/popt-1.16-r2.ebuild b/dev-libs/popt/popt-1.16-r2.ebuild
deleted file mode 100644
index db75fdf..0000000
--- a/dev-libs/popt/popt-1.16-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib-minimal libtool
-
-DESCRIPTION="Parse Options - Command line parser"
-HOMEPAGE="http://rpm5.org/"
-SRC_URI="http://rpm5.org/files/popt/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="*"
-IUSE="nls static-libs"
-
-RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
-DEPEND="nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/fix-popt-pkgconfig-libdir.patch #349558
-	sed -i -e 's:lt-test1:test1:' testit.sh || die
-	elibtoolize
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static) \
-		$(use_enable nls)
-}
-
-multilib_src_install_all() {
-	dodoc CHANGES README
-	prune_libtool_files --all
-}
diff --git a/dev-libs/popt/popt-1.18.ebuild b/dev-libs/popt/popt-1.18.ebuild
new file mode 100644
index 0000000..075d814
--- /dev/null
+++ b/dev-libs/popt/popt-1.18.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-minimal libtool
+
+DESCRIPTION="Parse Options - Command line parser"
+HOMEPAGE="https://github.com/rpm-software-management/popt"
+SRC_URI="http://ftp.rpm.org/${PN}/releases/${PN}-1.x/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="*"
+IUSE="nls static-libs"
+
+RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+	sed -i -e 's:lt-test1:test1:' tests/testit.sh || die
+	elibtoolize
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable nls)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	dodoc CHANGES README
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/tinyxml2/Manifest b/dev-libs/tinyxml2/Manifest
new file mode 100644
index 0000000..b1a96e8
--- /dev/null
+++ b/dev-libs/tinyxml2/Manifest
@@ -0,0 +1 @@
+DIST tinyxml2-8.0.0.tar.gz 593833 BLAKE2B afc21220e28a1c139b1abd89e67f8e64980d2ba9bc6f60a33d435a4a02cb40ecacc27ac28bd9702ac3a435f66764ebb752b597a1b1e178d0b549e366d5b669dd SHA512 bcbb065c2af34ea681ec556377fd22e720b6f5d4caa73f432b1e34e08603a96f2233763f0ec5ae86b9ee71ddbe3062f58d3794cd3a162ce6903435530de0bba6
diff --git a/dev-libs/tinyxml2/OWNERS b/dev-libs/tinyxml2/OWNERS
new file mode 100644
index 0000000..b72e79c
--- /dev/null
+++ b/dev-libs/tinyxml2/OWNERS
@@ -0,0 +1 @@
+include chromiumos/overlays/chromiumos-overlay:/net-wireless/systembt/OWNERS
diff --git a/dev-libs/tinyxml2/metadata.xml b/dev-libs/tinyxml2/metadata.xml
new file mode 100644
index 0000000..d359b71
--- /dev/null
+++ b/dev-libs/tinyxml2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+    <name>Gentoo Video project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">leethomason/tinyxml2</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-libs/tinyxml2/tinyxml2-8.0.0.ebuild b/dev-libs/tinyxml2/tinyxml2-8.0.0.ebuild
new file mode 100644
index 0000000..75a28b8
--- /dev/null
+++ b/dev-libs/tinyxml2/tinyxml2-8.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="A simple, small, efficient, C++ XML parser"
+HOMEPAGE="http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/"
+SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0/8"
+KEYWORDS="*"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local mycmakeargs=( -DBUILD_TESTING=$(usex test) )
+	cmake_src_configure
+}
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index ef91124..ba97a46 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1 +1 @@
-DIST wayland-protocols-1.11.tar.xz 117852 SHA256 3afcee1d51c5b1d70b59da790c9830b354236324b19b2b7af9683bd3b7be6804 SHA512 6a6f816dd24f338182ddf11e2daa2db4f048f9153c618bd75712b6e02fccc41294c6c5f33692e858f54bab6b644b1dff49ca223ca2c8410a4afb8aa1b39e34a6 WHIRLPOOL 3fd53e7f868b6ebd6bcc37133294943ec4749d2b71a3d54d382d784d5f86656520c0e4e6be1f21230191ec08752c56458f42c15c32d8575e205da7a872c657e8
+DIST wayland-protocols-1.20.tar.xz 111684 BLAKE2B 2ddd3d0b0dde94fda4788a1fd6631b6fcf22fb134e74a55f2c310ab4b72802d3b069d294e3d7b68ea6ddfdb0f944ac9011b73a9678e65eec924135822f697087 SHA512 d13f65d03add2c39cc32bf6bda0e981e9f52504bf8505fceea045c8baeb73bea64fa4edb99cb837677fbab1b5b3023054adff36fac127e819690f366b81c4977
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.11.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.11.ebuild
deleted file mode 100644
index 911d8ec..0000000
--- a/dev-libs/wayland-protocols/wayland-protocols-1.11.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
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/wayland-protocols.git"
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-	AUTOTOOLS_AUTORECONF=1
-fi
-
-inherit autotools-utils ${GIT_ECLASS}
-
-DESCRIPTION="Wayland protocol files"
-HOMEPAGE="https://wayland.freedesktop.org/"
-
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="*"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/wayland"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_test() {
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	autotools-utils_src_test
-}
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild
new file mode 100644
index 0000000..16b0f9a
--- /dev/null
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Wayland protocol files"
+HOMEPAGE="https://wayland.freedesktop.org/"
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/${PN}.git/"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
+	KEYWORDS="*"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-libs/wayland"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_test() {
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	default
+}
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index 54c86a1..c5622c6 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1 +1 @@
-DIST wayland-1.17.0.tar.xz 437680 BLAKE2B 2f4eb54c5ded90453b4e2812f7b5086aa211196ec9f7333d316cdb829269d55db570ccb45a67ee07a039633245e630ab54da6403ff4754d59366f3c13fb87549 SHA512 c5051aab5ff078b368c196ecfedb33ccd961265bb914845d7ed81de361bb86ae18299575baa6c4eceb0d82cf8b495e8293f31b51d1cbc05d84af0a199ab3f946
+DIST wayland-1.19.0.tar.xz 456380 BLAKE2B 0f70bb02e890898c4763001884527067adb686abe9a2b9325badf1730d411d269c437037afc298eec8075eb1e3845f5b81b8ed3d702908388a54e7063cbea91a SHA512 d8a86f5e23e4a88e7c84b82fdb51eb350419086afe462ecb2f4d5c3ba9290ede310cbbcffd60215219ddccf5bad4adec21a5ebfbef6577200f66ac7a1b64a5ef
diff --git a/dev-libs/wayland/files/0001-connection-test-Encode-size-in-message-headers-corre.patch b/dev-libs/wayland/files/0001-connection-test-Encode-size-in-message-headers-corre.patch
new file mode 100644
index 0000000..72e1ca3
--- /dev/null
+++ b/dev-libs/wayland/files/0001-connection-test-Encode-size-in-message-headers-corre.patch
@@ -0,0 +1,78 @@
+From aee23e155474cb3001a8224b247cb6ded7e1f4a3 Mon Sep 17 00:00:00 2001
+From: Fergus Dall <sidereal@google.com>
+Date: Tue, 22 Jun 2021 20:05:47 +1000
+Subject: [PATCH 1/2] connection-test: Encode size in message headers correctly
+
+In these tests, message sizes are inconsistently encoded in either the upper
+or lower 16 bits of the second word of the message. Resolve this in favour
+of using the upper 16 bits, as this is how messages are supposed to be
+encoded, even though that aspect of message decoding isn't being tested
+here.
+
+Signed-off-by: Fergus Dall <sidereal@google.com>
+---
+ tests/connection-test.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/tests/connection-test.c b/tests/connection-test.c
+index c04845b..669d73b 100644
+--- a/tests/connection-test.c
++++ b/tests/connection-test.c
+@@ -394,7 +394,7 @@ demarshal(struct marshal_data *data, const char *format,
+ 	struct wl_closure *closure;
+ 	struct wl_map objects;
+ 	struct wl_object object = { NULL, &func, 0 };
+-	int size = msg[1];
++	int size = msg[1] >> 16;
+ 
+ 	assert(write(data->s[1], msg, size) == size);
+ 	assert(wl_connection_read(data->read_connection) == size);
+@@ -417,39 +417,39 @@ TEST(connection_demarshal)
+ 
+ 	data.value.u = 8000;
+ 	msg[0] = 400200;	/* object id */
+-	msg[1] = 12;		/* size = 12, opcode = 0 */
++	msg[1] = 12 << 16;		/* size = 12, opcode = 0 */
+ 	msg[2] = data.value.u;
+ 	demarshal(&data, "u", msg, (void *) validate_demarshal_u);
+ 
+ 	data.value.i = -557799;
+ 	msg[0] = 400200;
+-	msg[1] = 12;
++	msg[1] = 12 << 16;
+ 	msg[2] = data.value.i;
+ 	demarshal(&data, "i", msg, (void *) validate_demarshal_i);
+ 
+ 	data.value.s = "superdude";
+ 	msg[0] = 400200;
+-	msg[1] = 24;
++	msg[1] = 24 << 16;
+ 	msg[2] = 10;
+ 	memcpy(&msg[3], data.value.s, msg[2]);
+ 	demarshal(&data, "s", msg, (void *) validate_demarshal_s);
+ 
+ 	data.value.s = "superdude";
+ 	msg[0] = 400200;
+-	msg[1] = 24;
++	msg[1] = 24 << 16;
+ 	msg[2] = 10;
+ 	memcpy(&msg[3], data.value.s, msg[2]);
+ 	demarshal(&data, "?s", msg, (void *) validate_demarshal_s);
+ 
+ 	data.value.i = wl_fixed_from_double(-90000.2390);
+ 	msg[0] = 400200;
+-	msg[1] = 12;
++	msg[1] = 12 << 16;
+ 	msg[2] = data.value.i;
+ 	demarshal(&data, "f", msg, (void *) validate_demarshal_f);
+ 
+ 	data.value.s = NULL;
+ 	msg[0] = 400200;
+-	msg[1] = 12;
++	msg[1] = 12 << 16;
+ 	msg[2] = 0;
+ 	demarshal(&data, "?s", msg, (void *) validate_demarshal_s);
+ 
+-- 
+2.32.0.93.g670b81a890-goog
+
diff --git a/dev-libs/wayland/files/0002-connection-Handle-non-nullable-strings-in-wl_connect.patch b/dev-libs/wayland/files/0002-connection-Handle-non-nullable-strings-in-wl_connect.patch
new file mode 100644
index 0000000..ad27201
--- /dev/null
+++ b/dev-libs/wayland/files/0002-connection-Handle-non-nullable-strings-in-wl_connect.patch
@@ -0,0 +1,66 @@
+From d514bc6d906ccbb3a8bd9afd2fc214f010c293c6 Mon Sep 17 00:00:00 2001
+From: Fergus Dall <sidereal@google.com>
+Date: Tue, 22 Jun 2021 19:31:26 +1000
+Subject: [PATCH 2/2] connection: Handle non-nullable strings in
+ wl_connection_demarshal
+
+Currently a null string passed into a non-nullable argument of a message
+will decode succesfully, probably resulting in the handler function
+crashing. Instead treat it the same way we do non-nullable objects and ids.
+
+Signed-off-by: Fergus Dall <sidereal@google.com>
+---
+ src/connection.c        |  7 +++++++
+ tests/connection-test.c | 18 ++++++++++++++++++
+ 2 files changed, 25 insertions(+)
+
+diff --git a/src/connection.c b/src/connection.c
+index d0c7d9f..557c611 100644
+--- a/src/connection.c
++++ b/src/connection.c
+@@ -749,6 +749,13 @@ wl_connection_demarshal(struct wl_connection *connection,
+ 		case 's':
+ 			length = *p++;
+ 
++			if (length == 0 && !arg.nullable) {
++				wl_log("NULL string received on non-nullable "
++				       "type, message %s(%s)\n", message->name,
++				       message->signature);
++				errno = EINVAL;
++				goto err;
++			}
+ 			if (length == 0) {
+ 				closure->args[i].s = NULL;
+ 				break;
+diff --git a/tests/connection-test.c b/tests/connection-test.c
+index 669d73b..7220d87 100644
+--- a/tests/connection-test.c
++++ b/tests/connection-test.c
+@@ -553,6 +553,24 @@ expected_fail_demarshal(struct marshal_data *data, const char *format,
+ 	assert(errno == expected_error);
+ }
+ 
++TEST(connection_demarshal_null_strings)
++{
++	struct marshal_data data;
++	uint32_t msg[3];
++
++	setup_marshal_data(&data);
++
++	data.value.s = NULL;
++	msg[0] = 400200;	/* object id */
++	msg[1] = 12 << 16;	/* size = 12, opcode = 0 */
++	msg[2] = 0;		/* string length = 0 */
++	demarshal(&data, "?s", msg, (void *) validate_demarshal_s);
++
++	expected_fail_demarshal(&data, "s", msg, EINVAL);
++
++	release_marshal_data(&data);
++}
++
+ /* These tests are verifying that the demarshaling code will gracefully handle
+  * clients lying about string and array lengths and giving values near
+  * UINT32_MAX. Before fixes f7fdface and f5b9e3b9 this test would crash on
+-- 
+2.32.0.93.g670b81a890-goog
+
diff --git a/dev-libs/wayland/wayland-1.17.0.ebuild b/dev-libs/wayland/wayland-1.17.0.ebuild
deleted file mode 100644
index 261062d..0000000
--- a/dev-libs/wayland/wayland-1.17.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
-	inherit git-r3
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="*"
-fi
-inherit autotools libtool multilib-minimal toolchain-funcs
-
-DESCRIPTION="Wayland protocol libraries"
-HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc static-libs"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.6[dot]
-		app-text/xmlto
-		>=media-gfx/graphviz-2.26.0
-		sys-apps/grep[pcre]
-	)
-"
-DEPEND="
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	dev-libs/libxml2:=
-	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	!<media-libs/mesa-18.1.1-r1
-"
-
-src_prepare() {
-	default
-	[[ $PV = 9999* ]] && eautoreconf || elibtoolize
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(multilib_native_use_enable doc documentation)
-		$(multilib_native_enable dtd-validation)
-	)
-	tc-is-cross-compiler && myeconfargs+=( --with-host-scanner )
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
-	einstalldocs
-}
-
-src_test() {
-	# We set it on purpose to only a short subdir name, as socket paths are
-	# created in there, which are 108 byte limited. With this it hopefully
-	# barely fits to the limit with /var/tmp/portage/$CAT/$PF/temp/xdr
-	export XDG_RUNTIME_DIR="${T}"/xdr
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	multilib-minimal_src_test
-}
diff --git a/dev-libs/wayland/wayland-1.19.0-r1.ebuild b/dev-libs/wayland/wayland-1.19.0-r1.ebuild
new file mode 100644
index 0000000..ef33ea0
--- /dev/null
+++ b/dev-libs/wayland/wayland-1.19.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
+	inherit git-r3
+else
+	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
+	KEYWORDS="*"
+fi
+inherit meson-multilib
+
+DESCRIPTION="Wayland protocol libraries"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc"
+
+BDEPEND="
+	~dev-util/wayland-scanner-${PV}[$MULTILIB_USEDEP]
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.6[dot]
+		app-text/xmlto
+		>=media-gfx/graphviz-2.26.0
+	)
+"
+DEPEND="
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	dev-libs/libxml2:=
+	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/0001-connection-test-Encode-size-in-message-headers-corre.patch
+	"${FILESDIR}"/0002-connection-Handle-non-nullable-strings-in-wl_connect.patch
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_native_use_bool doc documentation)
+		$(meson_native_true dtd_validation)
+		-Dlibraries=true
+		-Dscanner=false
+	)
+	meson_src_configure
+}
+
+src_test() {
+	# We set it on purpose to only a short subdir name, as socket paths are
+	# created in there, which are 108 byte limited. With this it hopefully
+	# barely fits to the limit with /var/tmp/portage/${CATEGORY}/${PF}/temp/x
+	export XDG_RUNTIME_DIR="${T}"/x
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	multilib-minimal_src_test
+}
diff --git a/dev-perl/Canary-Stability/Canary-Stability-2013.0.0.ebuild b/dev-perl/Canary-Stability/Canary-Stability-2013.0.0.ebuild
new file mode 100644
index 0000000..d162612
--- /dev/null
+++ b/dev-perl/Canary-Stability/Canary-Stability-2013.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=MLEHMANN
+DIST_VERSION=2013
+inherit perl-module
+
+DESCRIPTION="Canary to check perl compatibility for schmorp's modules"
+
+SLOT="0"
+KEYWORDS="*"
+
+BDEPEND="
+	virtual/perl-ExtUtils-MakeMaker
+"
+src_test() {
+	perl-module_src_test
+	perl -Mblib="${S}" -M"Canary::Stability ${DIST_VERSION} ()" -e1	||
+		die "Could not load Canary::Stability"
+}
diff --git a/dev-perl/Canary-Stability/Manifest b/dev-perl/Canary-Stability/Manifest
new file mode 100644
index 0000000..85b605a
--- /dev/null
+++ b/dev-perl/Canary-Stability/Manifest
@@ -0,0 +1 @@
+DIST Canary-Stability-2013.tar.gz 4861 BLAKE2B d9f10167b5ad7391ff18cd360f908947fb95cf3608841f37cc5987bef4b4846ad80f5053319e26441da9bda3f166e239758e8900de87e72ed862abd9a776e077 SHA512 9dfb0e6d136048050aac7c29e1fc79dc2a7703c8800582aa837c5d9b9934c48bfcb0a9ef1c6b5bb7e71a10a709e7f7431b3c79ea12b8d9f374b33bfd4a3e468d
diff --git a/dev-perl/Canary-Stability/OWNERS b/dev-perl/Canary-Stability/OWNERS
new file mode 100644
index 0000000..a42b046
--- /dev/null
+++ b/dev-perl/Canary-Stability/OWNERS
@@ -0,0 +1,2 @@
+# Needed by the lcov package.
+include /dev-util/lcov/OWNERS
diff --git a/dev-perl/Canary-Stability/metadata.xml b/dev-perl/Canary-Stability/metadata.xml
new file mode 100644
index 0000000..1d35a66
--- /dev/null
+++ b/dev-perl/Canary-Stability/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">Canary-Stability</remote-id>
+    <remote-id type="cpan-module">Canary::Stability</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-perl/JSON-XS/JSON-XS-3.40.0.ebuild b/dev-perl/JSON-XS/JSON-XS-3.40.0.ebuild
new file mode 100644
index 0000000..c764c4d
--- /dev/null
+++ b/dev-perl/JSON-XS/JSON-XS-3.40.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MLEHMANN
+DIST_VERSION=3.04
+DIST_EXAMPLES=("eg/bench")
+inherit perl-module
+
+DESCRIPTION="JSON::XS - JSON serialising/deserialising, done correctly and fast"
+
+SLOT="0"
+KEYWORDS="*"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-perl/Types-Serialiser
+	dev-perl/common-sense
+	!<dev-perl/JSON-2.900.0
+	!<dev-perl/JSON-Any-1.310.0
+"
+DEPEND="${RDEPEND}
+	dev-perl/Canary-Stability
+	>=virtual/perl-ExtUtils-MakeMaker-6.520.0
+	test? ( virtual/perl-Test-Harness )"
diff --git a/dev-perl/JSON-XS/Manifest b/dev-perl/JSON-XS/Manifest
new file mode 100644
index 0000000..9990775
--- /dev/null
+++ b/dev-perl/JSON-XS/Manifest
@@ -0,0 +1 @@
+DIST JSON-XS-3.04.tar.gz 83424 BLAKE2B 031e3b9d4902b7d9ad704655914fc4ee880874aa3073ded7248e5a842287cdaea47fce8be9d6c2999d19bdd3b5026fa2c0fb963c3183d6ac006387a741e0cdd0 SHA512 69c2e199385b5b5e331d905b64805304de80e1a3b393acaf7dce21c45254b1f23f1a83b246dcd3a80c2cfdadaf8ce3634ee587c469629cb69106f0c2239c73db
diff --git a/dev-perl/JSON-XS/OWNERS b/dev-perl/JSON-XS/OWNERS
new file mode 100644
index 0000000..a42b046
--- /dev/null
+++ b/dev-perl/JSON-XS/OWNERS
@@ -0,0 +1,2 @@
+# Needed by the lcov package.
+include /dev-util/lcov/OWNERS
diff --git a/dev-perl/JSON-XS/metadata.xml b/dev-perl/JSON-XS/metadata.xml
new file mode 100644
index 0000000..28d3b49
--- /dev/null
+++ b/dev-perl/JSON-XS/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">JSON-XS</remote-id>
+    <remote-id type="cpan-module">JSON::XS</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-perl/JSON/JSON-2.940.0.ebuild b/dev-perl/JSON/JSON-2.940.0.ebuild
new file mode 100644
index 0000000..e184b4a
--- /dev/null
+++ b/dev-perl/JSON/JSON-2.940.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=ISHIGAKI
+DIST_VERSION=2.94
+DIST_EXAMPLES=("eg/*")
+inherit perl-module
+
+DESCRIPTION="JSON (JavaScript Object Notation) encoder/decoder"
+
+SLOT="0"
+KEYWORDS="*"
+IUSE="test +xs"
+RESTRICT="!test? ( test )"
+
+RDEPEND="xs? ( >=dev-perl/JSON-XS-2.340.0 )"
+DEPEND="
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+src_test() {
+	perl_rm_files t/00_pod.t
+	perl-module_src_test
+}
diff --git a/dev-perl/JSON/Manifest b/dev-perl/JSON/Manifest
new file mode 100644
index 0000000..b23b3ab
--- /dev/null
+++ b/dev-perl/JSON/Manifest
@@ -0,0 +1 @@
+DIST JSON-2.94.tar.gz 82629 BLAKE2B 284e8fc19732ad680c9f953211f916222e29a032f2d70075d81df2372769874d409aea5a77c4f25fd00f2ff47784e34f421603adbdd0001834ce2e579c4de4b1 SHA512 0a20562441d525ee37fff467111f7d65124525e06b4f825079948752da2a983757e719025dd2ab896115b34ba146b4c495f738e4f005542dce0b058440c73a46
diff --git a/dev-perl/JSON/OWNERS b/dev-perl/JSON/OWNERS
new file mode 100644
index 0000000..a42b046
--- /dev/null
+++ b/dev-perl/JSON/OWNERS
@@ -0,0 +1,2 @@
+# Needed by the lcov package.
+include /dev-util/lcov/OWNERS
diff --git a/dev-perl/JSON/metadata.xml b/dev-perl/JSON/metadata.xml
new file mode 100644
index 0000000..b93c6f1
--- /dev/null
+++ b/dev-perl/JSON/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <use>
+    <flag name="xs">Install C-based <pkg>dev-perl/JSON-XS</pkg> for faster performance</flag>
+  </use>
+  <upstream>
+    <remote-id type="cpan">JSON</remote-id>
+    <remote-id type="cpan-module">JSON</remote-id>
+    <remote-id type="cpan-module">JSON::PP::IncrParser</remote-id>
+    <remote-id type="cpan-module">JSON::Backend::PP</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-perl/PerlIO-gzip/Manifest b/dev-perl/PerlIO-gzip/Manifest
new file mode 100644
index 0000000..a208f42
--- /dev/null
+++ b/dev-perl/PerlIO-gzip/Manifest
@@ -0,0 +1 @@
+DIST PerlIO-gzip-0.20.tar.gz 19076 BLAKE2B e7ff1dd280bbfe80720c113a26626e222695642bc02730f5271345583784ca3e850d1fbd9958acc43a12dd603ef32cefc786acdc8e86263f9d38fd675df9b7e1 SHA512 b24e8fa99cbcbaf07feabfc09cefc55a10c1dce59b495b59343ff5217536f7108c92f462751e70242e6567be32e69a0cc88a2e66325e926174a64042d4b87966
diff --git a/dev-perl/PerlIO-gzip/OWNERS b/dev-perl/PerlIO-gzip/OWNERS
new file mode 100644
index 0000000..a42b046
--- /dev/null
+++ b/dev-perl/PerlIO-gzip/OWNERS
@@ -0,0 +1,2 @@
+# Needed by the lcov package.
+include /dev-util/lcov/OWNERS
diff --git a/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0.ebuild b/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0.ebuild
new file mode 100644
index 0000000..98f2eba
--- /dev/null
+++ b/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=NWCLARK
+DIST_VERSION=0.20
+inherit perl-module
+
+DESCRIPTION="PerlIO layer to gzip/gunzip"
+
+SLOT="0"
+KEYWORDS="*"
+IUSE=""
+
+DEPEND="sys-libs/zlib"
+RDEPEND="${DEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/PerlIO-gzip/metadata.xml b/dev-perl/PerlIO-gzip/metadata.xml
new file mode 100644
index 0000000..57be8ce
--- /dev/null
+++ b/dev-perl/PerlIO-gzip/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">PerlIO-gzip</remote-id>
+    <remote-id type="cpan-module">PerlIO::gzip</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-perl/Types-Serialiser/Manifest b/dev-perl/Types-Serialiser/Manifest
new file mode 100644
index 0000000..5e1ef91
--- /dev/null
+++ b/dev-perl/Types-Serialiser/Manifest
@@ -0,0 +1 @@
+DIST Types-Serialiser-1.0.tar.gz 6238 BLAKE2B ec0dee2f4519605b1fbbdad832bbf2eced1f27005f6b84a4ed1c2f8d6b4ca898f0c2747f1c1986de78fe92f730cad7d93aa54ac56010e6146a9d699c54a3fe88 SHA512 b786bcd3ee976a6ad948cc98a9c71d2cdcd30f485528eff059091f6d86ae7078c10ba2dc2982326fcf0184dbfbdddea84daff324c6ec6a129fe6aac01253c8fb
diff --git a/dev-perl/Types-Serialiser/OWNERS b/dev-perl/Types-Serialiser/OWNERS
new file mode 100644
index 0000000..a42b046
--- /dev/null
+++ b/dev-perl/Types-Serialiser/OWNERS
@@ -0,0 +1,2 @@
+# Needed by the lcov package.
+include /dev-util/lcov/OWNERS
diff --git a/dev-perl/Types-Serialiser/Types-Serialiser-1.0.0-r1.ebuild b/dev-perl/Types-Serialiser/Types-Serialiser-1.0.0-r1.ebuild
new file mode 100644
index 0000000..0b66739
--- /dev/null
+++ b/dev-perl/Types-Serialiser/Types-Serialiser-1.0.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MLEHMANN
+DIST_VERSION=1.0
+inherit perl-module
+
+DESCRIPTION="simple data types for common serialisation formats"
+
+SLOT="0"
+KEYWORDS="*"
+IUSE=""
+
+RDEPEND="
+	dev-perl/common-sense
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Types-Serialiser/metadata.xml b/dev-perl/Types-Serialiser/metadata.xml
new file mode 100644
index 0000000..51d2e3c
--- /dev/null
+++ b/dev-perl/Types-Serialiser/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">Types-Serialiser</remote-id>
+    <remote-id type="cpan-module">Types::Serialiser</remote-id>
+    <remote-id type="cpan-module">Types::Serialiser::BooleanBase</remote-id>
+    <remote-id type="cpan-module">Types::Serialiser::Error</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-perl/common-sense/Manifest b/dev-perl/common-sense/Manifest
new file mode 100644
index 0000000..00d7681
--- /dev/null
+++ b/dev-perl/common-sense/Manifest
@@ -0,0 +1 @@
+DIST common-sense-3.74.tar.gz 13002 BLAKE2B 234f86e1d51d650c43be0e79f1e87f24f07c529fc7724084fdb75048e3a7295961131dc108bc573e8d3ca757e6b51c657426adcfb800afdf8ded3d8bf86a352c SHA512 658ad70a2d1bbd0b26f91c4ea5d69b4cc0b632ede9532b88282987002a5e280f0475d63ee846b7bd2d38ef82f2680e20c2093803e4b62a984750ed447f318d60
diff --git a/dev-perl/common-sense/OWNERS b/dev-perl/common-sense/OWNERS
new file mode 100644
index 0000000..a42b046
--- /dev/null
+++ b/dev-perl/common-sense/OWNERS
@@ -0,0 +1,2 @@
+# Needed by the lcov package.
+include /dev-util/lcov/OWNERS
diff --git a/dev-perl/common-sense/common-sense-3.740.0-r1.ebuild b/dev-perl/common-sense/common-sense-3.740.0-r1.ebuild
new file mode 100644
index 0000000..dacab93
--- /dev/null
+++ b/dev-perl/common-sense/common-sense-3.740.0-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MLEHMANN
+DIST_VERSION=3.74
+inherit perl-module
+
+DESCRIPTION="Save a tree AND a kitten, use common::sense!"
+
+SLOT="0"
+KEYWORDS="*"
+IUSE=""
+
+DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/common-sense/metadata.xml b/dev-perl/common-sense/metadata.xml
new file mode 100644
index 0000000..03c6d58
--- /dev/null
+++ b/dev-perl/common-sense/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">common-sense</remote-id>
+    <remote-id type="cpan-module">common::sense</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/asn1crypto/Manifest b/dev-python/asn1crypto/Manifest
deleted file mode 100644
index 5e47229..0000000
--- a/dev-python/asn1crypto/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST asn1crypto-0.22.0.tar.gz 84508 SHA256 cbbadd640d3165ab24b06ef25d1dca09a3441611ac15f6a6b452474fdf0aed1a SHA512 fdc98f71ec3b744e69a75909b5b0a8381fb82d448941a6e1059823af47ca107218e1dbe6ff192e2173f11fc2454be1afcd387d801dc8e716451179857d71f8b8 WHIRLPOOL 83422e7f17c5e8c5ff5dff4e6e295596d4649f163bab8151b6885df48cdb2e61730b7abba5af5b5d44781078af69fe6495a1d1a20bc1fd1927f64f726bbdfdb1
diff --git a/dev-python/asn1crypto/asn1crypto-0.22.0-r2.ebuild b/dev-python/asn1crypto/asn1crypto-0.22.0-r2.ebuild
deleted file mode 120000
index 2ab2785..0000000
--- a/dev-python/asn1crypto/asn1crypto-0.22.0-r2.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-asn1crypto-0.22.0.ebuild
\ No newline at end of file
diff --git a/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild b/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild
deleted file mode 100644
index da5b4f8..0000000
--- a/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python ASN.1 library with a focus on performance and a pythonic API"
-HOMEPAGE="https://github.com/wbond/asn1crypto/ https://pypi.python.org/pypi/asn1crypto/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="*"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/asn1crypto/metadata.xml b/dev-python/asn1crypto/metadata.xml
deleted file mode 100644
index 2dfa57b..0000000
--- a/dev-python/asn1crypto/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">cryptography</remote-id>
-    <remote-id type="github">pyca/cryptography</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index b2c97dd..a3541fe 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -1 +1 @@
-DIST attrs-18.2.0.tar.gz 116817 BLAKE2B 79d50c9b49956bbc1e04084eed36a5f65f2dda8e954b23f15650cb881d6f77a8325e042c6d1a77dcad43661d4524a4d253d96bd0053464ef03091779636e6d0b SHA512 58c26579d6dfcacbe9e3f770a125861e0625d435f1293eebe0d62efc9b8aa9572be2b312d73037a647163bffb0a13b240fb157aff7ed35196f637ae945d61d22
+DIST attrs-20.3.0.tar.gz 164523 BLAKE2B 66d2e038e485833f5033fbabe2ef9a6565e3f5f5e8530f2c70019e4f5bdfca51083ac6d0bbc9eb765f838070bc90e01db1c83ed6da113ced67300238e12b5f42 SHA512 640532c6b763fd96572e5d85e93c111bebc4c5e0ff9419fe92fb51280f03acb5f9f43339f57d30659e777d5578460675c60ec0a362f9ad433893e3624ce6a931
diff --git a/dev-python/attrs/OWNERS b/dev-python/attrs/OWNERS
new file mode 100644
index 0000000..3d2e096
--- /dev/null
+++ b/dev-python/attrs/OWNERS
@@ -0,0 +1 @@
+include chromiumos/platform/ec:/OWNERS
diff --git a/dev-python/attrs/attrs-18.2.0.ebuild b/dev-python/attrs/attrs-18.2.0.ebuild
deleted file mode 100644
index f179d46..0000000
--- a/dev-python/attrs/attrs-18.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Attributes without boilerplate"
-HOMEPAGE="
-	https://github.com/hynek/attrs
-	https://attrs.readthedocs.org/
-	https://pypi.org/project/attrs/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="*"
-IUSE="test"
-
-RDEPEND="
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	py.test -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/attrs/attrs-20.3.0.ebuild b/dev-python/attrs/attrs-20.3.0.ebuild
new file mode 100644
index 0000000..ec74bc8
--- /dev/null
+++ b/dev-python/attrs/attrs-20.3.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Attributes without boilerplate"
+HOMEPAGE="
+	https://github.com/python-attrs/attrs
+	https://attrs.readthedocs.io/
+	https://pypi.org/project/attrs/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="*"
+
+RDEPEND="
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.3.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/backports-lzma/Manifest b/dev-python/backports-lzma/Manifest
deleted file mode 100644
index 731d41e..0000000
--- a/dev-python/backports-lzma/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST backports.lzma-0.0.8.tar.gz 36111 SHA256 200584ad5079d8ca6b1bfe14890c7be58666ab0128d8ca26cfb2669b476085f3 SHA512 bc5e7672a0ac53b7cf97ea52a566e96d92a3dd334a8321699585225e32ad7c723b4ffd6e4b153bd2ae3ead2a2cd6a48678b915257de4952ddca8389032db48ad WHIRLPOOL 1aaa4ac5b0a2d25a932577ed52843a99a92ef152e1eaf5795bbdd9ec13cb048acd0f01a99eef1182392b33ae62aa2b4f61fb0e801e44eb729d665d707ca71ebf
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild
deleted file mode 100644
index 29a4336..0000000
--- a/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Backport of Python 3.3's lzma module for XZ/LZMA compressed files"
-HOMEPAGE="https://github.com/peterjc/backports.lzma/ https://pypi.python.org/pypi/backports.lzma/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="*"
-
-RDEPEND="app-arch/xz-utils
-	dev-python/backports[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	PYTHONPATH="${BUILD_DIR}/lib" "${PYTHON}" test/test_lzma.py || die "tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	# main namespace provided by dev-python/backports
-	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
-	rm -f backports/__init__.py || die
-
-	distutils-r1_python_install
-}
diff --git a/dev-python/backports-lzma/metadata.xml b/dev-python/backports-lzma/metadata.xml
deleted file mode 100644
index c58f6b9..0000000
--- a/dev-python/backports-lzma/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">peterjc/backports.lzma</remote-id>
-    <remote-id type="pypi">backports.lzma</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/backports-shutil_get_terminal_size/Manifest b/dev-python/backports-shutil_get_terminal_size/Manifest
deleted file mode 100644
index c82df62..0000000
--- a/dev-python/backports-shutil_get_terminal_size/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST backports.shutil_get_terminal_size-1.0.0.tar.gz 4279 BLAKE2B 8f4772c8c9b7e80c4d1402ef9cf3fefaa7ab61a1baed26b87fa0d347bea6ad704f5ae7d9379cd266bd949509eff9e89cda9d87ecedc9832c5cb332c5ed6496d0 SHA512 b74341c6616f9aace5abcc7fd657fc33801b558b6227c533002ccaf588734490b465a4a27d2bdc8047a385771afdcded610edef832dfa5ef24632f4541729050
diff --git a/dev-python/backports-shutil_get_terminal_size/backports-shutil_get_terminal_size-1.0.0-r1.ebuild b/dev-python/backports-shutil_get_terminal_size/backports-shutil_get_terminal_size-1.0.0-r1.ebuild
deleted file mode 100644
index a4d5c81..0000000
--- a/dev-python/backports-shutil_get_terminal_size/backports-shutil_get_terminal_size-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="backports.shutil_get_terminal_size"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A backport of the get_terminal_size function from Python 3.3's shutil"
-HOMEPAGE="https://pypi.org/project/backports.shutil_get_terminal_size/ https://github.com/chrippa/backports.shutil_get_terminal_size"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="*"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-python_install() {
-	distutils-r1_python_install
-
-	# main namespace provided by dev-python/backports
-	rm "${D}$(python_get_sitedir)"/backports/__init__.py* || die
-}
diff --git a/dev-python/backports-shutil_get_terminal_size/metadata.xml b/dev-python/backports-shutil_get_terminal_size/metadata.xml
deleted file mode 100644
index f9b37db..0000000
--- a/dev-python/backports-shutil_get_terminal_size/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">backports.shutil_get_terminal_size</remote-id>
-		<remote-id type="github">chrippa/backports.shutil_get_terminal_size</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/boto/boto-2.49.0-r4.ebuild b/dev-python/boto/boto-2.49.0-r4.ebuild
new file mode 100644
index 0000000..41f923e
--- /dev/null
+++ b/dev-python/boto/boto-2.49.0-r4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Amazon Web Services API"
+HOMEPAGE="https://github.com/boto/boto https://pypi.org/project/boto/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="*"
+
+PATCHES=(
+	# taken from https://bugs.debian.org/909545
+	"${FILESDIR}"/${P}-try-to-add-SNI-support-v3.patch
+	"${FILESDIR}"/${P}-py38.patch
+	"${FILESDIR}"/${P}-py3-socket-binary.patch
+	"${FILESDIR}"/${P}-py3-httplib-strict.patch
+	"${FILESDIR}"/${P}-py3-server-port.patch
+	"${FILESDIR}"/${P}-unbundle-six.patch
+)
+
+RDEPEND=">=dev-python/six-1.12.0[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	test? (
+		dev-python/httpretty[${PYTHON_USEDEP}]
+		dev-python/keyring[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/paramiko[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/rsa[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests nose
+
+src_prepare() {
+	# remove bundled libs.
+	rm -f "${S}"/boto/vendored/six.py || die
+	# broken, not worth fixing
+	rm tests/unit/cloudfront/test_signed_urls.py || die
+	# fix tests
+	mkdir -p "${HOME}"/.ssh || die
+	: > "${HOME}"/.ssh/known_hosts || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	nosetests -v tests/unit ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/boto/boto-2.49.0.ebuild b/dev-python/boto/boto-2.49.0.ebuild
deleted file mode 100644
index 3811e9b..0000000
--- a/dev-python/boto/boto-2.49.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Amazon Web Services API"
-HOMEPAGE="https://github.com/boto/boto https://pypi.org/project/boto/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="*"
-IUSE="doc test"
-
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-# requires Amazon Web Services keys to pass some tests
-RESTRICT="test"
-
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
-}
-
-python_test() {
-	"${PYTHON}" tests/test.py -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_prepare_all() {
-	# Prevent un-needed d'loading
-	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/source/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		# Appease the doc build and supply a file for _static
-		# the usual emake -C docs doesn't work under this authorship
-		cd docs && mkdir source/_static  || die
-		emake html
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/boto/files/boto-2.49.0-py3-httplib-strict.patch b/dev-python/boto/files/boto-2.49.0-py3-httplib-strict.patch
new file mode 100644
index 0000000..209b01a
--- /dev/null
+++ b/dev-python/boto/files/boto-2.49.0-py3-httplib-strict.patch
@@ -0,0 +1,35 @@
+https://github.com/boto/boto/commit/4f4dcb31fe852c05ce19b44eb9d5b5d747e36f7c
+https://github.com/boto/boto/pull/2718
+
+From 4f4dcb31fe852c05ce19b44eb9d5b5d747e36f7c Mon Sep 17 00:00:00 2001
+From: Lee Ball <43632885+catleeball@users.noreply.github.com>
+Date: Mon, 10 Jun 2019 16:02:53 -0700
+Subject: [PATCH] Remove `strict=True` from http_client (#6)
+
+In Python 3.4, the `strict` kwarg was removed[1]. We are removing it
+here too.
+
+Alternatively, we can leave in `strict=True` for 2.x, but I chose to
+remove it entirely to maintain consistent behavior across versions.
+
+[1]: https://docs.python.org/3/library/http.client.html
+---
+ boto/connection.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/boto/connection.py b/boto/connection.py
+index c731173bb4eb..54e26fb2de16 100644
+--- a/boto/connection.py
++++ b/boto/connection.py
+@@ -807,7 +807,7 @@ class AWSAuthConnection(object):
+                 sock.sendall(six.ensure_binary("\r\n"))
+         else:
+             sock.sendall(six.ensure_binary("\r\n"))
+-        resp = http_client.HTTPResponse(sock, strict=True, debuglevel=self.debug)
++        resp = http_client.HTTPResponse(sock, debuglevel=self.debug)
+         resp.begin()
+ 
+         if resp.status != 200:
+-- 
+2.28.0
+
diff --git a/dev-python/boto/files/boto-2.49.0-py3-server-port.patch b/dev-python/boto/files/boto-2.49.0-py3-server-port.patch
new file mode 100644
index 0000000..62e3319
--- /dev/null
+++ b/dev-python/boto/files/boto-2.49.0-py3-server-port.patch
@@ -0,0 +1,42 @@
+https://github.com/boto/boto/commit/b9f6cb0ab717ea76e2780c7fddd1cd36b3bf7d63
+
+From b9f6cb0ab717ea76e2780c7fddd1cd36b3bf7d63 Mon Sep 17 00:00:00 2001
+From: Matt Houglum <houglum@google.com>
+Date: Fri, 21 Jun 2019 15:09:11 -0700
+Subject: [PATCH] Make server_name() behave correctly for PY3
+
+...because Python-2.6-or-newer doesn't just include Python 2.6 and 2.7.
+---
+ boto/connection.py | 14 +++++---------
+ 1 file changed, 5 insertions(+), 9 deletions(-)
+
+diff --git a/boto/connection.py b/boto/connection.py
+index 54e26fb2de16..bbb25d8fb842 100644
+--- a/boto/connection.py
++++ b/boto/connection.py
+@@ -650,17 +650,13 @@ class AWSAuthConnection(object):
+         if port == 80:
+             signature_host = self.host
+         else:
+-            # This unfortunate little hack can be attributed to
+-            # a difference in the 2.6 version of http_client.  In old
+-            # versions, it would append ":443" to the hostname sent
+-            # in the Host header and so we needed to make sure we
+-            # did the same when calculating the V2 signature.  In 2.6
+-            # (and higher!)
+-            # it no longer does that.  Hence, this kludge.
+-            if ((ON_APP_ENGINE and sys.version[:3] == '2.5') or
+-                    sys.version[:3] in ('2.6', '2.7')) and port == 443:
++            ver_int = sys.version_info[0] * 10 + sys.version_info[1]
++            if port == 443 and ver_int >= 26:  # Py >= 2.6
+                 signature_host = self.host
+             else:
++                # In versions < 2.6, Python's http_client would append ":443"
++                # to the hostname sent in the Host header and so we needed to
++                # make sure we did the same when calculating the V2 signature.
+                 signature_host = '%s:%d' % (self.host, port)
+         return signature_host
+ 
+-- 
+2.28.0
+
diff --git a/dev-python/boto/files/boto-2.49.0-py3-socket-binary.patch b/dev-python/boto/files/boto-2.49.0-py3-socket-binary.patch
new file mode 100644
index 0000000..1d109a3
--- /dev/null
+++ b/dev-python/boto/files/boto-2.49.0-py3-socket-binary.patch
@@ -0,0 +1,59 @@
+https://github.com/boto/boto/commit/d2cb697b32c297858ecc36701a5a4176818ab36d
+https://github.com/boto/boto/pull/2718
+https://github.com/boto/boto/pull/2893
+https://github.com/boto/boto/pull/3699
+
+From d2cb697b32c297858ecc36701a5a4176818ab36d Mon Sep 17 00:00:00 2001
+From: Cat Lee Ball <cball@google.com>
+Date: Mon, 10 Jun 2019 13:31:11 -0700
+Subject: [PATCH] Ensure binary strings sent to socket
+
+When running pre-release tests with proxied connections, it appeared a
+few spots in connection.py would fail under Python 3 since the
+socket.sendall method expects binary strings rather than unicode.
+---
+ boto/connection.py | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/boto/connection.py b/boto/connection.py
+index a0d89a51f49c..d084d1f881fb 100644
+--- a/boto/connection.py
++++ b/boto/connection.py
+@@ -796,17 +796,17 @@ class AWSAuthConnection(object):
+         else:
+             sock = socket.create_connection((self.proxy, int(self.proxy_port)))
+         boto.log.debug("Proxy connection: CONNECT %s HTTP/1.0\r\n", host)
+-        sock.sendall("CONNECT %s HTTP/1.0\r\n" % host)
+-        sock.sendall("User-Agent: %s\r\n" % UserAgent)
++        sock.sendall(six.ensure_binary("CONNECT %s HTTP/1.0\r\n" % host))
++        sock.sendall(six.ensure_binary("User-Agent: %s\r\n" % UserAgent))
+         if self.proxy_user and self.proxy_pass:
+             for k, v in self.get_proxy_auth_header().items():
+-                sock.sendall("%s: %s\r\n" % (k, v))
++                sock.sendall(six.ensure_binary("%s: %s\r\n" % (k, v)))
+             # See discussion about this config option at
+             # https://groups.google.com/forum/?fromgroups#!topic/boto-dev/teenFvOq2Cc
+             if config.getbool('Boto', 'send_crlf_after_proxy_auth_headers', False):
+-                sock.sendall("\r\n")
++                sock.sendall(six.ensure_binary("\r\n"))
+         else:
+-            sock.sendall("\r\n")
++            sock.sendall(six.ensure_binary("\r\n"))
+         resp = http_client.HTTPResponse(sock, strict=True, debuglevel=self.debug)
+         resp.begin()
+ 
+@@ -814,9 +814,10 @@ class AWSAuthConnection(object):
+             # Fake a socket error, use a code that make it obvious it hasn't
+             # been generated by the socket library
+             raise socket.error(-71,
++                               six.ensure_binary(
+                                "Error talking to HTTP proxy %s:%s: %s (%s)" %
+                                (self.proxy, self.proxy_port,
+-                                resp.status, resp.reason))
++                                resp.status, resp.reason)))
+ 
+         # We can safely close the response, it duped the original socket
+         resp.close()
+-- 
+2.28.0
+
diff --git a/dev-python/boto/files/boto-2.49.0-py38.patch b/dev-python/boto/files/boto-2.49.0-py38.patch
new file mode 100644
index 0000000..0052c6e
--- /dev/null
+++ b/dev-python/boto/files/boto-2.49.0-py38.patch
@@ -0,0 +1,54 @@
+diff --git a/boto/ecs/item.py b/boto/ecs/item.py
+index 79177a31..292b05af 100644
+--- a/boto/ecs/item.py
++++ b/boto/ecs/item.py
+@@ -21,7 +21,7 @@
+ 
+ 
+ import xml.sax
+-import cgi
++import html
+ from boto.compat import six, StringIO
+ 
+ class ResponseGroup(xml.sax.ContentHandler):
+@@ -67,7 +67,7 @@ class ResponseGroup(xml.sax.ContentHandler):
+         return None
+ 
+     def endElement(self, name, value, connection):
+-        self._xml.write("%s</%s>" % (cgi.escape(value).replace("&amp;amp;", "&amp;"), name))
++        self._xml.write("%s</%s>" % (html.escape(value).replace("&amp;amp;", "&amp;"), name))
+         if len(self._nodepath) == 0:
+             return
+         obj = None
+diff --git a/tests/unit/utils/test_utils.py b/tests/unit/utils/test_utils.py
+index db15b56d..89d1a524 100644
+--- a/tests/unit/utils/test_utils.py
++++ b/tests/unit/utils/test_utils.py
+@@ -85,7 +85,7 @@ class TestPassword(unittest.TestCase):
+         def hmac_hashfunc(cls, msg):
+             if not isinstance(msg, bytes):
+                 msg = msg.encode('utf-8')
+-            return hmac.new(b'mysecretkey', msg)
++            return hmac.new(b'mysecretkey', msg, digestmod='MD5')
+ 
+         class HMACPassword(Password):
+             hashfunc = hmac_hashfunc
+@@ -95,15 +95,15 @@ class TestPassword(unittest.TestCase):
+         password.set('foo')
+ 
+         self.assertEquals(str(password),
+-                          hmac.new(b'mysecretkey', b'foo').hexdigest())
++                          hmac.new(b'mysecretkey', b'foo', digestmod='MD5').hexdigest())
+ 
+     def test_constructor(self):
+-        hmac_hashfunc = lambda msg: hmac.new(b'mysecretkey', msg)
++        hmac_hashfunc = lambda msg: hmac.new(b'mysecretkey', msg, digestmod='MD5')
+ 
+         password = Password(hashfunc=hmac_hashfunc)
+         password.set('foo')
+         self.assertEquals(password.str,
+-                          hmac.new(b'mysecretkey', b'foo').hexdigest())
++                          hmac.new(b'mysecretkey', b'foo', digestmod='MD5').hexdigest())
+ 
+ 
+ class TestPythonizeName(unittest.TestCase):
diff --git a/dev-python/boto/files/boto-2.49.0-try-to-add-SNI-support-v3.patch b/dev-python/boto/files/boto-2.49.0-try-to-add-SNI-support-v3.patch
new file mode 100644
index 0000000..11d346a
--- /dev/null
+++ b/dev-python/boto/files/boto-2.49.0-try-to-add-SNI-support-v3.patch
@@ -0,0 +1,104 @@
+From f5e7f6c98b46ff622f60a4661ffc9ce07216d109 Mon Sep 17 00:00:00 2001
+From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
+Date: Sat, 29 Sep 2018 21:47:11 +0200
+Subject: [PATCH] boto: try to add SNI support
+
+Add SNI support. Newer OpenSSL (with TLS1.3) fail to connect if the
+hostname is missing.
+
+Link: https://bugs.debian.org/bug=909545
+Tested-by: Witold Baryluk <witold.baryluk@gmail.com>
+Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
+---
+ boto/connection.py       | 19 ++++++++++---------
+ boto/https_connection.py | 22 +++++++++++-----------
+ 2 files changed, 21 insertions(+), 20 deletions(-)
+
+diff --git a/boto/connection.py b/boto/connection.py
+index 34b428f101df7..b4867a7657465 100644
+--- a/boto/connection.py
++++ b/boto/connection.py
+@@ -778,8 +778,10 @@
+ 
+     def proxy_ssl(self, host=None, port=None):
+         if host and port:
++            cert_host = host
+             host = '%s:%d' % (host, port)
+         else:
++            cert_host = self.host
+             host = '%s:%d' % (self.host, self.port)
+         # Seems properly to use timeout for connect too
+         timeout = self.http_connection_kwargs.get("timeout")
+@@ -824,23 +824,24 @@ DEFAULT_CA_CERTS_FILE = os.path.join(os.path.dirname(os.path.abspath(boto.cacert
+         h = http_client.HTTPConnection(host)
+ 
+         if self.https_validate_certificates and HAVE_HTTPS_CONNECTION:
++            context = ssl.create_default_context()
++            context.verify_mode = ssl.CERT_REQUIRED
++            context.check_hostname = True
++
+             msg = "wrapping ssl socket for proxied connection; "
+             if self.ca_certificates_file:
+                 msg += "CA certificate file=%s" % self.ca_certificates_file
++                context.load_verify_locations(cafile=self.ca_certificates_file)
+             else:
+                 msg += "using system provided SSL certs"
++                context.load_default_certs()
+             boto.log.debug(msg)
+             key_file = self.http_connection_kwargs.get('key_file', None)
+             cert_file = self.http_connection_kwargs.get('cert_file', None)
+-            sslSock = ssl.wrap_socket(sock, keyfile=key_file,
+-                                      certfile=cert_file,
+-                                      cert_reqs=ssl.CERT_REQUIRED,
+-                                      ca_certs=self.ca_certificates_file)
+-            cert = sslSock.getpeercert()
+-            hostname = self.host.split(':', 0)[0]
+-            if not https_connection.ValidateCertificateHostname(cert, hostname):
+-                raise https_connection.InvalidCertificateException(
+-                    hostname, cert, 'hostname mismatch')
++            if key_file:
++                context.load_cert_chain(certfile=cert_file, keyfile=key_file)
++
++            sslSock = context.wrap_socket(sock, server_hostname=cert_host)
+         else:
+             # Fallback for old Python without ssl.wrap_socket
+             if hasattr(http_client, 'ssl'):
+diff --git a/boto/https_connection.py b/boto/https_connection.py
+index ddc31a152292e..a5076f6f9b261 100644
+--- a/boto/https_connection.py
++++ b/boto/https_connection.py
+@@ -119,20 +119,20 @@ from boto.compat import six, http_client
+             sock = socket.create_connection((self.host, self.port), self.timeout)
+         else:
+             sock = socket.create_connection((self.host, self.port))
++
++        context = ssl.create_default_context()
++        context.verify_mode = ssl.CERT_REQUIRED
++        context.check_hostname = True
++        if self.key_file:
++            context.load_cert_chain(certfile=self.cert_file, keyfile=self.key_file)
++
+         msg = "wrapping ssl socket; "
+         if self.ca_certs:
+             msg += "CA certificate file=%s" % self.ca_certs
++            context.load_verify_locations(cafile=self.ca_certs)
+         else:
+             msg += "using system provided SSL certs"
++            context.load_default_certs()
+         boto.log.debug(msg)
+-        self.sock = ssl.wrap_socket(sock, keyfile=self.key_file,
+-                                    certfile=self.cert_file,
+-                                    cert_reqs=ssl.CERT_REQUIRED,
+-                                    ca_certs=self.ca_certs)
+-        cert = self.sock.getpeercert()
+-        hostname = self.host.split(':', 0)[0]
+-        if not ValidateCertificateHostname(cert, hostname):
+-            raise InvalidCertificateException(hostname,
+-                                              cert,
+-                                              'remote hostname "%s" does not match '
+-                                              'certificate' % hostname)
++
++        self.sock = context.wrap_socket(sock, server_hostname=self.host)
+-- 
+2.19.0
+
diff --git a/dev-python/boto/files/boto-2.49.0-unbundle-six.patch b/dev-python/boto/files/boto-2.49.0-unbundle-six.patch
new file mode 100644
index 0000000..188dae7
--- /dev/null
+++ b/dev-python/boto/files/boto-2.49.0-unbundle-six.patch
@@ -0,0 +1,28 @@
+use the system copy of six
+
+--- a/boto/compat.py
++++ b/boto/compat.py
+@@ -46,16 +46,16 @@ except (AttributeError, ImportError):
+     # This is probably running on App Engine.
+     expanduser = (lambda x: x)
+ 
+-from boto.vendored import six
++import six
+ 
+-from boto.vendored.six import BytesIO, StringIO
+-from boto.vendored.six.moves import filter, http_client, map, _thread, \
++from six import BytesIO, StringIO
++from six.moves import filter, http_client, map, _thread, \
+                                     urllib, zip
+-from boto.vendored.six.moves.queue import Queue
+-from boto.vendored.six.moves.urllib.parse import parse_qs, quote, unquote, \
++from six.moves.queue import Queue
++from six.moves.urllib.parse import parse_qs, quote, unquote, \
+                                                  urlparse, urlsplit
+-from boto.vendored.six.moves.urllib.parse import unquote_plus
+-from boto.vendored.six.moves.urllib.request import urlopen
++from six.moves.urllib.parse import unquote_plus
++from six.moves.urllib.request import urlopen
+ 
+ if six.PY3:
+     # StandardError was removed, so use the base exception type instead
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index 5959be2..dd748ac 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -1 +1 @@
-DIST certifi-2017.4.17.tar.gz 373512 SHA256 f7527ebf7461582ce95f7a9e03dd141ce810d40590834f4ec20cddd54234c10a SHA512 0bd054bb2eaa8c196a94a0b7865d2488aea1fcb5e66ddc8c776c68cfa518a198a8c67bed5b485bf55db3f55d26c0ab2b4fc07839bb9175a50cb525e25d3869a5 WHIRLPOOL f949eefd72c41900202944315f058c0f8bab88883a0be1283bddadec4a273b138d012f37cda61d0f5656baadb304d7340816d953db53f624c9bd5c8545ebdf86
+DIST certifi-shim-10001.tar.gz 4061 BLAKE2B 183c573b958921877b14e38e9e26842e8a4f1c1617979a30b65ef1e2bbf001e5ff0aab830e4399906a7d21fb3c71ac12b1e757e4d283aae16cced8e7de7c2a1d SHA512 93beea61e579b2b414bd37c63eba49365e0a1a62304e0c7ac920bedaf5d72cb095a4a46b2240b3c2e6ee31e5b91cd520ae8348b6a8033212d11bbca31db6750c
diff --git a/dev-python/certifi/certifi-10001.ebuild b/dev-python/certifi/certifi-10001.ebuild
new file mode 100644
index 0000000..f3fd403
--- /dev/null
+++ b/dev-python/certifi/certifi-10001.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+MY_P=certifi-shim-${PV}
+DESCRIPTION="Thin replacement for certifi using system certificate store"
+HOMEPAGE="
+	https://github.com/mgorny/certifi-shim
+	https://pypi.org/project/certifi"
+SRC_URI="
+	https://github.com/mgorny/certifi-shim/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="*"
+
+RDEPEND="app-misc/ca-certificates"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	sed -i -e "s^/etc^${EPREFIX}/etc^" certifi/core.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/certifi/certifi-2017.4.17-r1.ebuild b/dev-python/certifi/certifi-2017.4.17-r1.ebuild
deleted file mode 100644
index 9d3f05f..0000000
--- a/dev-python/certifi/certifi-2017.4.17-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="http://certifi.io/ https://pypi.python.org/pypi/certifi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/certifi/certifi-2017.4.17-r2.ebuild b/dev-python/certifi/certifi-2017.4.17-r2.ebuild
deleted file mode 120000
index 89d9ab2..0000000
--- a/dev-python/certifi/certifi-2017.4.17-r2.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-certifi-2017.4.17-r1.ebuild
\ No newline at end of file
diff --git a/dev-python/certifi/metadata.xml b/dev-python/certifi/metadata.xml
index 85d5028..2c9c847 100644
--- a/dev-python/certifi/metadata.xml
+++ b/dev-python/certifi/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">certifi</remote-id>
   </upstream>
diff --git a/dev-python/configparser/Manifest b/dev-python/configparser/Manifest
deleted file mode 100644
index 5f4bb8c..0000000
--- a/dev-python/configparser/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST configparser-3.5.0.tar.gz 39573 SHA256 5308b47021bc2340965c371f0f058cc6971a04502638d4244225c49d80db273a SHA512 490b9f7807bce02667f41a48389b51f550818d2bd4296b528833d65d4b04bdbe5b906e7584e55eee4495405267a697ba26a056e6504fe6b3f8cf07ea8f55f7d3 WHIRLPOOL b10b1bf1b605d7da4cac44c0feb53e50b7aa1005d06be218e84e502387b32469bd566a68c1d2e0420eb880a90bb754c6e8875771bdcd7d9207553afed0a1ca9d
diff --git a/dev-python/configparser/configparser-3.5.0-r1.ebuild b/dev-python/configparser/configparser-3.5.0-r1.ebuild
deleted file mode 100644
index b585f35..0000000
--- a/dev-python/configparser/configparser-3.5.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 pypy )
-inherit distutils-r1
-
-DESCRIPTION="Backport of Python-3 built-in configparser"
-HOMEPAGE="https://pypi.python.org/pypi/configparser/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/configparser/metadata.xml b/dev-python/configparser/metadata.xml
deleted file mode 100644
index 7787195..0000000
--- a/dev-python/configparser/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">configparser</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/django/django-1.5.12-r1.ebuild b/dev-python/django/django-1.5.12-r3.ebuild
similarity index 100%
rename from dev-python/django/django-1.5.12-r1.ebuild
rename to dev-python/django/django-1.5.12-r3.ebuild
diff --git a/dev-python/django/django-1.5.12.ebuild b/dev-python/django/django-1.5.12.ebuild
index 57f5313..88003a5 100644
--- a/dev-python/django/django-1.5.12.ebuild
+++ b/dev-python/django/django-1.5.12.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 pypy python3_{6,7} )
 PYTHON_REQ_USE='sqlite?,threads(+)'
 WEBAPP_NO_AUTO_INSTALL="yes"
 
@@ -19,7 +19,8 @@
 KEYWORDS="*"
 IUSE="doc mysql postgres sqlite test"
 
-RDEPEND="dev-python/imaging[${PYTHON_USEDEP}]
+RDEPEND="( $(python_gen_cond_dep 'dev-python/imaging[${PYTHON_USEDEP}]' 'python2*' ) )
+	( $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python3*' ) )
 	postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]' 'python*') )
 	mysql? ( $(python_gen_cond_dep '>=dev-python/mysql-python-1.2.3[${PYTHON_USEDEP}]' 'python*') )"
 DEPEND="${RDEPEND}
@@ -34,7 +35,8 @@
 WEBAPP_MANUAL_SLOT="yes"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.5.4-objects.patch \
-		"${FILESDIR}"/${PN}-1.5-py3tests.patch )
+		"${FILESDIR}"/${PN}-1.5-py3tests.patch \
+		"${FILESDIR}"/${PN}-1.5-py35.patch )
 
 python_compile_all() {
 	if use doc; then
diff --git a/dev-python/django/files/django-1.5-py35.patch b/dev-python/django/files/django-1.5-py35.patch
new file mode 100644
index 0000000..9d8ecc8
--- /dev/null
+++ b/dev-python/django/files/django-1.5-py35.patch
@@ -0,0 +1,28 @@
+https://code.djangoproject.com/ticket/23763
+From b07aa52e8a8e4c7fdc7265f75ce2e7992e657ae9 Mon Sep 17 00:00:00 2001
+From: Tim Graham <timograham@gmail.com>
+Date: Tue, 4 Nov 2014 20:56:00 -0500
+Subject: [PATCH] Added a dummy class for HTMLParserError; refs #23763.
+
+---
+ django/utils/html_parser.py | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/django/utils/html_parser.py b/django/utils/html_parser.py
+index efe54227d326..ab1f65497891 100644
+--- a/django/utils/html_parser.py
++++ b/django/utils/html_parser.py
+@@ -9,7 +9,12 @@
+     (current_version >= (3, 0) and current_version < (3, 2, 3))
+ )
+ 
+-HTMLParseError = _html_parser.HTMLParseError
++try:
++    HTMLParseError = _html_parser.HTMLParseError
++except AttributeError:
++    # create a dummy class for Python 3.5+ where it's been removed
++    class HTMLParseError(Exception):
++        pass
+ 
+ if not use_workaround:
+     if current_version >= (3, 4):
\ No newline at end of file
diff --git a/dev-python/elementtree/Manifest b/dev-python/elementtree/Manifest
deleted file mode 100644
index fbc843d..0000000
--- a/dev-python/elementtree/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST elementtree-1.2.6-20050316.tar.gz 41752 BLAKE2B 41bb745d5a5f0eb0b3da96b3c6eccf97c23b45d2c886e0a6160fdc72c4f299419b2e7f1e36a6ef85d329d2b44e58ad74e105fd385fd3318d77bb6db89a72f508 SHA512 f213cf5bd9a79b59a2033c652d9d53087fd07dd3550db1771b8ba97168c3a5722d31ac5ff8699830df0f14a1d9f0caf8d237e8c6153568e16347d8b212771baf
diff --git a/dev-python/elementtree/elementtree-1.2.6-r3.ebuild b/dev-python/elementtree/elementtree-1.2.6-r3.ebuild
deleted file mode 100644
index 4a41712..0000000
--- a/dev-python/elementtree/elementtree-1.2.6-r3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-MY_P="${P}-20050316"
-
-DESCRIPTION="A light-weight XML object model for Python"
-HOMEPAGE="http://effbot.org/zone/element-index.htm https://pypi.org/project/elementtree/"
-SRC_URI="http://effbot.org/downloads/${MY_P}.tar.gz"
-
-LICENSE="ElementTree"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	sed -e "s/distutils.core/setuptools/" -i setup.py || die "sed failed"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" selftest.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local HTML_DOCS=( docs/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/elementtree/metadata.xml b/dev-python/elementtree/metadata.xml
deleted file mode 100644
index 9e5274c..0000000
--- a/dev-python/elementtree/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>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-python/gcs-oauth2-boto-plugin/Manifest b/dev-python/gcs-oauth2-boto-plugin/Manifest
index 32c869d..210a637 100644
--- a/dev-python/gcs-oauth2-boto-plugin/Manifest
+++ b/dev-python/gcs-oauth2-boto-plugin/Manifest
@@ -1 +1 @@
-DIST gcs-oauth2-boto-plugin-2.5.tar.gz 16739 BLAKE2B a8ef124670063eb19119f7ab6cfd3101f68815a61ec183b3c9ac79ac158e3e47f48349b4f3faa0cf83ce9a203ab2f350e61fdd8a87872962bc1b24a8182f741f SHA512 db6810351c8364c9b217e092aa83803cdc7831136b3fa1be4c54f978f919e2e33bdaf32b8d36db359c5a328eb57f7ad2cee219b94d7f60403f27aaa6a6fd53cc
+DIST gcs-oauth2-boto-plugin-2.7.tar.gz 20929 BLAKE2B 79db6c7bdf76320c2f74ab5edca0dd1cf7967bd38fb9a7a0a34c05fca3cab51317fb3ebd3e9ba195b42af2944cc951d150e3ee90cc93cdeab176f79d027a9800 SHA512 0ea8d4b01a2da79397e06de9dc0279594017e58e3874a2633b32007590efa2e8a29b5d2127d0218663cf7e63042adcc9801dbbb11bdfcb40d0c5d67c47267a09
diff --git a/dev-python/gcs-oauth2-boto-plugin/OWNERS b/dev-python/gcs-oauth2-boto-plugin/OWNERS
new file mode 100644
index 0000000..d138b17
--- /dev/null
+++ b/dev-python/gcs-oauth2-boto-plugin/OWNERS
@@ -0,0 +1 @@
+include /net-misc/gsutil/OWNERS
diff --git a/dev-python/gcs-oauth2-boto-plugin/files/gcs-oauth2-boto-plugin-1.13-use-friendy-version-checks.patch b/dev-python/gcs-oauth2-boto-plugin/files/gcs-oauth2-boto-plugin-1.13-use-friendy-version-checks.patch
deleted file mode 100644
index 334ee5e..0000000
--- a/dev-python/gcs-oauth2-boto-plugin/files/gcs-oauth2-boto-plugin-1.13-use-friendy-version-checks.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -36,9 +36,7 @@
-     'httplib2>=0.8',
-     'oauth2client>=1.5.2, !=2.0.*',
-     'pyOpenSSL>=0.13',
--    # Not using 1.02 because of:
--    #   https://code.google.com/p/socksipy-branch/issues/detail?id=3
--    'SocksiPy-branch==1.01',
-+    'SocksiPy-branch>=1.01',
-     'retry_decorator>=1.0.0',
-     'six>=1.6.1'
- ]
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5.ebuild
deleted file mode 100644
index afa74da..0000000
--- a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library"
-HOMEPAGE="https://pypi.org/project/gcs-oauth2-boto-plugin/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="*"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.13-use-friendy-version-checks.patch"
-)
-
-# Keep versions in sync with setup.py.
-DEPEND="${PYTHON_DEPS}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/boto-2.29.1[${PYTHON_USEDEP}]
-	dev-python/google-reauth-python[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
-	!=dev-python/oauth2client-2.0*
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -i \
-		-e '/SocksiPy-branch/d' \
-		setup.py || die
-	# Make sure the unittests aren't installed.
-	mv gcs_oauth2_boto_plugin/test_oauth2_client.py ./ || die
-}
-
-python_test() {
-	${EPYTHON} "${S}"/test_oauth2_client.py -v || die
-}
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.7.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.7.ebuild
new file mode 100644
index 0000000..f6b1f15
--- /dev/null
+++ b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.7.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library"
+HOMEPAGE="https://pypi.org/project/gcs-oauth2-boto-plugin/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="*"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Keep versions in sync with setup.py.
+BDEPEND="
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
+"
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/boto-2.29.1[${PYTHON_USEDEP}]
+	>=dev-python/google-reauth-python-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.18[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	# Make sure the unittests aren't installed.
+	mv gcs_oauth2_boto_plugin/test_oauth2_client.py ./ || die
+}
+
+python_test() {
+	"${EPYTHON}" "${S}"/test_oauth2_client.py -v \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/gcs-oauth2-boto-plugin/metadata.xml b/dev-python/gcs-oauth2-boto-plugin/metadata.xml
index fa87f77..cbbec30 100644
--- a/dev-python/gcs-oauth2-boto-plugin/metadata.xml
+++ b/dev-python/gcs-oauth2-boto-plugin/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+    <name>Zac Medico</name>
   </maintainer>
   <upstream>
     <remote-id type="pypi">gcs-oauth2-boto-plugin</remote-id>
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
deleted file mode 100644
index 2a389d9..0000000
--- a/dev-python/google-api-python-client/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST google-api-python-client-1.3.1.tar.gz 1480269 SHA256 5137c4d6e853cda1a2e32b7f1b1ce28b66f5d62e464d91386be22492c276b1f8 SHA512 385377bd99f006154f90bed2b6f55cb25786032d28ac7f15b9859882670cc8bf94acbfbd8485c4cf89abd665908f1a7f46f74e84f05faba992a62fe4b9fd5bd1 WHIRLPOOL cda6825e502738f6d3035e524494aadc159ac8d41ae12d3f682236f8c344dc41e2ecf03aee6b247233c5b9aa8c756ac8d598c98c95333dc8a8929901c3a82327
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.3.1.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.3.1.ebuild
deleted file mode 100644
index 651c76a..0000000
--- a/dev-python/google-api-python-client/google-api-python-client-1.3.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/google-api-python-client/google-api-python-client-1.3.1.ebuild,v 1.3 2014/12/30 17:44:08 maekke Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="http://code.google.com/p/google-api-python-client/ https://github.com/google/google-api-python-client"
-SRC_URI="https://github.com/google/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-DEPEND="
-	dev-python/python-gflags[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	dev-python/oauth2client[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/uritemplate[${PYTHON_USEDEP}]
-	"
-RDEPEND="${DEPEND}"
-
-python_prepare_all(){
-	export SKIP_GOOGLEAPICLIENT_COMPAT_CHECK=true
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests --verbosity=3 || die
-}
diff --git a/dev-python/google-api-python-client/metadata.xml b/dev-python/google-api-python-client/metadata.xml
deleted file mode 100644
index 557ca51..0000000
--- a/dev-python/google-api-python-client/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>
-    <email>robbat2@gentoo.org</email>
-    <name>Robin H. Johnson</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-python/google-apputils/Manifest b/dev-python/google-apputils/Manifest
deleted file mode 100644
index cbe766e..0000000
--- a/dev-python/google-apputils/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST google-apputils-0.4.0.tar.gz 80014 SHA256 b260eb39f2723b71329ad016773033b95a31e89d8c9e13b8e6a1ef8eed8e94a3 SHA512 5dbbf50e9551b33d882557ef9385c64691dcff6d6c219c9ff6aea2dc73c8af6d03392b3088fe1fb4000979e227830a0e437dc347520488627657085c8ea23f5e WHIRLPOOL c52d3fb5a4b0a81f212f53e4e1c92efee1275415fdb6ac337bce18494cee5a9c319c07634f890187e3e9f6b7d9222da048dc484d18fde6727db569d7c579d27f
diff --git a/dev-python/google-apputils/google-apputils-0.4.0.ebuild b/dev-python/google-apputils/google-apputils-0.4.0.ebuild
deleted file mode 100644
index 87074a2..0000000
--- a/dev-python/google-apputils/google-apputils-0.4.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/google-apputils/google-apputils-0.4.0.ebuild,v 1.5 2015/03/08 23:49:25 pacho Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )	# Doesn't yet support py3
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of utilities for building Python applications"
-HOMEPAGE="http://code.google.com/p/google-apputils-python/"
-SRC_URI="http://google-apputils-python.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="*"
-IUSE="test"
-
-RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
-
-		dev-python/python-gflags[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/mox[${PYTHON_USEDEP}] )"
-# version borders needed are already confluent with versions in the tree
-
-python_prepare_all() {
-	# https://code.google.com/p/google-apputils-python/source/detail?r=12
-	# This version bordering is long out of date and wrong since end of March 2012!
-	sed -e 's:>=1.4,<2:>=1.4:' -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# These yield 2 fails which are in fact expected errors run from a shell script!
-	# They seemingly have no immediate mechanism to exit 0 in an expected fail style.
-	for test in tests/{app_test*.py,[b-s]*.py}
-	do
-		"${PYTHON}" $test || die "test failure under ${EPYTHON}"
-	done
-}
diff --git a/dev-python/google-apputils/metadata.xml b/dev-python/google-apputils/metadata.xml
deleted file mode 100644
index 301d220..0000000
--- a/dev-python/google-apputils/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>python</herd>
-</pkgmetadata>
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index 547c385..aadcd1f 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -1 +1 @@
-DIST httplib2-0.11.3.tar.gz 215815 SHA256 e71daed9a0e6373642db61166fa70beecc9bf04383477f84671348c02a04cbdf SHA512 e74be0ba945aaf5836ef14f4b8262e2be4b7f2a1df52b60f8ae7109d9727e117a69a8b7e4f524fb91997781af031a8a7c2112a7ab2b5d9f5c94b04a56aa04659 WHIRLPOOL b7fe90e2b217e84adb85f78d818def574389df457bcd8e42a5007430453229d922e65d4b2fd162adc11da35ab666bc4e37ee77093c546d37ec0066d7a44b8b32
+DIST httplib2-0.19.0.tar.gz 263522 BLAKE2B b35c8dcf86de17a5d8eac86a9a6b4110fb247925662e24a7645a67dfd0b2e640dc29875b41673c5a91a083f17e9619fd40dd08cf2c9ee7f48c8069bc14a50966 SHA512 9193a0e8e9a58a3f0e9b27fdf827932482a47b88af297af6e5f004164ca0b72feeff513b8191bf7c48d6714070a1390ae54eb8a2c6840f54f2580889c7837c7f
diff --git a/dev-python/httplib2/files/httplib2-0.11.3-use-system-cacerts.patch b/dev-python/httplib2/files/httplib2-0.11.3-use-system-cacerts.patch
deleted file mode 100644
index 8aace02..0000000
--- a/dev-python/httplib2/files/httplib2-0.11.3-use-system-cacerts.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 437b5bba5dac2e43815a900dbc6ee093c675bb4c Mon Sep 17 00:00:00 2001
-From: Marc Deslauriers <marc.deslauriers@canonical.com>
-Date: Thu, 8 Oct 2015 12:15:44 -0700
-Subject: Use system ca certificates, not the bundled ones
-
-Forwarded: not-needed
-Bug-Ubuntu: https://launchpad.net/bugs/882027
-
-Patch-Name: use_system_cacerts.patch
----
- python2/httplib2/__init__.py | 5 ++---
- python3/httplib2/__init__.py | 5 ++---
- setup.py                     | 1 -
- 3 files changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/python2/httplib2/__init__.py b/python2/httplib2/__init__.py
-index 6fa3cc6..e996d01 100644
---- a/python2/httplib2/__init__.py
-+++ b/python2/httplib2/__init__.py
-@@ -190,9 +190,8 @@ try:
-     import ca_certs_locater
-     CA_CERTS = ca_certs_locater.get()
- except ImportError:
--    # Default CA certificates file bundled with httplib2.
--    CA_CERTS = os.path.join(
--        os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
-+    # Use system CA certificates
-+    CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
- 
- # Which headers are hop-by-hop headers by default
- HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
-diff --git a/python3/httplib2/__init__.py b/python3/httplib2/__init__.py
-index 3ce019e..8383cc4 100644
---- a/python3/httplib2/__init__.py
-+++ b/python3/httplib2/__init__.py
-@@ -123,9 +123,8 @@ DEFAULT_MAX_REDIRECTS = 5
- # Which headers are hop-by-hop headers by default
- HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
- 
--# Default CA certificates file bundled with httplib2.
--CA_CERTS = os.path.join(
--        os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
-+# Use system CA certificates
-+CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
- 
- def _get_end2end_headers(response):
-     hopbyhop = list(HOP_BY_HOP)
-diff --git a/setup.py b/setup.py
-index fb00ed2..2c31f44 100755
---- a/setup.py
-+++ b/setup.py
-@@ -58,7 +58,6 @@
- """,
-     package_dir=pkgdir,
-     packages=['httplib2'],
--    package_data={'httplib2': ['*.txt']},
-     classifiers=(
-         'Development Status :: 4 - Beta',
-         'Environment :: Web Environment',
diff --git a/dev-python/httplib2/files/httplib2-0.12.1-use-system-cacerts.patch b/dev-python/httplib2/files/httplib2-0.12.1-use-system-cacerts.patch
new file mode 100644
index 0000000..e189a54
--- /dev/null
+++ b/dev-python/httplib2/files/httplib2-0.12.1-use-system-cacerts.patch
@@ -0,0 +1,26 @@
+--- a/python2/httplib2/certs.py
++++ b/python2/httplib2/certs.py
+@@ -19,9 +19,7 @@ except ImportError:
+     pass
+ 
+ 
+-BUILTIN_CA_CERTS = os.path.join(
+-    os.path.dirname(os.path.abspath(__file__)), "cacerts.txt"
+-)
++BUILTIN_CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
+ 
+ 
+ def where():
+--- a/python3/httplib2/certs.py
++++ b/python3/httplib2/certs.py
+@@ -19,9 +19,7 @@ except ImportError:
+     pass
+ 
+ 
+-BUILTIN_CA_CERTS = os.path.join(
+-    os.path.dirname(os.path.abspath(__file__)), "cacerts.txt"
+-)
++BUILTIN_CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
+ 
+ 
+ def where():
diff --git a/dev-python/httplib2/httplib2-0.11.3.ebuild b/dev-python/httplib2/httplib2-0.11.3.ebuild
deleted file mode 100644
index 7f15ea2..0000000
--- a/dev-python/httplib2/httplib2-0.11.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A comprehensive HTTP client library"
-HOMEPAGE="https://pypi.org/project/httplib2/ https://github.com/jcgregorio/httplib2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="app-misc/ca-certificates"
-
-# tests connect to random remote sites
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.11.3-use-system-cacerts.patch )
-
-python_prepare_all() {
-	chmod o+r */*egg*/* || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if [[ ${EPYTHON} =~ ^(python2.7|pypy)$ ]] ; then
-		cd python2 || die
-	else
-		cd python3 || die
-	fi
-
-	"${PYTHON}" httplib2test.py || die
-}
diff --git a/dev-python/httplib2/httplib2-0.19.0-r1.ebuild b/dev-python/httplib2/httplib2-0.19.0-r1.ebuild
new file mode 100644
index 0000000..f559544
--- /dev/null
+++ b/dev-python/httplib2/httplib2-0.19.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A comprehensive HTTP client library"
+HOMEPAGE="https://pypi.org/project/httplib2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="*"
+
+RDEPEND="
+	app-misc/ca-certificates
+	dev-python/pyparsing[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+PATCHES=( "${FILESDIR}"/${PN}-0.12.1-use-system-cacerts.patch )
+
+src_prepare() {
+	sed -i -e '/--cov/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local deselect=(
+		# broken by using system certificates
+		tests/test_cacerts_from_env.py::test_certs_file_from_builtin
+		tests/test_cacerts_from_env.py::test_certs_file_from_environment
+		tests/test_cacerts_from_env.py::test_with_certifi_removed_from_modules
+
+		# broken by new PySocks, probably
+		tests/test_proxy.py::test_server_not_found_error_is_raised_for_invalid_hostname
+		tests/test_proxy.py::test_socks5_auth
+	)
+
+	# tests in python* are replaced by tests/
+	# upstream fails at cleaning up stuff
+	pytest -vv ${deselect[@]/#/--deselect } tests ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/httplib2/metadata.xml b/dev-python/httplib2/metadata.xml
index a3e1442..9deda39 100644
--- a/dev-python/httplib2/metadata.xml
+++ b/dev-python/httplib2/metadata.xml
@@ -5,9 +5,9 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
-    <remote-id type="google-code">httplib2</remote-id>
     <remote-id type="pypi">httplib2</remote-id>
-    <remote-id type="github">jcgregorio/httplib2</remote-id>
+    <remote-id type="github">httplib2/httplib2</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
new file mode 100644
index 0000000..466c7d8
--- /dev/null
+++ b/dev-python/hypothesis/Manifest
@@ -0,0 +1 @@
+DIST hypothesis-python-5.43.4.tar.gz 9104105 BLAKE2B 08b8c9ac7ac72afcc4556ae2167af7b4ab79d505da8c9f6a11c91d211f26ccf320c8f5ed41458f5e34f75614ad4aecdbf6df62275868dc079c037390dcbc9e08 SHA512 065e1bdd878eab35f38105e8da3f5cf108670a51fd48ea1996bebedf8c8a152386d0eb5284ed43d4e588695a408b3a455a2e4757430e31bb5dbf0ece1f64d294
diff --git a/dev-python/hypothesis/OWNERS b/dev-python/hypothesis/OWNERS
new file mode 100644
index 0000000..3d2e096
--- /dev/null
+++ b/dev-python/hypothesis/OWNERS
@@ -0,0 +1 @@
+include chromiumos/platform/ec:/OWNERS
diff --git a/dev-python/hypothesis/hypothesis-5.43.4.ebuild b/dev-python/hypothesis/hypothesis-5.43.4.ebuild
new file mode 100644
index 0000000..8207d55
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.43.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="*"
+IUSE="cli test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{6..9})
+	)
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		<dev-python/pytest-6.2[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+python_prepare() {
+	if ! use cli || [[ ${EPYTHON} != python* ]]; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing --via-root
+	pytest -vv tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/metadata.xml b/dev-python/hypothesis/metadata.xml
new file mode 100644
index 0000000..7c5b756
--- /dev/null
+++ b/dev-python/hypothesis/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!--
+		This package has a very frequent release cycle which makes
+		it hard to track stable candidates.  Please do not bump it
+		without my approval.
+	-->
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">hypothesis</remote-id>
+		<remote-id type="github">HypothesisWorks/hypothesis</remote-id>
+	</upstream>
+	<use>
+		<flag name="cli">
+			Install a CLI tool used to write tests.
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-python/jinja/jinja-2.11.3-r1.ebuild b/dev-python/jinja/jinja-2.11.3-r1.ebuild
new file mode 120000
index 0000000..a37e7d4
--- /dev/null
+++ b/dev-python/jinja/jinja-2.11.3-r1.ebuild
@@ -0,0 +1 @@
+jinja-2.11.3.ebuild
\ No newline at end of file
diff --git a/dev-python/jinja/jinja-2.11.3.ebuild b/dev-python/jinja/jinja-2.11.3.ebuild
index 8a407d5..d12981e 100644
--- a/dev-python/jinja/jinja-2.11.3.ebuild
+++ b/dev-python/jinja/jinja-2.11.3.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-# Add python3_6 as python3_7 is
-# not used by lakitu.
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/oauth/Manifest b/dev-python/oauth/Manifest
deleted file mode 100644
index b808b95..0000000
--- a/dev-python/oauth/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST oauth-1.0.1.tar.gz 9533 SHA256 e769819ff0b0c043d020246ce1defcaadd65b9c21d244468a45a7f06cb88af5d SHA512 a503b1bfff18c97a0e666cc376bfcb11e3cc0f3340dd16e0254fcd4340ed28ab0fc52d1de81b573309351a5edaf83d0b437c155580c00e32a81a7c219ee7eca9 WHIRLPOOL c068087ac15061236bb5809d51e4e55c9ea489c36ac27275f69e8e8eb3b1e3fc89a08b75c8cb23091cd68e8722911bb5dfd643c371bc5c3ee7589fe6158392e9
diff --git a/dev-python/oauth/metadata.xml b/dev-python/oauth/metadata.xml
deleted file mode 100644
index 27c5e14..0000000
--- a/dev-python/oauth/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>
-	<herd>python</herd>
-	<upstream>
-		<remote-id type="pypi">oauth</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/oauth/oauth-1.0.1-r1.ebuild b/dev-python/oauth/oauth-1.0.1-r1.ebuild
deleted file mode 100644
index 5e60f02..0000000
--- a/dev-python/oauth/oauth-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oauth/oauth-1.0.1-r1.ebuild,v 1.6 2015/04/08 08:04:58 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python OAuth module"
-HOMEPAGE="http://pypi.python.org/pypi/oauth"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/pybluez/Manifest b/dev-python/pybluez/Manifest
deleted file mode 100644
index 2bd50d5..0000000
--- a/dev-python/pybluez/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST PyBluez-0.18.tar.gz 74501 SHA256 66b2184e0eaad5e1ecc89eb4c81cba0696b3028b85d1301186b45b0bbd761065 SHA512 ddd185ad90f7c6235e25182afccfb586efa0d361f38140f33718dc2d29ca62f3aa68867d075820afffd5ee2fbd306b907b565fbdfdf32f906657f6a3a8c779da WHIRLPOOL 7cc0aaa8f5d33626689c10c4c171d0b5f115cbefda1c561b3146ae0f2b397739bf67a05f7f0ae330620194a54b595d408da81f11e07fcf51f4b176f60e11a7ba
diff --git a/dev-python/pybluez/metadata.xml b/dev-python/pybluez/metadata.xml
deleted file mode 100644
index 041c292..0000000
--- a/dev-python/pybluez/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription>PyBluez is an effort to create Python wrappers around bluez to allow Python
-developers to use system bluetooth resources. It works on machines running the
-GNU/Linux operating system and the bluez bluetooth stack.</longdescription>
-	<upstream>
-		<remote-id type="google-code">pybluez</remote-id>
-		<remote-id type="github">karulis/pybluez</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pybluez/pybluez-0.18-r1.ebuild b/dev-python/pybluez/pybluez-0.18-r1.ebuild
deleted file mode 100644
index 0609187..0000000
--- a/dev-python/pybluez/pybluez-0.18-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-MY_P="PyBluez-${PV}"
-
-DESCRIPTION="Python bindings for Bluez Bluetooth Stack"
-HOMEPAGE="https://github.com/karulis/pybluez"
-SRC_URI="https://pybluez.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE="examples"
-
-DEPEND="net-wireless/bluez"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index 8e5aeac..736d098 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -1 +1 @@
-DIST pyparsing-2.2.0.tar.gz 1232522 SHA256 0832bcf47acd283788593e7a0f542407bd9550a55a8a8435214a1960e04bcb04 SHA512 6a409f429d40a5ac202d144e4150de2c80d7c7120147f603f72a4a99797d48c50822a6437f590ec5ae4418d51aa1f6b1d4e5d95a57e19bec0a127b04e4937008 WHIRLPOOL dde3e3ec016671f76976f4b585a027070b3087b46a336363c994dc3e97ad699b5551dc439b8f52230ca48bdd6a50d3ac3576440dcac4802e29e6f9ca4494f2d9
+DIST pyparsing_2.4.7.tar.gz 648158 BLAKE2B 24525b4ee7876e245b9eb270f0e3e22fe2d8b398f9777ad3b3657b8a1227dcbd25983aa64a3f3018debdbffc1a042c732e6b3a09800e081c7acac7b97da15317 SHA512 c7a546729f86a2b5176e2482b566b9fd715b03e495aaef4d720b21307bb03f385dbc849247f8d266cb3d92be0a83c34ce4995b655ce85318355d5a0d42d6991e
diff --git a/dev-python/pyparsing/files/pyparsing-2.2.0-distutils.patch b/dev-python/pyparsing/files/pyparsing-2.2.0-distutils.patch
deleted file mode 100644
index 6fa4a30..0000000
--- a/dev-python/pyparsing/files/pyparsing-2.2.0-distutils.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Force distutils to be used instead of falling back to it after trying
-setuptools in order to avoid bootstrap issues.
-
---- pyparsing-2.2.0/setup.py
-+++ pyparsing-2.2.0/setup.py
-@@ -4,10 +4,7 @@
- 

- # Setuptools depends on pyparsing (via packaging) as of version 34, so allow

- # installing without it to avoid bootstrap problems.

--try:

--    from setuptools import setup

--except ImportError:

--    from distutils.core import setup

-+from distutils.core import setup

- 

- import sys

- import os

diff --git a/dev-python/pyparsing/metadata.xml b/dev-python/pyparsing/metadata.xml
index 9a57fea..b4b32c3 100644
--- a/dev-python/pyparsing/metadata.xml
+++ b/dev-python/pyparsing/metadata.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription lang="en">
-    The pyparsing module is an alternative approach to creating and
-    executing simple grammars, vs. the traditional lex/yacc approach, or the
-    use of regular expressions. The pyparsing module provides a library of
-    classes that client code uses to construct the grammar directly in
-    Python code.
-  </longdescription>
-  <upstream>
-    <remote-id type="sourceforge">pyparsing</remote-id>
-    <remote-id type="pypi">pyparsing</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		The pyparsing module is an alternative approach to creating and
+		executing simple grammars, vs. the traditional lex/yacc approach, or the
+		use of regular expressions. The pyparsing module provides a library of
+		classes that client code uses to construct the grammar directly in
+		Python code.
+	</longdescription>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="sourceforge">pyparsing</remote-id>
+		<remote-id type="pypi">pyparsing</remote-id>
+		<remote-id type="github">pyparsing/pyparsing</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyparsing/pyparsing-2.2.0-r1.ebuild b/dev-python/pyparsing/pyparsing-2.2.0-r1.ebuild
deleted file mode 100644
index 06f30dc..0000000
--- a/dev-python/pyparsing/pyparsing-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy-to-use Python module for text parsing"
-HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="*"
-IUSE="doc examples"
-
-# not contained in the tarball
-RESTRICT=test
-
-PATCHES=( "${FILESDIR}"/${P}-distutils.patch )
-
-python_install_all() {
-	local HTML_DOCS=( HowToUsePyparsing.html )
-	if use doc; then
-		HTML_DOCS+=( htmldoc/. )
-		dodoc docs/*.pdf
-	fi
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	${PYTHON} unitTests.py || die
-}
-
-pkg_preinst() {
-	_remove_egg_info() {
-		local pyver="$("${PYTHON}" -c 'import sys; print(sys.version[:3])')"
-		local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
-		if [[ -d ${egginfo} ]]; then
-			einfo "Removing ${egginfo}"
-			rm -r "${egginfo}" || die
-		fi
-	}
-	python_foreach_impl _remove_egg_info
-}
diff --git a/dev-python/pyparsing/pyparsing-2.2.0-r2.ebuild b/dev-python/pyparsing/pyparsing-2.2.0-r2.ebuild
deleted file mode 120000
index ccbc3ff..0000000
--- a/dev-python/pyparsing/pyparsing-2.2.0-r2.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-pyparsing-2.2.0-r1.ebuild
\ No newline at end of file
diff --git a/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild b/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild
new file mode 100644
index 0000000..5c9f9d5
--- /dev/null
+++ b/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2004-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+MY_P=${P/-/_}
+DESCRIPTION="Easy-to-use Python module for text parsing"
+HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
+# pypi releases and generated github tarballs lack tests
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="*"
+IUSE="examples"
+
+distutils_enable_tests setup.py
+
+S=${WORKDIR}/${PN}-${MY_P}
+
+python_install_all() {
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/retry-decorator/Manifest b/dev-python/retry-decorator/Manifest
index d371f31..8cec44a 100644
--- a/dev-python/retry-decorator/Manifest
+++ b/dev-python/retry-decorator/Manifest
@@ -1 +1 @@
-DIST retry-decorator-1.0.0.tar.gz 2835 BLAKE2B b04d127ba3d357a61fb5e35a63867b297834acd82d0d7cdf736a69efe95fa33a263309799dcd4d8ae42e72ad5adb12b6c52557a81413ee8ebc49f5e0e728fa8b SHA512 f650740dd6d05010b7418b4d5ae7351058eb4418dabf7329390eaacceb72db60363bae8ff0bb15284301f0b5bfd9bfb731e71fdffb7231065a4db7ed6ce86da2
+DIST retry-decorator-1.1.1.tar.gz 4466 BLAKE2B a64836bba5620974e393a952544c82074b667a5fac80d6944069bf88e9162d03cc48cfe511f09476571c46561331576a2b06b2aefd087f905f968aa8257a596c SHA512 2241b24a02424905a2f3b7660c7ee4f6cd034c67c5019cce54d38ae250a9ac9e011fe323b25254bed051a0d3560d48ecdf4e2a1ee84cf2d7c5b1c12dea2921be
diff --git a/dev-python/retry-decorator/OWNERS b/dev-python/retry-decorator/OWNERS
new file mode 100644
index 0000000..d138b17
--- /dev/null
+++ b/dev-python/retry-decorator/OWNERS
@@ -0,0 +1 @@
+include /net-misc/gsutil/OWNERS
diff --git a/dev-python/retry-decorator/metadata.xml b/dev-python/retry-decorator/metadata.xml
index 17f1f73..6ab5a77 100644
--- a/dev-python/retry-decorator/metadata.xml
+++ b/dev-python/retry-decorator/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">pnpnpn/retry-decorator</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">pnpnpn/retry-decorator</remote-id>
+		<remote-id type="pypi">retry-decorator</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/retry-decorator/retry-decorator-1.0.0.ebuild b/dev-python/retry-decorator/retry-decorator-1.0.0.ebuild
deleted file mode 100644
index 545c933..0000000
--- a/dev-python/retry-decorator/retry-decorator-1.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Decorator for retrying when exceptions occur"
-HOMEPAGE="https://github.com/pnpnpn/retry-decorator"
-SRC_URI="https://github.com/pnpnpn/retry-decorator/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( README.rst )
diff --git a/dev-python/retry-decorator/retry-decorator-1.1.1.ebuild b/dev-python/retry-decorator/retry-decorator-1.1.1.ebuild
new file mode 100644
index 0000000..30c82a9
--- /dev/null
+++ b/dev-python/retry-decorator/retry-decorator-1.1.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Decorator for retrying when exceptions occur"
+HOMEPAGE="https://github.com/pnpnpn/retry-decorator"
+SRC_URI="https://github.com/pnpnpn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="*"
+
+DOCS=( README.rst )
+
+distutils_enable_tests pytest
diff --git a/dev-python/singledispatch/Manifest b/dev-python/singledispatch/Manifest
deleted file mode 100644
index 6506cce..0000000
--- a/dev-python/singledispatch/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST singledispatch-3.4.0.3.tar.gz 9529 BLAKE2B 51e948c1a60adac7db3b97931becad4c699277b7c6af2e211e160fd6ec8fdf0501a3a2b40780b9bf7a2a5c62d08d905c7058c5a771018f9ec78a60688e3b03b5 SHA512 ba065d36092ddee6527be3d7cb777c51c0949855bf6dd0ffb7c25acaedaa35d36fe6dc096587acddcd1e9e54c6ac5f92c196b11f9ee1270cc0c1cf2f410446cf
diff --git a/dev-python/singledispatch/metadata.xml b/dev-python/singledispatch/metadata.xml
deleted file mode 100644
index 59b6525..0000000
--- a/dev-python/singledispatch/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>timo@rothenpieler.org</email>
-		<name>Timo Rothenpieler</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Gentoo Proxy Maintainers Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">singledispatch</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild b/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild
deleted file mode 100644
index 3adc7a6..0000000
--- a/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A library to bring functools.singledispatch from Python 3.4 to Python 2.6-3.3"
-HOMEPAGE="https://docs.python.org/3/library/functools.html#functools.singledispatch"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PF}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/sortedcontainers/Manifest b/dev-python/sortedcontainers/Manifest
new file mode 100644
index 0000000..5de1ab0
--- /dev/null
+++ b/dev-python/sortedcontainers/Manifest
@@ -0,0 +1 @@
+DIST python-sortedcontainers-2.3.0.gh.tar.gz 9228968 BLAKE2B cdff8230d4e4ac42a89ed3192666ebf22cd48a4475f1dc173cffb0339c7f27e9cdfde1fb631daadf04adf2c00bed8a924e1202712d0ebcbd591f5542de863461 SHA512 0488e2f9f07ea7e4737ade69441f02614b63cfccb32a71af4e5953001bfa840d2e113a36a0a0a6d4c1e7fdd920ac3937b0baaea522d742547a4d81a99b8d1a6c
diff --git a/dev-python/sortedcontainers/OWNERS b/dev-python/sortedcontainers/OWNERS
new file mode 100644
index 0000000..3d2e096
--- /dev/null
+++ b/dev-python/sortedcontainers/OWNERS
@@ -0,0 +1 @@
+include chromiumos/platform/ec:/OWNERS
diff --git a/dev-python/sortedcontainers/metadata.xml b/dev-python/sortedcontainers/metadata.xml
new file mode 100644
index 0000000..9757920
--- /dev/null
+++ b/dev-python/sortedcontainers/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">sortedcontainers</remote-id>
+		<remote-id type="github">grantjenks/python-sortedcontainers</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.3.0.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.3.0.ebuild
new file mode 100644
index 0000000..6d9dd38
--- /dev/null
+++ b/dev-python/sortedcontainers/sortedcontainers-2.3.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+MY_P=python-${P}
+DESCRIPTION="Python library to sort collections and containers"
+HOMEPAGE="http://www.grantjenks.com/docs/sortedcontainers/
+	https://pypi.org/project/sortedcontainers/
+	https://github.com/grantjenks/python-sortedcontainers/"
+SRC_URI="
+	https://github.com/grantjenks/python-sortedcontainers/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="*"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTHONPATH=.
+	pytest -vv --ignore docs/conf.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
new file mode 100644
index 0000000..320bdfe
--- /dev/null
+++ b/dev-python/testfixtures/Manifest
@@ -0,0 +1 @@
+DIST testfixtures-6.17.1.tar.gz 121440 BLAKE2B 6fcdf4f99af7941044f5f3cdc3e1204b5730d514a009e95f14451537f62af6c6ebaa97356b7ca0dae6313bd81b2a83d981567346e20c477c2d17c6bca73ecdcf SHA512 fbf7c8cd39b83516a257c5a3bce724a8416af88cf1bac8d69457b2030873185c685feb12aea065df2af729a9b733b3e0afe76207bd78e9b5a0c2d464b727d99e
diff --git a/dev-python/testfixtures/OWNERS b/dev-python/testfixtures/OWNERS
new file mode 100644
index 0000000..976dbfd
--- /dev/null
+++ b/dev-python/testfixtures/OWNERS
@@ -0,0 +1 @@
+sjg@chromium.org
diff --git a/dev-python/testfixtures/metadata.xml b/dev-python/testfixtures/metadata.xml
new file mode 100644
index 0000000..2a1aa71
--- /dev/null
+++ b/dev-python/testfixtures/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <stabilize-allarches/>
+  <upstream>
+    <remote-id type="pypi">testfixtures</remote-id>
+    <remote-id type="github">Simplistix/testfixtures</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/testfixtures/testfixtures-6.17.1.ebuild b/dev-python/testfixtures/testfixtures-6.17.1.ebuild
new file mode 100644
index 0000000..5002310
--- /dev/null
+++ b/dev-python/testfixtures/testfixtures-6.17.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of helpers and mock objects for unit tests and doc tests"
+HOMEPAGE="https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="*"
+
+# We cannot run tests for these packages as we don't have django, etc. and don't
+# want to bring it in just for this package.
+IUSE="-test"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/sybil[${PYTHON_USEDEP}]
+		>=dev-python/twisted-18[${PYTHON_USEDEP}]
+		dev-python/zope-component[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# kill weird way of declaring build deps
+	sed -e '/build=/d' -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PYTHONPATH="." \
+	DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings \
+	pytest -vv || die "Tests failed with "${EPYTHON}
+}
diff --git a/dev-python/twisted-core/Manifest b/dev-python/twisted-core/Manifest
deleted file mode 100644
index a94ee6a..0000000
--- a/dev-python/twisted-core/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST TwistedCore-13.2.0.tar.bz2 1496299 BLAKE2B a7034a23c4ad890a8591e7ef1de1c3ba1dc486ac6f3d1987cfc280756323d3e968a913bc4291ef8dede295a12c02b8e166a27f665ce7f4a1c536e6e7a6991e53 SHA512 90cf2019f0d5b125c7bbb5a9e3e7d2dedcd8efd5f9b2ab057e0b41f899d394b995fe599128223c82b1a634fb881ad7ae8ddc5b86b26adb28a3834c05da45f2c6
diff --git a/dev-python/twisted-core/files/twistd.conf b/dev-python/twisted-core/files/twistd.conf
deleted file mode 100644
index 53788cd..0000000
--- a/dev-python/twisted-core/files/twistd.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# These are passed to twistd.
-# TWISTD_OPTS="--no_save --logfile=/var/log/twistd -y /etc/twistd.tac"
-# TWISTD_OPTS="--no_save --logfile=/var/log/twistd -f /etc/twistd.tap"
-
-# Make any additions to PYTHONPATH the twistd needs here.
-# PYTHONPATH="/path/to/extra/python/modules"
diff --git a/dev-python/twisted-core/files/twistd.init b/dev-python/twisted-core/files/twistd.init
deleted file mode 100644
index b031b00..0000000
--- a/dev-python/twisted-core/files/twistd.init
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	need net
-}
-
-start() {
-	if [ -z "${TWISTD_OPTS}" ]; then
-		eerror "TWISTD_OPTS is not set!"
-		eerror "You need to configure twistd in /etc/conf.d/twistd."
-		return 1
-	fi
-	export PYTHONPATH
-	ebegin "Starting twistd"
-	start-stop-daemon --start --quiet --pidfile /var/run/twistd.pid \
-		--exec /usr/bin/twistd -- --pidfile /var/run/twistd.pid \
-			${TWISTD_OPTS}
-	eend $? "Failed to start twistd"
-}
-
-stop() {
-	ebegin "Stopping twistd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/twistd.pid 
-	eend $? "Failed to stop twistd"
-}
diff --git a/dev-python/twisted-core/files/twisted-core-12.1.0-remove-tests-conch-dependency.patch b/dev-python/twisted-core/files/twisted-core-12.1.0-remove-tests-conch-dependency.patch
deleted file mode 100644
index db2e245..0000000
--- a/dev-python/twisted-core/files/twisted-core-12.1.0-remove-tests-conch-dependency.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: twisted/test/test_strcred.py
-===================================================================
---- twisted/test/test_strcred.py	(revision 34525)
-+++ twisted/test/test_strcred.py	(working copy)
-@@ -352,6 +352,10 @@
-     except ImportError:
-         skip = "PyCrypto is not available"
- 
-+    try:
-+        from twisted import conch
-+    except ImportError:
-+        skip = "Twisted Conch is not available"
- 
-     def test_isChecker(self):
-         """
diff --git a/dev-python/twisted-core/files/twisted-core-2.1.0-echo-less.patch b/dev-python/twisted-core/files/twisted-core-2.1.0-echo-less.patch
deleted file mode 100644
index c180a11..0000000
--- a/dev-python/twisted-core/files/twisted-core-2.1.0-echo-less.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'twisted/test/test_process.py'
---- twisted/test/test_process.py	
-+++ twisted/test/test_process.py	
-@@ -76,7 +76,7 @@
- 
- class EchoProtocol(protocol.ProcessProtocol):
- 
--    s = "1234567" * 1001
-+    s = "1234567" * 11
-     n = 10
-     finished = 0
- 
-
diff --git a/dev-python/twisted-core/files/twisted-core-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch b/dev-python/twisted-core/files/twisted-core-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch
deleted file mode 100644
index 2fe22f1..0000000
--- a/dev-python/twisted-core/files/twisted-core-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- twisted/plugin.py
-+++ twisted/plugin.py
-@@ -174,7 +174,7 @@
-             if pluginKey not in existingKeys:
-                 del dropinDotCache[pluginKey]
-                 needsWrite = True
--        if needsWrite:
-+        if needsWrite and os.environ.get("TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE") is None:
-             try:
-                 dropinPath.setContent(pickle.dumps(dropinDotCache))
-             except:
diff --git a/dev-python/twisted-core/metadata.xml b/dev-python/twisted-core/metadata.xml
deleted file mode 100644
index 28680e2..0000000
--- a/dev-python/twisted-core/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<use>
-		<flag name="serial">include serial port support</flag>
-	</use>
-	<longdescription>
-		Twisted is an asynchronous networking framework written in Python,
-		supporting TCP, UDP, multicast, SSL/TLS, serial communication and
-		more. It is used by most of the servers, clients and protocols that
-		are part of other Twisted projects.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-python/twisted-core/twisted-core-13.2.0.ebuild b/dev-python/twisted-core/twisted-core-13.2.0.ebuild
deleted file mode 100644
index 29071f4..0000000
--- a/dev-python/twisted-core/twisted-core-13.2.0.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit eutils flag-o-matic twisted-r1
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-
-KEYWORDS="*"
-IUSE="crypt gtk serial"
-
-DEPEND="
-	>=dev-python/zope-interface-3.6.0[${PYTHON_USEDEP}]
-	crypt? ( >=dev-python/pyopenssl-0.10[${PYTHON_USEDEP}] )
-	gtk? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
-	serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
-
-PATCHES=(
-	# Give a load-sensitive test a better chance of succeeding.
-	"${FILESDIR}/${PN}-2.1.0-echo-less.patch"
-
-	# Skip a test if twisted conch is not available
-	# (see Twisted ticket #5703)
-	"${FILESDIR}/${PN}-12.1.0-remove-tests-conch-dependency.patch"
-
-	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
-	"${FILESDIR}/${PN}-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
-)
-
-python_prepare_all() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		# Disable tests failing with root permissions.
-		sed \
-			-e "s/test_newPluginsOnReadOnlyPath/_&/" \
-			-e "s/test_deployedMode/_&/" \
-			-i twisted/test/test_plugin.py
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		# Needed to make the sendmsg extension work
-		# (see http://twistedmatrix.com/trac/ticket/5701 )
-
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	# NOTE: on pypy a couple of failures (refcounting, version-checking) is
-	# expected
-
-	distutils_install_for_testing
-
-	pushd "${TEST_DIR}"/lib > /dev/null || die
-
-	# Skip broken tests.
-
-	# http://twistedmatrix.com/trac/ticket/5375
-	sed -e "/class ZshIntegrationTestCase/,/^$/d" -i twisted/scripts/test/test_scripts.py \
-		|| die "sed failed"
-
-	# tap2rpm is already skipped if rpm is not installed, but fails for me on a Gentoo box with it present.
-	# I currently lack the cycles to track this failure down.
-	rm twisted/scripts/test/test_tap2rpm.py
-
-	# Prevent it from pulling in plugins from already installed twisted packages.
-	rm -f twisted/plugins/__init__.py
-
-	# An empty file doesn't work because the tests check for doc strings in all packages.
-	echo "'''plugins stub'''" > twisted/plugins/__init__.py || die
-
-	# https://twistedmatrix.com/trac/ticket/6920
-	sed -e 's:test_basicOperation:_&:' -i twisted/scripts/test/test_tap2deb.py || die
-	sed -e 's:test_inspectCertificate:_&:' -i twisted/test/test_sslverify.py || die
-
-	# Requires twisted-web creating a cric. dep
-	rm -f twisted/python/test/test_release.py || die
-
-	# Requires connection to the network
-	sed -e 's:test_multiListen:_&:' -i twisted/test/test_udp.py || die
-
-	if ! "${TEST_DIR}"/scripts/trial twisted; then
-		die "Tests failed with ${EPYTHON}"
-	fi
-
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	cd "${D%/}$(python_get_sitedir)" || die
-
-	# create 'Twisted' egg wrt bug #299736
-	local egg=( Twisted_Core*.egg-info )
-	[[ -f ${egg[0]} ]] || die "Twisted_Core*.egg-info not found"
-	ln -s "${egg[0]}" "${egg[0]/_Core/}" || die
-
-	# own the dropin.cache so we don't leave orphans
-	touch twisted/plugins/dropin.cache || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}/twistd.conf" twistd
-	newinitd "${FILESDIR}/twistd.init" twistd
-}
diff --git a/dev-python/twisted-web/Manifest b/dev-python/twisted-web/Manifest
deleted file mode 100644
index 2c25add..0000000
--- a/dev-python/twisted-web/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST TwistedWeb-13.2.0.tar.bz2 403931 BLAKE2B b003889c566b9063ffbef9eeb3f98af22eff4ba1b10cf2db1eb76ff3da08ac45d3892790943348c0d1cf4a28d8e66050aca9281409b47e48df42ec036a25e1af SHA512 69e721ec456214d000f88268340b7cf21186073af11e7f906bf95c9a1bfaf49fdc5832b4e39586ebdddd3f1378bf823ab147de58d7aa9e8491a2561a54389a1f
diff --git a/dev-python/twisted-web/metadata.xml b/dev-python/twisted-web/metadata.xml
deleted file mode 100644
index 7f4f33c..0000000
--- a/dev-python/twisted-web/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>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-python/twisted-web/twisted-web-13.2.0.ebuild b/dev-python/twisted-web/twisted-web-13.2.0.ebuild
deleted file mode 100644
index 8f8dfaf..0000000
--- a/dev-python/twisted-web/twisted-web-13.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-MY_PN="TwistedWeb"
-DESCRIPTION="Twisted web server, programmable in Python"
-
-KEYWORDS="*"
-IUSE="soap"
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	soap? ( dev-python/soappy[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
-
-python_prepare_all() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		# Disable tests failing with root permissions.
-		sed -e "s/test_forbiddenResource/_&/" -i twisted/web/test/test_static.py
-		sed -e "s/testDownloadPageError3/_&/" -i twisted/web/test/test_webclient.py
-	fi
-
-	distutils-r1_python_prepare_all
-}
-# testsuite has a PYTHONPATH oddity, currently appears to require a system install to effectively import,
-# putting in question as to whether it is a testsuite
diff --git a/dev-python/typing/Manifest b/dev-python/typing/Manifest
deleted file mode 100644
index b0f97dc..0000000
--- a/dev-python/typing/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST typing-3.6.4.tar.gz 71347 BLAKE2B dd49919595698347ce4b1004abd075409296acf11e10dd6ae0697d2bf94dc9d1cebedb2afe454be95eddb80fd0a60aebe14ddadc8df8de86545dd2ea05986c57 SHA512 f595e0fc395ba13a129ae45681faca7b199fd5c23e8f1573f49e2a6f162b7f2aef680306e76cbf50b978de9f047c674323219981e89c476474295bb8c02211ce
diff --git a/dev-python/typing/metadata.xml b/dev-python/typing/metadata.xml
deleted file mode 100644
index 8fac39f..0000000
--- a/dev-python/typing/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">typing</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/typing/typing-3.6.4-r1.ebuild b/dev-python/typing/typing-3.6.4-r1.ebuild
deleted file mode 100644
index 185a73f..0000000
--- a/dev-python/typing/typing-3.6.4-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Type Hints for Python"
-HOMEPAGE="https://docs.python.org/3/library/typing.html https://pypi.org/project/typing/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	if [[ ${EPYTHON} == python2* || ${EPYTHON} == pypy ]]; then
-		cd "${S}"/python2 || die
-	else
-		cd "${S}"/src || die
-	fi
-
-	"${PYTHON}" test_typing.py || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index 4180750..307183d 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -1,2 +1,2 @@
 DIST bazel-0.24.1-dist.zip 174691842 BLAKE2B 56d42421ac6f5513f019f3b71ca0c5e7b499c199dd8d9f22ca4fdca832527a1974afffccd6bff6b1d29dc3156ee28ba7f91a9a37f2f8524da5c5f30645be97aa SHA512 a78c871eb517ec53a0d1d9592887288fa54e5e9f44b0b7dba44792a74a1ba0c98e38ff2f6094ab6e8b3add3ec4a0188de3b2489d94d419373e210d16db641774
-DIST bazel-3.2.0-dist.zip 269368916 BLAKE2B 1eb54c42e22432d2c836a87179094563b797744de423468bf9bce1b7b4dbcdce20e033ed03c4cd7ea5026c9e0d971e16202aff09f9c45d91c9fc53af6f0f8802 SHA512 fd8191188ecb49087b2b474bc383b2bb5d131460952be64b8930dc7e573fd14f99f231c4270b88fb4c9537fb94a04588fb580891519d20c7b90d705238f17f81
+DIST bazel-3.7.2-dist.zip 313677756 BLAKE2B cd6363762c68d25739a6bf6c13f10e191302a10b6fb7d97455effbc678d4f0b644c76115cad478aad7c09f703d9e594f4bdb8669ed6ab97d6a559a27723c510c SHA512 e8746ef5ec22feb95e9dbbddb3fb56cf8f49c80f326fc2a4e0ce2619607826fac22f46bfb995daee55bf9ffabb9d646b8454be2bce7b479da5cf2a7e5b3be62b
diff --git a/dev-util/bazel/bazel-0.24.1-r2.ebuild b/dev-util/bazel/bazel-0.24.1-r3.ebuild
similarity index 100%
rename from dev-util/bazel/bazel-0.24.1-r2.ebuild
rename to dev-util/bazel/bazel-0.24.1-r3.ebuild
diff --git a/dev-util/bazel/bazel-0.24.1.ebuild b/dev-util/bazel/bazel-0.24.1.ebuild
index 86d7017..44aa6d2 100644
--- a/dev-util/bazel/bazel-0.24.1.ebuild
+++ b/dev-util/bazel/bazel-0.24.1.ebuild
@@ -54,6 +54,9 @@
 
 src_prepare() {
 	default
+	# Apply upstream grpc gettid patches, https://crbug.com/1187317 .
+	cd third_party/grpc || die
+	eapply "${FILESDIR}/bazel-0.24-grpc-gettid-rename.patch"
 
 	# F: fopen_wr
 	# S: deny
diff --git a/dev-util/bazel/bazel-3.2.0-r1.ebuild b/dev-util/bazel/bazel-3.2.0-r1.ebuild
deleted file mode 120000
index 49ab430..0000000
--- a/dev-util/bazel/bazel-3.2.0-r1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-bazel-3.2.0.ebuild
\ No newline at end of file
diff --git a/dev-util/bazel/bazel-3.2.0.ebuild b/dev-util/bazel/bazel-3.2.0.ebuild
deleted file mode 100644
index 108872a..0000000
--- a/dev-util/bazel/bazel-3.2.0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 java-pkg-2 multiprocessing
-
-DESCRIPTION="Fast and correct automated build system"
-HOMEPAGE="https://bazel.build/"
-
-SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="*"
-IUSE="examples tools"
-# strip corrupts the bazel binary
-# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794)
-RESTRICT="strip test"
-RDEPEND=">=virtual/jdk-1.8:*"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	app-arch/zip"
-
-S="${WORKDIR}"
-
-bazel-get-flags() {
-	local i fs=()
-	for i in ${CFLAGS}; do
-		fs+=( "--copt=${i}" "--host_copt=${i}" )
-	done
-	for i in ${CXXFLAGS}; do
-		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
-	done
-	for i in ${CPPFLAGS}; do
-		fs+=( "--copt=${i}" "--host_copt=${i}" )
-		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
-	done
-	for i in ${LDFLAGS}; do
-		fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
-	done
-	echo "${fs[*]}"
-}
-
-pkg_setup() {
-	echo ${PATH} | grep -q ccache && \
-		ewarn "${PN} usually fails to compile with ccache, you have been warned"
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	# Only unpack the main distfile
-	unpack ${P}-dist.zip
-}
-
-src_prepare() {
-	default
-
-	# F: fopen_wr
-	# S: deny
-	# P: /proc/self/setgroups
-	# A: /proc/self/setgroups
-	# R: /proc/24939/setgroups
-	# C: /usr/lib/systemd/systemd
-	addpredict /proc
-}
-
-src_compile() {
-	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel-get-flags) --host_javabase=@local_jdk//:jdk"
-	VERBOSE=yes ./compile.sh || die
-
-	./scripts/generate_bash_completion.sh \
-		--bazel=output/bazel \
-		--output=bazel-complete.bash \
-		--prepend=scripts/bazel-complete-header.bash \
-		--prepend=scripts/bazel-complete-template.bash
-}
-
-src_test() {
-	output/bazel test \
-		--verbose_failures \
-		--spawn_strategy=standalone \
-		--genrule_strategy=standalone \
-		--verbose_test_summary \
-		examples/cpp:hello-success_test || die
-	output/bazel shutdown
-}
-
-src_install() {
-	dobin output/bazel
-	newbashcomp bazel-complete.bash ${PN}
-	bashcomp_alias ${PN} ibazel
-	insinto /usr/share/zsh/site-functions
-	doins scripts/zsh_completion/_bazel
-
-	if use examples; then
-		docinto examples
-		dodoc -r examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	# could really build tools but I don't know which ones
-	# are actually used
-	if use tools; then
-		docinto tools
-		dodoc -r tools/*
-		docompress -x /usr/share/doc/${PF}/tools
-		docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata
-	fi
-}
diff --git a/dev-util/bazel/bazel-3.7.2-r1.ebuild b/dev-util/bazel/bazel-3.7.2-r1.ebuild
new file mode 120000
index 0000000..981a4be
--- /dev/null
+++ b/dev-util/bazel/bazel-3.7.2-r1.ebuild
@@ -0,0 +1 @@
+bazel-3.7.2.ebuild
\ No newline at end of file
diff --git a/dev-util/bazel/bazel-3.7.2.ebuild b/dev-util/bazel/bazel-3.7.2.ebuild
new file mode 100644
index 0000000..470f76e
--- /dev/null
+++ b/dev-util/bazel/bazel-3.7.2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 java-pkg-2 multiprocessing
+
+DESCRIPTION="Fast and correct automated build system"
+HOMEPAGE="https://bazel.build/"
+
+SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="*"
+IUSE="examples tools prefix static-libs"
+REQUIRED_USE="prefix? ( static-libs )"
+# strip corrupts the bazel binary
+# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794)
+RESTRICT="strip test"
+RDEPEND=">=virtual/jdk-1.8:*"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	app-arch/zip"
+
+S="${WORKDIR}"
+
+bazel-get-flags() {
+	local i fs=()
+	for i in ${CFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+	done
+	for i in ${CXXFLAGS}; do
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${CPPFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${LDFLAGS}; do
+		fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
+	done
+	echo "${fs[*]}"
+}
+
+pkg_setup() {
+	echo ${PATH} | grep -q ccache && \
+		ewarn "${PN} usually fails to compile with ccache, you have been warned"
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	# Only unpack the main distfile
+	unpack ${P}-dist.zip
+}
+
+src_prepare() {
+	default
+
+	# F: fopen_wr
+	# S: deny
+	# P: /proc/self/setgroups
+	# A: /proc/self/setgroups
+	# R: /proc/24939/setgroups
+	# C: /usr/lib/systemd/systemd
+	addpredict /proc
+}
+
+src_compile() {
+	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel-get-flags) --host_javabase=@local_jdk//:jdk"
+	if use static-libs; then
+		export BAZEL_LINKOPTS=-static-libs:-static-libgcc BAZEL_LINKLIBS=-l%:libstdc++.a:-lm
+	fi
+	VERBOSE=yes ./compile.sh || die
+
+	./scripts/generate_bash_completion.sh \
+		--bazel=output/bazel \
+		--output=bazel-complete.bash \
+		--prepend=scripts/bazel-complete-header.bash \
+		--prepend=scripts/bazel-complete-template.bash
+}
+
+src_test() {
+	output/bazel test \
+		--verbose_failures \
+		--spawn_strategy=standalone \
+		--genrule_strategy=standalone \
+		--verbose_test_summary \
+		examples/cpp:hello-success_test || die
+	output/bazel shutdown
+}
+
+src_install() {
+	dobin output/bazel
+	newbashcomp bazel-complete.bash ${PN}
+	bashcomp_alias ${PN} ibazel
+	insinto /usr/share/zsh/site-functions
+	doins scripts/zsh_completion/_bazel
+
+	if use examples; then
+		docinto examples
+		dodoc -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	# could really build tools but I don't know which ones
+	# are actually used
+	if use tools; then
+		docinto tools
+		dodoc -r tools/*
+		docompress -x /usr/share/doc/${PF}/tools
+		docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata
+	fi
+}
diff --git a/dev-util/bazel/files/bazel-0.24-grpc-gettid-rename.patch b/dev-util/bazel/files/bazel-0.24-grpc-gettid-rename.patch
new file mode 100644
index 0000000..6086e04
--- /dev/null
+++ b/dev-util/bazel/files/bazel-0.24-grpc-gettid-rename.patch
@@ -0,0 +1,33 @@
+From de6255941a5e1c2fb2d50e57f84e38c09f45023d Mon Sep 17 00:00:00 2001
+From: Juanli Shen <juanlishen@google.com>
+Date: Fri, 23 Aug 2019 08:46:09 -0700
+Subject: [PATCH] Fix gettid() naming conflict
+
+---
+ src/core/lib/gpr/log_linux.cc | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc
+index 561276f0c20..81026e5689b 100644
+--- a/src/core/lib/gpr/log_linux.cc
++++ b/src/core/lib/gpr/log_linux.cc
+@@ -40,7 +40,9 @@
+ #include <time.h>
+ #include <unistd.h>
+ 
+-static long gettid(void) { return syscall(__NR_gettid); }
++// Not naming it as gettid() to avoid duplicate declarations when complied with
++// GCC 9.1.
++static long local_gettid(void) { return syscall(__NR_gettid); }
+ 
+ void gpr_log(const char* file, int line, gpr_log_severity severity,
+              const char* format, ...) {
+@@ -70,7 +72,7 @@ void gpr_default_log(gpr_log_func_args* args) {
+   gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME);
+   struct tm tm;
+   static __thread long tid = 0;
+-  if (tid == 0) tid = gettid();
++  if (tid == 0) tid = local_gettid();
+ 
+   timer = static_cast<time_t>(now.tv_sec);
+   final_slash = strrchr(args->file, '/');
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
deleted file mode 100644
index c9d7739..0000000
--- a/dev-util/gdbus-codegen/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST glib-2.66.7.tar.xz 4844892 BLAKE2B 2d128e8c933a8c5bd27734e96e50244f27c29199823e2185e8cfa5b4bbc0ca23f761c9de275c9941672eb945e302178b3cb4b5bd577f375ad953a97dddc70e34 SHA512 f6e6cc0fe2ab4a31a623bf9a1e63f833783e044e7ed55b66a84fc0cbf1410eec233fe0e226abb20aac0e40167a9624bf5e65197f9eed879da1293af44408d530
diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.56.1-sitedir.patch b/dev-util/gdbus-codegen/files/gdbus-codegen-2.56.1-sitedir.patch
deleted file mode 100644
index 30f0d7d..0000000
--- a/dev-util/gdbus-codegen/files/gdbus-codegen-2.56.1-sitedir.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 9eaaa76e2e36e46a43dbd419724696fd7ff8ea64 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
-Date: Sat, 14 Apr 2018 09:55:22 +0200
-Subject: [PATCH 1/2] gdbus-codegen-2.54.3-sitedir.patch
-
----
- gio/gdbus-2.0/codegen/gdbus-codegen.in | 28 --------------------------
- 1 file changed, 28 deletions(-)
-
-diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
-index 67d367543..190afa28f 100755
---- a/gdbus-codegen.in
-+++ b/gdbus-codegen.in
-@@ -20,36 +20,8 @@
- # Author: David Zeuthen <davidz@redhat.com>
- 
- 
--import os
- import sys
- 
--srcdir = os.getenv('UNINSTALLED_GLIB_SRCDIR', None)
--filedir = os.path.dirname(__file__)
--
--if srcdir is not None:
--    path = os.path.join(srcdir, 'gio', 'gdbus-2.0')
--elif os.path.basename(filedir) == 'bin':
--    # Make the prefix containing gdbus-codegen 'relocatable' at runtime by
--    # adding /some/prefix/bin/../share/glib-2.0 to the python path
--    path = os.path.join(filedir, '..', 'share', 'glib-2.0')
--else:
--    # Assume that the modules we need are in the current directory and add the
--    # parent directory to the python path.
--    path = os.path.join(filedir, '..')
--
--# Canonicalize, then do further testing
--path = os.path.abspath(path)
--
--# If the above path detection failed, use the hard-coded datadir. This can
--# happen when, for instance, bindir and datadir are not in the same prefix or
--# on Windows where we cannot make any guarantees about the directory structure.
--#
--# In these cases our installation cannot be relocatable, but at least we should
--# be able to find the codegen module.
--if not os.path.isfile(os.path.join(path, 'codegen', 'codegen_main.py')):
--    path = os.path.join('@DATADIR@', 'glib-2.0')
--
--sys.path.insert(0, path)
--from codegen import codegen_main
-+from gdbus_codegen import codegen_main
- 
- sys.exit(codegen_main.codegen_main())
--- 
-2.17.0
-
diff --git a/dev-util/gdbus-codegen/files/setup.py-2.32.4 b/dev-util/gdbus-codegen/files/setup.py-2.32.4
deleted file mode 100644
index c5318e3..0000000
--- a/dev-util/gdbus-codegen/files/setup.py-2.32.4
+++ /dev/null
@@ -1,6 +0,0 @@
-from distutils.core import setup
-setup(name="gdbus_codegen",
-      version="@PV@",
-      packages=["gdbus_codegen"],
-      package_dir={"gdbus_codegen" : ""},
-      scripts=["gdbus-codegen"])
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.66.7.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.66.7.ebuild
deleted file mode 100644
index 2b24423..0000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.66.7.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-PYTHON_REQ_USE="xml"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit gnome.org distutils-r1
-
-DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-
-	local MAJOR_VERSION=$(ver_cut 1)
-	local MINOR_VERSION=$(ver_cut 2)
-	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
-	sed -e "s:@VERSION@:${PV}:" \
-		-e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \
-		-e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die
-	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
-	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
-}
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
-
-src_test() {
-	einfo "Skipping tests. This package is tested by dev-libs/glib"
-	einfo "when merged with FEATURES=test"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all # no-op, but prevents QA warning
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
diff --git a/dev-util/gdbus-codegen/metadata.xml b/dev-util/gdbus-codegen/metadata.xml
deleted file mode 100644
index 3998080..0000000
--- a/dev-util/gdbus-codegen/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>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index a5b48a9..897a8b4 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1 +1 @@
-DIST glslang-8.13.3743.tar.gz 3183453 BLAKE2B 2e8fc3693477be8bd6f8000a0eb032b314f5903991dc5a73dbd913a92aa0d6878e45f29f0a01ca5e8453b566d8a503a3cf4256def7f90a4cb561391b047c2a1d SHA512 19169c4ffa511113978af8e8efc57b290d4aa962a4c2429dbea1af72204787c6ce20ffbbb452dc04bef5416e00510819d84463a2e76295b9a59b409e12af6792
+DIST glslang-11.2.0.tar.gz 3295235 BLAKE2B 42417f3be070a57f0c71f5a0c81ffcf4938044c74fd59435fad6889b74c077032fda18e73971db41b180341c1eb6bcdc24081d5ff57fb9baf36c32fbfac9e67a SHA512 0d6cd866c4e28069dbc2c5f0ceba2acab73356751499f8fe81177357c61b2bdae92d2502c47889687d57094dd9fd59b78a06234de1d9c4989a204f9ce3c73751
diff --git a/dev-util/glslang/OWNERS b/dev-util/glslang/OWNERS
new file mode 100644
index 0000000..8907698
--- /dev/null
+++ b/dev-util/glslang/OWNERS
@@ -0,0 +1,3 @@
+chadversary@chromium.org
+olv@google.com
+pwang@chromium.org
diff --git a/dev-util/glslang/glslang-11.2.0.ebuild b/dev-util/glslang/glslang-11.2.0.ebuild
new file mode 100644
index 0000000..c70a143
--- /dev/null
+++ b/dev-util/glslang/glslang-11.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
+	inherit git-r3
+else
+	SNAPSHOT_COMMIT="${PV}"
+	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="*"
+	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
+fi
+
+DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
+HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="!<media-libs/shaderc-2020.1"
+BDEPEND="${PYTHON_DEPS}"
+
+# Bug 698850
+RESTRICT="test"
diff --git a/dev-util/glslang/glslang-8.13.3743-r1.ebuild b/dev-util/glslang/glslang-8.13.3743-r1.ebuild
deleted file mode 100644
index 049f4ac..0000000
--- a/dev-util/glslang/glslang-8.13.3743-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
-	inherit git-r3
-else
-	SNAPSHOT_COMMIT="${PV}"
-	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="*"
-	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
-fi
-
-DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
-HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="!<media-libs/shaderc-2020.1"
-BDEPEND="${PYTHON_DEPS}"
-
-# Bug 698850
-RESTRICT="test"
diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild
deleted file mode 100644
index 52d501a..0000000
--- a/dev-util/glslang/glslang-9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~*"
-fi
-
-DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
-HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="!<media-libs/shaderc-2020.1"
-BDEPEND="${PYTHON_DEPS}"
-
-# Bug 698850
-RESTRICT="test"
diff --git a/dev-util/glslang/metadata.xml b/dev-util/glslang/metadata.xml
index c277a80..4577a9f 100644
--- a/dev-util/glslang/metadata.xml
+++ b/dev-util/glslang/metadata.xml
@@ -9,4 +9,3 @@
 		<remote-id type="github">KhronosGroup/glslang</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-util/lcov/Manifest b/dev-util/lcov/Manifest
index 8186095..61f311d 100644
--- a/dev-util/lcov/Manifest
+++ b/dev-util/lcov/Manifest
@@ -1 +1 @@
-DIST lcov-1.10.tar.gz 150174 RMD160 515b9a26ffaa5716228fbb21436174aea7f064d7 SHA1 70fb361bcfd7dd81ea30731d6fe532ddea56f283 SHA256 8a4661becc95fafad7875786672f7f29b080437825c3ff31d55a49492c15b88f
+DIST lcov-1.15.tar.gz 190487 BLAKE2B 2d6478caae488b84c74a3f7b489013b065b3e8fb106a6e8c5f413ffe87be7f4530aade8d2b5df5b8193949d60f49d5255b4eddb0cd5f1cab6f450ba2f97426ab SHA512 dda0eadbd0ea2093f17cba039309ccda3dbcb7266d083b46bda61e02cd7f049d66de49be1e005157c3e5af910d2703ffbc9cfe7f1242bd67b9787f8508e4d052
diff --git a/dev-util/lcov/OWNERS b/dev-util/lcov/OWNERS
new file mode 100644
index 0000000..cd05d19
--- /dev/null
+++ b/dev-util/lcov/OWNERS
@@ -0,0 +1,3 @@
+pfagerburg@chromium.org
+
+include chromiumos/platform/ec:/OWNERS
diff --git a/dev-util/lcov/lcov-1.10.ebuild b/dev-util/lcov/lcov-1.10.ebuild
deleted file mode 100644
index 97a475c..0000000
--- a/dev-util/lcov/lcov-1.10.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/lcov/lcov-1.10.ebuild,v 1.1 2013/02/04 08:48:33 patrick Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
-HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php"
-SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=dev-lang/perl-5
-	dev-perl/GD[png]"
-
-src_compile() { :; }
-
-src_install() {
-	emake PREFIX="${ED}" install
-}
diff --git a/dev-util/lcov/lcov-1.15.ebuild b/dev-util/lcov/lcov-1.15.ebuild
new file mode 100644
index 0000000..9998fe1
--- /dev/null
+++ b/dev-util/lcov/lcov-1.15.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/linux-test-project/lcov.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/linux-test-project/lcov/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="*"
+fi
+
+inherit optfeature prefix
+
+DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
+HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/JSON
+	dev-perl/PerlIO-gzip
+"
+
+src_prepare() {
+	default
+	if use prefix; then
+		hprefixify bin/*.{pl,sh}
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	emake -j1 PREFIX="${ED}/usr" CFG_DIR="${ED}/etc" install
+}
+
+pkg_postinst() {
+	elog "Optional features:"
+	optfeature "png output support" dev-perl/GD[png]
+}
diff --git a/dev-util/lcov/metadata.xml b/dev-util/lcov/metadata.xml
index e44eaf4..90c8676 100644
--- a/dev-util/lcov/metadata.xml
+++ b/dev-util/lcov/metadata.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-tools</herd>
+	<maintainer type="person">
+		<email>jeffrey@icurse.nl</email>
+		<name>Jeffrey Lin</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>marbacz@gmail.com</email>
+		<name>Marcin Baczyński</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ltp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/meson-format-array/files/meson-format-array b/dev-util/meson-format-array/files/meson-format-array
new file mode 100644
index 0000000..d2bf49b
--- /dev/null
+++ b/dev-util/meson-format-array/files/meson-format-array
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+import itertools
+import shlex
+import sys
+
+def quote(s):
+    return "'" + s.replace("\\", "\\\\").replace("'", "\\'") + "'"
+
+def main(args):
+    # Split each argument according to shell rules
+    args = (shlex.split(x) for x in args)
+
+    # Flatten the resulting list of lists
+    args = itertools.chain.from_iterable(args)
+
+    # Add quotes and escape embedded quotes
+    args = (quote(x) for x in args)
+
+    # Format the result
+    print("[" + ", ".join(args) + "]")
+
+if __name__ == "__main__":
+    main(sys.argv[1:])
diff --git a/dev-util/meson-format-array/meson-format-array-0.ebuild b/dev-util/meson-format-array/meson-format-array-0.ebuild
new file mode 100644
index 0000000..e4cf00a
--- /dev/null
+++ b/dev-util/meson-format-array/meson-format-array-0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-r1
+
+DESCRIPTION="Format shell expressions into a meson array"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="*"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RDEPEND="${PYTHON_DEPS}"
+S="${WORKDIR}"
+
+src_install() {
+	python_foreach_impl python_doscript "${FILESDIR}"/meson-format-array
+}
diff --git a/dev-util/meson-format-array/metadata.xml b/dev-util/meson-format-array/metadata.xml
new file mode 100644
index 0000000..d35a395
--- /dev/null
+++ b/dev-util/meson-format-array/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 56d8beb..765d085 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1 +1 @@
-DIST meson-0.55.3.tar.gz 1740465 BLAKE2B 7d121f5d2bf487ae3c38be5ddccde6900134b9d0ea47868aac5625449e18a1a97ae0012849b795187221632cd3ac343097ef29b282753a1e8bd871c393d5c0e8 SHA512 afb0bb25b367e681131d920995124df4b06f6d144ae1a95ebec27be13e06fefbd95840e0287cd1d84bdbb8d9c115b589a833d847c60926f55e0f15749cf66bae
+DIST meson-0.57.2.tar.gz 1853721 BLAKE2B 9c167a21745719589a165e7ffc31007bd6307b347027f390fd660b2f44b5a2e6d8f36e999e15fa4b28ae269ddb0bb3897e0297288c59b62cc493aad058126293 SHA512 a3b0bf3d5e1d1b7ac7c97313f43046c94aa2a6b21964958569c89764dfda08db166adb89d48cbfad735bd472114587a71089d5e8b4f0fce04c3289da21b3f40e
diff --git a/dev-util/meson/meson-0.55.3.ebuild b/dev-util/meson/meson-0.55.3.ebuild
deleted file mode 100644
index d60e981..0000000
--- a/dev-util/meson/meson-0.55.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2016-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="*"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		dev-util/ninja
-		dev-vcs/git
-		sys-libs/zlib[static-libs(+)]
-		virtual/pkgconfig
-	)
-"
-
-python_prepare_all() {
-	local disable_unittests=(
-		# ASAN and sandbox both want control over LD_PRELOAD
-		# https://bugs.gentoo.org/673016
-		-e 's/test_generate_gir_with_address_sanitizer/_&/'
-
-		# ASAN is unsupported on some targets
-		# https://bugs.gentoo.org/692822
-		-e 's/test_pch_with_address_sanitizer/_&/'
-
-		# https://github.com/mesonbuild/meson/issues/7203
-		-e 's/test_templates/_&/'
-
-		# Broken due to python2 wrapper
-		-e 's/test_python_module/_&/'
-	)
-
-	sed -i "${disable_unittests[@]}" run_unittests.py || die
-
-	# Broken due to python2 script created by python_wrapper_setup
-	rm -r "test cases/frameworks/1 boost" || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	tc-export PKG_CONFIG
-	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
-		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
-	else
-		# https://bugs.gentoo.org/687792
-		unset PKG_CONFIG
-		distutils-r1_src_test
-	fi
-}
-
-python_test() {
-	(
-		# test_meson_installed
-		unset PYTHONDONTWRITEBYTECODE
-
-		# test_cross_file_system_paths
-		unset XDG_DATA_HOME
-
-		${EPYTHON} -u run_tests.py
-	) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.57.2.ebuild b/dev-util/meson/meson-0.57.2.ebuild
new file mode 100644
index 0000000..61a15fd
--- /dev/null
+++ b/dev-util/meson/meson-0.57.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2016-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="*"
+fi
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		dev-util/ninja
+		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
+		virtual/pkgconfig
+	)
+"
+
+python_prepare_all() {
+	local disable_unittests=(
+		# ASAN and sandbox both want control over LD_PRELOAD
+		# https://bugs.gentoo.org/673016
+		-e 's/test_generate_gir_with_address_sanitizer/_&/'
+
+		# ASAN is unsupported on some targets
+		# https://bugs.gentoo.org/692822
+		-e 's/test_pch_with_address_sanitizer/_&/'
+
+		# https://github.com/mesonbuild/meson/issues/7203
+		-e 's/test_templates/_&/'
+
+		# Broken due to python2 wrapper
+		-e 's/test_python_module/_&/'
+	)
+
+	sed -i "${disable_unittests[@]}" run_unittests.py || die
+
+	# Broken due to python2 script created by python_wrapper_setup
+	rm -r "test cases/frameworks/1 boost" || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	tc-export PKG_CONFIG
+	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+	else
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	(
+		# test_meson_installed
+		unset PYTHONDONTWRITEBYTECODE
+
+		# test_cross_file_system_paths
+		unset XDG_DATA_HOME
+
+		# 'test cases/unit/73 summary' expects 80 columns
+		export COLUMNS=80
+
+		${EPYTHON} -u run_tests.py
+	) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles
+	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+	insinto /usr/share/zsh/site-functions
+	doins data/shell-completions/zsh/_meson
+}
diff --git a/dev-util/meson/metadata.xml b/dev-util/meson/metadata.xml
index d762c3a..aba1d26 100644
--- a/dev-util/meson/metadata.xml
+++ b/dev-util/meson/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-util/shflags/Manifest b/dev-util/shflags/Manifest
index ff85a68..0db0e1b 100644
--- a/dev-util/shflags/Manifest
+++ b/dev-util/shflags/Manifest
@@ -1 +1 @@
-DIST shflags-1.0.3.tgz 43549 RMD160 9dbfbd5e13e0173fea8e0459e0afc0837463e349 SHA1 978db4688b2886fa68a037deb82705ba3ecce278 SHA256 956a14771230760e24fa6ad5692bf858d1c9ee2d314320091fd045181cec8a22
+DIST shflags-1.2.3.tgz 42253 BLAKE2B 4837d31762129790659b67d4025cf8627ca5db32225ac61b437a5ba6bf9f894c87976d06dd5e5039a5ad4b7a0b7b173cc7f96fc3a11dc3c2ac797de2c749a8ed SHA512 5bddebce14e516fe37b2b1631d5aec54651ee728e538dfb0fcc68d32b79d335c7b48f5ef5aab99dd730de3b8fd556a6640db9b9ae2a7753feb6aa1e0831b64af
diff --git a/dev-util/shflags/metadata.xml b/dev-util/shflags/metadata.xml
index b314e39..f6f583e 100644
--- a/dev-util/shflags/metadata.xml
+++ b/dev-util/shflags/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
-	<maintainer>
-		<email>vapier@gentoo.org</email>
+	<maintainer type="project">
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">shflags</remote-id>
+		<remote-id type="github">kward/shflags</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/shflags/shflags-1.0.3.ebuild b/dev-util/shflags/shflags-1.0.3.ebuild
deleted file mode 100644
index 2d86f04..0000000
--- a/dev-util/shflags/shflags-1.0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/shflags/shflags-1.0.3.ebuild,v 1.1 2011/10/15 17:40:57 vapier Exp $
-
-EAPI="4"
-
-DESCRIPTION="Command-line flags module for Unix shell scripts"
-HOMEPAGE="http://code.google.com/p/shflags/"
-SRC_URI="http://shflags.googlecode.com/files/${P}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="*"
-IUSE="examples"
-
-src_test() {
-	cd src
-	./shflags_test.sh || die
-}
-
-src_install() {
-	dohtml README.html
-	dodoc README.txt doc/*.txt
-	insinto /usr/share/misc
-	doins src/shflags
-	use examples && dodoc examples/*.sh
-}
diff --git a/dev-util/shflags/shflags-1.2.3.ebuild b/dev-util/shflags/shflags-1.2.3.ebuild
new file mode 100644
index 0000000..20000a5
--- /dev/null
+++ b/dev-util/shflags/shflags-1.2.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Command-line flags module for Unix shell scripts"
+HOMEPAGE="https://github.com/kward/shflags"
+SRC_URI="https://github.com/kward/shflags/archive/v${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="*"
+IUSE="examples"
+
+src_test() {
+	sh test_runner || die
+}
+
+src_install() {
+	dodoc README* doc/*.txt
+	insinto /usr/share/misc
+	doins "${PN}"
+	use examples && dodoc examples/*
+}
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
new file mode 100644
index 0000000..c705894
--- /dev/null
+++ b/dev-util/spirv-headers/Manifest
@@ -0,0 +1 @@
+DIST spirv-headers-1.5.4.1.tar.gz 395834 BLAKE2B e4852f1d694271e9928f1f9aa460c6ba33ad2d0568bd38b24ba31e8dd0390a5542192f9c6977cd3ff4a56520af83280b779fd4e7cece6adc33a5261ef2d2398d SHA512 3578a0210b954e904ac154307a0b98a2c01410adf910e549669109b1b559781959bb5771e39945c50523548a6613d064576fcba15aa3c9125255c0443d3e61a6
diff --git a/dev-util/spirv-headers/OWNERS b/dev-util/spirv-headers/OWNERS
new file mode 100644
index 0000000..882c57e
--- /dev/null
+++ b/dev-util/spirv-headers/OWNERS
@@ -0,0 +1 @@
+chadversary@chromium.org
diff --git a/dev-util/spirv-headers/metadata.xml b/dev-util/spirv-headers/metadata.xml
new file mode 100644
index 0000000..898d15d
--- /dev/null
+++ b/dev-util/spirv-headers/metadata.xml
@@ -0,0 +1,15 @@
+<?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>
+	<maintainer type="person">
+		<email>sarnex@gentoo.org</email>
+		<name>Nick Sarnie</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">KhronosGroup/SPIRV-Headers</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/spirv-headers/spirv-headers-1.5.4.1.ebuild b/dev-util/spirv-headers/spirv-headers-1.5.4.1.ebuild
new file mode 100644
index 0000000..0abf73c
--- /dev/null
+++ b/dev-util/spirv-headers/spirv-headers-1.5.4.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Machine-readable files for the SPIR-V Registry"
+HOMEPAGE="https://www.khronos.org/registry/spir-v/"
+EGIT_COMMIT="f027d53ded7e230e008d37c8b47ede7cd308e19d"
+SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="*"
+
+RDEPEND="!<x11-drivers/opengles-headers-0.0.1-r35"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
new file mode 100644
index 0000000..ab2ae6d
--- /dev/null
+++ b/dev-util/spirv-tools/Manifest
@@ -0,0 +1 @@
+DIST spirv-tools-2020.6.tar.gz 2595300 BLAKE2B bd500824866fcd0f0e05ccf3f43a168e33bc4783396d24fa6ddc58d4e46110b001cc32acde1cadcd793a997d547476f58c07475f43c3cbec5314b039926896b2 SHA512 b6d3667581101536e1f4d405e9c1c64e64a0aba174cc2f41d31e080f44d23bcfaed9642fd31f1d44a56c3df3e894526b643c572832cb96218b16d748b1ac6fe2
diff --git a/dev-util/spirv-tools/OWNERS b/dev-util/spirv-tools/OWNERS
new file mode 100644
index 0000000..3f0223d
--- /dev/null
+++ b/dev-util/spirv-tools/OWNERS
@@ -0,0 +1,2 @@
+chadversary@chromium.org
+olv@google.com
diff --git a/dev-util/spirv-tools/metadata.xml b/dev-util/spirv-tools/metadata.xml
new file mode 100644
index 0000000..a1baeed
--- /dev/null
+++ b/dev-util/spirv-tools/metadata.xml
@@ -0,0 +1,15 @@
+<?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>
+	<maintainer type="person">
+		<email>sarnex@gentoo.org</email>
+		<name>Nick Sarnie</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">KhronosGroup/SPIRV-Tools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/spirv-tools/spirv-tools-2020.6.ebuild b/dev-util/spirv-tools/spirv-tools-2020.6.ebuild
new file mode 100644
index 0000000..78f6fca
--- /dev/null
+++ b/dev-util/spirv-tools/spirv-tools-2020.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=SPIRV-Tools
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	EGIT_COMMIT="${PV}"
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="*"
+	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
+fi
+
+DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# Tests fail upon finding symbols that do not match a regular expression
+# in the generated library. Easily hit with non-standard compiler flags
+RESTRICT="test"
+COMMON_DEPEND=">=dev-util/spirv-headers-1.5.4.1"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND=""
+BDEPEND="${PYTHON_DEPS}
+	${COMMON_DEPEND}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
+		"-DSPIRV_WERROR=OFF"
+		"-DSPIRV_TOOLS_BUILD_STATIC=OFF"
+		"-DBUILD_SHARED_LIBS=ON"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index b27e271..fff1121 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1 +1 @@
-DIST vulkan-headers-1.1.92.0.tar.gz 541278 BLAKE2B f1743a376d18185bed136acd11cab0f8cdea2146ae4f9d389332b1afd83a29a32f2dc2a66f441cdb07f99a24c68d8743710762716cc3d0baf8f10933a3db0351 SHA512 61e47eec60ca713e958cbe2fe80241afe699a7853a0ca2b7f866aa37de064115df8418226b2ace22def12fdf97531f2301a92756b6ebe7862a11004d2f1d93c4
+DIST vulkan-headers-1.2.162.tar.gz 852973 BLAKE2B 3907c247f115f4dee2fc8697f157aeb30a3ef91a774132591771c0b327090abf7c0caad2082edb86c787883c167ce1ffe75c199d9b94fc642aae30526f5311cd SHA512 7b33f6ef32f1ef34d3b37ad38b077a3a2ebcef62612371afa1b6f4910815bbab8418a837c49b3872b57d2e5012c15623521121f5d62836e46d6f20773841d7b0
diff --git a/dev-util/vulkan-headers/OWNERS b/dev-util/vulkan-headers/OWNERS
new file mode 100644
index 0000000..882c57e
--- /dev/null
+++ b/dev-util/vulkan-headers/OWNERS
@@ -0,0 +1 @@
+chadversary@chromium.org
diff --git a/dev-util/vulkan-headers/files/vulkan-headers-1.1.77.0-r1-Remove-loader-layer-dep.patch b/dev-util/vulkan-headers/files/vulkan-headers-1.1.77.0-r1-Remove-loader-layer-dep.patch
deleted file mode 100644
index 9cf443a..0000000
--- a/dev-util/vulkan-headers/files/vulkan-headers-1.1.77.0-r1-Remove-loader-layer-dep.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 396f82798a4d19b57fc9933490dc1bd7624c9bbb Mon Sep 17 00:00:00 2001
-From: Lenny Komow <lenny@lunarg.com>
-Date: Mon, 25 Jun 2018 13:59:47 -0600
-Subject: [PATCH] headers: Remove loader/layer dependency
-
-The header vk_layer.h included vk_layer_dispatch_table.h, which is not
-present in this repo. Instead, it had to be generated from either the
-Vulkan-Loader or Vulkan-ValidationLayers repo. This change removes
-that dependency.
----
- include/vulkan/vk_layer.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/include/vulkan/vk_layer.h b/include/vulkan/vk_layer.h
-index e8300c3..823c88a 100644
---- a/include/vulkan/vk_layer.h
-+++ b/include/vulkan/vk_layer.h
-@@ -35,9 +35,6 @@
- #define VK_LAYER_EXPORT
- #endif
- 
--// Definition for VkLayerDispatchTable and VkLayerInstanceDispatchTable now appear in externally generated header
--#include "vk_layer_dispatch_table.h"
--
- #define MAX_NUM_UNKNOWN_EXTS 250
- 
-  // Loader-Layer version negotiation API.  Versions add the following features:
-@@ -50,6 +47,9 @@
- 
- #define VK_CURRENT_CHAIN_VERSION 1
- 
-+// Typedef for use in the interfaces below
-+typedef PFN_vkVoidFunction (VKAPI_PTR *PFN_GetPhysicalDeviceProcAddr)(VkInstance instance, const char* pName);
-+
- // Version negotiation values
- typedef enum VkNegotiateLayerStructType {
-     LAYER_NEGOTIATE_UNINTIALIZED = 0,
-
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.1.92.0.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.1.92.0.ebuild
deleted file mode 100644
index 12d71cc..0000000
--- a/dev-util/vulkan-headers/vulkan-headers-1.1.92.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git"
-	inherit git-r3
-else
-	EGIT_COMMIT="114c3546e195819bd53a34b39f5194b2989a5b12"
-	KEYWORDS="*"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
-fi
-
-DESCRIPTION="Vulkan Header files and API registry"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-# Old packaging will cause file collisions
-RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.162.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.162.ebuild
new file mode 100644
index 0000000..6fcf1ba
--- /dev/null
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.162.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Headers
+inherit cmake
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="*"
+	S="${WORKDIR}"/${MY_PN}-${PV}
+fi
+
+DESCRIPTION="Vulkan Header files and API registry"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
diff --git a/dev-util/wayland-scanner/Manifest b/dev-util/wayland-scanner/Manifest
new file mode 100644
index 0000000..c5622c6
--- /dev/null
+++ b/dev-util/wayland-scanner/Manifest
@@ -0,0 +1 @@
+DIST wayland-1.19.0.tar.xz 456380 BLAKE2B 0f70bb02e890898c4763001884527067adb686abe9a2b9325badf1730d411d269c437037afc298eec8075eb1e3845f5b81b8ed3d702908388a54e7063cbea91a SHA512 d8a86f5e23e4a88e7c84b82fdb51eb350419086afe462ecb2f4d5c3ba9290ede310cbbcffd60215219ddccf5bad4adec21a5ebfbef6577200f66ac7a1b64a5ef
diff --git a/x11-libs/libXmu/metadata.xml b/dev-util/wayland-scanner/metadata.xml
similarity index 100%
copy from x11-libs/libXmu/metadata.xml
copy to dev-util/wayland-scanner/metadata.xml
diff --git a/dev-util/wayland-scanner/wayland-scanner-1.19.0.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.19.0.ebuild
new file mode 100644
index 0000000..13e6d66
--- /dev/null
+++ b/dev-util/wayland-scanner/wayland-scanner-1.19.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
+	inherit git-r3
+else
+	SRC_URI="https://wayland.freedesktop.org/releases/wayland-${PV}.tar.xz"
+	KEYWORDS="*"
+	S="${WORKDIR}/wayland-${PV}"
+fi
+inherit meson-multilib
+
+DESCRIPTION="wayland-scanner tool"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
+
+LICENSE="MIT"
+SLOT="0"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	!<dev-libs/wayland-${PV}
+	>=dev-libs/expat-2.1.0-r3:=[$MULTILIB_USEDEP]
+"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddocumentation=false
+		-Ddtd_validation=false
+		-Dlibraries=false
+		-Dscanner=true
+	)
+	meson_src_configure
+}
diff --git a/dev-vcs/cvs/Manifest b/dev-vcs/cvs/Manifest
deleted file mode 100644
index f8d9897..0000000
--- a/dev-vcs/cvs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST cederqvist-1.12.12.html.tar.bz2 137581 RMD160 4b98b01dce9554dc5191f82c5df54e784934dd2b SHA1 300e2860b4f3e33bf22e6b426693c78e4d8d6ece SHA256 6bdd66581ec363e05313a14db27cd3c201b547cdfc9ea2f8edde74e78301f0f6
-DIST cederqvist-1.12.12.pdf 1252423 RMD160 61b82c41cc365c03ee3a483cb7200a6dce2c9ffc SHA1 1d09926dd8eedce30d6cfff48f6931ac9cf0575e SHA256 211c5792d24bfd5694f23bc217a161d880bfb2447c41016fab6f657168b041ce
-DIST cederqvist-1.12.12.ps 1262208 RMD160 49fc79c627cd4b590381a6b0f609f55495546df8 SHA1 0767bc9f548176d01968ea11a09379426bb63c31 SHA256 0e14189614e2c5ead49bfe0ecd187239f8adc3e66371b49d52163be821e44cab
-DIST cvs-1.12.12.tar.bz2 3197171 RMD160 7275686576957e016b4f671ad5d52d8961d2d7d2 SHA1 402e81a3d231535a97e4b4f438c0b68920e57d0c SHA256 9fb9176d268b9019768fc57dedc2920c28fbeda5ba224c2348550d4f25043edc
diff --git a/dev-vcs/cvs/cvs-1.12.12-r6.ebuild b/dev-vcs/cvs/cvs-1.12.12-r6.ebuild
deleted file mode 100644
index ea42b0c..0000000
--- a/dev-vcs/cvs/cvs-1.12.12-r6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r6.ebuild,v 1.1 2010/06/19 00:27:23 abcd Exp $
-
-inherit eutils pam
-
-DESCRIPTION="Concurrent Versions System - source code revision control tools"
-HOMEPAGE="http://www.nongnu.org/cvs/"
-
-SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
-	doc? ( mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.html.tar.bz2
-		mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.pdf
-		mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.ps )"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="*"
-
-IUSE="crypt doc kerberos nls pam server"
-
-DEPEND=">=sys-libs/zlib-1.1.4
-	kerberos? ( virtual/krb5 )
-	pam? ( virtual/pam )"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	use doc && unpack cederqvist-${PV}.html.tar.bz2
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${P}-cvsbug-tmpfix.patch
-	epatch "${FILESDIR}"/${P}-openat.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${P}-block-requests.patch
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-cvs-gnulib-vasnprintf.patch
-	epatch "${FILESDIR}"/${P}-install-sh.patch
-	elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
-}
-
-src_compile() {
-	econf \
-		--with-external-zlib \
-		--with-tmpdir=/tmp \
-		$(use_enable crypt encryption) \
-		$(use_with kerberos gssapi) \
-		$(use_enable nls) \
-		$(use_enable pam) \
-		$(use_enable server) \
-		|| die
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
-
-	dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
-		MINOR* NEWS PROJECTS README* TESTS TODO
-
-	# Not installed into emacs site-lisp because it clobbers the normal C
-	# indentations.
-	dodoc cvs-format.el || die "dodoc failed"
-
-	use server && newdoc "${FILESDIR}"/cvs-1.12.12-cvs-custom.c cvs-custom.c
-
-	if use doc; then
-		dodoc "${DISTDIR}"/cederqvist-${PV}.pdf
-		dodoc "${DISTDIR}"/cederqvist-${PV}.ps
-		tar xjf "${DISTDIR}"/cederqvist-${PV}.html.tar.bz2
-		dohtml -r cederqvist-${PV}.html/*
-		cd "${D}"/usr/share/doc/${PF}/html/
-		ln -s cvs.html index.html
-	fi
-
-	newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
-}
-
-src_test() {
-	einfo "FEATURES=\"maketest\" has been disabled for dev-vcs/cvs"
-}
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-block-requests.patch b/dev-vcs/cvs/files/cvs-1.12.12-block-requests.patch
deleted file mode 100644
index 9c9b49d..0000000
--- a/dev-vcs/cvs/files/cvs-1.12.12-block-requests.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-Author: Robin H. Johnson <robbat2@gentoo.org>
-Date: 2006-08-09
-
-This patch allows a CVS server to deny usage of specific commands, based on
-input in the environment.
-
-Just set the CVS_BLOCK_REQUESTS env var with all of the commands you want,
-seperated by spaces. Eg:
-CVS_BLOCK_REQUESTS="Gzip-stream gzip-file-contents"
-would block ALL usage of compression.
-
-Please see the array 'struct request requests[]' in src/server.c for a full
-list of commands.
-
-Please note that if you block any commands marked as RQ_ESSENTIAL, CVS clients
-may fail! (This includes 'ci'!).
-
-See the companion cvs-custom.c for a wrapper that can enforce the environment variable for pserver setups.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*~' -U 10 cvs-1.12.12.orig/src/server.c cvs-1.12.12/src/server.c
---- cvs-1.12.12.orig/src/server.c	2005-04-14 14:13:29.000000000 +0000
-+++ cvs-1.12.12/src/server.c	2006-08-09 01:40:44.000000000 +0000
-@@ -5836,43 +5836,90 @@
- #undef REQ_LINE
- };
- #endif /* SERVER_SUPPORT or CLIENT_SUPPORT */
- 
- 
- 
- #ifdef SERVER_SUPPORT
- /*
-  * This server request is not ignored by the secondary.
-  */
-+
-+/* Hack by Robin H. Johnson <robbat2@gentoo.org>.
-+ * Allow the server ENV to specify what request types are to be ignored.
-+ */
-+
-+static char blocked_requests[BUFSIZ] = " ";
-+
-+static void build_blocked_requests() {
-+	char *tmp = getenv("CVS_BLOCK_REQUESTS");
-+
-+	if (tmp != NULL && strlen(tmp) > 0) {
-+		// move to our custom buffer
-+		strncat(blocked_requests, tmp, sizeof(blocked_requests)-strlen(blocked_requests));
-+		//add a space on the end as well for searching
-+		strncat(blocked_requests, " ", sizeof(blocked_requests)-strlen(blocked_requests));
-+	}
-+
-+	// now blocked_requests contains the list of every request that we do not
-+	// want to serve
-+}
-+
-+// returns 0 if we should serve this request
-+// use as if(checker(FOO)) continue;
-+static int serve_valid_requests_checker(char *reqname) {
-+	char needle[BUFSIZ] = " ";
-+	char *tmp;
-+
-+	if(!blocked_requests || strlen(blocked_requests) < 2)
-+		return 0;
-+
-+	// we want to look for ' 'reqname' '
-+	snprintf(needle, sizeof(needle), " %s ", reqname);
-+
-+	// now do the search
-+	tmp = strstr(blocked_requests, needle);
-+
-+	if (tmp != NULL)
-+		return 1;
-+
-+	return 0;
-+	
-+}
-+
- static void
- serve_valid_requests (char *arg)
- {
-     struct request *rq;
- 
-     /* Since this is processed in the first pass, don't reprocess it in the
-      * second.
-      *
-      * We still print errors since new errors could have been generated in the
-      * second pass.
-      */
-     if (print_pending_error ()
- #ifdef PROXY_SUPPORT
- 	|| reprocessing
- #endif /* PROXY_SUPPORT */
-        )
- 	return;
-+	
-+    build_blocked_requests();
- 
-     buf_output0 (buf_to_net, "Valid-requests");
-     for (rq = requests; rq->name != NULL; rq++)
-     {
- 	if (rq->func != NULL)
- 	{
-+		if(serve_valid_requests_checker(rq->name)) 
-+			continue;
- 	    buf_append_char (buf_to_net, ' ');
- 	    buf_output0 (buf_to_net, rq->name);
- 	}
-     }
-     buf_output0 (buf_to_net, "\nok\n");
- 
-     /* The client is waiting for the list of valid requests, so we
-        must send the output now.  */
-     buf_flush (buf_to_net, 1);
- }
-@@ -6353,20 +6400,24 @@
- 		    cmd += len;
- 		else if (cmd[len] == ' ')
- 		    cmd += len + 1;
- 		else
- 		    /*
- 		     * The first len characters match, but it's a different
- 		     * command.  e.g. the command is "cooperate" but we matched
- 		     * "co".
- 		     */
- 		    continue;
-+		// Ignore commands that we are supposed to ignore.
-+		if(serve_valid_requests_checker(rq->name))
-+				continue;
-+
- 
- 		if (!(rq->flags & RQ_ROOTLESS)
- 		    && current_parsed_root == NULL)
- 		{
- 		    /* For commands which change the way in which data
- 		       is sent and received, for example Gzip-stream,
- 		       this does the wrong thing.  Since the client
- 		       assumes that everything is being compressed,
- 		       unconditionally, there is no way to give this
- 		       error to the client without turning on
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-cvs-gnulib-vasnprintf.patch b/dev-vcs/cvs/files/cvs-1.12.12-cvs-gnulib-vasnprintf.patch
deleted file mode 100644
index d7d6e6b..0000000
--- a/dev-vcs/cvs/files/cvs-1.12.12-cvs-gnulib-vasnprintf.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-http://bugs.gentoo.org/213833
-
-commit 913c09becd9df89dbd9b9f386e7f35c240d5efe8
-Author: Bruno Haible <bruno@clisp.org>
-Date:   Fri Oct 19 01:50:42 2007 +0200
-
-    Don't use %n on glibc >= 2.3 systems.
-
-diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
-index f563823..5d818aa 100644
---- a/lib/vasnprintf.c
-+++ b/lib/vasnprintf.c
-@@ -3385,9 +3385,21 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
- #endif
- 		  *p = dp->conversion;
- #if USE_SNPRINTF
-+# if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3))
- 		p[1] = '%';
- 		p[2] = 'n';
- 		p[3] = '\0';
-+# else
-+		/* On glibc2 systems from glibc >= 2.3 - probably also older
-+		   ones - we know that snprintf's returns value conforms to
-+		   ISO C 99: the gl_SNPRINTF_DIRECTIVE_N test passes.
-+		   Therefore we can avoid using %n in this situation.
-+		   On glibc2 systems from 2004-10-18 or newer, the use of %n
-+		   in format strings in writable memory may crash the program
-+		   (if compiled with _FORTIFY_SOURCE=2), so we should avoid it
-+		   in this situation.  */
-+		p[1] = '\0';
-+# endif
- #else
- 		p[1] = '\0';
- #endif
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-cvsbug-tmpfix.patch b/dev-vcs/cvs/files/cvs-1.12.12-cvsbug-tmpfix.patch
deleted file mode 100644
index fcd4431..0000000
--- a/dev-vcs/cvs/files/cvs-1.12.12-cvsbug-tmpfix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: cvs-1.12.12/src/cvsbug.in
-===================================================================
---- cvs-1.12.12.orig/src/cvsbug.in
-+++ cvs-1.12.12/src/cvsbug.in
-@@ -109,14 +109,14 @@ elif [ -f /bin/domainname ]; then
-     /usr/bin/ypcat passwd 2>/dev/null | cat - /etc/passwd | grep "^$LOGNAME:" |
-       cut -f5 -d':' | sed -e 's/,.*//' > $TEMP
-     ORIGINATOR="`cat $TEMP`"
--    rm -f $TEMP
-+    > $TEMP
-   fi
- fi
-
- if [ "$ORIGINATOR" = "" ]; then
-   grep "^$LOGNAME:" /etc/passwd | cut -f5 -d':' | sed -e 's/,.*//' > $TEMP
-   ORIGINATOR="`cat $TEMP`"
--  rm -f $TEMP
-+  > $TEMP
- fi
-
- if [ -n "$ORGANIZATION" ]; then
-
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-install-sh.patch b/dev-vcs/cvs/files/cvs-1.12.12-install-sh.patch
deleted file mode 100644
index 825c0ee..0000000
--- a/dev-vcs/cvs/files/cvs-1.12.12-install-sh.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/build-aux/install-sh b/build-aux/install-sh
---- a/build-aux/install-sh	2006-03-25 20:04:46 +0000
-+++ b/build-aux/install-sh	2007-09-14 10:53:29 +0100
-@@ -246,7 +246,7 @@
-   fi
- 
-   if test -n "$dir_arg"; then
--    $doit $mkdircmd "$dst" \
-+    { test -d "$dst" || $doit $mkdircmd -p "$dst"; } \
-       && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-       && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-       && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-openat.patch b/dev-vcs/cvs/files/cvs-1.12.12-openat.patch
deleted file mode 100644
index fdb406a..0000000
--- a/dev-vcs/cvs/files/cvs-1.12.12-openat.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: cvs-1.12.12/lib/openat.c
-===================================================================
---- cvs-1.12.12.orig/lib/openat.c
-+++ cvs-1.12.12/lib/openat.c
-@@ -55,9 +55,13 @@ rpl_openat (int fd, char const *filename
-       va_list arg;
-       va_start (arg, flags);
- 
--      /* Assume that mode_t is passed compatibly with mode_t's type
--	 after argument promotion.  */
--      mode = va_arg (arg, mode_t);
-+      /* If mode_t is narrower than int, use the promoted type (int),
-+         not mode_t.  Use sizeof to guess whether mode_t is nerrower;
-+         we don't know of any practical counterexamples.  */
-+      if (sizeof (mode_t) < sizeof (int))
-+	mode = va_arg (arg, int);
-+      else
-+	mode = va_arg (arg, mode_t);
- 
-       va_end (arg);
-     }
diff --git a/dev-vcs/cvs/files/cvs.pam-include-1.12.12 b/dev-vcs/cvs/files/cvs.pam-include-1.12.12
deleted file mode 100644
index f401ec0..0000000
--- a/dev-vcs/cvs/files/cvs.pam-include-1.12.12
+++ /dev/null
@@ -1,4 +0,0 @@
-#%PAM-1.0
-auth        include	system-auth
-account     include	system-auth
-session     include	system-auth
diff --git a/dev-vcs/cvs/files/cvspserver.xinetd.d b/dev-vcs/cvs/files/cvspserver.xinetd.d
deleted file mode 100644
index 0f2edb0..0000000
--- a/dev-vcs/cvs/files/cvspserver.xinetd.d
+++ /dev/null
@@ -1,14 +0,0 @@
-service cvspserver
-{
-	disable		= yes
-	socket_type	= stream
-	wait		= no
-	user		= root
-	log_type	= FILE /var/log/cvspserver
-	protocol	= tcp
-	env		= HOME=/var/cvsroot
-	log_on_failure	+= USERID
-	port		= 2401
-	server		= /usr/bin/cvs
-	server_args	= -f --allow-root=/var/cvsroot pserver
-}
diff --git a/dev-vcs/cvs/metadata.xml b/dev-vcs/cvs/metadata.xml
deleted file mode 100644
index 4432750..0000000
--- a/dev-vcs/cvs/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>
-  <herd>cvs-utils</herd>
-  <use>
-    <flag name="server">Enable server support</flag>
-  </use>
-</pkgmetadata>
diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest
index 5a96f70..de665c0 100644
--- a/dev-vcs/repo/Manifest
+++ b/dev-vcs/repo/Manifest
@@ -1 +1,2 @@
-DIST repo-2.11 39791 BLAKE2B 535de238d934eb2717af7bddd960c158501a56dd400ae02f3665e30c34bd68a1973de4c84e2ea76f48aa027249dfd4270153f1a7d4c4a2d5d883b580f02664e9 SHA512 1889ee9c782a6dc90b782c8ca9c5411b97c4495e0d27add62b9661a5961a782096037e081e984c965e44d33459e8fe4428528b5ebfff9fe356ce401cb610480a
+DIST repo-2.15 44704 BLAKE2B 6d90cecb4d748f7fb3febec95e16ed1638112a945aa36f7d7cc12232cdf4bcd66d286aa1054fd23de5ae7e896ac52c05465778aaec759e5d0251227deb220d18 SHA512 e6aad90f6058f4e5750ce44f8951ac4df39dd39c1615d7f68670a0b8ac5007f52e3bb6219d6ca0842908ef6c87843c6fd655b3b2a47fcf410e2a74d47a334d34
+DIST repo-511a0e54f5801a3f36c00fac478a596d83867d10-bash-completion.sh.base64 4280 BLAKE2B 6c369d36176d5bd4d3f4ed4df39bbd6542022dd186375bd05a978889c574819e3328d19c7dac2982233614786078f73bfd1f0c80aa7c0c6c79bdfab776ed6e39 SHA512 f484bee79c3724a6daf8a69b3df80feef3c6aaad3bfb49443caabc52735dd7f3b0fcb3ad4b7480bc020c9b4cac2f3b044693ef761df6fc9d34e854289baf1f3d
diff --git a/dev-vcs/repo/metadata.xml b/dev-vcs/repo/metadata.xml
index de0e996..496b9d3 100644
--- a/dev-vcs/repo/metadata.xml
+++ b/dev-vcs/repo/metadata.xml
@@ -4,7 +4,4 @@
 <maintainer type="person">
 	<email>vapier@gentoo.org</email>
 </maintainer>
-<longdescription>
-Tool for managing multiple git repositories. From Google, useful for building Android.
-</longdescription>
 </pkgmetadata>
diff --git a/dev-vcs/repo/repo-2.11.ebuild b/dev-vcs/repo/repo-2.11.ebuild
deleted file mode 100644
index 675aef0..0000000
--- a/dev-vcs/repo/repo-2.11.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# NB: The $PV tracks the *repo launcher version*, not the last signed release
-# of the repo project.  The launcher only gets a new update when changes are
-# made in it.
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit python-r1
-
-DESCRIPTION="Google tool for managing git, particularly multiple repos"
-HOMEPAGE="https://gerrit.googlesource.com/git-repo"
-SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	!app-admin/radmind
-	!dev-util/repo"
-
-# The git-repo-downloads bucket is controlled by us.
-RESTRICT="nomirror"
-
-S=${WORKDIR}
-
-src_install() {
-	python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN}
-}
diff --git a/dev-vcs/repo/repo-2.15.ebuild b/dev-vcs/repo/repo-2.15.ebuild
new file mode 100644
index 0000000..179cfef
--- /dev/null
+++ b/dev-vcs/repo/repo-2.15.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NB: The $PV tracks the *repo launcher version*, not the last signed release
+# of the repo project.  The launcher only gets a new update when changes are
+# made in it.
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit bash-completion-r1 python-r1
+
+# This file rarely changes, so track it independently.
+COMP_VER="511a0e54f5801a3f36c00fac478a596d83867d10"
+COMP_NAME="${PN}-${COMP_VER}-bash-completion.sh.base64"
+
+DESCRIPTION="Google tool for managing git, particularly multiple repos"
+HOMEPAGE="https://gerrit.googlesource.com/git-repo"
+SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}
+	https://gerrit.googlesource.com/git-repo/+/${COMP_VER}/completion.bash?format=TEXT -> ${COMP_NAME}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="*"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	!app-admin/radmind
+	!dev-util/repo"
+
+S=${WORKDIR}
+
+src_unpack() {
+	base64 -d <"${DISTDIR}/${COMP_NAME}" >completion.bash || die
+}
+
+src_install() {
+	python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN}
+	newbashcomp completion.bash ${PN}
+}
diff --git a/eclass/bazel.eclass b/eclass/bazel.eclass
index ba0fda9..4f110fd 100644
--- a/eclass/bazel.eclass
+++ b/eclass/bazel.eclass
@@ -118,6 +118,7 @@
 
 		build --define=PREFIX=${EPREFIX%/}/usr
 		build --define=LIBDIR=\$(PREFIX)/$(get_libdir)
+		build --define=INCLUDEDIR=\$(PREFIX)/include
 		EOF
 
 	if tc-is-cross-compiler; then
diff --git a/eclass/meson-multilib.eclass b/eclass/meson-multilib.eclass
new file mode 100644
index 0000000..01e1498
--- /dev/null
+++ b/eclass/meson-multilib.eclass
@@ -0,0 +1,131 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: meson-multilib.eclass
+# @MAINTAINER:
+# Author: Matt Turner <mattst88@gentoo.org>
+# @AUTHOR:
+# Author: Michał Górny <mgorny@gentoo.org>
+# Author: Matt Turner <mattst88@gentoo.org>
+# @SUPPORTED_EAPIS: 7
+# @BLURB: meson wrapper for multilib builds
+# @DESCRIPTION:
+# The meson-multilib.eclass provides a glue between meson.eclass(5)
+# and multilib-minimal.eclass(5), aiming to provide a convenient way
+# to build packages using meson for multiple ABIs.
+#
+# Inheriting this eclass sets IUSE and exports default multilib_src_*()
+# sub-phases that call meson phase functions for each ABI enabled.
+# The multilib_src_*() functions can be defined in ebuild just like
+# in multilib-minimal, yet they ought to call appropriate meson
+# phase rather than 'default'.
+
+if [[ -z ${_MESON_MULTILIB_ECLASS} ]] ; then
+_MESON_MULTILIB_ECLASS=1
+
+case ${EAPI:-0} in
+	7) ;;
+	*) die "EAPI=${EAPI} is not supported" ;;
+esac
+
+inherit meson multilib-minimal
+
+EXPORT_FUNCTIONS src_configure src_compile src_test src_install
+
+# @FUNCTION: meson_native_use_bool
+# @USAGE: <USE flag> [option name]
+# @DESCRIPTION:
+# Given a USE flag and a meson project option, output a string like:
+#
+#   -Doption=true
+#   -Doption=false
+#
+# if building for the native ABI (multilib_is_native_abi is true). Otherwise,
+# output -Doption=false. If the project option is unspecified, it defaults
+# to the USE flag.
+meson_native_use_bool() {
+	multilib_native_usex "${1}" "-D${2-${1}}=true" "-D${2-${1}}=false"
+}
+
+# @FUNCTION: meson_native_use_feature
+# @USAGE: <USE flag> [option name]
+# @DESCRIPTION:
+# Given a USE flag and a meson project option, output a string like:
+#
+#   -Doption=enabled
+#   -Doption=disabled
+#
+# if building for the native ABI (multilib_is_native_abi is true). Otherwise,
+# output -Doption=disabled. If the project option is unspecified, it defaults
+# to the USE flag.
+meson_native_use_feature() {
+	multilib_native_usex "${1}" "-D${2-${1}}=enabled" "-D${2-${1}}=disabled"
+}
+
+# @FUNCTION: meson_native_enabled
+# @USAGE: <option name>
+# @DESCRIPTION:
+# Output -Doption=enabled option if executables are being built
+# (multilib_is_native_abi is true). Otherwise, output -Doption=disabled option.
+meson_native_enabled() {
+	if multilib_is_native_abi; then
+		echo "-D${1}=enabled"
+	else
+		echo "-D${1}=disabled"
+	fi
+}
+
+# @FUNCTION: meson_native_true
+# @USAGE: <option name>
+# @DESCRIPTION:
+# Output -Doption=true option if executables are being built
+# (multilib_is_native_abi is true). Otherwise, output -Doption=false option.
+meson_native_true() {
+	if multilib_is_native_abi; then
+		echo "-D${1}=true"
+	else
+		echo "-D${1}=false"
+	fi
+}
+
+meson-multilib_src_configure() {
+	local _meson_args=( "${@}" )
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	meson_src_configure "${_meson_args[@]}"
+}
+
+meson-multilib_src_compile() {
+	local _meson_args=( "${@}" )
+
+	multilib-minimal_src_compile
+}
+
+multilib_src_compile() {
+	meson_src_compile "${_meson_args[@]}"
+}
+
+meson-multilib_src_test() {
+	local _meson_args=( "${@}" )
+
+	multilib-minimal_src_test
+}
+
+multilib_src_test() {
+	meson_src_test "${_meson_args[@]}"
+}
+
+meson-multilib_src_install() {
+	local _meson_args=( "${@}" )
+
+	multilib-minimal_src_install
+}
+
+multilib_src_install() {
+	meson_src_install "${_meson_args[@]}"
+}
+
+fi
diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index fa859ac..c9a5e0b 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -1,4 +1,4 @@
-# Copyright 2017-2019 Gentoo Authors
+# Copyright 2017-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: meson.eclass
@@ -23,9 +23,9 @@
 #
 # src_configure() {
 # 	local emesonargs=(
-# 		-Dqt4=$(usex qt4 true false)
-# 		-Dthreads=$(usex threads true false)
-# 		-Dtiff=$(usex tiff true false)
+# 		$(meson_use qt4)
+# 		$(meson_feature threads)
+# 		$(meson_use bindist official_branding)
 # 	)
 # 	meson_src_configure
 # }
@@ -43,6 +43,10 @@
 
 inherit multiprocessing ninja-utils python-utils-r1 toolchain-funcs
 
+if [[ ${EAPI} == 6 ]]; then
+	inherit eapi7-ver
+fi
+
 fi
 
 EXPORT_FUNCTIONS src_configure src_compile src_test src_install
@@ -50,8 +54,10 @@
 if [[ -z ${_MESON_ECLASS} ]]; then
 _MESON_ECLASS=1
 
-MESON_DEPEND=">=dev-util/meson-0.48.2
-	>=dev-util/ninja-1.7.2"
+MESON_DEPEND=">=dev-util/meson-0.56.0
+	>=dev-util/ninja-1.8.2
+	dev-util/meson-format-array
+"
 
 if [[ ${EAPI:-0} == [6] ]]; then
 	DEPEND=${MESON_DEPEND}
@@ -84,19 +90,11 @@
 # Optional meson test arguments as Bash array; this should be defined before
 # calling meson_src_test.
 
-
-read -d '' __MESON_ARRAY_PARSER <<"EOF"
-import shlex
-import sys
-
-# See http://mesonbuild.com/Syntax.html#strings
-def quote(str):
-	escaped = str.replace("\\\\", "\\\\\\\\").replace("'", "\\\\'")
-	return "'{}'".format(escaped)
-
-print("[{}]".format(
-	", ".join([quote(x) for x in shlex.split(" ".join(sys.argv[1:]))])))
-EOF
+# @VARIABLE: MYMESONARGS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# User-controlled environment variable containing arguments to be passed to
+# meson in meson_src_configure.
 
 # @FUNCTION: _meson_env_array
 # @INTERNAL
@@ -117,20 +115,20 @@
 #          '--unicode-16=𐐷', '--unicode-32=𐤅']
 #
 _meson_env_array() {
-	python -c "${__MESON_ARRAY_PARSER}" "$@"
+	meson-format-array "$@"
 }
 
-# @FUNCTION: _meson_create_cross_file
+# @FUNCTION: _meson_get_machine_info
+# @USAGE: <tuple>
+# @RETURN: system/cpu_family/cpu variables
 # @INTERNAL
 # @DESCRIPTION:
-# Creates a cross file. meson uses this to define settings for
-# cross-compilers. This function is called from meson_src_configure.
-_meson_create_cross_file() {
-	# Reference: http://mesonbuild.com/Cross-compilation.html
+# Translate toolchain tuple into machine values for meson.
+_meson_get_machine_info() {
+	local tuple=$1
 
 	# system roughly corresponds to uname -s (lowercase)
-	local system=unknown
-	case ${CHOST} in
+	case ${tuple} in
 		*-aix*)          system=aix ;;
 		*-cygwin*)       system=cygwin ;;
 		*-darwin*)       system=darwin ;;
@@ -140,29 +138,49 @@
 		*-solaris*)      system=sunos ;;
 	esac
 
-	local cpu_family=$(tc-arch)
+	cpu_family=$(tc-arch "${tuple}")
 	case ${cpu_family} in
 		amd64) cpu_family=x86_64 ;;
 		arm64) cpu_family=aarch64 ;;
+		riscv)
+			case ${tuple} in
+				riscv32*) cpu_family=riscv32 ;;
+				riscv64*) cpu_family=riscv64 ;;
+			esac ;;
 	esac
 
 	# This may require adjustment based on CFLAGS
-	local cpu=${CHOST%%-*}
+	cpu=${tuple%%-*}
+}
 
-	cat > "${T}/meson.${CHOST}.${ABI}" <<-EOF
+# @FUNCTION: _meson_create_cross_file
+# @RETURN: path to cross file
+# @INTERNAL
+# @DESCRIPTION:
+# Creates a cross file. meson uses this to define settings for
+# cross-compilers. This function is called from meson_src_configure.
+_meson_create_cross_file() {
+	local system cpu_family cpu
+	_meson_get_machine_info "${CHOST}"
+
+	local fn=${T}/meson.${CHOST}.${ABI}.ini
+
+	cat > "${fn}" <<-EOF
 	[binaries]
 	ar = $(_meson_env_array "$(tc-getAR)")
 	c = $(_meson_env_array "$(tc-getCC)")
 	cpp = $(_meson_env_array "$(tc-getCXX)")
 	fortran = $(_meson_env_array "$(tc-getFC)")
 	llvm-config = '$(tc-getPROG LLVM_CONFIG llvm-config)'
+	nm = $(_meson_env_array "$(tc-getNM)")
 	objc = $(_meson_env_array "$(tc-getPROG OBJC cc)")
+	objcopy = $(_meson_env_array "$(tc-getOBJCOPY)")
 	objcpp = $(_meson_env_array "$(tc-getPROG OBJCXX c++)")
 	pkgconfig = '$(tc-getPKG_CONFIG)'
 	strip = $(_meson_env_array "$(tc-getSTRIP)")
 	windres = $(_meson_env_array "$(tc-getRC)")
 
-	[properties]
+	[built-in options]
 	c_args = $(_meson_env_array "${CFLAGS} ${CPPFLAGS}")
 	c_link_args = $(_meson_env_array "${CFLAGS} ${LDFLAGS}")
 	cpp_args = $(_meson_env_array "${CXXFLAGS} ${CPPFLAGS}")
@@ -174,12 +192,72 @@
 	objcpp_args = $(_meson_env_array "${OBJCXXFLAGS} ${CPPFLAGS}")
 	objcpp_link_args = $(_meson_env_array "${OBJCXXFLAGS} ${LDFLAGS}")
 
+	[properties]
+	needs_exe_wrapper = true
+	sys_root = '${SYSROOT}'
+	pkg_config_libdir = '${PKG_CONFIG_LIBDIR:-${EPREFIX}/usr/$(get_libdir)/pkgconfig}'
+
 	[host_machine]
 	system = '${system}'
 	cpu_family = '${cpu_family}'
 	cpu = '${cpu}'
-	endian = '$(tc-endian)'
+	endian = '$(tc-endian "${CHOST}")'
 	EOF
+
+	echo "${fn}"
+}
+
+# @FUNCTION: _meson_create_native_file
+# @RETURN: path to native file
+# @INTERNAL
+# @DESCRIPTION:
+# Creates a native file. meson uses this to define settings for
+# native compilers. This function is called from meson_src_configure.
+_meson_create_native_file() {
+	local system cpu_family cpu
+	_meson_get_machine_info "${CBUILD}"
+
+	local fn=${T}/meson.${CBUILD}.${ABI}.ini
+
+	cat > "${fn}" <<-EOF
+	[binaries]
+	ar = $(_meson_env_array "$(tc-getBUILD_AR)")
+	c = $(_meson_env_array "$(tc-getBUILD_CC)")
+	cpp = $(_meson_env_array "$(tc-getBUILD_CXX)")
+	fortran = $(_meson_env_array "$(tc-getBUILD_PROG FC gfortran)")
+	llvm-config = '$(tc-getBUILD_PROG LLVM_CONFIG llvm-config)'
+	nm = $(_meson_env_array "$(tc-getBUILD_NM)")
+	objc = $(_meson_env_array "$(tc-getBUILD_PROG OBJC cc)")
+	objcopy = $(_meson_env_array "$(tc-getBUILD_OBJCOPY)")
+	objcpp = $(_meson_env_array "$(tc-getBUILD_PROG OBJCXX c++)")
+	pkgconfig = '$(tc-getBUILD_PKG_CONFIG)'
+	strip = $(_meson_env_array "$(tc-getBUILD_STRIP)")
+	windres = $(_meson_env_array "$(tc-getBUILD_PROG RC windres)")
+
+	[built-in options]
+	c_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_CPPFLAGS}")
+	c_link_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_LDFLAGS}")
+	cpp_args = $(_meson_env_array "${BUILD_CXXFLAGS} ${BUILD_CPPFLAGS}")
+	cpp_link_args = $(_meson_env_array "${BUILD_CXXFLAGS} ${BUILD_LDFLAGS}")
+	fortran_args = $(_meson_env_array "${BUILD_FCFLAGS}")
+	fortran_link_args = $(_meson_env_array "${BUILD_FCFLAGS} ${BUILD_LDFLAGS}")
+	objc_args = $(_meson_env_array "${BUILD_OBJCFLAGS} ${BUILD_CPPFLAGS}")
+	objc_link_args = $(_meson_env_array "${BUILD_OBJCFLAGS} ${BUILD_LDFLAGS}")
+	objcpp_args = $(_meson_env_array "${BUILD_OBJCXXFLAGS} ${BUILD_CPPFLAGS}")
+	objcpp_link_args = $(_meson_env_array "${BUILD_OBJCXXFLAGS} ${BUILD_LDFLAGS}")
+
+	[properties]
+	needs_exe_wrapper = false
+	pkg_config_libdir = '${BUILD_PKG_CONFIG_LIBDIR:-${EPREFIX}/usr/$(get_libdir)/pkgconfig}'
+
+	[build_machine]
+	system = '${system}'
+	cpu_family = '${cpu_family}'
+	cpu = '${cpu}'
+	endian = '$(tc-endian "${CBUILD}")'
+	EOF
+
+	echo "${fn}"
 }
 
 # @FUNCTION: meson_use
@@ -215,32 +293,90 @@
 meson_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	# Common args
+	local BUILD_CFLAGS=${BUILD_CFLAGS}
+	local BUILD_CPPFLAGS=${BUILD_CPPFLAGS}
+	local BUILD_CXXFLAGS=${BUILD_CXXFLAGS}
+	local BUILD_FCFLAGS=${BUILD_FCFLAGS}
+	local BUILD_OBJCFLAGS=${BUILD_OBJCFLAGS}
+	local BUILD_OBJCXXFLAGS=${BUILD_OBJCXXFLAGS}
+	local BUILD_LDFLAGS=${BUILD_LDFLAGS}
+	local BUILD_PKG_CONFIG_LIBDIR=${BUILD_PKG_CONFIG_LIBDIR}
+	local BUILD_PKG_CONFIG_PATH=${BUILD_PKG_CONFIG_PATH}
+
+	if tc-is-cross-compiler; then
+		: ${BUILD_CFLAGS:=-O1 -pipe}
+		: ${BUILD_CXXFLAGS:=-O1 -pipe}
+		: ${BUILD_FCFLAGS:=-O1 -pipe}
+		: ${BUILD_OBJCFLAGS:=-O1 -pipe}
+		: ${BUILD_OBJCXXFLAGS:=-O1 -pipe}
+	else
+		: ${BUILD_CFLAGS:=${CFLAGS}}
+		: ${BUILD_CPPFLAGS:=${CPPFLAGS}}
+		: ${BUILD_CXXFLAGS:=${CXXFLAGS}}
+		: ${BUILD_FCFLAGS:=${FCFLAGS}}
+		: ${BUILD_LDFLAGS:=${LDFLAGS}}
+		: ${BUILD_OBJCFLAGS:=${OBJCFLAGS}}
+		: ${BUILD_OBJCXXFLAGS:=${OBJCXXFLAGS}}
+		: ${BUILD_PKG_CONFIG_LIBDIR:=${PKG_CONFIG_LIBDIR}}
+		: ${BUILD_PKG_CONFIG_PATH:=${PKG_CONFIG_PATH}}
+	fi
+
 	local mesonargs=(
+		meson setup
 		--buildtype plain
 		--libdir "$(get_libdir)"
 		--localstatedir "${EPREFIX}/var/lib"
 		--prefix "${EPREFIX}/usr"
 		--sysconfdir "${EPREFIX}/etc"
 		--wrap-mode nodownload
-		)
+		--build.pkg-config-path "${BUILD_PKG_CONFIG_PATH}${BUILD_PKG_CONFIG_PATH:+:}${EPREFIX}/usr/share/pkgconfig"
+		--pkg-config-path "${PKG_CONFIG_PATH}${PKG_CONFIG_PATH:+:}${EPREFIX}/usr/share/pkgconfig"
+		--native-file "$(_meson_create_native_file)"
+	)
 
-	if tc-is-cross-compiler || [[ ${ABI} != ${DEFAULT_ABI-${ABI}} ]]; then
-		_meson_create_cross_file || die "unable to write meson cross file"
-		mesonargs+=( --cross-file "${T}/meson.${CHOST}.${ABI}" )
+	if tc-is-cross-compiler; then
+		mesonargs+=( --cross-file "$(_meson_create_cross_file)" )
 	fi
 
+	BUILD_DIR="${BUILD_DIR:-${WORKDIR}/${P}-build}"
+
+	# Handle quoted whitespace
+	eval "local -a MYMESONARGS=( ${MYMESONARGS} )"
+
+	mesonargs+=(
+		# Arguments from ebuild
+		"${emesonargs[@]}"
+
+		# Arguments passed to this function
+		"$@"
+
+		# Arguments from user
+		"${MYMESONARGS[@]}"
+
+		# Source directory
+		"${EMESON_SOURCE:-${S}}"
+
+		# Build directory
+		"${BUILD_DIR}"
+	)
+
+	# Used by symbolextractor.py
+	# https://bugs.gentoo.org/717720
+	tc-export NM
+	tc-getPROG READELF readelf >/dev/null
+
 	# https://bugs.gentoo.org/625396
 	python_export_utf8_locale
 
-	# Append additional arguments from ebuild
-	mesonargs+=("${emesonargs[@]}")
+	# https://bugs.gentoo.org/721786
+	local -x BOOST_INCLUDEDIR="${BOOST_INCLUDEDIR-${EPREFIX}/usr/include}"
+	local -x BOOST_LIBRARYDIR="${BOOST_LIBRARYDIR-${EPREFIX}/usr/$(get_libdir)}"
 
-	BUILD_DIR="${BUILD_DIR:-${WORKDIR}/${P}-build}"
-	set -- meson "${mesonargs[@]}" "$@" \
-		"${EMESON_SOURCE:-${S}}" "${BUILD_DIR}"
-	echo "$@"
-	tc-env_build "$@" || die
+	(
+		export -n {C,CPP,CXX,F,OBJC,OBJCXX,LD}FLAGS PKG_CONFIG_{LIBDIR,PATH}
+		echo "${mesonargs[@]}" >&2
+		"${mesonargs[@]}"
+	) || die
 }
 
 # @FUNCTION: meson_src_compile
@@ -284,7 +420,10 @@
 	debug-print-function ${FUNCNAME} "$@"
 
 	DESTDIR="${D}" eninja -C "${BUILD_DIR}" install "$@"
+
+	pushd "${S}" > /dev/null || die
 	einstalldocs
+	popd > /dev/null || die
 }
 
 fi
diff --git a/eclass/multiprocessing.eclass b/eclass/multiprocessing.eclass
index 06e004a..4f6b965 100644
--- a/eclass/multiprocessing.eclass
+++ b/eclass/multiprocessing.eclass
@@ -1,6 +1,5 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 # @ECLASS: multiprocessing.eclass
 # @MAINTAINER:
@@ -8,29 +7,20 @@
 # @AUTHOR:
 # Brian Harring <ferringb@gentoo.org>
 # Mike Frysinger <vapier@gentoo.org>
-# @BLURB: parallelization with bash (wtf?)
+# @BLURB: multiprocessing helper functions
 # @DESCRIPTION:
-# The multiprocessing eclass contains a suite of functions that allow ebuilds
-# to quickly run things in parallel using shell code.
+# The multiprocessing eclass contains a suite of utility functions
+# that could be helpful to controlling parallel multiple job execution.
+# The most common use is processing MAKEOPTS in order to obtain job
+# count.
 #
-# It has two modes: pre-fork and post-fork.  If you don't want to dive into any
-# more nuts & bolts, just use the pre-fork mode.  For main threads that mostly
-# spawn children and then wait for them to finish, use the pre-fork mode.  For
-# main threads that do a bit of processing themselves, use the post-fork mode.
-# You may mix & match them for longer computation loops.
 # @EXAMPLE:
 #
 # @CODE
-# # First initialize things:
-# multijob_init
-#
-# # Then hash a bunch of files in parallel:
-# for n in {0..20} ; do
-# 	multijob_child_init md5sum data.${n} > data.${n}
-# done
-#
-# # Then wait for all the children to finish:
-# multijob_finish
+# src_compile() {
+#   # custom build system that does not support most of MAKEOPTS
+#   ./mybs -j$(makeopts_jobs)
+# }
 # @CODE
 
 if [[ -z ${_MULTIPROCESSING_ECLASS} ]]; then
@@ -53,6 +43,38 @@
 	sh -c 'echo ${PPID}'
 }
 
+# @FUNCTION: get_nproc
+# @USAGE: [${fallback:-1}]
+# @DESCRIPTION:
+# Attempt to figure out the number of processing units available.
+# If the value can not be determined, prints the provided fallback
+# instead. If no fallback is provided, defaults to 1.
+get_nproc() {
+	local nproc
+
+	# GNU
+	if type -P nproc &>/dev/null; then
+		nproc=$(nproc)
+	fi
+
+	# BSD
+	if [[ -z ${nproc} ]] && type -P sysctl &>/dev/null; then
+		nproc=$(sysctl -n hw.ncpu 2>/dev/null)
+	fi
+
+	# fallback to python2.6+
+	# note: this may fail (raise NotImplementedError)
+	if [[ -z ${nproc} ]] && type -P python &>/dev/null; then
+		nproc=$(python -c 'import multiprocessing; print(multiprocessing.cpu_count());' 2>/dev/null)
+	fi
+
+	if [[ -n ${nproc} ]]; then
+		echo "${nproc}"
+	else
+		echo "${1:-1}"
+	fi
+}
+
 # @FUNCTION: makeopts_jobs
 # @USAGE: [${MAKEOPTS}]
 # @DESCRIPTION:
diff --git a/eclass/optfeature.eclass b/eclass/optfeature.eclass
deleted file mode 100644
index 1943ae3..0000000
--- a/eclass/optfeature.eclass
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: optfeature.eclass
-# @MAINTAINER:
-# base-system@gentoo.org
-# @BLURB: Advertise optional functionality that might be useful to users
-
-case ${EAPI:-0} in
-	[0-7]) ;;
-	*)     die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
-esac
-
-if [[ -z ${_OPTFEATURE_ECLASS} ]]; then
-_OPTFEATURE_ECLASS=1
-
-# @FUNCTION: optfeature
-# @USAGE: <short description> <package atom to match> [other atoms]
-# @DESCRIPTION:
-# Print out a message suggesting an optional package (or packages)
-# not currently installed which provides the described functionality.
-#
-# The following snippet would suggest app-misc/foo for optional foo support,
-# app-misc/bar or app-misc/baz[bar] for optional bar support
-# and either both app-misc/a and app-misc/b or app-misc/c for alphabet support.
-# @CODE
-#	optfeature "foo support" app-misc/foo
-#	optfeature "bar support" app-misc/bar app-misc/baz[bar]
-#	optfeature "alphabet support" "app-misc/a app-misc/b" app-misc/c
-# @CODE
-optfeature() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local i j msg
-	local desc=$1
-	local flag=0
-	shift
-	for i; do
-		for j in ${i}; do
-			if has_version "${j}"; then
-				flag=1
-			else
-				flag=0
-				break
-			fi
-		done
-		if [[ ${flag} -eq 1 ]]; then
-			break
-		fi
-	done
-	if [[ ${flag} -eq 0 ]]; then
-		for i; do
-			msg=" "
-			for j in ${i}; do
-				msg+=" ${j} and"
-			done
-			msg="${msg:0: -4} for ${desc}"
-			elog "${msg}"
-		done
-	fi
-}
-
-fi
diff --git a/eclass/wrapper.eclass b/eclass/wrapper.eclass
new file mode 100644
index 0000000..399c7cc
--- /dev/null
+++ b/eclass/wrapper.eclass
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: wrapper.eclass
+# @MAINTAINER:
+# base-system@gentoo.org
+# @BLURB: create a shell wrapper script
+
+if [[ -z ${_WRAPPER_ECLASS} ]]; then
+_WRAPPER_ECLASS=1
+
+# @FUNCTION: make_wrapper
+# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
+# @DESCRIPTION:
+# Create a shell wrapper script named wrapper in installpath
+# (defaults to the bindir) to execute target (default of wrapper)
+# by first optionally setting LD_LIBRARY_PATH to the colon-delimited
+# libpaths followed by optionally changing directory to chdir.
+make_wrapper() {
+	local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
+	local tmpwrapper="${T}/tmp.wrapper.${wrapper##*/}"
+	has "${EAPI:-0}" 0 1 2 && local EPREFIX=""
+
+	(
+	echo '#!/bin/sh'
+	if [[ -n ${libdir} ]] ; then
+		local var
+		if [[ ${CHOST} == *-darwin* ]] ; then
+			var=DYLD_LIBRARY_PATH
+		else
+			var=LD_LIBRARY_PATH
+		fi
+		cat <<-EOF
+			if [ "\${${var}+set}" = "set" ] ; then
+				export ${var}="\${${var}}:${EPREFIX}${libdir}"
+			else
+				export ${var}="${EPREFIX}${libdir}"
+			fi
+		EOF
+	fi
+	[[ -n ${chdir} ]] && printf 'cd "%s" &&\n' "${EPREFIX}${chdir}"
+	# We don't want to quote ${bin} so that people can pass complex
+	# things as ${bin} ... "./someprog --args"
+	printf 'exec %s "$@"\n' "${bin/#\//${EPREFIX}/}"
+	) > "${tmpwrapper}"
+	chmod go+rx "${tmpwrapper}"
+
+	if [[ -n ${path} ]] ; then
+		(
+		exeopts -m 0755
+		exeinto "${path}"
+		newexe "${tmpwrapper}" "${wrapper}"
+		) || die
+	else
+		newbin "${tmpwrapper}" "${wrapper}" || die
+	fi
+}
+
+fi
diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass
index 0cbf495..4357e73 100644
--- a/eclass/wxwidgets.eclass
+++ b/eclass/wxwidgets.eclass
@@ -1,140 +1,97 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: wxwidgets.eclass
 # @MAINTAINER:
 # wxwidgets@gentoo.org
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6
+# @SUPPORTED_EAPIS: 7
 # @BLURB: Manages build configuration for wxGTK-using packages.
 # @DESCRIPTION:
-#  This eclass sets up the proper environment for ebuilds using the wxGTK
-#  libraries.  Ebuilds using wxPython do not need to inherit this eclass.
+# This eclass sets up the proper environment for ebuilds using the wxGTK
+# libraries.  Ebuilds using wxPython do not need to inherit this eclass.
 #
-#  More specifically, this eclass controls the configuration chosen by the
-#  /usr/bin/wx-config wrapper.
+# More specifically, this eclass controls the configuration chosen by the
+# ${ESYSROOT}/usr/bin/wx-config wrapper.
 #
-#  Using the eclass is simple:
+# Using the eclass is simple:
 #
-#    - set WX_GTK_VER equal to a SLOT of wxGTK
-#    - call setup-wxwidgets()
+#   - set WX_GTK_VER equal to a SLOT of wxGTK
+#   - call setup-wxwidgets()
 #
-#  The configuration chosen is based on the version required and the flags
-#  wxGTK was built with.
+# The configuration chosen is based on the version required and the flags
+# wxGTK was built with.
 
-if [[ -z ${_WXWIDGETS_ECLASS} ]]; then
-
-case ${EAPI} in
-	0|1|2|3|4|5)
-		inherit eutils flag-o-matic multilib
-
-		# This was used to set up a sane default for ebuilds so they could
-		# avoid calling need-wxwidgets if they didn't need a particular build.
-		# This was a bad idea for a couple different reasons, and because
-		# get_libdir() is now illegal in global scope in EAPI 6 we can't do it
-		# anymore.  All ebuilds must now use setup-wxwidgets and this code is
-		# only here for backwards compatability.
-		if [[ -z ${WX_CONFIG} ]]; then
-			if [[ -n ${WX_GTK_VER} ]]; then
-				for _wxtoolkit in mac gtk2 base; do
-					# newer versions don't have a seperate debug config
-					for _wxdebug in xxx release- debug-; do
-						_wxconf="${_wxtoolkit}-unicode-${_wxdebug/xxx/}${WX_GTK_VER}"
-
-						[[ -f ${EPREFIX}/usr/$(get_libdir)/wx/config/${_wxconf} ]] \
-							|| continue
-
-						WX_CONFIG="${EPREFIX}/usr/$(get_libdir)/wx/config/${_wxconf}"
-						WX_ECLASS_CONFIG="${WX_CONFIG}"
-						break
-					done
-					[[ -n ${WX_CONFIG} ]] && break
-				done
-				[[ -n ${WX_CONFIG} ]] && export WX_CONFIG WX_ECLASS_CONFIG
-			fi
-		fi
-		unset _wxtoolkit
-		unset _wxdebug
-		unset _wxconf
-		;;
-	6)
-		inherit flag-o-matic multilib
-		;;
-	*)
-		die "EAPI=${EAPI:-0} is not supported"
-		;;
+case ${EAPI:-0} in
+	[0-6]) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;;
+	7)     ;;
+	*)     die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
 esac
 
-# @FUNCTION:    setup-wxwidgets
+if [[ -z ${_WXWIDGETS_ECLASS} ]]; then
+_WXWIDGETS_ECLASS=1
+
+# @ECLASS-VARIABLE: WX_GTK_VER
+# @PRE_INHERIT
+# @REQUIRED
 # @DESCRIPTION:
-#
-#  Call this in your ebuild to set up the environment for wxGTK.  Besides
-#  controlling the wx-config wrapper this exports WX_CONFIG containing
-#  the path to the config in case it needs to be passed to a build system.
-#
-#  In wxGTK-2.9 and later it also controls the level of debugging output
-#  from the libraries.  In these versions debugging features are enabled
-#  by default and need to be disabled at the package level.  Because this
-#  causes many warning dialogs to pop up during runtime we add -DNDEBUG to
-#  CPPFLAGS to disable debugging features (unless your ebuild has a debug
-#  USE flag and it's enabled).  If you don't like this behavior you can set
-#  WX_DISABLE_NDEBUG to override it.
-#
-#  See: http://docs.wxwidgets.org/trunk/overview_debugging.html
+# The SLOT of the x11-libs/wxGTK you're targeting.  Needs to be defined before
+# inheriting the eclass.  Can be either "3.0" or "3.0-gtk3".
+case ${WX_GTK_VER} in
+	3.0|3.0-gtk3) ;;
+	"")           die "WX_GTK_VER not declared" ;;
+	*)            die "Invalid WX_GTK_VER: must be set to a valid wxGTK SLOT ('3.0' or '3.0-gtk3')" ;;
+esac
+readonly WX_GTK_VER
 
+inherit flag-o-matic
+
+# @FUNCTION: setup-wxwidgets
+# @DESCRIPTION:
+# Call this in your ebuild to set up the environment for wxGTK in src_configure.
+# Besides controlling the wx-config wrapper, this exports WX_CONFIG containing
+# the path to the config in case it needs to be passed to the build system.
+#
+# This function also controls the level of debugging output from the libraries.
+# Debugging features are enabled by default and need to be disabled at the
+# package level.  Because this causes many warning dialogs to pop up during
+# runtime, we add -DNDEBUG to CPPFLAGS to disable debugging features (unless
+# your ebuild has a debug USE flag and it's enabled).  If you don't like this
+# behavior, you can set WX_DISABLE_NDEBUG to override it.
+#
+# See: https://docs.wxwidgets.org/trunk/overview_debugging.html
 setup-wxwidgets() {
-	local wxtoolkit wxdebug wxconf
+	local w wxtoolkit wxconf
 
-	[[ -z ${WX_GTK_VER} ]] \
-		&& die "WX_GTK_VER must be set before calling $FUNCNAME."
-
-	case "${WX_GTK_VER}" in
-		3.0-gtk3)
-			wxtoolkit=gtk3
-			if [[ -z ${WX_DISABLE_NDEBUG} ]]; then
-				( in_iuse debug && use debug ) || append-cppflags -DNDEBUG
-			fi
-			;;
-		2.9|3.0)
-			wxtoolkit=gtk2
-			if [[ -z ${WX_DISABLE_NDEBUG} ]]; then
-				( in_iuse debug && use debug ) || append-cppflags -DNDEBUG
-			fi
-			;;
-		2.8)
-			wxtoolkit=gtk2
-			wxdebug="release-"
-			has_version x11-libs/wxGTK:${WX_GTK_VER}[debug] && wxdebug="debug-"
-			;;
-		*)
-			die "Invalid WX_GTK_VER: must be set to a valid wxGTK SLOT"
-			;;
+	case ${WX_GTK_VER} in
+		3.0-gtk3) wxtoolkit=gtk3 ;;
+		3.0)      wxtoolkit=gtk2
+		          eqawarn "This package relies on the deprecated GTK 2 slot, which will go away soon (https://bugs.gentoo.org/618642)"
+		          ;;
 	esac
 
+	if [[ -z ${WX_DISABLE_NDEBUG} ]]; then
+		{ in_iuse debug && use debug; } || append-cppflags -DNDEBUG
+	fi
+
 	# toolkit overrides
-	if has_version "x11-libs/wxGTK:${WX_GTK_VER}[aqua]"; then
+	if has_version -d "x11-libs/wxGTK:${WX_GTK_VER}[aqua]"; then
 		wxtoolkit="mac"
-	elif ! has_version "x11-libs/wxGTK:${WX_GTK_VER}[X]"; then
+	elif ! has_version -d "x11-libs/wxGTK:${WX_GTK_VER}[X]"; then
 		wxtoolkit="base"
 	fi
 
-	wxconf="${wxtoolkit}-unicode-${wxdebug}${WX_GTK_VER}"
+	wxconf="${wxtoolkit}-unicode-${WX_GTK_VER}"
+	for w in "${CHOST:-${CBUILD}}-${wxconf}" "${wxconf}"; do
+		[[ -f ${ESYSROOT}/usr/$(get_libdir)/wx/config/${w} ]] && wxconf=${w} && break
+	done || die "Failed to find configuration ${wxconf}"
 
-	[[ ! -f ${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf} ]] \
-		&& die "Failed to find configuration ${wxconf}"
-
-	export WX_CONFIG="${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf}"
+	export WX_CONFIG="${ESYSROOT}/usr/$(get_libdir)/wx/config/${wxconf}"
 	export WX_ECLASS_CONFIG="${WX_CONFIG}"
 
-	echo
+	einfo
 	einfo "Requested wxWidgets:        ${WX_GTK_VER}"
 	einfo "Using wxWidgets:            ${wxconf}"
-	echo
+	einfo
 }
 
-# deprecated
-need-wxwidgets() {
-	setup-wxwidgets
-}
-
-_WXWIDGETS_ECLASS=1
 fi
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
deleted file mode 100644
index 7bc705e..0000000
--- a/games-emulation/snes9x/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST snes9x-1.53-src.tar.bz2 1838746 RMD160 b3f7ba73caee5373951ec1e1decef1ab6c7207f2 SHA1 57be6480369f66b9aaaeb722789ce114f58ed1e2 SHA256 9f7c5d2d0fa3fe753611cf94e8879b73b8bb3c0eab97cdbcb6ab7376efa78dc3
diff --git a/games-emulation/snes9x/files/snes9x-1.53-build.patch b/games-emulation/snes9x/files/snes9x-1.53-build.patch
deleted file mode 100644
index c46e5f2..0000000
--- a/games-emulation/snes9x/files/snes9x-1.53-build.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -ru snes9x-1.53-src.orig/gtk/configure.ac snes9x-1.53-src/gtk/configure.ac
---- snes9x-1.53-src.orig/gtk/configure.ac	2011-04-24 09:38:10.000000000 -0400
-+++ snes9x-1.53-src/gtk/configure.ac	2011-09-26 16:06:46.746352405 -0400
-@@ -29,7 +29,7 @@
- 
- AM_GLIB_GNU_GETTEXT
- 
--snes9xlocaledir='${prefix}/${DATADIRNAME}/locale'
-+snes9xlocaledir='/usr/share/locale'
- AC_SUBST(snes9xlocaledir)
- 
- AC_ARG_WITH(debug,
-diff -ru snes9x-1.53-src.orig/gtk/po/Makefile.in.in snes9x-1.53-src/gtk/po/Makefile.in.in
---- snes9x-1.53-src.orig/gtk/po/Makefile.in.in	2011-04-24 16:12:50.000000000 -0400
-+++ snes9x-1.53-src/gtk/po/Makefile.in.in	2011-09-26 16:07:05.844485532 -0400
-@@ -34,7 +34,7 @@
- datarootdir = @datarootdir@
- libdir = @libdir@
- DATADIRNAME = @DATADIRNAME@
--itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+itlocaledir = /usr/share/locale
- subdir = po
- install_sh = @install_sh@
- # Automake >= 1.8 provides @mkdir_p@.
-diff -ru snes9x-1.53-src.orig/unix/Makefile.in snes9x-1.53-src/unix/Makefile.in
---- snes9x-1.53-src.orig/unix/Makefile.in	2011-04-24 09:38:10.000000000 -0400
-+++ snes9x-1.53-src/unix/Makefile.in	2011-09-26 16:06:46.746352405 -0400
-@@ -47,7 +47,7 @@
- 	exit 1
- 
- snes9x: $(OBJECTS)
--	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) -lm @S9XLIBS@
-+	$(CCC) $(LDFLAGS) $(INCLUDES) -o $@ $(OBJECTS) -lm @S9XLIBS@
- 
- ../jma/s9x-jma.o: ../jma/s9x-jma.cpp
- 	$(CCC) $(INCLUDES) -c $(CCFLAGS) -fexceptions $*.cpp -o $@
-diff -ru snes9x-1.53-src.orig/unix/configure.ac snes9x-1.53-src/unix/configure.ac
---- snes9x-1.53-src.orig/unix/configure.ac	2011-04-24 09:38:10.000000000 -0400
-+++ snes9x-1.53-src/unix/configure.ac	2011-09-26 16:06:46.747352203 -0400
-@@ -56,20 +56,6 @@
- # *** Execution begins here ***
- # *****************************
- 
--# Remove -g and -O2 flags manually.
--
--if test "x$CFLAGS" != "x"; then
--	CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-g//'`"
--	CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-O2//'`"
--fi
--
--if test "x$CXXFLAGS" != "x"; then
--	CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-g//'`"
--	CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-O2//'`"
--fi
--
--# Test what compiler flags we should use.
--
- AC_ARG_ENABLE([debug],
- 	[AS_HELP_STRING([--enable-debug],
- 		[leave debug information in the final binary (default: no)])],
-@@ -79,9 +65,6 @@
- 	AC_S9X_COMPILER_FLAG([-g],  [g])
- 	AC_S9X_COMPILER_FLAG([-O0], [o0])
- else
--	AC_S9X_COMPILER_FLAG([-O3], [o3], [
--		AC_S9X_COMPILER_FLAG([-O2], [o2], [
--			AC_S9X_COMPILER_FLAG([-O1], [o1])])])
- 	AC_S9X_COMPILER_FLAG([-fomit-frame-pointer], [omit_frame_pointer])
- fi
- 
diff --git a/games-emulation/snes9x/files/snes9x-1.53-cross-compile.patch b/games-emulation/snes9x/files/snes9x-1.53-cross-compile.patch
deleted file mode 100644
index c4e5ebd..0000000
--- a/games-emulation/snes9x/files/snes9x-1.53-cross-compile.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/unix/configure.ac
-+++ b/unix/configure.ac
-@@ -4,7 +4,7 @@ AC_REVISION([$Revision: 1.53 $])
- 
- AC_CONFIG_SRCDIR([unix.cpp])
- 
--AC_CANONICAL_TARGET
-+AC_CANONICAL_HOST
- 
- AC_PROG_CC
- AC_PROG_CXX
-@@ -38,7 +38,7 @@ AC_DEFUN([AC_S9X_COMPILER_FLAG],
- 				return (argc);
- 			}
- 		],
--		[snes9x_cv_option_$2="yes"], [snes9x_cv_option_$2="no"])
-+		[snes9x_cv_option_$2="yes"], [snes9x_cv_option_$2="no"], [snes9x_cv_option_$2="yes"])
- 	])
- 
- 	CXXFLAGS="[$]OLD_CXXFLAGS"
-@@ -94,7 +94,7 @@ AC_MSG_CHECKING([whether the OS is Linux])
- 
- AC_CACHE_VAL([snes9x_cv_linux_os],
- [
--	case "$target" in
-+	case "$host" in
- 		*-*-linux*)
- 			snes9x_cv_linux_os="yes"
- 			;;
-@@ -332,7 +332,7 @@ AC_DEFUN([AC_S9X_CHECK_SAR],
- 			return (i < 0 ? 0 : 1);
- 		}
- 	],
--	[snes9x_sar_$1="yes"], [snes9x_sar_$1="no"])
-+	[snes9x_sar_$1="yes"], [snes9x_sar_$1="no"], [snes9x_sar_$1=$GCC])
- 
- 	CXXFLAGS="[$]OLD_CXXFLAGS"
- 
diff --git a/games-emulation/snes9x/metadata.xml b/games-emulation/snes9x/metadata.xml
deleted file mode 100644
index 24e4956..0000000
--- a/games-emulation/snes9x/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>games</herd>
-	<use>
-		<flag name="netplay">Enable playing ROMs over the network (not recommended)</flag>
-		<flag name="xrandr">Enable support for the X xrandr extension</flag>
-	</use>
-	<upstream>
-		<remote-id type="google-code">snes9x-gtk</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/snes9x/snes9x-1.53.ebuild b/games-emulation/snes9x/snes9x-1.53.ebuild
deleted file mode 100644
index 8b6f5dc..0000000
--- a/games-emulation/snes9x/snes9x-1.53.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/snes9x-1.53.ebuild,v 1.10 2013/02/07 21:32:17 vapier Exp $
-
-EAPI=2
-inherit autotools eutils flag-o-matic multilib gnome2-utils games
-
-DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator"
-HOMEPAGE="http://code.google.com/p/snes9x-gtk/"
-SRC_URI="http://snes9x-gtk.googlecode.com/files/${P}-src.tar.bz2"
-
-LICENSE="HPND GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="alsa debug gtk joystick multilib netplay nls opengl oss png pulseaudio portaudio +xv +xrandr zlib"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	png? ( >=media-libs/libpng-1.2.43:0 )
-	gtk? ( >=x11-libs/gtk+-2.10:2
-		x11-misc/xdg-utils
-		portaudio? ( >=media-libs/portaudio-19_pre )
-		joystick? ( >=media-libs/libsdl-1.2.12[joystick] )
-		opengl? ( virtual/opengl )
-		xv? ( x11-libs/libXv )
-		xrandr? ( x11-libs/libXrandr )
-		alsa? ( media-libs/alsa-lib )
-		pulseaudio? ( media-sound/pulseaudio ) )"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	gtk? ( virtual/pkgconfig
-		xv? ( x11-proto/videoproto ) )
-	nls? ( dev-util/intltool )"
-
-S=${WORKDIR}/${P}-src/unix
-
-pkg_setup() {
-	games_pkg_setup
-}
-
-src_prepare() {
-	cd "${WORKDIR}"/${P}-src
-	sed -i -e '/pedantic/d' {gtk,unix}/configure.ac || die
-	sed -i -e '75i#define OF(x) x' unzip/{un,}zip.h || die
-	sed -i -e '22i#define OF(x) x' unzip/ioapi.h || die
-	epatch "${FILESDIR}"/${P}-build.patch
-	epatch "${FILESDIR}"/${P}-cross-compile.patch
-	cd unix
-	eautoreconf
-	if use gtk; then
-		cd ../gtk
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-
-	egamesconf \
-		$(use_enable joystick gamepad) \
-		$(use_enable debug debugger) \
-		$(use_enable netplay) \
-		$(use_enable zlib gzip) \
-		$(use_enable zlib zip) \
-		$(use_enable png screenshot)
-
-	if use gtk; then
-		cd ../gtk
-		egamesconf \
-			--disable-dependency-tracking \
-			--datadir=/usr/share \
-			$(use_enable nls) \
-			$(use_with opengl) \
-			$(use_with joystick) \
-			$(use_with xv) \
-			$(use_with xrandr) \
-			$(use_with netplay) \
-			$(use_with zlib) \
-			$(use_with alsa) \
-			$(use_with oss) \
-			$(use_with pulseaudio) \
-			$(use_with portaudio) \
-			$(use_with png screenshot)
-	fi
-}
-
-src_compile() {
-	games_src_compile
-	if use gtk; then
-		emake -C ../gtk || die
-	fi
-}
-
-src_install() {
-	dogamesbin ${PN} || die
-
-	dohtml {.,..}/docs/*.html
-	dodoc ../docs/{snes9x.conf.default,{changes,control-inputs,controls,snapshots}.txt}
-
-	if use gtk; then
-		emake -C ../gtk DESTDIR="${D}" install || die
-		dodoc ../gtk/{AUTHORS,doc/README}
-	fi
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	use gtk && gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	use gtk && gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_icon_cache_update
-}
diff --git a/licenses/DIR_METADATA b/licenses/DIR_METADATA
new file mode 100644
index 0000000..4f26c16
--- /dev/null
+++ b/licenses/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail {
+  component: "Infra>ChromeOS>Build"
+}
diff --git a/licenses/OWNERS b/licenses/OWNERS
new file mode 100644
index 0000000..d352a34
--- /dev/null
+++ b/licenses/OWNERS
@@ -0,0 +1,3 @@
+set noparent
+
+include ../OWNERS.general
diff --git a/licenses/SEGGER b/licenses/SEGGER
new file mode 100644
index 0000000..28a549c
--- /dev/null
+++ b/licenses/SEGGER
@@ -0,0 +1,604 @@
+Important - Read carefully:

+

+DEFINITIONS:

+For the purpose of this agreement, the terms shall have the following meaning when the entire word is marked bold:

+

+The "software" means all J-Link related software components included in the  J-Link software & documentation pack provided by SEGGER which can be downloaded at: http://www.segger.com/jlink-software.html

+

+"Licensor" shall mean SEGGER except under the following circumstances:

+If Licensee acquired the software as a bundled component of a third party product or service, then such third party shall either include this license terms or be Licensor and provide similar terms  which will not exceed those set forth in this agreement.

+

+1. LICENSE AGREEMENT

+This license is a legal agreement between YOU (either an individual or a single entity) and SEGGER Microcontroller GmbH (called SEGGER).

+By downloading and/or using J-Link software, you agree to be bound by the terms of this agreement.

+

+2. LICENSE GRANT

+These terms apply to the entire J-Link software & documentation pack, especially to its  software components, developed by SEGGER Microcontroller GmbH, which can be downloaded at: http://www.segger.com/jlink-software.html or as beta version at: http://www.segger.com/jlink-software-beta-version.html.

+The software consists of proprietary, unpublished products of SEGGER, protected under copyright and trade secret laws.

+All rights, title and interest in the software are and shall remain with SEGGER.

+Licensor grants Licensee a non-exclusive and non-transferable License to use the software or parts thereof with SEGGERs J-Link family of debug probes or authorized OEM products only.  Additional info on the original SEGGER J-Link family of debug probes or authorized OEM products can be obtained at: http://www.segger.com/terms-of-use.html.  Any other use of the software package is prohibited without prior written authorization from SEGGER.

+The use of the licensed software to operate J-Link clones is prohibited and illegal; SEGGER may hold Licensee liable, if Licensee fails to comply with this restriction.

+Any (re)distribution or shipment of the software  requires the prior written authorization from SEGGER in each instance.

+Licensee is entitled to make copies of the software for backup purposes only.

+All copies of the software, including modifications to the software, must bear all copyright, trademarks and other proprietary notices included thereon by SEGGER.

+This License does not entitle Licensee to receive from SEGGER hard-copy documentation, technical support, telephone assistance, or enhancements or updates for the software  unless a specific agreement clearly states otherwise.

+

+3. RESTRICTIONS

+Licensee may not:

+(a) decompile, disassemble, reverse engineer, or otherwise attempt to derive the source code of the software,

+(b) redistribute, encumber, sell, rent, lease, sublicense, or otherwise transfer rights of the software,

+(c) remove or alter any trademark, logo, copyright or other proprietary notices, legends, symbols or labels of the software,

+(d) install or use the software with unauthorized debug probes.

+

+4. FEES

+All features of the software which are functional without request for a license key can be used free of charge, at least for evaluation purposes.

+

+5. TERMINATION

+Without prejudice to any other rights, Licensor may terminate this agreement if Licensee breaches any term or condition of this agreement. In such event SEGGER is entitled to also claim monetary damages.

+

+6. PROPRIETARY RIGHTS

+Title, ownership rights, and intellectual property rights in the software shall remain by SEGGER and/or its suppliers. Licensee acknowledges such ownership and intellectual property rights and will not take any action to jeopardize, limit or interfere in any manner with SEGGER or its suppliers' ownership of or rights with respect to the software. The software is protected by copyright and other intellectual property laws and by international treaties.

+

+7. DISCLAIMER OF WARRANTY

+The software is provided on an "as is" basis, without warranty of any kind, including without limitation the warranties that it is free of defects, merchantable, fit for a particular purpose or non-infringing. The entire risk as to the quality and performance of the software is borne by Licensee. Should the software prove defective in any respect, Licensee and not Licensor or its suppliers or resellers assumes the entire cost of any service and repair. In addition Licensee must determine that the software sufficiently meets its requirements. This disclaimer of warranty constitutes an essential part of this agreement. No use of the software is authorized hereunder except under this disclaimer.

+

+8. LIMITATION OF LIABILITY

+To the maximum extent permitted by applicable law, in no event will Licensor or its suppliers or resellers be liable for any indirect, special, incidental or consequential damages arising out of the use of or inability to use the software, including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses, even if advised of the possibility thereof, and regardless of the legal or equitable theory (contract, tort or otherwise) upon which the claim is based. In any case, Licensor's entire liability under any provision of this agreement shall not exceed in the aggregate the sum of the fees Licensee paid for this license (if any), with the exception of death or personal injury caused by the negligence of Licensor to the extent applicable law prohibits the limitation of damages in such cases. Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so this exclusion and limitation may not be applicable. SEGGER is not responsible for any liability arising out of content provided by Licensee or a third party that is accessed through the product and/or any material linked through such content.

+

+9. HIGH RISK ACTIVITIES

+The software is not designed for use in hazardous environments requiring fail-safe performance, such as in the operation of nuclear facilities, aircraft navigation or communication systems, air traffic control, direct life support machines, or weapons systems, in which the failure of the software could lead directly to death, personal injury, or severe physical or environmental damage ("High Risk Activities"). Accordingly, Licensor and its suppliers specifically disclaim any express or implied warranty of fitness for High Risk Activities.

+

+10. MISCELLANEOUS

+(a) This agreement constitutes the entire agreement between the parties concerning the subject matter hereof.

+(b) This agreement may be changed only by an amendment in writing, signed by both parties.

+(c) If any provision in this agreement should be held illegal or unenforceable by a court having jurisdiction, such provision shall be modified to the extent necessary to render it enforceable without losing its intent, or severed from this agreement if no such modification is possible, and other provisions of this agreement shall remain in full force and effect.

+(d) This agreement shall be governed by the laws of the Federal Republic of Germany.

+(e) This agreement shall be binding upon and shall inure to the benefit of the parties, their successors and permitted assigns.

+(f) Neither party shall be in default or be liable for any delay, failure in performance (excepting the obligation to pay) or interruption of service resulting directly or indirectly from any cause beyond its reasonable control.

+(g) The relationship between Licensor and Licensee is that of independent contractors and neither Licensee nor its agents shall have any authority to bind Licensor in any way.

+(h) If any SEGGER  professional services are being provided, then such professional services are provided pursuant to the terms of a separate professional services agreement between the parties. The parties acknowledge that such services are acquired independently of the product licensed hereunder, and that provision of such services is not essential to the functionality of such product.

+

+Copyright (c) 2004-2018 SEGGER Microcontroller GmbH

+

+ADDITIONAL SOFTWARE

+

+Some applications in this package dynamically link against Qt4 (4.8.7) libraries distributed under the Lesser GNU General Public License version 2.1 (LGPLv21).

+The affected applications make notice about Qt usage in their "About" dialog.

+There is also an exception added by Qt to the LGPLv21 license. In the following, the LGPLv21 as well as the exception added by Qt is shown.

+

+            GNU LESSER GENERAL PUBLIC LICENSE

+

+ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.

+ Contact: http://www.qt.io/licensing/

+

+ You may use, distribute and copy the Qt GUI Toolkit under the terms of

+ GNU Lesser General Public License version 2.1, which is displayed below.

+

+-------------------------------------------------------------------------

+

+            GNU LESSER GENERAL PUBLIC LICENSE

+                Version 2.1, February 1999

+

+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.

+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

+ Everyone is permitted to copy and distribute verbatim copies

+ of this license document, but changing it is not allowed.

+

+[This is the first released version of the Lesser GPL.  It also counts

+ as the successor of the GNU Library Public License, version 2, hence

+ the version number 2.1.]

+

+ Preamble

+

+  The licenses for most software are designed to take away your

+freedom to share and change it.  By contrast, the GNU General Public

+Licenses are intended to guarantee your freedom to share and change

+free software--to make sure the software is free for all its users.

+

+  This license, the Lesser General Public License, applies to some

+specially designated software packages--typically libraries--of the

+Free Software Foundation and other authors who decide to use it.  You

+can use it too, but we suggest you first think carefully about whether

+this license or the ordinary General Public License is the better

+strategy to use in any particular case, based on the explanations below.

+

+  When we speak of free software, we are referring to freedom of use,

+not price.  Our General Public Licenses are designed to make sure that

+you have the freedom to distribute copies of free software (and charge

+for this service if you wish); that you receive source code or can get

+it if you want it; that you can change the software and use pieces of

+it in new free programs; and that you are informed that you can do

+these things.

+

+  To protect your rights, we need to make restrictions that forbid

+distributors to deny you these rights or to ask you to surrender these

+rights.  These restrictions translate to certain responsibilities for

+you if you distribute copies of the library or if you modify it.

+

+  For example, if you distribute copies of the library, whether gratis

+or for a fee, you must give the recipients all the rights that we gave

+you.  You must make sure that they, too, receive or can get the source

+code.  If you link other code with the library, you must provide

+complete object files to the recipients, so that they can relink them

+with the library after making changes to the library and recompiling

+it.  And you must show them these terms so they know their rights.

+

+  We protect your rights with a two-step method: (1) we copyright the

+library, and (2) we offer you this license, which gives you legal

+permission to copy, distribute and/or modify the library.

+

+  To protect each distributor, we want to make it very clear that

+there is no warranty for the free library.  Also, if the library is

+modified by someone else and passed on, the recipients should know

+that what they have is not the original version, so that the original

+author's reputation will not be affected by problems that might be

+introduced by others.

+

+  Finally, software patents pose a constant threat to the existence of

+any free program.  We wish to make sure that a company cannot

+effectively restrict the users of a free program by obtaining a

+restrictive license from a patent holder.  Therefore, we insist that

+any patent license obtained for a version of the library must be

+consistent with the full freedom of use specified in this license.

+

+  Most GNU software, including some libraries, is covered by the

+ordinary GNU General Public License.  This license, the GNU Lesser

+General Public License, applies to certain designated libraries, and

+is quite different from the ordinary General Public License.  We use

+this license for certain libraries in order to permit linking those

+libraries into non-free programs.

+

+  When a program is linked with a library, whether statically or using

+a shared library, the combination of the two is legally speaking a

+combined work, a derivative of the original library.  The ordinary

+General Public License therefore permits such linking only if the

+entire combination fits its criteria of freedom.  The Lesser General

+Public License permits more lax criteria for linking other code with

+the library.

+

+  We call this license the "Lesser" General Public License because it

+does Less to protect the user's freedom than the ordinary General

+Public License.  It also provides other free software developers Less

+of an advantage over competing non-free programs.  These disadvantages

+are the reason we use the ordinary General Public License for many

+libraries.  However, the Lesser license provides advantages in certain

+special circumstances.

+

+  For example, on rare occasions, there may be a special need to

+encourage the widest possible use of a certain library, so that it becomes

+a de-facto standard.  To achieve this, non-free programs must be

+allowed to use the library.  A more frequent case is that a free

+library does the same job as widely used non-free libraries.  In this

+case, there is little to gain by limiting the free library to free

+software only, so we use the Lesser General Public License.

+

+  In other cases, permission to use a particular library in non-free

+programs enables a greater number of people to use a large body of

+free software.  For example, permission to use the GNU C Library in

+non-free programs enables many more people to use the whole GNU

+operating system, as well as its variant, the GNU/Linux operating

+system.

+

+  Although the Lesser General Public License is Less protective of the

+users' freedom, it does ensure that the user of a program that is

+linked with the Library has the freedom and the wherewithal to run

+that program using a modified version of the Library.

+

+  The precise terms and conditions for copying, distribution and

+modification follow.  Pay close attention to the difference between a

+"work based on the library" and a "work that uses the library".  The

+former contains code derived from the library, whereas the latter must

+be combined with the library in order to run.

+

+        GNU LESSER GENERAL PUBLIC LICENSE

+    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

+

+  0. This License Agreement applies to any software library or other

+program which contains a notice placed by the copyright holder or

+other authorized party saying it may be distributed under the terms of

+this Lesser General Public License (also called "this License").

+Each licensee is addressed as "you".

+

+  A "library" means a collection of software functions and/or data

+prepared so as to be conveniently linked with application programs

+(which use some of those functions and data) to form executables.

+

+  The "Library", below, refers to any such software library or work

+which has been distributed under these terms.  A "work based on the

+Library" means either the Library or any derivative work under

+copyright law: that is to say, a work containing the Library or a

+portion of it, either verbatim or with modifications and/or translated

+straightforwardly into another language.  (Hereinafter, translation is

+included without limitation in the term "modification".)

+

+  "Source code" for a work means the preferred form of the work for

+making modifications to it.  For a library, complete source code means

+all the source code for all modules it contains, plus any associated

+interface definition files, plus the scripts used to control compilation

+and installation of the library.

+

+  Activities other than copying, distribution and modification are not

+covered by this License; they are outside its scope.  The act of

+running a program using the Library is not restricted, and output from

+such a program is covered only if its contents constitute a work based

+on the Library (independent of the use of the Library in a tool for

+writing it).  Whether that is true depends on what the Library does

+and what the program that uses the Library does.

+

+  1. You may copy and distribute verbatim copies of the Library's

+complete source code as you receive it, in any medium, provided that

+you conspicuously and appropriately publish on each copy an

+appropriate copyright notice and disclaimer of warranty; keep intact

+all the notices that refer to this License and to the absence of any

+warranty; and distribute a copy of this License along with the

+Library.

+

+  You may charge a fee for the physical act of transferring a copy,

+and you may at your option offer warranty protection in exchange for a

+fee.

+

+  2. You may modify your copy or copies of the Library or any portion

+of it, thus forming a work based on the Library, and copy and

+distribute such modifications or work under the terms of Section 1

+above, provided that you also meet all of these conditions:

+

+    a) The modified work must itself be a software library.

+

+    b) You must cause the files modified to carry prominent notices

+    stating that you changed the files and the date of any change.

+

+    c) You must cause the whole of the work to be licensed at no

+    charge to all third parties under the terms of this License.

+

+    d) If a facility in the modified Library refers to a function or a

+    table of data to be supplied by an application program that uses

+    the facility, other than as an argument passed when the facility

+    is invoked, then you must make a good faith effort to ensure that,

+    in the event an application does not supply such function or

+    table, the facility still operates, and performs whatever part of

+    its purpose remains meaningful.

+

+    (For example, a function in a library to compute square roots has

+    a purpose that is entirely well-defined independent of the

+    application.  Therefore, Subsection 2d requires that any

+    application-supplied function or table used by this function must

+    be optional: if the application does not supply it, the square

+    root function must still compute square roots.)

+

+These requirements apply to the modified work as a whole.  If

+identifiable sections of that work are not derived from the Library,

+and can be reasonably considered independent and separate works in

+themselves, then this License, and its terms, do not apply to those

+sections when you distribute them as separate works.  But when you

+distribute the same sections as part of a whole which is a work based

+on the Library, the distribution of the whole must be on the terms of

+this License, whose permissions for other licensees extend to the

+entire whole, and thus to each and every part regardless of who wrote

+it.

+

+Thus, it is not the intent of this section to claim rights or contest

+your rights to work written entirely by you; rather, the intent is to

+exercise the right to control the distribution of derivative or

+collective works based on the Library.

+

+In addition, mere aggregation of another work not based on the Library

+with the Library (or with a work based on the Library) on a volume of

+a storage or distribution medium does not bring the other work under

+the scope of this License.

+

+  3. You may opt to apply the terms of the ordinary GNU General Public

+License instead of this License to a given copy of the Library.  To do

+this, you must alter all the notices that refer to this License, so

+that they refer to the ordinary GNU General Public License, version 2,

+instead of to this License.  (If a newer version than version 2 of the

+ordinary GNU General Public License has appeared, then you can specify

+that version instead if you wish.)  Do not make any other change in

+these notices.

+

+  Once this change is made in a given copy, it is irreversible for

+that copy, so the ordinary GNU General Public License applies to all

+subsequent copies and derivative works made from that copy.

+

+  This option is useful when you wish to copy part of the code of

+the Library into a program that is not a library.

+

+  4. You may copy and distribute the Library (or a portion or

+derivative of it, under Section 2) in object code or executable form

+under the terms of Sections 1 and 2 above provided that you accompany

+it with the complete corresponding machine-readable source code, which

+must be distributed under the terms of Sections 1 and 2 above on a

+medium customarily used for software interchange.

+

+  If distribution of object code is made by offering access to copy

+from a designated place, then offering equivalent access to copy the

+source code from the same place satisfies the requirement to

+distribute the source code, even though third parties are not

+compelled to copy the source along with the object code.

+

+  5. A program that contains no derivative of any portion of the

+Library, but is designed to work with the Library by being compiled or

+linked with it, is called a "work that uses the Library".  Such a

+work, in isolation, is not a derivative work of the Library, and

+therefore falls outside the scope of this License.

+

+  However, linking a "work that uses the Library" with the Library

+creates an executable that is a derivative of the Library (because it

+contains portions of the Library), rather than a "work that uses the

+library".  The executable is therefore covered by this License.

+Section 6 states terms for distribution of such executables.

+

+  When a "work that uses the Library" uses material from a header file

+that is part of the Library, the object code for the work may be a

+derivative work of the Library even though the source code is not.

+Whether this is true is especially significant if the work can be

+linked without the Library, or if the work is itself a library.  The

+threshold for this to be true is not precisely defined by law.

+

+  If such an object file uses only numerical parameters, data

+structure layouts and accessors, and small macros and small inline

+functions (ten lines or less in length), then the use of the object

+file is unrestricted, regardless of whether it is legally a derivative

+work.  (Executables containing this object code plus portions of the

+Library will still fall under Section 6.)

+

+  Otherwise, if the work is a derivative of the Library, you may

+distribute the object code for the work under the terms of Section 6.

+Any executables containing that work also fall under Section 6,

+whether or not they are linked directly with the Library itself.

+

+  6. As an exception to the Sections above, you may also combine or

+link a "work that uses the Library" with the Library to produce a

+work containing portions of the Library, and distribute that work

+under terms of your choice, provided that the terms permit

+modification of the work for the customer's own use and reverse

+engineering for debugging such modifications.

+

+  You must give prominent notice with each copy of the work that the

+Library is used in it and that the Library and its use are covered by

+this License.  You must supply a copy of this License.  If the work

+during execution displays copyright notices, you must include the

+copyright notice for the Library among them, as well as a reference

+directing the user to the copy of this License.  Also, you must do one

+of these things:

+

+    a) Accompany the work with the complete corresponding

+    machine-readable source code for the Library including whatever

+    changes were used in the work (which must be distributed under

+    Sections 1 and 2 above); and, if the work is an executable linked

+    with the Library, with the complete machine-readable "work that

+    uses the Library", as object code and/or source code, so that the

+    user can modify the Library and then relink to produce a modified

+    executable containing the modified Library.  (It is understood

+    that the user who changes the contents of definitions files in the

+    Library will not necessarily be able to recompile the application

+    to use the modified definitions.)

+

+    b) Use a suitable shared library mechanism for linking with the

+    Library.  A suitable mechanism is one that (1) uses at run time a

+    copy of the library already present on the user's computer system,

+    rather than copying library functions into the executable, and (2)

+    will operate properly with a modified version of the library, if

+    the user installs one, as long as the modified version is

+    interface-compatible with the version that the work was made with.

+

+    c) Accompany the work with a written offer, valid for at

+    least three years, to give the same user the materials

+    specified in Subsection 6a, above, for a charge no more

+    than the cost of performing this distribution.

+

+    d) If distribution of the work is made by offering access to copy

+    from a designated place, offer equivalent access to copy the above

+    specified materials from the same place.

+

+    e) Verify that the user has already received a copy of these

+    materials or that you have already sent this user a copy.

+

+  For an executable, the required form of the "work that uses the

+Library" must include any data and utility programs needed for

+reproducing the executable from it.  However, as a special exception,

+the materials to be distributed need not include anything that is

+normally distributed (in either source or binary form) with the major

+components (compiler, kernel, and so on) of the operating system on

+which the executable runs, unless that component itself accompanies

+the executable.

+

+  It may happen that this requirement contradicts the license

+restrictions of other proprietary libraries that do not normally

+accompany the operating system.  Such a contradiction means you cannot

+use both them and the Library together in an executable that you

+distribute.

+

+  7. You may place library facilities that are a work based on the

+Library side-by-side in a single library together with other library

+facilities not covered by this License, and distribute such a combined

+library, provided that the separate distribution of the work based on

+the Library and of the other library facilities is otherwise

+permitted, and provided that you do these two things:

+

+    a) Accompany the combined library with a copy of the same work

+    based on the Library, uncombined with any other library

+    facilities.  This must be distributed under the terms of the

+    Sections above.

+

+    b) Give prominent notice with the combined library of the fact

+    that part of it is a work based on the Library, and explaining

+    where to find the accompanying uncombined form of the same work.

+

+  8. You may not copy, modify, sublicense, link with, or distribute

+the Library except as expressly provided under this License.  Any

+attempt otherwise to copy, modify, sublicense, link with, or

+distribute the Library is void, and will automatically terminate your

+rights under this License.  However, parties who have received copies,

+or rights, from you under this License will not have their licenses

+terminated so long as such parties remain in full compliance.

+

+  9. You are not required to accept this License, since you have not

+signed it.  However, nothing else grants you permission to modify or

+distribute the Library or its derivative works.  These actions are

+prohibited by law if you do not accept this License.  Therefore, by

+modifying or distributing the Library (or any work based on the

+Library), you indicate your acceptance of this License to do so, and

+all its terms and conditions for copying, distributing or modifying

+the Library or works based on it.

+

+  10. Each time you redistribute the Library (or any work based on the

+Library), the recipient automatically receives a license from the

+original licensor to copy, distribute, link with or modify the Library

+subject to these terms and conditions.  You may not impose any further

+restrictions on the recipients' exercise of the rights granted herein.

+You are not responsible for enforcing compliance by third parties with

+this License.

+

+  11. If, as a consequence of a court judgment or allegation of patent

+infringement or for any other reason (not limited to patent issues),

+conditions are imposed on you (whether by court order, agreement or

+otherwise) that contradict the conditions of this License, they do not

+excuse you from the conditions of this License.  If you cannot

+distribute so as to satisfy simultaneously your obligations under this

+License and any other pertinent obligations, then as a consequence you

+may not distribute the Library at all.  For example, if a patent

+license would not permit royalty-free redistribution of the Library by

+all those who receive copies directly or indirectly through you, then

+the only way you could satisfy both it and this License would be to

+refrain entirely from distribution of the Library.

+

+If any portion of this section is held invalid or unenforceable under any

+particular circumstance, the balance of the section is intended to apply,

+and the section as a whole is intended to apply in other circumstances.

+

+It is not the purpose of this section to induce you to infringe any

+patents or other property right claims or to contest validity of any

+such claims; this section has the sole purpose of protecting the

+integrity of the free software distribution system which is

+implemented by public license practices.  Many people have made

+generous contributions to the wide range of software distributed

+through that system in reliance on consistent application of that

+system; it is up to the author/donor to decide if he or she is willing

+to distribute software through any other system and a licensee cannot

+impose that choice.

+

+This section is intended to make thoroughly clear what is believed to

+be a consequence of the rest of this License.

+

+  12. If the distribution and/or use of the Library is restricted in

+certain countries either by patents or by copyrighted interfaces, the

+original copyright holder who places the Library under this License may add

+an explicit geographical distribution limitation excluding those countries,

+so that distribution is permitted only in or among countries not thus

+excluded.  In such case, this License incorporates the limitation as if

+written in the body of this License.

+

+  13. The Free Software Foundation may publish revised and/or new

+versions of the Lesser General Public License from time to time.

+Such new versions will be similar in spirit to the present version,

+but may differ in detail to address new problems or concerns.

+

+Each version is given a distinguishing version number.  If the Library

+specifies a version number of this License which applies to it and

+"any later version", you have the option of following the terms and

+conditions either of that version or of any later version published by

+the Free Software Foundation.  If the Library does not specify a

+license version number, you may choose any version ever published by

+the Free Software Foundation.

+

+  14. If you wish to incorporate parts of the Library into other free

+programs whose distribution conditions are incompatible with these,

+write to the author to ask for permission.  For software which is

+copyrighted by the Free Software Foundation, write to the Free

+Software Foundation; we sometimes make exceptions for this.  Our

+decision will be guided by the two goals of preserving the free status

+of all derivatives of our free software and of promoting the sharing

+and reuse of software generally.

+

+                NO WARRANTY

+

+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO

+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.

+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR

+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY

+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE

+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE

+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME

+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

+

+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN

+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY

+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU

+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR

+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE

+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING

+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A

+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF

+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH

+DAMAGES.

+

+                END OF TERMS AND CONDITIONS

+

+           How to Apply These Terms to Your New Libraries

+

+  If you develop a new library, and you want it to be of the greatest

+possible use to the public, we recommend making it free software that

+everyone can redistribute and change.  You can do so by permitting

+redistribution under these terms (or, alternatively, under the terms of the

+ordinary General Public License).

+

+  To apply these terms, attach the following notices to the library.  It is

+safest to attach them to the start of each source file to most effectively

+convey the exclusion of warranty; and each file should have at least the

+"copyright" line and a pointer to where the full notice is found.

+

+    <one line to give the library's name and a brief idea of what it does.>

+    Copyright (C) <year>  <name of author>

+

+    This library is free software; you can redistribute it and/or

+    modify it under the terms of the GNU Lesser General Public

+    License as published by the Free Software Foundation; either

+    version 2.1 of the License, or (at your option) any later version.

+

+    This library is distributed in the hope that it will be useful,

+    but WITHOUT ANY WARRANTY; without even the implied warranty of

+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+    Lesser General Public License for more details.

+

+    You should have received a copy of the GNU Lesser General Public

+    License along with this library; if not, write to the Free Software

+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

+

+Also add information on how to contact you by electronic and paper mail.

+

+You should also get your employer (if you work as a programmer) or your

+school, if any, to sign a "copyright disclaimer" for the library, if

+necessary.  Here is a sample; alter the names:

+

+  Yoyodyne, Inc., hereby disclaims all copyright interest in the

+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.

+

+  <signature of Ty Coon>, 1 April 1990

+  Ty Coon, President of Vice

+

+That's all there is to it!

+

+

+Digia Qt LGPL Exception version 1.1

+

+As an additional permission to the GNU Lesser General Public License version

+2.1, the object code form of a "work that uses the Library" may incorporate

+material from a header file that is part of the Library.  You may distribute

+such object code under terms of your choice, provided that:

+    (i)   the header files of the Library have not been modified; and

+    (ii)  the incorporated material is limited to numerical parameters, data

+          structure layouts, accessors, macros, inline functions and

+          templates; and

+    (iii) you comply with the terms of Section 6 of the GNU Lesser General

+          Public License version 2.1.

+

+Moreover, you may apply this exception to a modified version of the Library,

+provided that such modification does not involve copying material from the

+Library into the modified Library's header files unless such material is

+limited to (i) numerical parameters; (ii) data structure layouts;

+(iii) accessors; and (iv) small macros, templates and inline functions of

+five lines or less in length.

+

+Furthermore, you are not required to apply this additional permission to a

+modified version of the Library.

diff --git a/mail-client/mailx-support/Manifest b/mail-client/mailx-support/Manifest
deleted file mode 100644
index c2ff494..0000000
--- a/mail-client/mailx-support/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mailx-support-20060102.tar.bz2 8822 SHA256 e962d12116a99ab72cc04304cc0f9b86dce2ab84c5028599e052c21930fc4d62 SHA512 a4bd84253fcb5a97119e75290dfda01004115c3eb5898bb792c75f7b01c7e48fa1189b9ec4ed195c404196893af8b9390062f2f258da68889b464b53aa0ecbc2 WHIRLPOOL b009fc0405a9610c9ac8cd66024dc237dbc5910f9a7e9b13440a167be8a1bc751d9ce2e318008ca83d6ad5c6d8cd32a1433bb1647ab1f271da5ffe334318331a
diff --git a/mail-client/mailx-support/files/mailx-support-20060102-respect-ldflags.patch b/mail-client/mailx-support/files/mailx-support-20060102-respect-ldflags.patch
deleted file mode 100644
index 42aa569..0000000
--- a/mail-client/mailx-support/files/mailx-support-20060102-respect-ldflags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: mailx-support-20060102/Makefile
-===================================================================
---- mailx-support-20060102.orig/Makefile
-+++ mailx-support-20060102/Makefile
-@@ -17,10 +17,10 @@ clean:
- 	${RM} -f ${PRODUCTS} *.o
- 
- mail.local: mail.local.o locking.o open_with_exlock.o
--	${CC} ${CFLAGS} -o $@ $^
-+	${CC} ${LDFLAGS} ${CFLAGS} -o $@ $^
- 
- lockspool: lockspool.o locking.o open_with_exlock.o
--	${CC} ${CFLAGS} -o $@ $^
-+	${CC} ${LDFLAGS} ${BINDNOW_FLAGS} ${CFLAGS} -o $@ $^
- 
- .c.o:
- 	${CC} ${CFLAGS} -c -o $@ $^
-
diff --git a/mail-client/mailx-support/mailx-support-20060102-r1.ebuild b/mail-client/mailx-support/mailx-support-20060102-r1.ebuild
deleted file mode 100644
index 296ae60..0000000
--- a/mail-client/mailx-support/mailx-support-20060102-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mailx-support/mailx-support-20060102-r1.ebuild,v 1.17 2013/02/17 20:46:43 zmedico Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Provides lockspool utility"
-HOMEPAGE="http://www.openbsd.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-respect-ldflags.patch
-
-	# This code should only be ran with Gentoo Prefix profiles
-	if use prefix; then
-		ebegin "Allowing unprivileged install"
-		sed -i -e "s|-g 0 -o 0||g" Makefile
-		eend $?
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" BINDNOW_FLAGS="" || die "emake failed"
-}
-
-src_install() {
-	einstall || die "einstall failed"
-}
diff --git a/mail-client/mailx-support/metadata.xml b/mail-client/mailx-support/metadata.xml
deleted file mode 100644
index 51f94e3..0000000
--- a/mail-client/mailx-support/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>net-mail</herd>
-</pkgmetadata>
diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
deleted file mode 100644
index 45f2054..0000000
--- a/mail-client/mailx/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST mailx_8.1.2-0.20050715cvs-1.diff.gz 36758 SHA256 2fb891f912624766d0bef765d69cec75ad3334dda1aa58659f3c3c1d0579c2c3 SHA512 6506261f24d5a022fd9cee596a78488a279a0b39b7281cdad9c3e52b5c7f6c2506a1b24970c28cf7b4ffa4ce2d71fec650f42d22959b53aeca0f160b2885b2fe WHIRLPOOL f265880c7b318b4353b182f3e7923315bca5b42d1d1770232cba39d6e92b362acb13c6ca05330c43523ed9c8e55d5602ad71cef579d08f506476c5b107ecaab3
-DIST mailx_8.1.2-0.20050715cvs.orig.tar.gz 94664 SHA256 5c578a8c573b4430358d4f6523f8acd8b2c5039579d907c88ec09dab13b226d3 SHA512 1c1d991a0e522b2e78a49b9c78eed80b1f6d4f68ca0427ef720ebe77a3a2881bcd3d63967ab04f5d6f75fbf2212e260e4a841152f8a69d300c46acd90bb48d68 WHIRLPOOL d21dcdfa16a8d5ac8a750618b1319688781542d348397b7616d4efef660c2bc25dd0cd923fddadc772dc08a25dabc114179014e659ce3fe6cf4afc1a98fe2048
diff --git a/mail-client/mailx/files/mailx-8.1.2.20050715-nostrip.patch b/mail-client/mailx/files/mailx-8.1.2.20050715-nostrip.patch
deleted file mode 100644
index 14a05ba..0000000
--- a/mail-client/mailx/files/mailx-8.1.2.20050715-nostrip.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: mailx-8.1.2-0.20050715cvs.orig/Makefile
-===================================================================
---- mailx-8.1.2-0.20050715cvs.orig.orig/Makefile
-+++ mailx-8.1.2-0.20050715cvs.orig/Makefile
-@@ -3,16 +3,7 @@
- PROG=mail
- CC=gcc
- 
--CFLAGS=-D_BSD_SOURCE -DDEBIAN -g -Wall -IEXT
--
--ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
--  CFLAGS += -O0
--else
--  CFLAGS += -O2
--endif
--ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
--  LDFLAGS += -s
--endif
-+CFLAGS=-D_BSD_SOURCE -DDEBIAN -g -Wall -IEXT ${EXTRAFLAGS}
- 
- SRCS=	version.c aux.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c \
- 	edit.c fio.c getname.c head.c v7.local.c lex.c list.c main.c names.c \
diff --git a/mail-client/mailx/files/mailx-8.1.2.20050715-offsetof.patch b/mail-client/mailx/files/mailx-8.1.2.20050715-offsetof.patch
deleted file mode 100644
index 7af8128..0000000
--- a/mail-client/mailx/files/mailx-8.1.2.20050715-offsetof.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -r -u mailx-8.1.2-0.20050715cvs.orig.orig/def.h mailx-8.1.2-0.20050715cvs.orig/def.h
---- mailx-8.1.2-0.20050715cvs.orig.orig/def.h	2003-10-14 21:50:20.000000000 +0900
-+++ mailx-8.1.2-0.20050715cvs.orig/def.h	2010-03-31 10:29:37.000000000 +0900
-@@ -97,7 +97,7 @@
-  * Given a file address, determine the block number it represents.
-  */
- #define blockof(off)			((int) ((off) / 4096))
--#define offsetof(off)			((int) ((off) % 4096))
-+#define offsetofmailx(off)			((int) ((off) % 4096))
- #define positionof(block, offset)	((off_t)(block) * 4096 + (offset))
- 
- /*
-diff -r -u mailx-8.1.2-0.20050715cvs.orig.orig/edit.c mailx-8.1.2-0.20050715cvs.orig/edit.c
---- mailx-8.1.2-0.20050715cvs.orig.orig/edit.c	2004-05-25 01:34:32.000000000 +0900
-+++ mailx-8.1.2-0.20050715cvs.orig/edit.c	2010-03-31 10:41:28.000000000 +0900
-@@ -111,7 +111,7 @@
- 			(void)fseek(otf, 0L, 2);
- 			size = ftell(otf);
- 			mp->m_block = blockof(size);
--			mp->m_offset = offsetof(size);
-+			mp->m_offset = offsetofmailx(size);
- 			mp->m_size = fsize(fp);
- 			mp->m_lines = 0;
- 			mp->m_flag |= MODIFY;
-diff -r -u mailx-8.1.2-0.20050715cvs.orig.orig/fio.c mailx-8.1.2-0.20050715cvs.orig/fio.c
---- mailx-8.1.2-0.20050715cvs.orig.orig/fio.c	2004-05-25 01:34:32.000000000 +0900
-+++ mailx-8.1.2-0.20050715cvs.orig/fio.c	2010-03-31 10:29:28.000000000 +0900
-@@ -139,7 +139,7 @@
- 			this.m_size = 0;
- 			this.m_lines = 0;
- 			this.m_block = blockof(offset);
--			this.m_offset = offsetof(offset);
-+			this.m_offset = offsetofmailx(offset);
- 			inhead = 1;
- 		} else if (linebuf[0] == 0) {
- 			inhead = 0;
diff --git a/mail-client/mailx/mailx-8.1.2.20050715-r6.ebuild b/mail-client/mailx/mailx-8.1.2.20050715-r6.ebuild
deleted file mode 100644
index c3c7845..0000000
--- a/mail-client/mailx/mailx-8.1.2.20050715-r6.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mailx/mailx-8.1.2.20050715-r6.ebuild,v 1.8 2013/02/21 00:23:21 zmedico Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-MX_MAJ_VER=${PV%.*}
-MX_MIN_VER=${PV##*.}
-MY_PV=${MX_MAJ_VER}-0.${MX_MIN_VER}cvs
-S=${WORKDIR}/${PN}-${MY_PV}.orig/
-debian_patch=${PN}_${MY_PV}-1.diff.gz
-
-DESCRIPTION="The /bin/mail program, which is used to send mail via shell scripts"
-HOMEPAGE="http://www.debian.org/"
-SRC_URI="mirror://gentoo/mailx_${MY_PV}.orig.tar.gz
-	mirror://gentoo/${debian_patch}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-DEPEND=">=net-libs/liblockfile-1.03
-	virtual/mta
-	mail-client/mailx-support"
-
-RDEPEND="${DEPEND}
-	!mail-client/nail
-	!net-mail/mailutils"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${DISTDIR}/${debian_patch}"
-	epatch "${FILESDIR}/${P}-nostrip.patch"
-	sed -i -e "s: -O2: \$(EXTRAFLAGS):g" Makefile
-	epatch "${FILESDIR}/${P}-offsetof.patch"
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) EXTRAFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	dodir /usr/bin /bin /usr/share/man/man1 /etc
-
-	insinto /usr/bin
-	insopts -m 755
-	doins mail || die
-
-	doman mail.1
-
-	dosym mail /usr/bin/Mail
-	dosym mail /usr/bin/mailx
-	dosym mail.1 /usr/share/man/man1/Mail.1
-
-	insinto /usr/share/mailx/
-	doins misc/mail.help misc/mail.tildehelp || die
-	insinto /etc
-	insopts -m 644
-	doins misc/mail.rc || die
-
-	# compatibility link
-	dosym /usr/bin/mail /bin/mail || die
-}
-
-pkg_postinst() {
-	elog "mail command now lives in /usr/bin."
-	elog "Please adjust your scripts."
-}
diff --git a/mail-client/mailx/metadata.xml b/mail-client/mailx/metadata.xml
deleted file mode 100644
index 51f94e3..0000000
--- a/mail-client/mailx/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>net-mail</herd>
-</pkgmetadata>
diff --git a/media-fonts/encodings/Manifest b/media-fonts/encodings/Manifest
deleted file mode 100644
index b73a340..0000000
--- a/media-fonts/encodings/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST encodings-1.0.3.tar.bz2 678895 RMD160 15ac1362cc1969d7e0101767820537d2db348d9a SHA1 615b8367ee20fc50688e4876aa250419927d64cc SHA256 07d9766d4aebe05ac572599f8f903a4fe06ab667a8182f2b6cc03e5fb3b80f53
diff --git a/media-fonts/encodings/encodings-1.0.3.ebuild b/media-fonts/encodings/encodings-1.0.3.ebuild
deleted file mode 100644
index 7bb1139..0000000
--- a/media-fonts/encodings/encodings-1.0.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/encodings/encodings-1.0.3.ebuild,v 1.10 2010/01/19 17:57:22 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org font encodings"
-
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	x11-apps/mkfontscale"
-
-CONFIGURE_OPTIONS="--with-encodingsdir=/usr/share/fonts/encodings"
-
-ECONF_SOURCE="${S}"
-
-src_compile() {
-	mkdir "${S}"/build
-	cd "${S}"/build
-	x-modular_src_compile
-}
-
-src_install() {
-	cd "${S}"/build
-	x-modular_src_install
-}
diff --git a/media-fonts/encodings/metadata.xml b/media-fonts/encodings/metadata.xml
deleted file mode 100644
index 01c4c00..0000000
--- a/media-fonts/encodings/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-</pkgmetadata>
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
deleted file mode 100644
index b749c61..0000000
--- a/media-libs/freeglut/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST freeglut-2.4.0.tar.gz 469557 RMD160 77465647f3d65fbb5cf253eb93ac7409e0c37b14 SHA1 91a528aa72758b7288a0d69a964b1b7e3f322a12 SHA256 269f2d50ba30b381622eb36f20b552ad43a1b43d544b9075e484e7146e81b052
diff --git a/media-libs/freeglut/files/2.4.0-cursor.patch b/media-libs/freeglut/files/2.4.0-cursor.patch
deleted file mode 100644
index fab7f9e..0000000
--- a/media-libs/freeglut/files/2.4.0-cursor.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/freeglut_cursor.c.old	2006-10-11 20:49:13.000000000 +0200
-+++ src/freeglut_cursor.c	2006-10-11 20:51:43.000000000 +0200
-@@ -147,11 +147,13 @@
-             }
-         }
- 
--        if ( ( cursorIDToUse != GLUT_CURSOR_NONE ) && ( cursor == None ) ) {
-+	if ( cursorIDToUse == GLUT_CURSOR_INHERIT ) {
-+            XUndefineCursor( fgDisplay.Display, window->Window.Handle );
-+	} else if ( cursor != None ) {
-+            XDefineCursor( fgDisplay.Display, window->Window.Handle, cursor );
-+	} else if ( cursorIDToUse != GLUT_CURSOR_NONE ) {
-             fgError( "Failed to create cursor" );
-         }
--        XDefineCursor( fgDisplay.Display,
--                       window->Window.Handle, cursor );
-     }
- 
- #elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
diff --git a/media-libs/freeglut/files/freeglut-2.4.0-bsd-usb-joystick.patch b/media-libs/freeglut/files/freeglut-2.4.0-bsd-usb-joystick.patch
deleted file mode 100644
index 08aa132..0000000
--- a/media-libs/freeglut/files/freeglut-2.4.0-bsd-usb-joystick.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-We disable BSD usb joystick support until upstream has a better support for it
-so that it can at least build. For now it builds but does not link to libusbhid
-so that libglut.so has undefined references to hid_* symbols and causes linking
-errors later on in the build process.
-
---- freeglut-2.4.0/src/freeglut_joystick.c.old	2008-08-08 15:26:15 +0000
-+++ freeglut-2.4.0/src/freeglut_joystick.c	2008-08-08 15:26:32 +0000
-@@ -78,7 +78,7 @@
- #    include <errno.h>
- #    if defined(__FreeBSD__) || defined(__NetBSD__)
- /* XXX The below hack is done until freeglut's autoconf is updated. */
--#        define HAVE_USB_JS    1
-+#        undef HAVE_USB_JS
- 
- #        if defined(__FreeBSD__) && __FreeBSD_version >= 500000
- #            include <sys/joystick.h>
diff --git a/media-libs/freeglut/files/freeglut-2.4.0-macos.patch b/media-libs/freeglut/files/freeglut-2.4.0-macos.patch
deleted file mode 100644
index 8a05b94..0000000
--- a/media-libs/freeglut/files/freeglut-2.4.0-macos.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- freeglut-2.4.0/src/freeglut_joystick.c.orig	2005-07-02 10:41:52.000000000 +0200
-+++ freeglut-2.4.0/src/freeglut_joystick.c	2005-07-02 10:44:17.000000000 +0200
-@@ -1389,7 +1389,7 @@
- #    endif
- #endif
- 
--#if defined( __linux__ )
-+#if defined( __linux__ ) || defined(__APPLE_CC__)
-     /* Default for older Linux systems. */
-     joy->num_axes    =  2;
-     joy->num_buttons = 32;
diff --git a/media-libs/freeglut/files/freeglut-gcc42.patch b/media-libs/freeglut/files/freeglut-gcc42.patch
deleted file mode 100644
index 27404ea..0000000
--- a/media-libs/freeglut/files/freeglut-gcc42.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/freeglut_joystick.c.old	2006-07-25 21:15:14.000000000 -0600
-+++ src/freeglut_joystick.c	2006-07-25 21:21:54.000000000 -0600
-@@ -1684,9 +1684,6 @@
- 
-   fgInitialiseJoysticks ();
- 
--  if ( !fgJoystick )
--    return 0;
--
-   if ( !fgState.JoysticksInitialised )
-     return 0;
- 
diff --git a/media-libs/freeglut/freeglut-2.4.0-r3.ebuild b/media-libs/freeglut/freeglut-2.4.0-r3.ebuild
deleted file mode 100644
index 8be0b6b..0000000
--- a/media-libs/freeglut/freeglut-2.4.0-r3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.4.0-r2.ebuild,v 1.2 2009/12/14 11:49:26 remi Exp $
-
-inherit eutils flag-o-matic libtool autotools
-
-DESCRIPTION="A completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library"
-HOMEPAGE="http://freeglut.sourceforge.net/"
-SRC_URI="mirror://sourceforge/freeglut/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="virtual/opengl
-	virtual/glu
-	!media-libs/glut"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	# bug #134586
-	if [[ ${CFLAGS/march/} = ${CFLAGS} ]]; then
-		ewarn "You do not have 'march' set in your CFLAGS."
-		ewarn "This is known to cause compilation problems"
-		ewarn "in ${P}.  If the compile fails, please set"
-		ewarn "'march' to the appropriate architecture."
-		epause 5
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# fixes bug #97390
-	epatch "${FILESDIR}"/${P}-macos.patch
-
-	# #131856
-	epatch "${FILESDIR}"/${PN}-gcc42.patch
-
-	# (#140542) fix cursor handling so flightgear works
-	epatch "${FILESDIR}"/${PV}-cursor.patch
-
-	# Disable BSD's usb joystick support, see reasons in the patch
-	epatch "${FILESDIR}"/${P}-bsd-usb-joystick.patch
-
-	# bug #134586
-	replace-flags -O3 -O2
-
-	# Needed for sane .so versionning on bsd, please don't drop
-	elibtoolize
-	eautoreconf
-}
-
-src_compile() {
-	# (#191589) Don't let -Werror get tagged on
-	econf --disable-warnings || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
-	dohtml -r doc/*.html doc/*.png || die "dohtml failed"
-}
diff --git a/media-libs/freeglut/metadata.xml b/media-libs/freeglut/metadata.xml
deleted file mode 100644
index ac6ab69..0000000
--- a/media-libs/freeglut/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-<use>
-	<flag name="mpx">
-		Enable support for multi-pointer-X. One pointer for each pointer
-		device.
-	</flag>
-</use>
-<longdescription>
-	Freeglut provides an open-source alternative to the OpenGL Utility Toolkit
-	(GLUT) library. It is actively developed and maintained, while not being
-	restricted by its license.
-</longdescription>
-</pkgmetadata>
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
new file mode 100644
index 0000000..3b7d3db
--- /dev/null
+++ b/media-libs/harfbuzz/Manifest
@@ -0,0 +1 @@
+DIST harfbuzz-2.8.1.tar.gz 17939717 BLAKE2B 4e6eeb0beb45e88386d994eb219479a2ed68bd1b78af3becb4ef1c89152e21924319b415e194f57c7aa4acf8031ab4ae35725b873f36b6f816aaa33a7bbb86d9 SHA512 16e43b9182d3ebd2394c2c0e0df815ca9e715d55dc7e46de4eafcde49ddf59cccae69a5340e05c8aa2ee6bc2ba46d1cffae8252d1b2a004ffe9d70c62628cf73
diff --git a/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild
new file mode 100644
index 0000000..6a97204
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="*"
+fi
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+
+IUSE="+cairo debug doc +glib +graphite icu +introspection static-libs test +truetype"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/gobject-introspection-common-1.34
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-util/glib-utils )
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	sed -i \
+		-e 's:tests/macos.tests::' \
+		test/shaping/data/in-house/Makefile.sources \
+		|| die # bug 726120
+
+	# bug 618772
+	append-cxxflags -std=c++14
+
+	# bug 790359
+	filter-flags -fexceptions -fthreadsafe-statics
+
+	# bug 762415
+	local pyscript
+	for pyscript in $(find -type f -name "*.py") ; do
+		python_fix_shebang -q "${pyscript}"
+	done
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	local emesonargs=(
+		$(meson_native_use_feature cairo)
+		-Dcoretext="disabled"
+		$(meson_native_use_feature doc)
+		-Dfontconfig="disabled" #609300
+		$(meson_native_use_feature introspection)
+		$(meson_use static-libs static)
+		$(meson_feature glib)
+		$(meson_feature graphite)
+		$(meson_feature icu)
+		$(meson_feature introspection gobject)
+		$(meson_feature test tests)
+		$(meson_feature truetype freetype)
+	)
+	meson_src_configure
+}
diff --git a/media-libs/harfbuzz/metadata.xml b/media-libs/harfbuzz/metadata.xml
new file mode 100644
index 0000000..1c768f8
--- /dev/null
+++ b/media-libs/harfbuzz/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:harfbuzz_project:harfbuzz</remote-id>
+	</upstream>
+	<use>
+		<flag name="glib">Compile with GLib Unicode support</flag>
+		<flag name="graphite">Use graphite to render complex non-Roman writing systems</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
deleted file mode 100644
index e70ceac..0000000
--- a/media-libs/libsdl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SDL-1.2.15.tar.gz 3920622 RMD160 d4802a090cb4a24eeb0c8ce5690802f596d394c3 SHA1 0c5f193ced810b0d7ce3ab06d808cbb5eef03a2c SHA256 d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00
diff --git a/media-libs/libsdl/files/libsdl-1.2.13-sdl-config.patch b/media-libs/libsdl/files/libsdl-1.2.13-sdl-config.patch
deleted file mode 100644
index f430428..0000000
--- a/media-libs/libsdl/files/libsdl-1.2.13-sdl-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Only output -L -rpath cruft if using a non-standard install location.
-
-Makes ABI / cross-compiling easier on the soul.
-
---- sdl-config.in
-+++ sdl-config.in
-@@ -44,7 +44,12 @@
-       echo -I@includedir@/SDL @SDL_CFLAGS@
-       ;;
- @ENABLE_SHARED_TRUE@    --libs)
--@ENABLE_SHARED_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
-+@ENABLE_SHARED_TRUE@      if test x"${prefix}" != x"/usr" ; then
-+@ENABLE_SHARED_TRUE@          libdirs="-L@libdir@"
-+@ENABLE_SHARED_TRUE@      else
-+@ENABLE_SHARED_TRUE@          libdirs=""
-+@ENABLE_SHARED_TRUE@      fi
-+@ENABLE_SHARED_TRUE@      echo $libdirs @SDL_RLD_FLAGS@ @SDL_LIBS@
- @ENABLE_SHARED_TRUE@      ;;
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
diff --git a/media-libs/libsdl/files/libsdl-1.2.14-click.patch b/media-libs/libsdl/files/libsdl-1.2.14-click.patch
deleted file mode 100644
index f6e048b..0000000
--- a/media-libs/libsdl/files/libsdl-1.2.14-click.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- SDL-1.2.14/src/video/x11/SDL_x11events.c
-+++ SDL-1.2/src/video/x11/SDL_x11events.c
-@@ -441,8 +441,10 @@
- if ( xevent.xcrossing.mode == NotifyUngrab )
- printf("Mode: NotifyUngrab\n");
- #endif
--		if ( xevent.xcrossing.detail != NotifyInferior ) {
--			if ( this->input_grab == SDL_GRAB_OFF ) {
-+		if ( (xevent.xcrossing.mode != NotifyGrab) &&
-+		     (xevent.xcrossing.mode != NotifyUngrab) &&
-+		     (xevent.xcrossing.detail != NotifyInferior) ) {
-+               		if ( this->input_grab == SDL_GRAB_OFF ) {
- 				posted = SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS);
- 			} else {
- 				posted = SDL_PrivateMouseMotion(0, 0,
diff --git a/media-libs/libsdl/files/libsdl-1.2.14-glibc213.patch b/media-libs/libsdl/files/libsdl-1.2.14-glibc213.patch
deleted file mode 100644
index 364f69d..0000000
--- a/media-libs/libsdl/files/libsdl-1.2.14-glibc213.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/video/SDL_blit.c
-+++ b/src/video/SDL_blit.c
-@@ -214,7 +214,7 @@
- 	dstskip = w+info->d_skip;
- 	if ( dst < src ) {
- 		while ( h-- ) {
--			SDL_memcpy(dst, src, w);
-+			SDL_memmove(dst, src, w);
- 			src += srcskip;
- 			dst += dstskip;
- 		}
diff --git a/media-libs/libsdl/files/libsdl-1.2.14-joystick.patch b/media-libs/libsdl/files/libsdl-1.2.14-joystick.patch
deleted file mode 100644
index 1d699ea..0000000
--- a/media-libs/libsdl/files/libsdl-1.2.14-joystick.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- SDL-1.2.14/src/joystick/linux/SDL_sysjoystick.c
-+++ SDL-1.2.14-mod/src/joystick/linux/SDL_sysjoystick.c
-@@ -700,26 +700,26 @@
- 				continue;
- 			}
- 			if ( test_bit(i, absbit) ) {
--				int values[5];
-+				struct input_absinfo values;
- 
--				if ( ioctl(fd, EVIOCGABS(i), values) < 0 )
-+				if ( ioctl(fd, EVIOCGABS(i), &values) < 0 )
- 					continue;
- #ifdef DEBUG_INPUT_EVENTS
- 				printf("Joystick has absolute axis: %x\n", i);
- 				printf("Values = { %d, %d, %d, %d, %d }\n",
--					values[0], values[1],
--					values[2], values[3], values[4]);
-+					values.value, values.minimum,
-+					values.maximum, values.fuzz, values.flat);
- #endif /* DEBUG_INPUT_EVENTS */
- 				joystick->hwdata->abs_map[i] = joystick->naxes;
--				if ( values[1] == values[2] ) {
-+				if ( values.minimum == values.maximum ) {
- 				    joystick->hwdata->abs_correct[i].used = 0;
- 				} else {
- 				    joystick->hwdata->abs_correct[i].used = 1;
- 				    joystick->hwdata->abs_correct[i].coef[0] =
--					(values[2] + values[1]) / 2 - values[4];
-+					(values.maximum + values.minimum) / 2 - values.flat;
- 				    joystick->hwdata->abs_correct[i].coef[1] =
--					(values[2] + values[1]) / 2 + values[4];
--				    t = ((values[2] - values[1]) / 2 - 2 * values[4]);
-+					(values.maximum + values.minimum) / 2 + values.flat;
-+				    t = ((values.maximum - values.minimum) / 2 - 2 * values.flat);
- 				    if ( t != 0 ) {
- 					joystick->hwdata->abs_correct[i].coef[2] = (1 << 29) / t;
- 				    } else {
diff --git a/media-libs/libsdl/files/libsdl-1.2.15-joystick.patch b/media-libs/libsdl/files/libsdl-1.2.15-joystick.patch
deleted file mode 100644
index 35374c5..0000000
--- a/media-libs/libsdl/files/libsdl-1.2.15-joystick.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/joystick/linux/SDL_sysjoystick.c.org	2012-06-06 18:03:56.700819599 +0300
-+++ src/joystick/linux/SDL_sysjoystick.c	2012-06-06 18:04:31.473143816 +0300
-@@ -1106,6 +1106,10 @@ static __inline__ void EV_HandleEvents(S
- 				}
- 				break;
- 			    case EV_ABS:
-+				if (code >= ABS_MISC) {
-+				    break;
-+				}
-+
- 				switch (code) {
- 				    case ABS_HAT0X:
- 				    case ABS_HAT0Y:
diff --git a/media-libs/libsdl/files/libsdl-1.2.15-resizing.patch b/media-libs/libsdl/files/libsdl-1.2.15-resizing.patch
deleted file mode 100644
index 0655a13..0000000
--- a/media-libs/libsdl/files/libsdl-1.2.15-resizing.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: Revert change that breaks window corner resizing
- http://bugzilla.libsdl.org/show_bug.cgi?id=1430
-Author: Andrew Caudwell <acaudwell@gmail.com>
-Last-Update: 2012-04-10
-Bug-Debian: http://bugs.debian.org/665779
-
-diff -r c787fb1b5699 src/video/x11/SDL_x11events.c
---- a/src/video/x11/SDL_x11events.c	Mon Feb 20 23:51:08 2012 -0500
-+++ b/src/video/x11/SDL_x11events.c	Mon Mar 26 12:26:52 2012 +1300
-@@ -57,12 +57,6 @@
- static SDLKey MISC_keymap[256];
- SDLKey X11_TranslateKeycode(Display *display, KeyCode kc);
- 
--/*
-- Pending resize target for ConfigureNotify (so outdated events don't
-- cause inappropriate resize events)
--*/
--int X11_PendingConfigureNotifyWidth = -1;
--int X11_PendingConfigureNotifyHeight = -1;
- 
- #ifdef X_HAVE_UTF8_STRING
- Uint32 Utf8ToUcs4(const Uint8 *utf8)
-@@ -825,16 +819,6 @@
- #ifdef DEBUG_XEVENTS
- printf("ConfigureNotify! (resize: %dx%d)\n", xevent.xconfigure.width, xevent.xconfigure.height);
- #endif
--		if ((X11_PendingConfigureNotifyWidth != -1) &&
--		    (X11_PendingConfigureNotifyHeight != -1)) {
--		    if ((xevent.xconfigure.width != X11_PendingConfigureNotifyWidth) &&
--			(xevent.xconfigure.height != X11_PendingConfigureNotifyHeight)) {
--			    /* Event is from before the resize, so ignore. */
--			    break;
--		    }
--		    X11_PendingConfigureNotifyWidth = -1;
--		    X11_PendingConfigureNotifyHeight = -1;
--		}
- 		if ( SDL_VideoSurface ) {
- 		    if ((xevent.xconfigure.width != SDL_VideoSurface->w) ||
- 		        (xevent.xconfigure.height != SDL_VideoSurface->h)) {
-diff -r c787fb1b5699 src/video/x11/SDL_x11events_c.h
---- a/src/video/x11/SDL_x11events_c.h	Mon Feb 20 23:51:08 2012 -0500
-+++ b/src/video/x11/SDL_x11events_c.h	Mon Mar 26 12:26:52 2012 +1300
-@@ -27,8 +27,3 @@
- extern void X11_InitOSKeymap(_THIS);
- extern void X11_PumpEvents(_THIS);
- extern void X11_SetKeyboardState(Display *display, const char *key_vec);
--
--/* Variables to be exported */
--extern int X11_PendingConfigureNotifyWidth;
--extern int X11_PendingConfigureNotifyHeight;
--
-diff -r c787fb1b5699 src/video/x11/SDL_x11video.c
---- a/src/video/x11/SDL_x11video.c	Mon Feb 20 23:51:08 2012 -0500
-+++ b/src/video/x11/SDL_x11video.c	Mon Mar 26 12:26:52 2012 +1300
-@@ -1182,8 +1182,6 @@
- 			current = NULL;
- 			goto done;
- 		}
--		X11_PendingConfigureNotifyWidth = width;
--		X11_PendingConfigureNotifyHeight = height;
- 	} else {
- 		if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) {
- 			current = NULL;
diff --git a/media-libs/libsdl/files/libsdl-1.2.15-sdl-config.patch b/media-libs/libsdl/files/libsdl-1.2.15-sdl-config.patch
deleted file mode 100644
index f430428..0000000
--- a/media-libs/libsdl/files/libsdl-1.2.15-sdl-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Only output -L -rpath cruft if using a non-standard install location.
-
-Makes ABI / cross-compiling easier on the soul.
-
---- sdl-config.in
-+++ sdl-config.in
-@@ -44,7 +44,12 @@
-       echo -I@includedir@/SDL @SDL_CFLAGS@
-       ;;
- @ENABLE_SHARED_TRUE@    --libs)
--@ENABLE_SHARED_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
-+@ENABLE_SHARED_TRUE@      if test x"${prefix}" != x"/usr" ; then
-+@ENABLE_SHARED_TRUE@          libdirs="-L@libdir@"
-+@ENABLE_SHARED_TRUE@      else
-+@ENABLE_SHARED_TRUE@          libdirs=""
-+@ENABLE_SHARED_TRUE@      fi
-+@ENABLE_SHARED_TRUE@      echo $libdirs @SDL_RLD_FLAGS@ @SDL_LIBS@
- @ENABLE_SHARED_TRUE@      ;;
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
diff --git a/media-libs/libsdl/libsdl-1.2.15-r2.ebuild b/media-libs/libsdl/libsdl-1.2.15-r2.ebuild
deleted file mode 100644
index 9c50107..0000000
--- a/media-libs/libsdl/libsdl-1.2.15-r2.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.15-r2.ebuild,v 1.9 2012/08/27 17:40:01 armin76 Exp $
-
-EAPI=2
-inherit flag-o-matic multilib toolchain-funcs eutils libtool
-
-DESCRIPTION="Simple Direct Media Layer"
-HOMEPAGE="http://www.libsdl.org/"
-SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="*"
-# WARNING:
-# If you turn on the custom-cflags use flag in USE and something breaks,
-# you pick up the pieces.  Be prepared for bug reports to be marked INVALID.
-IUSE="oss alsa nas X dga xv xinerama fbcon directfb ggi svga tslib aalib opengl libcaca +audio +video +joystick custom-cflags pulseaudio ps3 static-libs"
-
-RDEPEND="audio? ( >=media-libs/audiofile-0.1.9 )
-	alsa? ( media-libs/alsa-lib )
-	nas? (
-		media-libs/nas
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libX11
-	)
-	X? (
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libXrandr
-	)
-	directfb? ( >=dev-libs/DirectFB-0.9.19 )
-	ggi? ( >=media-libs/libggi-2.0_beta3 )
-	svga? ( >=media-libs/svgalib-1.4.2 )
-	aalib? ( media-libs/aalib )
-	libcaca? ( >=media-libs/libcaca-0.9-r1 )
-	opengl? ( virtual/opengl virtual/glu )
-	ppc64? ( ps3? ( sys-libs/libspe2 ) )
-	tslib? ( x11-libs/tslib )
-	pulseaudio? ( media-sound/pulseaudio )"
-DEPEND="${RDEPEND}
-	nas? (
-		x11-proto/xextproto
-		x11-proto/xproto
-	)
-	X? (
-		x11-proto/xextproto
-		x11-proto/xproto
-	)
-	x86? ( || ( >=dev-lang/yasm-0.6.0 >=dev-lang/nasm-0.98.39-r3 ) )"
-
-S=${WORKDIR}/SDL-${PV}
-
-pkg_setup() {
-	if use custom-cflags ; then
-		ewarn "Since you've chosen to use possibly unsafe CFLAGS,"
-		ewarn "don't bother filing libsdl-related bugs until trying to remerge"
-		ewarn "libsdl without the custom-cflags use flag in USE."
-		epause 10
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-sdl-config.patch \
-		"${FILESDIR}"/${P}-resizing.patch \
-		"${FILESDIR}"/${P}-joystick.patch
-
-	elibtoolize
-}
-
-src_configure() {
-	local myconf=
-	if [[ $(tc-arch) != "x86" ]] ; then
-		myconf="${myconf} --disable-nasm"
-	else
-		myconf="${myconf} --enable-nasm"
-	fi
-	use custom-cflags || strip-flags
-	use audio || myconf="${myconf} --disable-audio"
-	use video \
-		&& myconf="${myconf} --enable-video-dummy" \
-		|| myconf="${myconf} --disable-video"
-	use joystick || myconf="${myconf} --disable-joystick"
-
-	local directfbconf="--disable-video-directfb"
-	if use directfb ; then
-		# since DirectFB can link against SDL and trigger a
-		# dependency loop, only link against DirectFB if it
-		# isn't broken #61592
-		echo 'int main(){}' > directfb-test.c
-		$(tc-getCC) directfb-test.c -ldirectfb 2>/dev/null \
-			&& directfbconf="--enable-video-directfb" \
-			|| ewarn "Disabling DirectFB since libdirectfb.so is broken"
-	fi
-
-	myconf="${myconf} ${directfbconf}"
-
-	econf \
-		--disable-rpath \
-		--disable-arts \
-		--disable-esd \
-		--enable-events \
-		--enable-cdrom \
-		--enable-threads \
-		--enable-timers \
-		--enable-file \
-		--enable-cpuinfo \
-		--disable-alsa-shared \
-		--disable-esd-shared \
-		--disable-pulseaudio-shared \
-		--disable-arts-shared \
-		--disable-nas-shared \
-		--disable-osmesa-shared \
-		$(use_enable oss) \
-		$(use_enable alsa) \
-		$(use_enable pulseaudio) \
-		$(use_enable nas) \
-		$(use_enable X video-x11) \
-		$(use_enable dga) \
-		$(use_enable xv video-x11-xv) \
-		$(use_enable xinerama video-x11-xinerama) \
-		$(use_enable X video-x11-xrandr) \
-		$(use_enable dga video-dga) \
-		$(use_enable fbcon video-fbcon) \
-		$(use_enable ggi video-ggi) \
-		$(use_enable svga video-svga) \
-		$(use_enable aalib video-aalib) \
-		$(use_enable libcaca video-caca) \
-		$(use_enable opengl video-opengl) \
-		$(use_enable ps3 video-ps3) \
-		$(use_enable tslib input-tslib) \
-		$(use_with X x) \
-		$(use_enable static-libs static) \
-		--disable-video-x11-xme \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	use static-libs || prune_libtool_files --all
-	dodoc BUGS CREDITS README README-SDL.txt README.HG TODO WhatsNew
-	dohtml -r ./
-}
diff --git a/media-libs/libsdl/metadata.xml b/media-libs/libsdl/metadata.xml
deleted file mode 100644
index 0ee2113..0000000
--- a/media-libs/libsdl/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>games</herd>
-  <longdescription>
-Simple DirectMedia Layer is a cross-platform multimedia library designed 
-to provide low level access to audio, keyboard, mouse, joystick, 3D 
-hardware via OpenGL, and 2D video framebuffer. It is used by MPEG 
-playback software, emulators, and many popular games, including the 
-award winning Linux port of "Civilization: Call To Power."
-
-Simple DirectMedia Layer supports Linux, Windows, BeOS, MacOS Classic, 
-MacOS X, FreeBSD, OpenBSD, BSD/OS, Solaris, IRIX, and QNX. There is also 
-code, but no official support, for Windows CE, AmigaOS, Dreamcast, 
-Atari, NetBSD, AIX, OSF/Tru64, RISC OS, and SymbianOS.
-
-SDL is written in C, but works with C++ natively, and has bindings to 
-several other languages, including Ada, Eiffel, Java, Lua, ML, Perl, 
-PHP, Pike, Python, and Ruby.
-</longdescription>
-  <use>
-	<flag name="audio">Control audio support (disable at your own risk)</flag>
-	<flag name="joystick">Control joystick support (disable at your own risk)</flag>
-	<flag name="ps3">Build the PS3 video driver</flag>
-	<flag name="tslib">Build with tslib support for touchscreen devices</flag>
-	<flag name="video">Control video support (disable at your own risk)</flag>
-  </use>
-</pkgmetadata>
diff --git a/media-libs/speex/Manifest b/media-libs/speex/Manifest
deleted file mode 100644
index 92b5042..0000000
--- a/media-libs/speex/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST speex-1.2rc1.tar.gz 1061882 RMD160 6f4a11ef910b0db9b820826bcac3da1b79cad3a1 SHA1 52daa72572e844e5165315e208da539b2a55c5eb SHA256 342f30dc57bd4a6dad41398365baaa690429660b10d866b7d508e8f1179cb7a6
diff --git a/media-libs/speex/files/speex-1.2_rc1-configure.patch b/media-libs/speex/files/speex-1.2_rc1-configure.patch
deleted file mode 100644
index cd780da..0000000
--- a/media-libs/speex/files/speex-1.2_rc1-configure.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ur speex-1.2rc1.orig/configure.ac speex-1.2rc1/configure.ac
---- speex-1.2rc1.orig/configure.ac	2008-07-30 22:49:17.000000000 -0400
-+++ speex-1.2rc1/configure.ac	2008-07-30 22:50:33.000000000 -0400
-@@ -112,9 +112,6 @@
- 
- AC_CHECK_HEADERS(sys/soundcard.h sys/audioio.h)
- 
--XIPH_PATH_OGG([src="src"], [src=""])
--AC_SUBST(src)
--
- AC_CHECK_LIB(m, sin)
- 
- # Check for getopt_long; if not found, use included source.
-@@ -139,10 +136,16 @@
-   AC_DEFINE([ENABLE_VALGRIND], , [Enable valgrind extra checks])
- fi])
- 
-+AC_ARG_ENABLE(ogg, [  --enable-ogg            Enable OGG support], [if test "$enableval" = yes; then
-+  XIPH_PATH_OGG([src="src"], [src=""])
-+  AC_SUBST(src)
-+fi
-+])
-+
- AC_ARG_ENABLE(sse, [  --enable-sse            Enable SSE support], [
- if test "x$enableval" != xno; then
- has_sse=yes
--CFLAGS="$CFLAGS -O3 -msse"
-+CFLAGS="$CFLAGS -msse"
- else
- has_sse=no
- fi
diff --git a/media-libs/speex/metadata.xml b/media-libs/speex/metadata.xml
deleted file mode 100644
index d499064..0000000
--- a/media-libs/speex/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>
-<herd>sound</herd>
-<upstream>
-  <remote-id type="cpe">cpe:/a:xiph:speex</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/media-libs/speex/speex-1.2_rc1.ebuild b/media-libs/speex/speex-1.2_rc1.ebuild
deleted file mode 100644
index a0075f0..0000000
--- a/media-libs/speex/speex-1.2_rc1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/speex-1.2_rc1.ebuild,v 1.8 2009/12/11 19:59:55 ranger Exp $
-
-inherit autotools eutils flag-o-matic
-
-MY_P=${P/_} ; MY_P=${MY_P/_p/.}
-
-DESCRIPTION="Audio compression format designed for speech."
-HOMEPAGE="http://www.speex.org"
-SRC_URI="http://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="*"
-IUSE="ogg sse"
-
-RDEPEND="ogg? ( media-libs/libogg )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-configure.patch
-
-	sed -i -e 's:noinst_PROGRAMS:check_PROGRAMS:' \
-		"${S}"/libspeex/Makefile.am \
-		|| die "unable to disable tests building"
-	eautoreconf
-}
-
-src_compile() {
-	append-flags -D_FILE_OFFSET_BITS=64
-
-	econf $(use_enable sse) $(use_enable ogg)
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" \
-		install || die "emake install failed."
-
-	dodoc AUTHORS ChangeLog NEWS README* TODO
-}
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 3e4c598..038a13d 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1 +1 @@
-DIST tiff-4.0.10.tar.gz 2402867 SHA256 2c52d11ccaf767457db0c46795d9c7d1a8d8f76f68b0b800a3dfe45786b996e4 SHA512 d213e5db09fd56b8977b187c5a756f60d6e3e998be172550c2892dbdb4b2a8e8c750202bc863fe27d0d1c577ab9de1710d15e9f6ed665aadbfd857525a81eea8 WHIRLPOOL 1d169c944f48869472e712180cee902b160238e37d011de075b6a7adaf825c306207f22a779378612b3bca099064e1100f6981c4cbab9ec987f49fad850dc474
+DIST tiff-4.2.0.tar.gz 2809373 BLAKE2B 62178da595e7ff4041f33643a87698580cd3a32d4536b5c60c414c9497616258686cf61514e1d4e0f062cb1333190c39ce86896bf07c01532c07454745d89cd9 SHA512 d7d42e6e6dbda9604c638f28e6cfa4705191a4e8ea276d18031d50dbab0931ac91141e57a2cf294124487f1a2e6dfcb9be62431c1b69de5acf4d0e632f3322e5
diff --git a/media-libs/tiff/OWNERS b/media-libs/tiff/OWNERS
deleted file mode 100644
index 93eb632..0000000
--- a/media-libs/tiff/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-skau@chromium.org
diff --git a/media-libs/tiff/files/tiff-4.0.10-CVE-2018-17000-tif_dirwrite-null-dereference.patch b/media-libs/tiff/files/tiff-4.0.10-CVE-2018-17000-tif_dirwrite-null-dereference.patch
deleted file mode 100644
index 321c6a4..0000000
--- a/media-libs/tiff/files/tiff-4.0.10-CVE-2018-17000-tif_dirwrite-null-dereference.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://crbug.com/901306
-
-commit 802d3cbf3043be5dce5317e140ccb1c17a6a2d39
-Author: Thomas Bernard <miniupnp@free.fr>
-Date:   Tue Jan 29 11:21:47 2019 +0100
-
-    TIFFWriteDirectoryTagTransferfunction() : fix NULL dereferencing
-
-    http://bugzilla.maptools.org/show_bug.cgi?id=2833
-
-    we must check the pointer is not NULL before memcmp() the memory
-
-diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c
-index c15a28dbd8fcb99b81fa5a1d44fcbcda881f42a7..ef30c869d30e210d90be16ce91f44087925fbad3 100644
---- a/libtiff/tif_dirwrite.c
-+++ b/libtiff/tif_dirwrite.c
-@@ -1893,12 +1893,14 @@ TIFFWriteDirectoryTagTransferfunction(TIFF* tif, uint32* ndir, TIFFDirEntry* dir
- 		n=3;
- 	if (n==3)
- 	{
--		if (!_TIFFmemcmp(tif->tif_dir.td_transferfunction[0],tif->tif_dir.td_transferfunction[2],m*sizeof(uint16)))
-+		if (tif->tif_dir.td_transferfunction[2] == NULL ||
-+		    !_TIFFmemcmp(tif->tif_dir.td_transferfunction[0],tif->tif_dir.td_transferfunction[2],m*sizeof(uint16)))
- 			n=2;
- 	}
- 	if (n==2)
- 	{
--		if (!_TIFFmemcmp(tif->tif_dir.td_transferfunction[0],tif->tif_dir.td_transferfunction[1],m*sizeof(uint16)))
-+		if (tif->tif_dir.td_transferfunction[1] == NULL ||
-+		    !_TIFFmemcmp(tif->tif_dir.td_transferfunction[0],tif->tif_dir.td_transferfunction[1],m*sizeof(uint16)))
- 			n=1;
- 	}
- 	if (n==0)
diff --git a/media-libs/tiff/files/tiff-4.0.10-CVE-2019-14973-fix-integer-overflow.patch b/media-libs/tiff/files/tiff-4.0.10-CVE-2019-14973-fix-integer-overflow.patch
deleted file mode 100644
index cbcbfd9..0000000
--- a/media-libs/tiff/files/tiff-4.0.10-CVE-2019-14973-fix-integer-overflow.patch
+++ /dev/null
@@ -1,395 +0,0 @@
-From 6ebfcac47224d3b8661c501967d495135449883e Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sat, 10 Aug 2019 18:25:03 +0200
-Subject: [PATCH] Fix integer overflow in _TIFFCheckMalloc() and other
- implementation-defined behaviour (CVE-2019-14973)
-
-_TIFFCheckMalloc()/_TIFFCheckRealloc() used a unsafe way to detect overflow
-in the multiplication of nmemb and elem_size (which are of type tmsize_t, thus
-signed), which was especially easily triggered on 32-bit builds (with recent
-enough compilers that assume that signed multiplication cannot overflow, since
-this is undefined behaviour by the C standard). The original issue which lead to
-this fix was trigged from tif_fax3.c
-
-There were also unsafe (implementation defied), and broken in practice on 64bit
-builds, ways of checking that a uint64 fits of a (signed) tmsize_t by doing
-(uint64)(tmsize_t)uint64_var != uint64_var comparisons. Those have no known
-at that time exploits, but are better to fix in a more bullet-proof way.
-Or similarly use of (int64)uint64_var <= 0.
-
---- a/libtiff/tif_aux.c
-+++ b/libtiff/tif_aux.c
-@@ -57,18 +57,57 @@ _TIFFMultiply64(TIFF* tif, uint64 first, uint64 second, const char* where)
- 	return bytes;
- }
- 
-+tmsize_t
-+_TIFFMultiplySSize(TIFF* tif, tmsize_t first, tmsize_t second, const char* where)
-+{
-+    if( first <= 0 || second <= 0 )
-+    {
-+        if( tif != NULL && where != NULL )
-+        {
-+            TIFFErrorExt(tif->tif_clientdata, where,
-+                        "Invalid argument to _TIFFMultiplySSize() in %s", where);
-+        }
-+        return 0;
-+    }
-+
-+    if( first > TIFF_TMSIZE_T_MAX / second )
-+    {
-+        if( tif != NULL && where != NULL )
-+        {
-+            TIFFErrorExt(tif->tif_clientdata, where,
-+                        "Integer overflow in %s", where);
-+        }
-+        return 0;
-+    }
-+    return first * second;
-+}
-+
-+tmsize_t _TIFFCastUInt64ToSSize(TIFF* tif, uint64 val, const char* module)
-+{
-+    if( val > (uint64)TIFF_TMSIZE_T_MAX )
-+    {
-+        if( tif != NULL && module != NULL )
-+        {
-+            TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
-+        }
-+        return 0;
-+    }
-+    return (tmsize_t)val;
-+}
-+
- void*
- _TIFFCheckRealloc(TIFF* tif, void* buffer,
- 		  tmsize_t nmemb, tmsize_t elem_size, const char* what)
- {
- 	void* cp = NULL;
--	tmsize_t bytes = nmemb * elem_size;
--
-+        tmsize_t count = _TIFFMultiplySSize(tif, nmemb, elem_size, NULL);
- 	/*
--	 * XXX: Check for integer overflow.
-+	 * Check for integer overflow.
- 	 */
--	if (nmemb && elem_size && bytes / elem_size == nmemb)
--		cp = _TIFFrealloc(buffer, bytes);
-+	if (count != 0)
-+	{
-+		cp = _TIFFrealloc(buffer, count);
-+	}
- 
- 	if (cp == NULL) {
- 		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
---- a/libtiff/tif_getimage.c
-+++ b/libtiff/tif_getimage.c
-@@ -755,9 +755,8 @@ gtTileSeparate(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
- 	uint32 leftmost_tw;
- 
- 	tilesize = TIFFTileSize(tif);  
--	bufsize = TIFFSafeMultiply(tmsize_t,alpha?4:3,tilesize);
-+	bufsize = _TIFFMultiplySSize(tif, alpha?4:3,tilesize, "gtTileSeparate");
- 	if (bufsize == 0) {
--		TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Integer overflow in %s", "gtTileSeparate");
- 		return (0);
- 	}
- 
-@@ -1019,9 +1018,8 @@ gtStripSeparate(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
-         uint16 colorchannels;
- 
- 	stripsize = TIFFStripSize(tif);  
--	bufsize = TIFFSafeMultiply(tmsize_t,alpha?4:3,stripsize);
-+	bufsize = _TIFFMultiplySSize(tif,alpha?4:3,stripsize, "gtStripSeparate");
- 	if (bufsize == 0) {
--		TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Integer overflow in %s", "gtStripSeparate");
- 		return (0);
- 	}
- 
---- a/libtiff/tif_luv.c
-+++ b/libtiff/tif_luv.c
-@@ -1264,16 +1264,10 @@ LogL16GuessDataFmt(TIFFDirectory *td)
- 	return (SGILOGDATAFMT_UNKNOWN);
- }
- 
--
--#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0))
--#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1)
--
- static tmsize_t
- multiply_ms(tmsize_t m1, tmsize_t m2)
- {
--        if( m1 == 0 || m2 > TIFF_TMSIZE_T_MAX / m1 )
--            return 0;
--        return m1 * m2;
-+        return _TIFFMultiplySSize(NULL, m1, m2, NULL);
- }
- 
- static int
---- a/libtiff/tif_pixarlog.c
-+++ b/libtiff/tif_pixarlog.c
-@@ -634,15 +634,10 @@ PixarLogGuessDataFmt(TIFFDirectory *td)
- 	return guess;
- }
- 
--#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0))
--#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1)
--
- static tmsize_t
- multiply_ms(tmsize_t m1, tmsize_t m2)
- {
--        if( m1 == 0 || m2 > TIFF_TMSIZE_T_MAX / m1 )
--            return 0;
--        return m1 * m2;
-+        return _TIFFMultiplySSize(NULL, m1, m2, NULL);
- }
- 
- static tmsize_t
---- a/libtiff/tif_read.c
-+++ b/libtiff/tif_read.c
-@@ -29,9 +29,6 @@
- #include "tiffiop.h"
- #include <stdio.h>
- 
--#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0))
--#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1)
--
- int TIFFFillStrip(TIFF* tif, uint32 strip);
- int TIFFFillTile(TIFF* tif, uint32 tile);
- static int TIFFStartStrip(TIFF* tif, uint32 strip);
-@@ -49,6 +46,8 @@ TIFFReadRawTile1(TIFF* tif, uint32 tile, void* buf, tmsize_t size, const char* m
- #define THRESHOLD_MULTIPLIER 10
- #define MAX_THRESHOLD (THRESHOLD_MULTIPLIER * THRESHOLD_MULTIPLIER * THRESHOLD_MULTIPLIER * INITIAL_THRESHOLD)
- 
-+#define TIFF_INT64_MAX ((((int64)0x7FFFFFFF) << 32) | 0xFFFFFFFF)
-+
- /* Read 'size' bytes in tif_rawdata buffer starting at offset 'rawdata_offset'
-  * Returns 1 in case of success, 0 otherwise. */
- static int TIFFReadAndRealloc( TIFF* tif, tmsize_t size,
-@@ -734,23 +733,8 @@ TIFFReadRawStrip(TIFF* tif, uint32 strip, void* buf, tmsize_t size)
- 		return ((tmsize_t)(-1));
- 	}
- 	bytecount = td->td_stripbytecount[strip];
--	if ((int64)bytecount <= 0) {
--#if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
--		TIFFErrorExt(tif->tif_clientdata, module,
--			     "%I64u: Invalid strip byte count, strip %lu",
--			     (unsigned __int64) bytecount,
--			     (unsigned long) strip);
--#else
--		TIFFErrorExt(tif->tif_clientdata, module,
--			     "%llu: Invalid strip byte count, strip %lu",
--			     (unsigned long long) bytecount,
--			     (unsigned long) strip);
--#endif
--		return ((tmsize_t)(-1));
--	}
--	bytecountm = (tmsize_t)bytecount;
--	if ((uint64)bytecountm!=bytecount) {
--		TIFFErrorExt(tif->tif_clientdata, module, "Integer overflow");
-+        bytecountm = _TIFFCastUInt64ToSSize(tif, bytecount, module);
-+	if (bytecountm == 0) {
- 		return ((tmsize_t)(-1));
- 	}
- 	if (size != (tmsize_t)(-1) && size < bytecountm)
-@@ -774,7 +758,7 @@ TIFFFillStrip(TIFF* tif, uint32 strip)
- 	if ((tif->tif_flags&TIFF_NOREADRAW)==0)
- 	{
- 		uint64 bytecount = td->td_stripbytecount[strip];
--		if ((int64)bytecount <= 0) {
-+		if( bytecount == 0 || bytecount > (uint64)TIFF_INT64_MAX ) {
- #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
- 			TIFFErrorExt(tif->tif_clientdata, module,
- 				"Invalid strip byte count %I64u, strip %lu",
-@@ -801,7 +785,7 @@ TIFFFillStrip(TIFF* tif, uint32 strip)
- 			    (bytecount - 4096) / 10 > (uint64)stripsize  )
- 			{
- 				uint64 newbytecount = (uint64)stripsize * 10 + 4096;
--				if( (int64)newbytecount >= 0 )
-+				if( newbytecount == 0 || newbytecount > (uint64)TIFF_INT64_MAX )
- 				{
- #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
- 					TIFFWarningExt(tif->tif_clientdata, module,
-@@ -1196,10 +1180,8 @@ TIFFReadRawTile(TIFF* tif, uint32 tile, void* buf, tmsize_t size)
- 	bytecount64 = td->td_stripbytecount[tile];
- 	if (size != (tmsize_t)(-1) && (uint64)size < bytecount64)
- 		bytecount64 = (uint64)size;
--	bytecountm = (tmsize_t)bytecount64;
--	if ((uint64)bytecountm!=bytecount64)
--	{
--		TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
-+	bytecountm = _TIFFCastUInt64ToSSize(tif, bytecount64, module);
-+        if( bytecountm == 0 ) {
- 		return ((tmsize_t)(-1));
- 	}
- 	return (TIFFReadRawTile1(tif, tile, buf, bytecountm, module));
-@@ -1221,7 +1203,7 @@ TIFFFillTile(TIFF* tif, uint32 tile)
- 	if ((tif->tif_flags&TIFF_NOREADRAW)==0)
- 	{
- 		uint64 bytecount = td->td_stripbytecount[tile];
--		if ((int64)bytecount <= 0) {
-+		if( bytecount == 0 || bytecount > (uint64)TIFF_INT64_MAX ) {
- #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
- 			TIFFErrorExt(tif->tif_clientdata, module,
- 				"%I64u: Invalid tile byte count, tile %lu",
-@@ -1248,7 +1230,7 @@ TIFFFillTile(TIFF* tif, uint32 tile)
- 			    (bytecount - 4096) / 10 > (uint64)stripsize  )
- 			{
- 				uint64 newbytecount = (uint64)stripsize * 10 + 4096;
--				if( (int64)newbytecount >= 0 )
-+				if( newbytecount == 0 || newbytecount > (uint64)TIFF_INT64_MAX )
- 				{
- #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
- 					TIFFWarningExt(tif->tif_clientdata, module,
---- a/libtiff/tif_strip.c
-+++ b/libtiff/tif_strip.c
-@@ -129,15 +129,8 @@ TIFFVStripSize(TIFF* tif, uint32 nrows)
- {
- 	static const char module[] = "TIFFVStripSize";
- 	uint64 m;
--	tmsize_t n;
- 	m=TIFFVStripSize64(tif,nrows);
--	n=(tmsize_t)m;
--	if ((uint64)n!=m)
--	{
--		TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
--		n=0;
--	}
--	return(n);
-+        return _TIFFCastUInt64ToSSize(tif, m, module);
- }
- 
- /*
-@@ -211,15 +204,8 @@ TIFFStripSize(TIFF* tif)
- {
- 	static const char module[] = "TIFFStripSize";
- 	uint64 m;
--	tmsize_t n;
- 	m=TIFFStripSize64(tif);
--	n=(tmsize_t)m;
--	if ((uint64)n!=m)
--	{
--		TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
--		n=0;
--	}
--	return(n);
-+	return _TIFFCastUInt64ToSSize(tif, m, module);
- }
- 
- /*
-@@ -330,14 +316,8 @@ TIFFScanlineSize(TIFF* tif)
- {
- 	static const char module[] = "TIFFScanlineSize";
- 	uint64 m;
--	tmsize_t n;
- 	m=TIFFScanlineSize64(tif);
--	n=(tmsize_t)m;
--	if ((uint64)n!=m) {
--		TIFFErrorExt(tif->tif_clientdata,module,"Integer arithmetic overflow");
--		n=0;
--	}
--	return(n);
-+	return _TIFFCastUInt64ToSSize(tif, m, module);
- }
- 
- /*
-@@ -366,15 +346,8 @@ TIFFRasterScanlineSize(TIFF* tif)
- {
- 	static const char module[] = "TIFFRasterScanlineSize";
- 	uint64 m;
--	tmsize_t n;
- 	m=TIFFRasterScanlineSize64(tif);
--	n=(tmsize_t)m;
--	if ((uint64)n!=m)
--	{
--		TIFFErrorExt(tif->tif_clientdata,module,"Integer arithmetic overflow");
--		n=0;
--	}
--	return(n);
-+	return _TIFFCastUInt64ToSSize(tif, m, module);
- }
- 
- /* vim: set ts=8 sts=8 sw=8 noet: */
---- a/libtiff/tif_tile.c
-+++ b/libtiff/tif_tile.c
-@@ -181,15 +181,8 @@ TIFFTileRowSize(TIFF* tif)
- {
- 	static const char module[] = "TIFFTileRowSize";
- 	uint64 m;
--	tmsize_t n;
- 	m=TIFFTileRowSize64(tif);
--	n=(tmsize_t)m;
--	if ((uint64)n!=m)
--	{
--		TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
--		n=0;
--	}
--	return(n);
-+	return _TIFFCastUInt64ToSSize(tif, m, module);
- }
- 
- /*
-@@ -248,15 +241,8 @@ TIFFVTileSize(TIFF* tif, uint32 nrows)
- {
- 	static const char module[] = "TIFFVTileSize";
- 	uint64 m;
--	tmsize_t n;
- 	m=TIFFVTileSize64(tif,nrows);
--	n=(tmsize_t)m;
--	if ((uint64)n!=m)
--	{
--		TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
--		n=0;
--	}
--	return(n);
-+	return _TIFFCastUInt64ToSSize(tif, m, module);
- }
- 
- /*
-@@ -272,15 +258,8 @@ TIFFTileSize(TIFF* tif)
- {
- 	static const char module[] = "TIFFTileSize";
- 	uint64 m;
--	tmsize_t n;
- 	m=TIFFTileSize64(tif);
--	n=(tmsize_t)m;
--	if ((uint64)n!=m)
--	{
--		TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
--		n=0;
--	}
--	return(n);
-+	return _TIFFCastUInt64ToSSize(tif, m, module);
- }
- 
- /*
---- a/libtiff/tiffiop.h
-+++ b/libtiff/tiffiop.h
-@@ -77,6 +77,9 @@ extern int snprintf(char* str, size_t size, const char* format, ...);
- #define	FALSE	0
- #endif
- 
-+#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0))
-+#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1)
-+
- typedef struct client_info {
-     struct client_info *next;
-     void *data;
-@@ -258,7 +261,7 @@ struct tiff {
- #define TIFFhowmany8_64(x) (((x)&0x07)?((uint64)(x)>>3)+1:(uint64)(x)>>3)
- #define TIFFroundup_64(x, y) (TIFFhowmany_64(x,y)*(y))
- 
--/* Safe multiply which returns zero if there is an integer overflow */
-+/* Safe multiply which returns zero if there is an *unsigned* integer overflow. This macro is not safe for *signed* integer types */
- #define TIFFSafeMultiply(t,v,m) ((((t)(m) != (t)0) && (((t)(((v)*(m))/(m))) == (t)(v))) ? (t)((v)*(m)) : (t)0)
- 
- #define TIFFmax(A,B) ((A)>(B)?(A):(B))
-@@ -368,6 +371,8 @@ extern TIFFErrorHandlerExt _TIFFerrorHandlerExt;
- 
- extern uint32 _TIFFMultiply32(TIFF*, uint32, uint32, const char*);
- extern uint64 _TIFFMultiply64(TIFF*, uint64, uint64, const char*);
-+extern tmsize_t _TIFFMultiplySSize(TIFF*, tmsize_t, tmsize_t, const char*);
-+extern tmsize_t _TIFFCastUInt64ToSSize(TIFF*, uint64, const char*);
- extern void* _TIFFCheckMalloc(TIFF*, tmsize_t, tmsize_t, const char*);
- extern void* _TIFFCheckRealloc(TIFF*, void*, tmsize_t, tmsize_t, const char*);
- 
diff --git a/media-libs/tiff/files/tiff-4.0.10-CVE-2019-17546-RGBA-integer-overflow.patch b/media-libs/tiff/files/tiff-4.0.10-CVE-2019-17546-RGBA-integer-overflow.patch
deleted file mode 100644
index 4cd4edd..0000000
--- a/media-libs/tiff/files/tiff-4.0.10-CVE-2019-17546-RGBA-integer-overflow.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 4bb584a35f87af42d6cf09d15e9ce8909a839145 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Thu, 15 Aug 2019 15:05:28 +0200
-Subject: [PATCH] RGBA interface: fix integer overflow potentially causing
- write heap buffer overflow, especially on 32 bit builds. Fixes
- https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=16443. Credit to OSS
- Fuzz
-
----
- libtiff/tif_getimage.c | 26 ++++++++++++++++++++------
- 1 file changed, 20 insertions(+), 6 deletions(-)
-
---- a/libtiff/tif_getimage.c
-+++ b/libtiff/tif_getimage.c
-@@ -950,16 +950,23 @@ gtStripContig(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
- 	fromskew = (w < imagewidth ? imagewidth - w : 0);
- 	for (row = 0; row < h; row += nrow)
- 	{
-+		uint32 temp;
- 		rowstoread = rowsperstrip - (row + img->row_offset) % rowsperstrip;
- 		nrow = (row + rowstoread > h ? h - row : rowstoread);
- 		nrowsub = nrow;
- 		if ((nrowsub%subsamplingver)!=0)
- 			nrowsub+=subsamplingver-nrowsub%subsamplingver;
-+		temp = (row + img->row_offset)%rowsperstrip + nrowsub;
-+		if( scanline > 0 && temp > (size_t)(TIFF_TMSIZE_T_MAX / scanline) )
-+		{
-+			TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Integer overflow in gtStripContig");
-+			return 0;
-+		}
- 		if (_TIFFReadEncodedStripAndAllocBuffer(tif,
- 		    TIFFComputeStrip(tif,row+img->row_offset, 0),
- 		    (void**)(&buf),
-                     maxstripsize,
--		    ((row + img->row_offset)%rowsperstrip + nrowsub) * scanline)==(tmsize_t)(-1)
-+		    temp * scanline)==(tmsize_t)(-1)
- 		    && (buf == NULL || img->stoponerr))
- 		{
- 			ret = 0;
-@@ -1053,15 +1060,22 @@ gtStripSeparate(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
- 	fromskew = (w < imagewidth ? imagewidth - w : 0);
- 	for (row = 0; row < h; row += nrow)
- 	{
-+		uint32 temp;
- 		rowstoread = rowsperstrip - (row + img->row_offset) % rowsperstrip;
- 		nrow = (row + rowstoread > h ? h - row : rowstoread);
- 		offset_row = row + img->row_offset;
-+		temp = (row + img->row_offset)%rowsperstrip + nrow;
-+                if( scanline > 0 && temp > (size_t)(TIFF_TMSIZE_T_MAX / scanline) )
-+                {
-+                        TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Integer overflow in gtStripSeparate");
-+                        return 0;
-+                }
-                 if( buf == NULL )
-                 {
-                     if (_TIFFReadEncodedStripAndAllocBuffer(
-                             tif, TIFFComputeStrip(tif, offset_row, 0),
-                             (void**) &buf, bufsize,
--                            ((row + img->row_offset)%rowsperstrip + nrow) * scanline)==(tmsize_t)(-1)
-+			    temp * scanline)==(tmsize_t)(-1)
-                         && (buf == NULL || img->stoponerr))
-                     {
-                             ret = 0;
-@@ -1081,7 +1095,7 @@ gtStripSeparate(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
-                     }
-                 }
- 		else if (TIFFReadEncodedStrip(tif, TIFFComputeStrip(tif, offset_row, 0),
--		    p0, ((row + img->row_offset)%rowsperstrip + nrow) * scanline)==(tmsize_t)(-1)
-+		    p0, temp * scanline)==(tmsize_t)(-1)
- 		    && img->stoponerr)
- 		{
- 			ret = 0;
-@@ -1089,7 +1103,7 @@ gtStripSeparate(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
- 		}
- 		if (colorchannels > 1 
-                     && TIFFReadEncodedStrip(tif, TIFFComputeStrip(tif, offset_row, 1),
--                                            p1, ((row + img->row_offset)%rowsperstrip + nrow) * scanline) == (tmsize_t)(-1)
-+                                            p1, temp * scanline) == (tmsize_t)(-1)
- 		    && img->stoponerr)
- 		{
- 			ret = 0;
-@@ -1097,7 +1111,7 @@ gtStripSeparate(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
- 		}
- 		if (colorchannels > 1 
-                     && TIFFReadEncodedStrip(tif, TIFFComputeStrip(tif, offset_row, 2),
--                                            p2, ((row + img->row_offset)%rowsperstrip + nrow) * scanline) == (tmsize_t)(-1)
-+                                            p2, temp * scanline) == (tmsize_t)(-1)
- 		    && img->stoponerr)
- 		{
- 			ret = 0;
-@@ -1106,7 +1120,7 @@ gtStripSeparate(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
- 		if (alpha)
- 		{
- 			if (TIFFReadEncodedStrip(tif, TIFFComputeStrip(tif, offset_row, colorchannels),
--			    pa, ((row + img->row_offset)%rowsperstrip + nrow) * scanline)==(tmsize_t)(-1)
-+			    pa, temp * scanline)==(tmsize_t)(-1)
- 			    && img->stoponerr)
- 			{
- 				ret = 0;
--- 
-2.21.0
-
diff --git a/media-libs/tiff/files/tiff-4.0.10-CVE-2019-6128-pal2rgb-leak.patch b/media-libs/tiff/files/tiff-4.0.10-CVE-2019-6128-pal2rgb-leak.patch
deleted file mode 100644
index 38d020f..0000000
--- a/media-libs/tiff/files/tiff-4.0.10-CVE-2019-6128-pal2rgb-leak.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://crbug.com/923647
-
-commit ae0bed1fe530a82faf2e9ea1775109dbf301a971
-Merge: 933784a1 0c74a9f4
-Author: Even Rouault <even.rouault@spatialys.com>
-Date:   Sat Feb 2 14:46:05 2019 +0000
-
-    Merge branch 'master' into 'master'
-
-    Fix for simple memory leak that was assigned CVE-2019-6128.
-
-    See merge request libtiff/libtiff!50
-
-diff --git a/tools/pal2rgb.c b/tools/pal2rgb.c
-index 01d8502ecf7a8a7f015e49ca9378a1a741cbc06b..9492f1cf1212177bf7e97d307757d0977c898e90 100644
---- a/tools/pal2rgb.c
-+++ b/tools/pal2rgb.c
-@@ -118,12 +118,14 @@ main(int argc, char* argv[])
- 	    shortv != PHOTOMETRIC_PALETTE) {
- 		fprintf(stderr, "%s: Expecting a palette image.\n",
- 		    argv[optind]);
-+		(void) TIFFClose(in);
- 		return (-1);
- 	}
- 	if (!TIFFGetField(in, TIFFTAG_COLORMAP, &rmap, &gmap, &bmap)) {
- 		fprintf(stderr,
- 		    "%s: No colormap (not a valid palette image).\n",
- 		    argv[optind]);
-+		(void) TIFFClose(in);
- 		return (-1);
- 	}
- 	bitspersample = 0;
-@@ -131,11 +133,14 @@ main(int argc, char* argv[])
- 	if (bitspersample != 8) {
- 		fprintf(stderr, "%s: Sorry, can only handle 8-bit images.\n",
- 		    argv[optind]);
-+		(void) TIFFClose(in);
- 		return (-1);
- 	}
- 	out = TIFFOpen(argv[optind+1], "w");
--	if (out == NULL)
-+	if (out == NULL) {
-+		(void) TIFFClose(in);
- 		return (-2);
-+	}
- 	cpTags(in, out);
- 	TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &imagewidth);
- 	TIFFGetField(in, TIFFTAG_IMAGELENGTH, &imagelength);
diff --git a/media-libs/tiff/files/tiff-4.0.10-CVE-2019-7663-tiffcpIntegerOverflow.patch b/media-libs/tiff/files/tiff-4.0.10-CVE-2019-7663-tiffcpIntegerOverflow.patch
deleted file mode 100644
index a68ba2f..0000000
--- a/media-libs/tiff/files/tiff-4.0.10-CVE-2019-7663-tiffcpIntegerOverflow.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 2b0d0e699730d1f26bbeba8397bfdf0e9e01e59d Mon Sep 17 00:00:00 2001
-From: Thomas Bernard <miniupnp@free.fr>
-Date: Mon, 11 Feb 2019 10:05:33 +0100
-Subject: [PATCH 1/2] check that (Tile Width)*(Samples/Pixel) do no overflow
-
-fixes bug 2833
----
- tools/tiffcp.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/tools/tiffcp.c b/tools/tiffcp.c
-index 2f406e2d7..f0ee2c029 100644
---- a/tools/tiffcp.c
-+++ b/tools/tiffcp.c
-@@ -1408,7 +1408,7 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer)
- 	int status = 1;
- 	uint32 imagew = TIFFRasterScanlineSize(in);
- 	uint32 tilew = TIFFTileRowSize(in);
--	int iskew  = imagew - tilew*spp;
-+	int iskew;
- 	tsize_t tilesize = TIFFTileSize(in);
- 	tdata_t tilebuf;
- 	uint8* bufp = (uint8*) buf;
-@@ -1416,6 +1416,12 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer)
- 	uint32 row;
- 	uint16 bps = 0, bytes_per_sample;
- 
-+	if (spp > (0x7fffffff / tilew))
-+	{
-+		TIFFError(TIFFFileName(in), "Error, cannot handle that much samples per tile row (Tile Width * Samples/Pixel)");
-+		return 0;
-+	}
-+	iskew = imagew - tilew*spp;
- 	tilebuf = _TIFFmalloc(tilesize);
- 	if (tilebuf == 0)
- 		return 0;
--- 
-2.21.0
-
-
-From 7cc76e9bc40bc8eb329a718ab26ecef7dd1afd94 Mon Sep 17 00:00:00 2001
-From: Thomas Bernard <miniupnp@free.fr>
-Date: Mon, 11 Feb 2019 21:42:03 +0100
-Subject: [PATCH 2/2] tiffcp.c: use INT_MAX
-
----
- tools/tiffcp.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tools/tiffcp.c b/tools/tiffcp.c
-index f0ee2c029..8c81aa4f2 100644
---- a/tools/tiffcp.c
-+++ b/tools/tiffcp.c
-@@ -41,6 +41,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <limits.h>
- 
- #include <ctype.h>
- 
-@@ -1416,7 +1417,7 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer)
- 	uint32 row;
- 	uint16 bps = 0, bytes_per_sample;
- 
--	if (spp > (0x7fffffff / tilew))
-+	if (spp > (INT_MAX / tilew))
- 	{
- 		TIFFError(TIFFFileName(in), "Error, cannot handle that much samples per tile row (Tile Width * Samples/Pixel)");
- 		return 0;
--- 
-2.21.0
-
diff --git a/media-libs/tiff/metadata.xml b/media-libs/tiff/metadata.xml
index 1844a8c..7cc4f8f 100644
--- a/media-libs/tiff/metadata.xml
+++ b/media-libs/tiff/metadata.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
-<longdescription>TIFF image library and tools, mostly for scanner and fax
- support, but also used by GIS and other imaging tools.</longdescription>
-<upstream>
-	<remote-id type="cpe">cpe:/a:libtiff:libtiff</remote-id>
-	<remote-id type="cpe">cpe:/a:libtiff_project:libtiff</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>codec@gentoo.org</email>
+		<name>Gentoo Codec Project</name>
+	</maintainer>
+	<longdescription>
+		TIFF image library and tools, mostly for scanner and fax
+		support, but also used by GIS and other imaging tools.
+	</longdescription>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:libtiff:libtiff</remote-id>
+		<remote-id type="cpe">cpe:/a:libtiff_project:libtiff</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/tiff/tiff-4.0.10-r4.ebuild b/media-libs/tiff/tiff-4.0.10-r4.ebuild
deleted file mode 100644
index 6d4749b..0000000
--- a/media-libs/tiff/tiff-4.0.10-r4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools libtool multilib-minimal
-
-DESCRIPTION="Tag Image File Format (TIFF) library"
-HOMEPAGE="http://libtiff.maptools.org"
-SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
-
-LICENSE="libtiff"
-SLOT="0"
-KEYWORDS="*"
-IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
-
-RDEPEND="
-	jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zstd? ( >=app-arch/zstd-1.3.7-r1:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="test? ( jpeg )" #483132
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.10-CVE-2018-17000-tif_dirwrite-null-dereference.patch
-	"${FILESDIR}"/${PN}-4.0.10-CVE-2019-6128-pal2rgb-leak.patch
-	"${FILESDIR}"/${PN}-4.0.10-CVE-2019-7663-tiffcpIntegerOverflow.patch
-	"${FILESDIR}"/${P}-CVE-2019-14973-fix-integer-overflow.patch
-	"${FILESDIR}"/${P}-CVE-2019-17546-RGBA-integer-overflow.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/tiffconf.h
-)
-
-src_prepare() {
-	default
-
-	# tiffcp-thumbnail.sh fails as thumbnail binary doesn't get built anymore since tiff-4.0.7
-	sed '/tiffcp-thumbnail\.sh/d' -i test/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--without-x
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable cxx)
-		$(use_enable jbig)
-		$(use_enable jpeg)
-		$(use_enable lzma)
-		$(use_enable static-libs static)
-		$(use_enable webp)
-		$(use_enable zlib)
-		$(use_enable zstd)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	# remove useless subdirs
-	if ! multilib_is_native_abi ; then
-		sed -i \
-			-e 's/ tools//' \
-			-e 's/ contrib//' \
-			-e 's/ man//' \
-			-e 's/ html//' \
-			Makefile || die
-	fi
-}
-
-multilib_src_test() {
-	if ! multilib_is_native_abi ; then
-		emake -C tools
-	fi
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-	rm "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} || die
-}
diff --git a/media-libs/tiff/tiff-4.2.0.ebuild b/media-libs/tiff/tiff-4.2.0.ebuild
new file mode 100644
index 0000000..b395759
--- /dev/null
+++ b/media-libs/tiff/tiff-4.2.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool multilib-minimal
+
+DESCRIPTION="Tag Image File Format (TIFF) library"
+HOMEPAGE="http://libtiff.maptools.org"
+SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
+
+LICENSE="libtiff"
+SLOT="0"
+KEYWORDS="*"
+IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
+	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zstd? ( >=app-arch/zstd-1.3.7-r1:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="test? ( jpeg )" #483132
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/tiffconf.h
+)
+
+src_prepare() {
+	default
+
+	# tiffcp-thumbnail.sh fails as thumbnail binary doesn't get built anymore since tiff-4.0.7
+	sed '/tiffcp-thumbnail\.sh/d' -i test/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--without-x
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable cxx)
+		$(use_enable jbig)
+		$(use_enable jpeg)
+		$(use_enable lzma)
+		$(use_enable static-libs static)
+		$(use_enable webp)
+		$(use_enable zlib)
+		$(use_enable zstd)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	# remove useless subdirs
+	if ! multilib_is_native_abi ; then
+		sed -i \
+			-e 's/ tools//' \
+			-e 's/ contrib//' \
+			-e 's/ man//' \
+			-e 's/ html//' \
+			Makefile || die
+	fi
+}
+
+multilib_src_test() {
+	if ! multilib_is_native_abi ; then
+		emake -C tools
+	fi
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} || die
+}
diff --git a/metadata/md5-cache/app-admin/haskell-updater-1.3.1 b/metadata/md5-cache/app-admin/haskell-updater-1.3.1
index 38acbef..3c7b1ee 100644
--- a/metadata/md5-cache/app-admin/haskell-updater-1.3.1
+++ b/metadata/md5-cache/app-admin/haskell-updater-1.3.1
@@ -8,5 +8,5 @@
 RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/haskell-updater-1.3.1/haskell-updater-1.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e265f92f3f204c98d36a800a888203b7
diff --git a/metadata/md5-cache/app-admin/setools-4.3.0 b/metadata/md5-cache/app-admin/setools-4.3.0
index 2f8415e..1a5cf28 100644
--- a/metadata/md5-cache/app-admin/setools-4.3.0
+++ b/metadata/md5-cache/app-admin/setools-4.3.0
@@ -12,5 +12,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/setools/releases/download/4.3.0/setools-4.3.0.tar.bz2
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=99e41720f427b28dd6e1eca2d2735df9
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.5_p2 b/metadata/md5-cache/app-admin/sudo-1.9.5_p2
index cd91ec1..74e5484 100644
--- a/metadata/md5-cache/app-admin/sudo-1.9.5_p2
+++ b/metadata/md5-cache/app-admin/sudo-1.9.5_p2
@@ -12,4 +12,4 @@
 SLOT=0
 SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.5p2.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.5p2.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3f4855f965de0c13c8feb60cd47657d2
+_md5_=15685ad337e752819b92c9a8a38febbc
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.5_p2-r1 b/metadata/md5-cache/app-admin/sudo-1.9.5_p2-r1
new file mode 100644
index 0000000..74e5484
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sudo-1.9.5_p2-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sssd? ( sys-auth/sssd[sudo] )
+DESCRIPTION=Allows users or groups to run commands as other users
+EAPI=7
+HOMEPAGE=https://www.sudo.ws/
+IUSE=gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd
+KEYWORDS=*
+LICENSE=ISC BSD
+RDEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
+REQUIRED_USE=?? ( pam skey ) ?? ( gcrypt ssl )
+SLOT=0
+SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.5p2.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.5p2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=15685ad337e752819b92c9a8a38febbc
diff --git a/metadata/md5-cache/app-admin/webapp-config-1.55-r1 b/metadata/md5-cache/app-admin/webapp-config-1.55-r1
index 5ba985b..a0458bd 100644
--- a/metadata/md5-cache/app-admin/webapp-config-1.55-r1
+++ b/metadata/md5-cache/app-admin/webapp-config-1.55-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~twitch153/webapp-config/webapp-config-1.55.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=57795549e5745126022bbdd88ad7e186
diff --git a/metadata/md5-cache/app-arch/brotli-1.0.7 b/metadata/md5-cache/app-arch/brotli-1.0.7
deleted file mode 100644
index 8ab4aad..0000000
--- a/metadata/md5-cache/app-arch/brotli-1.0.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=Generic-purpose lossless compression algorithm
-EAPI=7
-HOMEPAGE=https://github.com/google/brotli
-IUSE=python test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=*
-LICENSE=MIT python? ( Apache-2.0 )
-RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 ) )
-SLOT=0/1
-SRC_URI=https://github.com/google/brotli/archive/v1.0.7.tar.gz -> brotli-1.0.7.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	91d6ef31dc426240577497cacbf2508c	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fa1eaa08a1ad0717a7e2531d02a27e36
diff --git a/metadata/md5-cache/app-arch/brotli-1.0.9-r2 b/metadata/md5-cache/app-arch/brotli-1.0.9-r2
new file mode 100644
index 0000000..7566328
--- /dev/null
+++ b/metadata/md5-cache/app-arch/brotli-1.0.9-r2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DESCRIPTION=Generic-purpose lossless compression algorithm
+EAPI=7
+HOMEPAGE=https://github.com/google/brotli
+IUSE=python static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=*
+LICENSE=MIT python? ( Apache-2.0 )
+RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
+RESTRICT=test
+SLOT=0/1
+SRC_URI=https://github.com/google/brotli/archive/v1.0.9.tar.gz -> brotli-1.0.9.tar.gz
+_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	91d6ef31dc426240577497cacbf2508c	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cc05fa737d134b8ce139f621bac9d19d
diff --git a/metadata/md5-cache/app-arch/bzip2-1.0.6-r11 b/metadata/md5-cache/app-arch/bzip2-1.0.6-r11
deleted file mode 100644
index 284beef..0000000
--- a/metadata/md5-cache/app-arch/bzip2-1.0.6-r11
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A high-quality data compressor used extensively by Gentoo Linux
-EAPI=6
-HOMEPAGE=https://sourceware.org/bzip2/
-IUSE=static static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
-KEYWORDS=*
-LICENSE=BZIP2
-SLOT=0/1
-SRC_URI=mirror://gentoo/bzip2-1.0.6.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=184dd7a59992c59f040692916a1c6664
diff --git a/metadata/md5-cache/app-arch/bzip2-1.0.8-r1 b/metadata/md5-cache/app-arch/bzip2-1.0.8-r1
new file mode 100644
index 0000000..b874f0a
--- /dev/null
+++ b/metadata/md5-cache/app-arch/bzip2-1.0.8-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A high-quality data compressor used extensively by Gentoo Linux
+EAPI=7
+HOMEPAGE=https://sourceware.org/bzip2/
+IUSE=static static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 split-usr
+KEYWORDS=*
+LICENSE=BZIP2
+SLOT=0/1
+SRC_URI=https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
+_md5_=1e7bc16e0db2d175e880412a5b42971f
diff --git a/metadata/md5-cache/app-arch/cabextract-1.6 b/metadata/md5-cache/app-arch/cabextract-1.6
deleted file mode 100644
index aabcfbd..0000000
--- a/metadata/md5-cache/app-arch/cabextract-1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Extracts files from Microsoft cabinet archive files
-EAPI=5
-HOMEPAGE=http://www.cabextract.org.uk/
-IUSE=extras
-KEYWORDS=*
-LICENSE=GPL-3
-RDEPEND=extras? ( dev-lang/perl )
-SLOT=0
-SRC_URI=http://www.cabextract.org.uk/cabextract-1.6.tar.gz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=929aadb3d76dcdca6fc323ba96801126
diff --git a/metadata/md5-cache/app-arch/cabextract-1.9.1 b/metadata/md5-cache/app-arch/cabextract-1.9.1
new file mode 100644
index 0000000..365ef15
--- /dev/null
+++ b/metadata/md5-cache/app-arch/cabextract-1.9.1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-libs/libmspack-0.8_alpha:= virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Extracts files from Microsoft cabinet archive files
+EAPI=7
+HOMEPAGE=https://www.cabextract.org.uk/
+IUSE=extras
+KEYWORDS=*
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/libmspack-0.8_alpha:= extras? ( dev-lang/perl )
+SLOT=0
+SRC_URI=https://www.cabextract.org.uk/cabextract-1.9.1.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8bd7b390708013ecddf3fe3210726b02
diff --git a/metadata/md5-cache/app-arch/gcab-1.4 b/metadata/md5-cache/app-arch/gcab-1.4
index cdb4600..d620398 100644
--- a/metadata/md5-cache/app-arch/gcab-1.4
+++ b/metadata/md5-cache/app-arch/gcab-1.4
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/meson-0.50.0 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.14 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+BDEPEND=>=dev-util/meson-0.50.0 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.14 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=dev-libs/glib-2.62.0:2 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Library and tool for working with Microsoft Cabinet (CAB) files
@@ -12,5 +12,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gcab/1.4/gcab-1.4.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2f3804278870542119da624a5eded505	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2f3804278870542119da624a5eded505	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=88c830e3b9ac09e7135abe5d12d690f0
diff --git a/metadata/md5-cache/app-arch/gzip-1.10 b/metadata/md5-cache/app-arch/gzip-1.10
new file mode 100644
index 0000000..5375210
--- /dev/null
+++ b/metadata/md5-cache/app-arch/gzip-1.10
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Standard GNU compressor
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/gzip/
+IUSE=pic static
+KEYWORDS=*
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=mirror://gnu/gzip/gzip-1.10.tar.xz https://alpha.gnu.org/gnu/gzip/gzip-1.10.tar.xz mirror://gentoo/gzip-1.10.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ad8a5785252a5d6c065c2662aa07c618
diff --git a/metadata/md5-cache/app-arch/gzip-1.9 b/metadata/md5-cache/app-arch/gzip-1.9
deleted file mode 100644
index dbb8ba1..0000000
--- a/metadata/md5-cache/app-arch/gzip-1.9
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Standard GNU compressor
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/gzip/
-IUSE=pic static
-KEYWORDS=*
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://gnu/gzip/gzip-1.9.tar.xz mirror://gnu-alpha/gzip/gzip-1.9.tar.xz mirror://gentoo/gzip-1.9.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b37f48c1012d6599ce2b616c4e5d72d5
diff --git a/metadata/md5-cache/app-arch/lbzip2-2.5 b/metadata/md5-cache/app-arch/lbzip2-2.5
deleted file mode 100644
index 1a52435..0000000
--- a/metadata/md5-cache/app-arch/lbzip2-2.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170815
-DESCRIPTION=Parallel bzip2 utility
-EAPI=5
-HOMEPAGE=https://github.com/kjn/lbzip2/
-IUSE=debug symlink
-KEYWORDS=*
-LICENSE=GPL-3
-RDEPEND=symlink? ( !app-arch/pbzip2[symlink] )
-SLOT=0
-SRC_URI=http://archive.lbzip2.org/lbzip2-2.5.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b33e416066f80d2034b799da5cc2aac6
diff --git a/metadata/md5-cache/app-arch/lbzip2-2.5_p20181227-r1 b/metadata/md5-cache/app-arch/lbzip2-2.5_p20181227-r1
new file mode 100644
index 0000000..11cdfc7
--- /dev/null
+++ b/metadata/md5-cache/app-arch/lbzip2-2.5_p20181227-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install prepare
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Parallel bzip2 utility
+EAPI=7
+HOMEPAGE=https://github.com/kjn/lbzip2/
+IUSE=debug static symlink
+KEYWORDS=*
+LICENSE=GPL-3
+RDEPEND=symlink? ( !app-arch/pbzip2[symlink] )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~whissi/dist/lbzip2/lbzip2-2.5_p20181227.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=213d0cc02729fa3ea96a596e061056e7
diff --git a/metadata/md5-cache/app-arch/libarchive-3.4.2 b/metadata/md5-cache/app-arch/libarchive-3.4.2
deleted file mode 100644
index 28975be..0000000
--- a/metadata/md5-cache/app-arch/libarchive-3.4.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) blake2? ( app-crypt/libb2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) lzma? ( app-arch/xz-utils[threads=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) lzo? ( >=dev-libs/lzo-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) zstd? ( app-arch/zstd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) kernel_linux? ( virtual/os-headers e2fsprogs? ( sys-fs/e2fsprogs ) )
-DESCRIPTION=Multi-format archive and compression library
-EAPI=7
-HOMEPAGE=https://www.libarchive.org/
-IUSE=acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
-KEYWORDS=*
-LICENSE=BSD BSD-2 BSD-4 public-domain
-RDEPEND=acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) blake2? ( app-crypt/libb2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) lzma? ( app-arch/xz-utils[threads=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) lzo? ( >=dev-libs/lzo-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) zstd? ( app-arch/zstd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
-RESTRICT=test
-SLOT=0/13
-SRC_URI=https://www.libarchive.org/downloads/libarchive-3.4.2.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=06c9a6462f357ac795783d59acfeccb6
diff --git a/metadata/md5-cache/app-arch/libarchive-3.5.1 b/metadata/md5-cache/app-arch/libarchive-3.5.1
new file mode 100644
index 0000000..a7e93c6
--- /dev/null
+++ b/metadata/md5-cache/app-arch/libarchive-3.5.1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) blake2? ( app-crypt/libb2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) lzma? ( app-arch/xz-utils[threads=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) lzo? ( >=dev-libs/lzo-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) zstd? ( app-arch/zstd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) kernel_linux? ( virtual/os-headers e2fsprogs? ( sys-fs/e2fsprogs ) )
+DESCRIPTION=Multi-format archive and compression library
+EAPI=7
+HOMEPAGE=https://www.libarchive.org/
+IUSE=acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=BSD BSD-2 BSD-4 public-domain
+RDEPEND=acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) blake2? ( app-crypt/libb2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) lzma? ( app-arch/xz-utils[threads=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) lzo? ( >=dev-libs/lzo-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) zstd? ( app-arch/zstd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
+SLOT=0/13
+SRC_URI=https://www.libarchive.org/downloads/libarchive-3.5.1.tar.gz
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9c5c49970fd8dc609a71e6f246368be0
diff --git a/metadata/md5-cache/app-arch/lz4-1.9.2 b/metadata/md5-cache/app-arch/lz4-1.9.2
deleted file mode 100644
index f75160f..0000000
--- a/metadata/md5-cache/app-arch/lz4-1.9.2
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extremely Fast Compression algorithm
-EAPI=7
-HOMEPAGE=https://github.com/lz4/lz4
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
-KEYWORDS=*
-LICENSE=BSD-2 GPL-2
-SLOT=0/r132
-SRC_URI=https://github.com/lz4/lz4/archive/v1.9.2.tar.gz -> lz4-1.9.2.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=13f66555c0db5b7e622fb686f24949e8
diff --git a/metadata/md5-cache/app-arch/lz4-1.9.3 b/metadata/md5-cache/app-arch/lz4-1.9.3
new file mode 100644
index 0000000..f6ef478
--- /dev/null
+++ b/metadata/md5-cache/app-arch/lz4-1.9.3
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Extremely Fast Compression algorithm
+EAPI=7
+HOMEPAGE=https://github.com/lz4/lz4
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=BSD-2 GPL-2
+SLOT=0/r132
+SRC_URI=https://github.com/lz4/lz4/archive/v1.9.3.tar.gz -> lz4-1.9.3.tar.gz
+_eclasses_=cmake	b22e256fd899c7e0c747e8834eff121a	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4ab66cd7cbc318c1426b0a511f0e2893
diff --git a/metadata/md5-cache/app-arch/lzop-1.03 b/metadata/md5-cache/app-arch/lzop-1.03
deleted file mode 100644
index a351b74..0000000
--- a/metadata/md5-cache/app-arch/lzop-1.03
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=>=dev-libs/lzo-2
-DESCRIPTION=Utility for fast (even real-time) compression/decompression
-EAPI=2
-HOMEPAGE=http://www.lzop.org/
-KEYWORDS=*
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/lzo-2
-SLOT=0
-SRC_URI=http://www.lzop.org/download/lzop-1.03.tar.gz
-_md5_=01b7269acc878287f8e6258ae30a3f83
diff --git a/metadata/md5-cache/app-arch/lzop-1.04 b/metadata/md5-cache/app-arch/lzop-1.04
new file mode 100644
index 0000000..2a1d43b
--- /dev/null
+++ b/metadata/md5-cache/app-arch/lzop-1.04
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install test
+DEPEND=>=dev-libs/lzo-2
+DESCRIPTION=Utility for fast (even real-time) compression/decompression
+EAPI=6
+HOMEPAGE=https://www.lzop.org/
+KEYWORDS=*
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/lzo-2
+SLOT=0
+SRC_URI=https://www.lzop.org/download/lzop-1.04.tar.gz
+_md5_=8f43789294456f1880577f235d62783b
diff --git a/metadata/md5-cache/app-arch/makeself-2.2.0 b/metadata/md5-cache/app-arch/makeself-2.2.0
deleted file mode 100644
index 8e98fbe..0000000
--- a/metadata/md5-cache/app-arch/makeself-2.2.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DESCRIPTION=shell script that generates a self-extractible tar.gz
-EAPI=4
-HOMEPAGE=http://www.megastep.org/makeself/
-KEYWORDS=*
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/megastep/makeself/archive/release-2.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2227a1826e99e98dcffc3e67735489e3
diff --git a/metadata/md5-cache/app-arch/makeself-2.4.4 b/metadata/md5-cache/app-arch/makeself-2.4.4
new file mode 100644
index 0000000..c1ae124
--- /dev/null
+++ b/metadata/md5-cache/app-arch/makeself-2.4.4
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install postinst
+DESCRIPTION=Shell script that generates a self-extractible tar.gz
+EAPI=7
+HOMEPAGE=http://www.megastep.org/makeself/
+KEYWORDS=*
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=https://github.com/megastep/makeself/archive/refs/tags/release-2.4.4.tar.gz -> makeself-2.4.4.tar.gz
+_eclasses_=optfeature	f4941a15f8b66955c45f7b0e7c4ae890
+_md5_=9da09d8da60984d85998bee10d27f4a3
diff --git a/metadata/md5-cache/app-arch/p7zip-16.02-r2 b/metadata/md5-cache/app-arch/p7zip-16.02-r2
deleted file mode 100644
index da35986..0000000
--- a/metadata/md5-cache/app-arch/p7zip-16.02-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=wxwidgets? ( x11-libs/wxGTK:3.0[X] ) abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/nasm )
-DESCRIPTION=Port of 7-Zip archiver for Unix
-EAPI=6
-HOMEPAGE=http://p7zip.sourceforge.net/
-IUSE=abi_x86_x32 doc kde +pch rar static wxwidgets
-KEYWORDS=*
-LICENSE=LGPL-2.1 rar? ( unRAR )
-RDEPEND=wxwidgets? ( x11-libs/wxGTK:3.0[X] )
-REQUIRED_USE=kde? ( wxwidgets )
-SLOT=0
-SRC_URI=mirror://sourceforge/p7zip/p7zip_16.02_src_all.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89
-_md5_=2c4adc959a1ef13ebbaa8f718d872554
diff --git a/metadata/md5-cache/app-arch/p7zip-16.02-r8 b/metadata/md5-cache/app-arch/p7zip-16.02-r8
new file mode 100644
index 0000000..664b7af
--- /dev/null
+++ b/metadata/md5-cache/app-arch/p7zip-16.02-r8
@@ -0,0 +1,15 @@
+BDEPEND=abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/nasm )
+DEFINED_PHASES=compile install postinst postrm preinst prepare test
+DEPEND=wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Port of 7-Zip archiver for Unix
+EAPI=7
+HOMEPAGE=http://p7zip.sourceforge.net/
+IUSE=abi_x86_x32 doc kde +pch rar static wxwidgets
+KEYWORDS=*
+LICENSE=LGPL-2.1 rar? ( unRAR )
+RDEPEND=wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] )
+REQUIRED_USE=kde? ( wxwidgets )
+SLOT=0
+SRC_URI=mirror://sourceforge/p7zip/p7zip_16.02_src_all.tar.bz2
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5b8433d269d615fec5807f84555ea27b
diff --git a/metadata/md5-cache/app-arch/pbzip2-1.1.13 b/metadata/md5-cache/app-arch/pbzip2-1.1.13
index 34654bf..d84e6c7 100644
--- a/metadata/md5-cache/app-arch/pbzip2-1.1.13
+++ b/metadata/md5-cache/app-arch/pbzip2-1.1.13
@@ -1,7 +1,7 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=configure install prepare
 DEPEND=!static? ( app-arch/bzip2 ) symlink? ( !app-arch/lbzip2[symlink] ) static? ( app-arch/bzip2[static-libs(+)] )
 DESCRIPTION=Parallel bzip2 (de)compressor using libbz2
-EAPI=5
+EAPI=7
 HOMEPAGE=http://compression.ca/pbzip2/ https://launchpad.net/pbzip2
 IUSE=static symlink
 KEYWORDS=*
@@ -9,5 +9,5 @@
 RDEPEND=!static? ( app-arch/bzip2 ) symlink? ( !app-arch/lbzip2[symlink] )
 SLOT=0
 SRC_URI=https://launchpad.net/pbzip2/1.1/1.1.13/+download/pbzip2-1.1.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=41c2f73f688d7605829e193a7ac5a804
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=54c3d928b7e6edfcbe0714006c17d223
diff --git a/metadata/md5-cache/app-arch/pigz-2.3.1 b/metadata/md5-cache/app-arch/pigz-2.3.1
deleted file mode 100644
index b65ea4a..0000000
--- a/metadata/md5-cache/app-arch/pigz-2.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=!static? ( sys-libs/zlib ) static? ( sys-libs/zlib[static-libs(+)] ) test? ( app-arch/ncompress )
-DESCRIPTION=A parallel implementation of gzip
-EAPI=5
-HOMEPAGE=http://www.zlib.net/pigz/
-IUSE=static symlink test
-KEYWORDS=*
-LICENSE=ZLIB
-RDEPEND=!static? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=http://www.zlib.net/pigz/pigz-2.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=85b1c0ce1cae1cd15aed21fe89628186
diff --git a/metadata/md5-cache/app-arch/pigz-2.6 b/metadata/md5-cache/app-arch/pigz-2.6
new file mode 100644
index 0000000..cbbe3e9
--- /dev/null
+++ b/metadata/md5-cache/app-arch/pigz-2.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install
+DEPEND=!static? ( sys-libs/zlib ) static? ( sys-libs/zlib[static-libs(+)] ) test? ( app-arch/ncompress )
+DESCRIPTION=A parallel implementation of gzip
+EAPI=7
+HOMEPAGE=https://www.zlib.net/pigz/
+IUSE=static symlink test
+KEYWORDS=*
+LICENSE=ZLIB
+RDEPEND=!static? ( sys-libs/zlib )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.zlib.net/pigz/pigz-2.6.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6e2a58c9e7bbc0f78749b0a27bf67ebb
diff --git a/metadata/md5-cache/app-arch/pixz-1.0.6 b/metadata/md5-cache/app-arch/pixz-1.0.6
deleted file mode 100644
index 2fe189f..0000000
--- a/metadata/md5-cache/app-arch/pixz-1.0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 ) static? ( >=app-arch/libarchive-2.8:=[static-libs(+)] >=app-arch/xz-utils-5[static-libs(+)] )
-DESCRIPTION=Parallel Indexed XZ compressor
-EAPI=5
-HOMEPAGE=https://github.com/vasi/pixz
-IUSE=static
-KEYWORDS=*
-LICENSE=BSD-2
-RDEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 )
-SLOT=0
-SRC_URI=https://github.com/vasi/pixz/releases/download/v1.0.6/pixz-1.0.6.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a6759370794eb95b4fb71ad9ef8d2e6c
diff --git a/metadata/md5-cache/app-arch/pixz-1.0.7 b/metadata/md5-cache/app-arch/pixz-1.0.7
new file mode 100644
index 0000000..2f1a482
--- /dev/null
+++ b/metadata/md5-cache/app-arch/pixz-1.0.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare test
+DEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 ) static? ( >=app-arch/libarchive-2.8:=[static-libs(+)] >=app-arch/xz-utils-5[static-libs(+)] )
+DESCRIPTION=Parallel Indexed XZ compressor
+EAPI=7
+HOMEPAGE=https://github.com/vasi/pixz
+IUSE=static
+KEYWORDS=*
+LICENSE=BSD-2
+RDEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 )
+SLOT=0
+SRC_URI=https://github.com/vasi/pixz/releases/download/v1.0.7/pixz-1.0.7.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7eee69f2c76be2734cb9f5d0bab1668a
diff --git a/metadata/md5-cache/app-arch/pixz-9999 b/metadata/md5-cache/app-arch/pixz-9999
deleted file mode 100644
index 1c0ad35..0000000
--- a/metadata/md5-cache/app-arch/pixz-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare unpack
-DEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 ) static? ( >=app-arch/libarchive-2.8:=[static-libs(+)] >=app-arch/xz-utils-5[static-libs(+)] ) app-text/asciidoc >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Parallel Indexed XZ compressor
-EAPI=5
-HOMEPAGE=https://github.com/vasi/pixz
-IUSE=static
-LICENSE=BSD-2
-PROPERTIES=live
-RDEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 )
-SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-r3	c8f4649ab5a3c07ee2b75b12bc446f6a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a6759370794eb95b4fb71ad9ef8d2e6c
diff --git a/metadata/md5-cache/app-arch/rpm2targz-2021.03.16 b/metadata/md5-cache/app-arch/rpm2targz-2021.03.16
new file mode 100644
index 0000000..74132d5
--- /dev/null
+++ b/metadata/md5-cache/app-arch/rpm2targz-2021.03.16
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Convert a .rpm file to a .tar.gz archive
+EAPI=7
+HOMEPAGE=http://www.slackware.com/config/packages.php
+KEYWORDS=*
+LICENSE=BSD-1
+RDEPEND=app-arch/cpio
+SLOT=0
+SRC_URI=mirror://gentoo/rpm2targz-2021.03.16.tar.xz https://dev.gentoo.org/~vapier/dist/rpm2targz-2021.03.16.tar.xz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5bcce2c9555ff73726906a262d01edbc
diff --git a/metadata/md5-cache/app-arch/rpm2targz-9.0.0.5g b/metadata/md5-cache/app-arch/rpm2targz-9.0.0.5g
deleted file mode 100644
index 42ee975..0000000
--- a/metadata/md5-cache/app-arch/rpm2targz-9.0.0.5g
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Convert a .rpm file to a .tar.gz archive
-EAPI=4
-HOMEPAGE=http://www.slackware.com/config/packages.php
-KEYWORDS=*
-LICENSE=BSD-1
-RDEPEND=app-arch/cpio
-SLOT=0
-SRC_URI=mirror://gentoo/rpm2targz-9.0.0.5g.tar.xz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a18fb2d094a7740a0a0bf6ff6b54669e
diff --git a/metadata/md5-cache/app-arch/sharutils-4.14-r1 b/metadata/md5-cache/app-arch/sharutils-4.14-r1
deleted file mode 100644
index 0dd11aa..0000000
--- a/metadata/md5-cache/app-arch/sharutils-4.14-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=app-arch/xz-utils sys-apps/texinfo nls? ( >=sys-devel/gettext-0.10.35 )
-DESCRIPTION=Tools to deal with shar archives
-EAPI=5
-HOMEPAGE=http://www.gnu.org/software/sharutils/
-IUSE=nls
-KEYWORDS=*
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://gnu/sharutils/sharutils-4.14.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ece8f4fcb334803a1a00444195711a36
diff --git a/metadata/md5-cache/app-arch/sharutils-4.15.2-r2 b/metadata/md5-cache/app-arch/sharutils-4.15.2-r2
new file mode 100644
index 0000000..aeb542a
--- /dev/null
+++ b/metadata/md5-cache/app-arch/sharutils-4.15.2-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=app-arch/xz-utils sys-apps/texinfo nls? ( >=sys-devel/gettext-0.10.35 )
+DESCRIPTION=Tools to deal with shar archives
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/sharutils/
+IUSE=nls
+KEYWORDS=*
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=mirror://gnu/sharutils/sharutils-4.15.2.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2611729699ac04b392d2fa1a5b6132c6
diff --git a/metadata/md5-cache/app-arch/snappy-1.1.7 b/metadata/md5-cache/app-arch/snappy-1.1.7
deleted file mode 100644
index 47713e8..0000000
--- a/metadata/md5-cache/app-arch/snappy-1.1.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A high-speed compression/decompression library by Google
-EAPI=6
-HOMEPAGE=https://github.com/google/snappy
-IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
-KEYWORDS=*
-LICENSE=BSD
-REQUIRED_USE=!static-libs
-SLOT=0/1
-SRC_URI=https://github.com/google/snappy/archive/1.1.7.tar.gz -> snappy-1.1.7.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=df9765652684d2806a38960375f9fafd
diff --git a/metadata/md5-cache/app-arch/snappy-1.1.8 b/metadata/md5-cache/app-arch/snappy-1.1.8
new file mode 100644
index 0000000..2de3952
--- /dev/null
+++ b/metadata/md5-cache/app-arch/snappy-1.1.8
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-cpp/gtest )
+DESCRIPTION=A high-speed compression/decompression library by Google
+EAPI=7
+HOMEPAGE=https://github.com/google/snappy
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=BSD
+RESTRICT=!test? ( test )
+SLOT=0/1
+SRC_URI=https://github.com/google/snappy/archive/1.1.8.tar.gz -> snappy-1.1.8.tar.gz
+_eclasses_=cmake	b22e256fd899c7e0c747e8834eff121a	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6592ebfc86ab6fd8d0aef88903b7fc83
diff --git a/metadata/md5-cache/app-arch/unrar-5.9.4 b/metadata/md5-cache/app-arch/unrar-5.9.4
deleted file mode 100644
index 51de422..0000000
--- a/metadata/md5-cache/app-arch/unrar-5.9.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=Uncompress rar files
-EAPI=7
-HOMEPAGE=https://www.rarlab.com/rar_add.htm
-KEYWORDS=*
-LICENSE=unRAR
-RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
-SLOT=0/5
-SRC_URI=https://www.rarlab.com/rar/unrarsrc-5.9.4.tar.gz -> unrar-5.9.4.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4432bd2b2a437ad248a6fb4ed5eaf50e
diff --git a/metadata/md5-cache/app-arch/unrar-6.0.6 b/metadata/md5-cache/app-arch/unrar-6.0.6
new file mode 100644
index 0000000..d52237c
--- /dev/null
+++ b/metadata/md5-cache/app-arch/unrar-6.0.6
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=Uncompress rar files
+EAPI=7
+HOMEPAGE=https://www.rarlab.com/rar_add.htm
+KEYWORDS=*
+LICENSE=unRAR
+RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
+SLOT=0/6
+SRC_URI=https://www.rarlab.com/rar/unrarsrc-6.0.6.tar.gz -> unrar-6.0.6.tar.gz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a765984fd8071f1aeb65f01d0bd5020d
diff --git a/metadata/md5-cache/app-arch/unzip-6.0_p21-r2 b/metadata/md5-cache/app-arch/unzip-6.0_p21-r2
deleted file mode 100644
index 0f61766..0000000
--- a/metadata/md5-cache/app-arch/unzip-6.0_p21-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
-DESCRIPTION=unzipper for pkzip-compressed files
-EAPI=6
-HOMEPAGE=http://www.info-zip.org/
-IUSE=bzip2 natspec unicode
-KEYWORDS=*
-LICENSE=Info-ZIP
-RDEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
-SLOT=0
-SRC_URI=mirror://sourceforge/infozip/unzip60.tar.gz mirror://debian/pool/main/u/unzip/unzip_6.0-21.debian.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=481114f1b6a95f2a30133fb3ad600f43
diff --git a/metadata/md5-cache/app-arch/unzip-6.0_p26 b/metadata/md5-cache/app-arch/unzip-6.0_p26
new file mode 100644
index 0000000..cfa0a11
--- /dev/null
+++ b/metadata/md5-cache/app-arch/unzip-6.0_p26
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
+DESCRIPTION=unzipper for pkzip-compressed files
+EAPI=7
+HOMEPAGE=http://www.info-zip.org/
+IUSE=bzip2 natspec unicode
+KEYWORDS=*
+LICENSE=Info-ZIP
+RDEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
+SLOT=0
+SRC_URI=mirror://sourceforge/infozip/unzip60.tar.gz mirror://debian/pool/main/u/unzip/unzip_6.0-26.debian.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=59e4feb4b4ce733eef78ff8339922bc7
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.2.4-r2 b/metadata/md5-cache/app-arch/xz-utils-5.2.4-r2
deleted file mode 100644
index 8bb779c..0000000
--- a/metadata/md5-cache/app-arch/xz-utils-5.2.4-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=!<app-arch/lzma-4.63 !<app-arch/p7zip-4.57 >=app-portage/elt-patches-20170815
-DESCRIPTION=utils for managing LZMA compressed files
-EAPI=6
-HOMEPAGE=https://tukaani.org/xz/
-IUSE=elibc_FreeBSD +extra-filters nls static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 split-usr
-KEYWORDS=*
-LICENSE=public-domain LGPL-2.1+ GPL-2+
-RDEPEND=!<app-arch/lzma-4.63 !<app-arch/p7zip-4.57
-RESTRICT=!extra-filters? ( test )
-SLOT=0
-SRC_URI=https://tukaani.org/xz/xz-5.2.4.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=d06b1fcdfb6b53d0f9c71382a97b9b31
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.2.5 b/metadata/md5-cache/app-arch/xz-utils-5.2.5
new file mode 100644
index 0000000..1d70074
--- /dev/null
+++ b/metadata/md5-cache/app-arch/xz-utils-5.2.5
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=!<app-arch/lzma-4.63 !<app-arch/p7zip-4.57 !<app-i18n/man-pages-de-2.16
+DESCRIPTION=utils for managing LZMA compressed files
+EAPI=7
+HOMEPAGE=https://tukaani.org/xz/
+IUSE=elibc_FreeBSD +extra-filters nls static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 split-usr
+KEYWORDS=*
+LICENSE=public-domain LGPL-2.1+ GPL-2+
+RDEPEND=!<app-arch/lzma-4.63 !<app-arch/p7zip-4.57 !<app-i18n/man-pages-de-2.16
+RESTRICT=!extra-filters? ( test )
+SLOT=0
+SRC_URI=https://tukaani.org/xz/xz-5.2.5.tar.gz
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
+_md5_=a15553680ac3a14946cdf694cb776bb9
diff --git a/metadata/md5-cache/app-arch/zip-3.0-r3 b/metadata/md5-cache/app-arch/zip-3.0-r3
deleted file mode 100644
index e900bd2..0000000
--- a/metadata/md5-cache/app-arch/zip-3.0-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec ) app-arch/unzip
-DESCRIPTION=Info ZIP (encryption support)
-EAPI=4
-HOMEPAGE=http://www.info-zip.org/
-IUSE=bzip2 crypt natspec unicode
-KEYWORDS=*
-LICENSE=Info-ZIP
-RDEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
-SLOT=0
-SRC_URI=mirror://sourceforge/infozip/zip30.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=892f4d2d23d97a28f0bd4bcd65c97809
diff --git a/metadata/md5-cache/app-arch/zip-3.0-r4 b/metadata/md5-cache/app-arch/zip-3.0-r4
new file mode 100644
index 0000000..02ef310
--- /dev/null
+++ b/metadata/md5-cache/app-arch/zip-3.0-r4
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=Info ZIP (encryption support)
+EAPI=7
+HOMEPAGE=http://www.info-zip.org/
+IUSE=bzip2 crypt natspec unicode
+KEYWORDS=*
+LICENSE=Info-ZIP
+RDEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
+SLOT=0
+SRC_URI=mirror://sourceforge/infozip/zip30.zip
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fc8ea10664d54de5026d49ba9c5ca33b
diff --git a/metadata/md5-cache/app-benchmarks/stress-ng-0.11.17 b/metadata/md5-cache/app-benchmarks/stress-ng-0.11.17
deleted file mode 100644
index 5499b66..0000000
--- a/metadata/md5-cache/app-benchmarks/stress-ng-0.11.17
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile postinst
-DEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib
-DESCRIPTION=Stress test for a computer system with various selectable ways
-EAPI=7
-HOMEPAGE=https://kernel.ubuntu.com/~cking/stress-ng/
-KEYWORDS=*
-LICENSE=GPL-2+
-RDEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib
-SLOT=0
-SRC_URI=https://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-0.11.17.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=db84754d9fe1a8de86deebf9ab0de701
diff --git a/metadata/md5-cache/app-benchmarks/stress-ng-0.12.09 b/metadata/md5-cache/app-benchmarks/stress-ng-0.12.09
new file mode 100644
index 0000000..9ec7315
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/stress-ng-0.12.09
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile postinst prepare
+DEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib
+DESCRIPTION=Stress test for a computer system with various selectable ways
+EAPI=7
+HOMEPAGE=https://kernel.ubuntu.com/~cking/stress-ng/
+KEYWORDS=*
+LICENSE=GPL-2+
+RDEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib
+SLOT=0
+SRC_URI=https://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-0.12.09.tar.xz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	optfeature	f4941a15f8b66955c45f7b0e7c4ae890	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e642d5c1272e720ad18e24480661b943
diff --git a/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha06 b/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha06
index a5f8688..35bc92e 100644
--- a/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha06
+++ b/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha06
@@ -9,5 +9,5 @@
 RDEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit
 SLOT=0
 SRC_URI=mirror://sourceforge/cdrtools/alpha/cdrtools-3.02a06.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	eeefea88d5fef2853d4c1e3770340302	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	4a09528c0754e152c1dbab8e9af16ea6	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9cf7ca683632a06dd0ba18346bee59b7
diff --git a/metadata/md5-cache/app-crypt/efitools-1.9.2 b/metadata/md5-cache/app-crypt/efitools-1.9.2
deleted file mode 100644
index 78713e4..0000000
--- a/metadata/md5-cache/app-crypt/efitools-1.9.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=!static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-apps/util-linux app-crypt/sbsigntools dev-perl/File-Slurp static? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) sys-apps/help2man sys-boot/gnu-efi virtual/pkgconfig
-DESCRIPTION=Tools for manipulating UEFI secure boot platforms
-EAPI=6
-HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git
-IUSE=libressl static
-KEYWORDS=*
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=!static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-apps/util-linux
-SLOT=0
-SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/efitools-1.9.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=74903acdc93d14a4b1a34138930e4069
diff --git a/metadata/md5-cache/app-crypt/efitools-1.9.2-r2 b/metadata/md5-cache/app-crypt/efitools-1.9.2-r2
new file mode 100644
index 0000000..981abc9
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/efitools-1.9.2-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=prepare
+DEPEND=!static? ( dev-libs/openssl:0= ) sys-apps/util-linux app-crypt/sbsigntools dev-perl/File-Slurp static? ( dev-libs/openssl:0=[static-libs(+)] ) sys-apps/help2man sys-boot/gnu-efi virtual/pkgconfig
+DESCRIPTION=Tools for manipulating UEFI secure boot platforms
+EAPI=6
+HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git
+IUSE=static
+KEYWORDS=*
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=!static? ( dev-libs/openssl:0= ) sys-apps/util-linux
+SLOT=0
+SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/efitools-1.9.2.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=028ff4d36f3da8c89a6b8d3dd070105f
diff --git a/metadata/md5-cache/app-doc/doxygen-1.8.15 b/metadata/md5-cache/app-doc/doxygen-1.8.15
index 073b16d..b4a713b 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.8.15
+++ b/metadata/md5-cache/app-doc/doxygen-1.8.15
@@ -11,5 +11,5 @@
 RESTRICT=test
 SLOT=0
 SRC_URI=http://doxygen.nl/files/doxygen-1.8.15.src.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0aadb3be9db03f8be0dbbde5ea32df31
diff --git a/metadata/md5-cache/app-emulation/lxc-2.0.8 b/metadata/md5-cache/app-emulation/lxc-2.0.8
deleted file mode 100644
index c05d2b9..0000000
--- a/metadata/md5-cache/app-emulation/lxc-2.0.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=net-libs/gnutls sys-libs/libcap cgmanager? ( app-admin/cgmanager ) lua? ( >=dev-lang/lua-5.1:= ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) doc? ( app-text/docbook-sgml-utils ) >=sys-kernel/linux-headers-3.2 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=LinuX Containers userspace utilities
-EAPI=5
-HOMEPAGE=https://linuxcontainers.org/
-IUSE=cgmanager doc examples lua python seccomp selinux python_targets_python3_6 kernel_linux
-KEYWORDS=*
-LICENSE=LGPL-3
-RDEPEND=net-libs/gnutls sys-libs/libcap cgmanager? ( app-admin/cgmanager ) lua? ( >=dev-lang/lua-5.1:= ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) sys-process/criu[selinux=] sys-apps/util-linux app-misc/pax-utils virtual/awk
-REQUIRED_USE=python? ( || ( python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-2.0.8.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	327865b9921771330775d971263dc234	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f724603fb4cbe57b03c205767a6a0443
diff --git a/metadata/md5-cache/app-emulation/qemu-5.0.0 b/metadata/md5-cache/app-emulation/qemu-5.0.0
deleted file mode 100644
index 0ac70c5..0000000
--- a/metadata/md5-cache/app-emulation/qemu-5.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) dev-lang/perl sys-apps/texinfo virtual/pkgconfig doc? ( dev-python/sphinx ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig
-DEFINED_PHASES=compile configure info install postinst postrm prepare pretend setup test
-DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 xkb? ( x11-libs/libxkbcommon ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.12.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) dev-libs/libxml2[static-libs(+)] xkb? ( x11-libs/libxkbcommon[static-libs(+)] ) >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:=[static-libs(+)] sys-fabric/libibverbs:=[static-libs(+)] sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing[static-libs(+)] ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2[static-libs(+)] ) sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) ) filecaps? ( sys-libs/libcap )
-DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
-EAPI=7
-HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
-IUSE=accessibility +aio alsa bzip2 capstone +caps +curl debug doc +fdt glusterfs gnutls gtk infiniband iscsi io-uring jemalloc +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs +xkb zstd qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_rx qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx kernel_linux python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 +filecaps
-KEYWORDS=*
-LICENSE=GPL-2 LGPL-2 BSD-2
-RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 xkb? ( x11-libs/libxkbcommon ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.12.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu )
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) static? ( static-user !alsa !gtk !opengl !pulseaudio !plugins !rbd !snappy ) static-user? ( !plugins ) virtfs? ( xattr ) vte? ( gtk ) plugins? ( !static !static-user )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.qemu.org/qemu-5.0.0.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	eeefea88d5fef2853d4c1e3770340302	flag-o-matic	5d5921a298e95441da2f85be419894c0	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	327865b9921771330775d971263dc234	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	3551398d6ede2b572568832730cc2a45	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=68a26645ddb8efa8a7395a54795aae2d
diff --git a/metadata/md5-cache/app-emulation/qemu-5.2.0-r50 b/metadata/md5-cache/app-emulation/qemu-5.2.0-r50
new file mode 100644
index 0000000..4486ad9
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/qemu-5.2.0-r50
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) dev-lang/perl sys-apps/texinfo virtual/pkgconfig doc? ( dev-python/sphinx ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig
+DEFINED_PHASES=compile configure info install postinst postrm prepare pretend setup test
+DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202008[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202008[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) dev-libs/libxml2[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:=[static-libs(+)] sys-fabric/libibverbs:=[static-libs(+)] sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:=[static-libs(+)] ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2[static-libs(+)] ) sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) slirp? ( net-libs/libslirp[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) udev? ( virtual/libudev[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) ) filecaps? ( sys-libs/libcap )
+DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
+EAPI=7
+HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
+IUSE=accessibility +aio alsa bzip2 capstone +caps +curl debug +doc +fdt glusterfs gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg kernel_linux kernel_FreeBSD lzo multipath ncurses nfs nls numa opengl +oss +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap test udev usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs zstd qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_avr qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_rx qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx kernel_linux python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 +filecaps
+KEYWORDS=*
+LICENSE=GPL-2 LGPL-2 BSD-2
+RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202008[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202008[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu )
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy ) static-user? ( !plugins ) vhost-user-fs? ( caps seccomp ) virtfs? ( caps xattr ) vte? ( gtk ) multipath? ( udev ) plugins? ( !static !static-user )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.qemu.org/qemu-5.2.0.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	4a09528c0754e152c1dbab8e9af16ea6	flag-o-matic	5d5921a298e95441da2f85be419894c0	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	327865b9921771330775d971263dc234	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	3551398d6ede2b572568832730cc2a45	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=02f362beb782fd12c8878aa705293573
diff --git a/metadata/md5-cache/app-misc/ckermit-8.0.211-r4 b/metadata/md5-cache/app-misc/ckermit-8.0.211-r4
deleted file mode 100644
index 27ea8e7..0000000
--- a/metadata/md5-cache/app-misc/ckermit-8.0.211-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=ncurses? ( >=sys-libs/ncurses-5.2 )
-DESCRIPTION=combined serial and network communication software package
-EAPI=4
-HOMEPAGE=http://www.kermit-project.org/
-IUSE=ncurses
-KEYWORDS=*
-LICENSE=Kermit
-RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2 ) net-dialup/lrzsz
-SLOT=0
-SRC_URI=ftp://kermit.columbia.edu/kermit/archives/cku211.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e20eb2db71860c212bc6487768c2dcfa
diff --git a/metadata/md5-cache/app-misc/ckermit-9.0.302 b/metadata/md5-cache/app-misc/ckermit-9.0.302
new file mode 100644
index 0000000..9ec83c9
--- /dev/null
+++ b/metadata/md5-cache/app-misc/ckermit-9.0.302
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=ncurses? ( >=sys-libs/ncurses-5.2:= )
+DESCRIPTION=combined serial and network communication software package
+EAPI=7
+HOMEPAGE=http://www.kermitproject.org/
+IUSE=ncurses
+KEYWORDS=*
+LICENSE=Kermit
+RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2:= ) net-dialup/lrzsz
+SLOT=0
+SRC_URI=ftp://kermit.columbia.edu/kermit/archives/cku302.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2af7209cf1c46177865bfcd2e27e97f7
diff --git a/metadata/md5-cache/app-portage/esearch-1.3-r2 b/metadata/md5-cache/app-portage/esearch-1.3-r2
index 5188063..6778809 100644
--- a/metadata/md5-cache/app-portage/esearch-1.3-r2
+++ b/metadata/md5-cache/app-portage/esearch-1.3-r2
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/downloads/fuzzyray/esearch/esearch-1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7d18af476e9cd0d0300c9c8c2b47bfde
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.4.8 b/metadata/md5-cache/app-portage/gentoolkit-0.4.8
index 3157711..55ba380 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.4.8
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.4.8
@@ -11,5 +11,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.4.8.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=678e4b6166dc2457233284f41bb4f8a7
diff --git a/metadata/md5-cache/app-shells/bash-4.3_p48-r1 b/metadata/md5-cache/app-shells/bash-4.3_p48-r1
deleted file mode 100644
index 0771959..0000000
--- a/metadata/md5-cache/app-shells/bash-4.3_p48-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-6.3:0= ) nls? ( virtual/libintl ) virtual/yacc
-DESCRIPTION=The standard GNU Bourne again shell
-EAPI=5
-HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
-IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline
-KEYWORDS=*
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-6.3:0= ) nls? ( virtual/libintl ) !<sys-apps/portage-2.1.6.7_p1 !<sys-apps/paludis-0.26.0_alpha5
-SLOT=0
-SRC_URI=mirror://gnu/bash/bash-4.3.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-001 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-002 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-003 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-004 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-005 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-006 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-007 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-008 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-009 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-010 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-011 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-012 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-013 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-014 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-015 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-016 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-017 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-018 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-019 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-020 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-021 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-022 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-023 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-024 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-025 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-026 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-027 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-028 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-029 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-030 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-031 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-032 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-033 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-034 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-035 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-036 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-037 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-038 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-039 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-040 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-041 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-042 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-043 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-044 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-045 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-046 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-047 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-048 mirror://gnu/bash/bash-4.3-patches/bash43-001 mirror://gnu/bash/bash-4.3-patches/bash43-002 mirror://gnu/bash/bash-4.3-patches/bash43-003 mirror://gnu/bash/bash-4.3-patches/bash43-004 mirror://gnu/bash/bash-4.3-patches/bash43-005 mirror://gnu/bash/bash-4.3-patches/bash43-006 mirror://gnu/bash/bash-4.3-patches/bash43-007 mirror://gnu/bash/bash-4.3-patches/bash43-008 mirror://gnu/bash/bash-4.3-patches/bash43-009 mirror://gnu/bash/bash-4.3-patches/bash43-010 mirror://gnu/bash/bash-4.3-patches/bash43-011 mirror://gnu/bash/bash-4.3-patches/bash43-012 mirror://gnu/bash/bash-4.3-patches/bash43-013 mirror://gnu/bash/bash-4.3-patches/bash43-014 mirror://gnu/bash/bash-4.3-patches/bash43-015 mirror://gnu/bash/bash-4.3-patches/bash43-016 mirror://gnu/bash/bash-4.3-patches/bash43-017 mirror://gnu/bash/bash-4.3-patches/bash43-018 mirror://gnu/bash/bash-4.3-patches/bash43-019 mirror://gnu/bash/bash-4.3-patches/bash43-020 mirror://gnu/bash/bash-4.3-patches/bash43-021 mirror://gnu/bash/bash-4.3-patches/bash43-022 mirror://gnu/bash/bash-4.3-patches/bash43-023 mirror://gnu/bash/bash-4.3-patches/bash43-024 mirror://gnu/bash/bash-4.3-patches/bash43-025 mirror://gnu/bash/bash-4.3-patches/bash43-026 mirror://gnu/bash/bash-4.3-patches/bash43-027 mirror://gnu/bash/bash-4.3-patches/bash43-028 mirror://gnu/bash/bash-4.3-patches/bash43-029 mirror://gnu/bash/bash-4.3-patches/bash43-030 mirror://gnu/bash/bash-4.3-patches/bash43-031 mirror://gnu/bash/bash-4.3-patches/bash43-032 mirror://gnu/bash/bash-4.3-patches/bash43-033 mirror://gnu/bash/bash-4.3-patches/bash43-034 mirror://gnu/bash/bash-4.3-patches/bash43-035 mirror://gnu/bash/bash-4.3-patches/bash43-036 mirror://gnu/bash/bash-4.3-patches/bash43-037 mirror://gnu/bash/bash-4.3-patches/bash43-038 mirror://gnu/bash/bash-4.3-patches/bash43-039 mirror://gnu/bash/bash-4.3-patches/bash43-040 mirror://gnu/bash/bash-4.3-patches/bash43-041 mirror://gnu/bash/bash-4.3-patches/bash43-042 mirror://gnu/bash/bash-4.3-patches/bash43-043 mirror://gnu/bash/bash-4.3-patches/bash43-044 mirror://gnu/bash/bash-4.3-patches/bash43-045 mirror://gnu/bash/bash-4.3-patches/bash43-046 mirror://gnu/bash/bash-4.3-patches/bash43-047 mirror://gnu/bash/bash-4.3-patches/bash43-048
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=06f9962cbf1a6346871836678eec7dc7
diff --git a/metadata/md5-cache/app-shells/bash-4.3_p48-r4 b/metadata/md5-cache/app-shells/bash-4.3_p48-r4
deleted file mode 100644
index 0771959..0000000
--- a/metadata/md5-cache/app-shells/bash-4.3_p48-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-6.3:0= ) nls? ( virtual/libintl ) virtual/yacc
-DESCRIPTION=The standard GNU Bourne again shell
-EAPI=5
-HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
-IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline
-KEYWORDS=*
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-6.3:0= ) nls? ( virtual/libintl ) !<sys-apps/portage-2.1.6.7_p1 !<sys-apps/paludis-0.26.0_alpha5
-SLOT=0
-SRC_URI=mirror://gnu/bash/bash-4.3.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-001 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-002 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-003 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-004 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-005 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-006 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-007 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-008 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-009 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-010 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-011 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-012 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-013 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-014 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-015 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-016 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-017 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-018 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-019 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-020 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-021 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-022 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-023 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-024 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-025 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-026 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-027 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-028 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-029 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-030 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-031 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-032 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-033 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-034 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-035 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-036 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-037 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-038 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-039 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-040 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-041 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-042 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-043 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-044 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-045 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-046 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-047 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-048 mirror://gnu/bash/bash-4.3-patches/bash43-001 mirror://gnu/bash/bash-4.3-patches/bash43-002 mirror://gnu/bash/bash-4.3-patches/bash43-003 mirror://gnu/bash/bash-4.3-patches/bash43-004 mirror://gnu/bash/bash-4.3-patches/bash43-005 mirror://gnu/bash/bash-4.3-patches/bash43-006 mirror://gnu/bash/bash-4.3-patches/bash43-007 mirror://gnu/bash/bash-4.3-patches/bash43-008 mirror://gnu/bash/bash-4.3-patches/bash43-009 mirror://gnu/bash/bash-4.3-patches/bash43-010 mirror://gnu/bash/bash-4.3-patches/bash43-011 mirror://gnu/bash/bash-4.3-patches/bash43-012 mirror://gnu/bash/bash-4.3-patches/bash43-013 mirror://gnu/bash/bash-4.3-patches/bash43-014 mirror://gnu/bash/bash-4.3-patches/bash43-015 mirror://gnu/bash/bash-4.3-patches/bash43-016 mirror://gnu/bash/bash-4.3-patches/bash43-017 mirror://gnu/bash/bash-4.3-patches/bash43-018 mirror://gnu/bash/bash-4.3-patches/bash43-019 mirror://gnu/bash/bash-4.3-patches/bash43-020 mirror://gnu/bash/bash-4.3-patches/bash43-021 mirror://gnu/bash/bash-4.3-patches/bash43-022 mirror://gnu/bash/bash-4.3-patches/bash43-023 mirror://gnu/bash/bash-4.3-patches/bash43-024 mirror://gnu/bash/bash-4.3-patches/bash43-025 mirror://gnu/bash/bash-4.3-patches/bash43-026 mirror://gnu/bash/bash-4.3-patches/bash43-027 mirror://gnu/bash/bash-4.3-patches/bash43-028 mirror://gnu/bash/bash-4.3-patches/bash43-029 mirror://gnu/bash/bash-4.3-patches/bash43-030 mirror://gnu/bash/bash-4.3-patches/bash43-031 mirror://gnu/bash/bash-4.3-patches/bash43-032 mirror://gnu/bash/bash-4.3-patches/bash43-033 mirror://gnu/bash/bash-4.3-patches/bash43-034 mirror://gnu/bash/bash-4.3-patches/bash43-035 mirror://gnu/bash/bash-4.3-patches/bash43-036 mirror://gnu/bash/bash-4.3-patches/bash43-037 mirror://gnu/bash/bash-4.3-patches/bash43-038 mirror://gnu/bash/bash-4.3-patches/bash43-039 mirror://gnu/bash/bash-4.3-patches/bash43-040 mirror://gnu/bash/bash-4.3-patches/bash43-041 mirror://gnu/bash/bash-4.3-patches/bash43-042 mirror://gnu/bash/bash-4.3-patches/bash43-043 mirror://gnu/bash/bash-4.3-patches/bash43-044 mirror://gnu/bash/bash-4.3-patches/bash43-045 mirror://gnu/bash/bash-4.3-patches/bash43-046 mirror://gnu/bash/bash-4.3-patches/bash43-047 mirror://gnu/bash/bash-4.3-patches/bash43-048
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=06f9962cbf1a6346871836678eec7dc7
diff --git a/metadata/md5-cache/app-shells/bash-4.4_p23-r1 b/metadata/md5-cache/app-shells/bash-4.4_p23-r1
new file mode 100644
index 0000000..b9f0208
--- /dev/null
+++ b/metadata/md5-cache/app-shells/bash-4.4_p23-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-7.0:0= ) nls? ( virtual/libintl )
+DESCRIPTION=The standard GNU Bourne again shell
+EAPI=6
+HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
+IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline
+KEYWORDS=*
+LICENSE=GPL-3
+RDEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-7.0:0= ) nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://gnu/bash/bash-4.4.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-001 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-002 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-003 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-004 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-005 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-006 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-007 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-008 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-009 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-010 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-011 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-012 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-013 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-014 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-015 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-016 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-017 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-018 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-019 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-020 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-021 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-022 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-023 mirror://gnu/bash/bash-4.4-patches/bash44-001 mirror://gnu/bash/bash-4.4-patches/bash44-002 mirror://gnu/bash/bash-4.4-patches/bash44-003 mirror://gnu/bash/bash-4.4-patches/bash44-004 mirror://gnu/bash/bash-4.4-patches/bash44-005 mirror://gnu/bash/bash-4.4-patches/bash44-006 mirror://gnu/bash/bash-4.4-patches/bash44-007 mirror://gnu/bash/bash-4.4-patches/bash44-008 mirror://gnu/bash/bash-4.4-patches/bash44-009 mirror://gnu/bash/bash-4.4-patches/bash44-010 mirror://gnu/bash/bash-4.4-patches/bash44-011 mirror://gnu/bash/bash-4.4-patches/bash44-012 mirror://gnu/bash/bash-4.4-patches/bash44-013 mirror://gnu/bash/bash-4.4-patches/bash44-014 mirror://gnu/bash/bash-4.4-patches/bash44-015 mirror://gnu/bash/bash-4.4-patches/bash44-016 mirror://gnu/bash/bash-4.4-patches/bash44-017 mirror://gnu/bash/bash-4.4-patches/bash44-018 mirror://gnu/bash/bash-4.4-patches/bash44-019 mirror://gnu/bash/bash-4.4-patches/bash44-020 mirror://gnu/bash/bash-4.4-patches/bash44-021 mirror://gnu/bash/bash-4.4-patches/bash44-022 mirror://gnu/bash/bash-4.4-patches/bash44-023
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=17f31ec7f71704aa73f9308cdbd3e126
diff --git a/metadata/md5-cache/app-text/po4a-0.45-r1 b/metadata/md5-cache/app-text/po4a-0.45-r1
index 6b07894..037e1fe 100644
--- a/metadata/md5-cache/app-text/po4a-0.45-r1
+++ b/metadata/md5-cache/app-text/po4a-0.45-r1
@@ -9,5 +9,5 @@
 RDEPEND=dev-perl/SGMLSpm >=sys-devel/gettext-0.13 app-text/openjade dev-libs/libxslt dev-perl/Locale-gettext dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/po4a/po4a_0.45.orig.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d27d5965afd3a306e4a6d4294d345e58
diff --git a/metadata/md5-cache/app-text/poppler-0.80.0 b/metadata/md5-cache/app-text/poppler-0.80.0
deleted file mode 100644
index e6994ba..0000000
--- a/metadata/md5-cache/app-text/poppler-0.80.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
-EAPI=6
-HOMEPAGE=https://poppler.freedesktop.org/
-IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
-KEYWORDS=*
-LICENSE=GPL-2
-RDEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( app-text/poppler-data )
-RESTRICT=test
-SLOT=0/90
-SRC_URI=https://poppler.freedesktop.org/poppler-0.80.0.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b494c1302a3f32072244b92528d1897e
diff --git a/metadata/md5-cache/app-text/poppler-21.01.0 b/metadata/md5-cache/app-text/poppler-21.01.0
new file mode 100644
index 0000000..e0de4d1
--- /dev/null
+++ b/metadata/md5-cache/app-text/poppler-21.01.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 )
+DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
+EAPI=7
+HOMEPAGE=https://poppler.freedesktop.org/
+IUSE=cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
+KEYWORDS=*
+LICENSE=GPL-2
+RDEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( app-text/poppler-data )
+RESTRICT=test
+SLOT=0/106
+SRC_URI=https://poppler.freedesktop.org/poppler-21.01.0.tar.xz
+_eclasses_=cmake	b22e256fd899c7e0c747e8834eff121a	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dc76f487096fc67d7cbbf67802505719
diff --git a/metadata/md5-cache/app-text/poppler-data-0.4.10 b/metadata/md5-cache/app-text/poppler-data-0.4.10
new file mode 100644
index 0000000..19324d2
--- /dev/null
+++ b/metadata/md5-cache/app-text/poppler-data-0.4.10
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Data files for poppler to support uncommon encodings without xpdfrc
+EAPI=7
+HOMEPAGE=https://poppler.freedesktop.org/
+KEYWORDS=*
+LICENSE=BSD GPL-2 MIT
+SLOT=0
+SRC_URI=https://poppler.freedesktop.org/poppler-data-0.4.10.tar.gz
+_md5_=3f64cb4aa1688ca52369aac7bc550eb8
diff --git a/metadata/md5-cache/app-text/poppler-data-0.4.7 b/metadata/md5-cache/app-text/poppler-data-0.4.7
deleted file mode 100644
index 5ea9754..0000000
--- a/metadata/md5-cache/app-text/poppler-data-0.4.7
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Data files for poppler to support uncommon encodings without xpdfrc
-EAPI=5
-HOMEPAGE=http://poppler.freedesktop.org/
-KEYWORDS=*
-LICENSE=BSD GPL-2 MIT
-SLOT=0
-SRC_URI=http://poppler.freedesktop.org/poppler-data-0.4.7.tar.gz
-_md5_=6625763f4b78dae639a55ded76f36f5a
diff --git a/metadata/md5-cache/app-text/tree-1.5.3 b/metadata/md5-cache/app-text/tree-1.5.3
deleted file mode 100644
index ad4bf96..0000000
--- a/metadata/md5-cache/app-text/tree-1.5.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DESCRIPTION=Lists directories recursively, and produces an indented listing of files.
-EAPI=2
-HOMEPAGE=http://mama.indstate.edu/users/ice/tree/
-IUSE=bash-completion
-KEYWORDS=*
-LICENSE=GPL-2
-PDEPEND=bash-completion? ( app-shells/bash-completion )
-RDEPEND=bash-completion? ( app-admin/eselect )
-SLOT=0
-SRC_URI=ftp://mama.indstate.edu/linux/tree/tree-1.5.3.tgz
-_eclasses_=bash-completion	f913ed18b57a2d3372c4291680454db4	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=528056ae62ca0b61a21ec334a4a11c2a
diff --git a/metadata/md5-cache/app-text/tree-1.8.0 b/metadata/md5-cache/app-text/tree-1.8.0
new file mode 100644
index 0000000..1a6ba53
--- /dev/null
+++ b/metadata/md5-cache/app-text/tree-1.8.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Lists directories recursively, and produces an indented listing of files
+EAPI=7
+HOMEPAGE=http://mama.indstate.edu/users/ice/tree/
+KEYWORDS=*
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=ftp://mama.indstate.edu/linux/tree/tree-1.8.0.tgz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c4e42b72d5db1a54055fb1e558774630
diff --git a/metadata/md5-cache/app-text/xmlto-0.0.24-r1 b/metadata/md5-cache/app-text/xmlto-0.0.24-r1
deleted file mode 100644
index 8576b38..0000000
--- a/metadata/md5-cache/app-text/xmlto-0.0.24-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=app-shells/bash || ( sys-apps/which sys-freebsd/freebsd-ubin ) dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.62.0-r1 ~app-text/docbook-xml-dtd-4.2 || ( sys-apps/util-linux app-misc/getopt ) || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin ) latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 ) sys-devel/flex
-DESCRIPTION=script for converting XML and DocBook formatted documents to a variety of output formats
-EAPI=3
-HOMEPAGE=https://fedorahosted.org/xmlto/
-IUSE=latex
-KEYWORDS=*
-LICENSE=GPL-2
-RDEPEND=app-shells/bash || ( sys-apps/which sys-freebsd/freebsd-ubin ) dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.62.0-r1 ~app-text/docbook-xml-dtd-4.2 || ( sys-apps/util-linux app-misc/getopt ) || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin ) latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )
-SLOT=0
-SRC_URI=https://fedorahosted.org/releases/x/m/xmlto/xmlto-0.0.24.tar.bz2 mirror://gentoo/xmlto-0.0.24-mans.tar.bz2 http://dev.gentoo.org/~vapier/dist/xmlto-0.0.24-mans.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1b90b2d8b4113aff257ea4b0f44f3185
diff --git a/metadata/md5-cache/app-text/xmlto-0.0.28-r6 b/metadata/md5-cache/app-text/xmlto-0.0.28-r6
new file mode 100644
index 0000000..ba48426
--- /dev/null
+++ b/metadata/md5-cache/app-text/xmlto-0.0.28-r6
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure prepare
+DEPEND=app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.2 dev-libs/libxslt || ( sys-apps/util-linux app-misc/getopt ) text? ( || ( virtual/w3m www-client/elinks www-client/links www-client/lynx ) ) latex? ( dev-texlive/texlive-formatsextra ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Script for converting XML and DocBook documents to a variety of output formats
+EAPI=7
+HOMEPAGE=https://pagure.io/xmlto
+IUSE=latex text
+KEYWORDS=*
+LICENSE=GPL-2
+RDEPEND=app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.2 dev-libs/libxslt || ( sys-apps/util-linux app-misc/getopt ) text? ( || ( virtual/w3m www-client/elinks www-client/links www-client/lynx ) ) latex? ( dev-texlive/texlive-formatsextra )
+SLOT=0
+SRC_URI=https://releases.pagure.org/xmlto/xmlto-0.0.28.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9d81d47ff73d6eeb15743dc7952b5878
diff --git a/metadata/md5-cache/dev-cpp/cpp-hocon-0.2.1 b/metadata/md5-cache/dev-cpp/cpp-hocon-0.2.1
index c4aca71..4dd4715 100644
--- a/metadata/md5-cache/dev-cpp/cpp-hocon-0.2.1
+++ b/metadata/md5-cache/dev-cpp/cpp-hocon-0.2.1
@@ -10,5 +10,5 @@
 RDEPEND=>=dev-libs/boost-1.54:=[nls] >=dev-libs/leatherman-0.9.3:=
 SLOT=0/0.2.1
 SRC_URI=https://github.com/puppetlabs/cpp-hocon/archive/0.2.1.tar.gz -> cpp-hocon-0.2.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0c59c703e217a30b82d6672caefbfad3
diff --git a/metadata/md5-cache/dev-cpp/eigen-3.3.7-r1 b/metadata/md5-cache/dev-cpp/eigen-3.3.7-r1
index 012cc70..019f55f 100644
--- a/metadata/md5-cache/dev-cpp/eigen-3.3.7-r1
+++ b/metadata/md5-cache/dev-cpp/eigen-3.3.7-r1
@@ -10,5 +10,5 @@
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://bitbucket.org/eigen/eigen/get/3.3.7.tar.bz2 -> eigen-3.3.7.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7c9f981a129f15ecc6668c653ca17782
diff --git a/metadata/md5-cache/dev-cpp/gflags-2.2.0 b/metadata/md5-cache/dev-cpp/gflags-2.2.0
index 22e4b75..09a853a 100644
--- a/metadata/md5-cache/dev-cpp/gflags-2.2.0
+++ b/metadata/md5-cache/dev-cpp/gflags-2.2.0
@@ -8,5 +8,5 @@
 LICENSE=BSD
 SLOT=0/2.2
 SRC_URI=https://github.com/gflags/gflags/archive/v2.2.0.tar.gz -> gflags-2.2.0.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=79103164cf173d9e65ced67897a93b86
diff --git a/metadata/md5-cache/dev-cpp/yaml-cpp-0.6.2 b/metadata/md5-cache/dev-cpp/yaml-cpp-0.6.2
index e94dd1d..0dcf3cd 100644
--- a/metadata/md5-cache/dev-cpp/yaml-cpp-0.6.2
+++ b/metadata/md5-cache/dev-cpp/yaml-cpp-0.6.2
@@ -8,5 +8,5 @@
 LICENSE=MIT
 SLOT=0/0.6
 SRC_URI=https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.6.2.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bfc600f084d9b806cb6eff1c43d622f3
diff --git a/metadata/md5-cache/dev-embedded/jlink-6.94a b/metadata/md5-cache/dev-embedded/jlink-6.94a
new file mode 100644
index 0000000..083a546
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/jlink-6.94a
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install nofetch
+DESCRIPTION=Tools for Segger J-Link JTAG adapters
+EAPI=7
+HOMEPAGE=https://www.segger.com/jlink-software.html
+KEYWORDS=-* amd64
+LICENSE=SEGGER
+RDEPEND=media-libs/fontconfig media-libs/freetype sys-devel/gcc sys-libs/glibc x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr
+RESTRICT=fetch strip
+SLOT=0
+SRC_URI=https://www.segger.com/downloads/jlink/JLink_Linux_V694a_x86_64.tgz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=e22c9569b1bea9d07124ad78e8bfc634
diff --git a/metadata/md5-cache/dev-haskell/ansi-terminal-0.6.2.1 b/metadata/md5-cache/dev-haskell/ansi-terminal-0.6.2.1
index 9f98833..fde2292 100644
--- a/metadata/md5-cache/dev-haskell/ansi-terminal-0.6.2.1
+++ b/metadata/md5-cache/dev-haskell/ansi-terminal-0.6.2.1
@@ -9,5 +9,5 @@
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.6.2.1
 SRC_URI=mirror://hackage/packages/archive/ansi-terminal/0.6.2.1/ansi-terminal-0.6.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fdb06dce2d8e5c9a972f78a633a635f4
diff --git a/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.7.3 b/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.7.3
index 91ca4e9..02f8323 100644
--- a/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.7.3
+++ b/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.7.3
@@ -9,5 +9,5 @@
 RDEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.6.7.3
 SRC_URI=mirror://hackage/packages/archive/ansi-wl-pprint/0.6.7.3/ansi-wl-pprint-0.6.7.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=55fa5259c80785500f23eb66440f2449
diff --git a/metadata/md5-cache/dev-haskell/base-compat-0.9.1 b/metadata/md5-cache/dev-haskell/base-compat-0.9.1
index d41f619..bd1454a 100644
--- a/metadata/md5-cache/dev-haskell/base-compat-0.9.1
+++ b/metadata/md5-cache/dev-haskell/base-compat-0.9.1
@@ -10,5 +10,5 @@
 RESTRICT=!test? ( test )
 SLOT=0/0.9.1
 SRC_URI=mirror://hackage/packages/archive/base-compat/0.9.1/base-compat-0.9.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0313498cbeecf2c06edd8f04881f6629
diff --git a/metadata/md5-cache/dev-haskell/binary-0.7.6.1 b/metadata/md5-cache/dev-haskell/binary-0.7.6.1
index 1c055eb..3de2c10 100644
--- a/metadata/md5-cache/dev-haskell/binary-0.7.6.1
+++ b/metadata/md5-cache/dev-haskell/binary-0.7.6.1
@@ -10,5 +10,5 @@
 RESTRICT=test
 SLOT=0/0.7.6.1
 SRC_URI=mirror://hackage/packages/archive/binary/0.7.6.1/binary-0.7.6.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=11d812b54ffab882186fd56a2af9c99c
diff --git a/metadata/md5-cache/dev-haskell/binary-0.8.3.0 b/metadata/md5-cache/dev-haskell/binary-0.8.3.0
index e668bdb..f56a792 100644
--- a/metadata/md5-cache/dev-haskell/binary-0.8.3.0
+++ b/metadata/md5-cache/dev-haskell/binary-0.8.3.0
@@ -10,5 +10,5 @@
 RESTRICT=test
 SLOT=0/0.8.3.0
 SRC_URI=https://hackage.haskell.org/package/binary-0.8.3.0/binary-0.8.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b598a84721ca4dfc684ad0d6d194b4ac
diff --git a/metadata/md5-cache/dev-haskell/bytestring-builder-0.10.6.0.0 b/metadata/md5-cache/dev-haskell/bytestring-builder-0.10.6.0.0
index 513a1e0..de4baa6 100644
--- a/metadata/md5-cache/dev-haskell/bytestring-builder-0.10.6.0.0
+++ b/metadata/md5-cache/dev-haskell/bytestring-builder-0.10.6.0.0
@@ -9,5 +9,5 @@
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.10.6.0.0
 SRC_URI=mirror://hackage/packages/archive/bytestring-builder/0.10.6.0.0/bytestring-builder-0.10.6.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c2e91d1c218a05f1543a87b308fa7b29
diff --git a/metadata/md5-cache/dev-haskell/diff-0.3.0 b/metadata/md5-cache/dev-haskell/diff-0.3.0
index a28a70d..d7cd012 100644
--- a/metadata/md5-cache/dev-haskell/diff-0.3.0
+++ b/metadata/md5-cache/dev-haskell/diff-0.3.0
@@ -9,5 +9,5 @@
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.0
 SRC_URI=mirror://hackage/packages/archive/Diff/0.3.0/Diff-0.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8f1ddf78ee15a3c673f454b1f2ef4f55
diff --git a/metadata/md5-cache/dev-haskell/diff-0.3.4 b/metadata/md5-cache/dev-haskell/diff-0.3.4
index 159a813..3e27a43 100644
--- a/metadata/md5-cache/dev-haskell/diff-0.3.4
+++ b/metadata/md5-cache/dev-haskell/diff-0.3.4
@@ -10,5 +10,5 @@
 RESTRICT=!test? ( test )
 SLOT=0/0.3.4
 SRC_URI=https://hackage.haskell.org/package/Diff-0.3.4/Diff-0.3.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1ea9d1e45a662539a31474ef01d1043d
diff --git a/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4 b/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4
index fb04d6f..a483a75 100644
--- a/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4
+++ b/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4
@@ -9,5 +9,5 @@
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.1.4
 SRC_URI=mirror://hackage/packages/archive/extensible-exceptions/0.1.1.4/extensible-exceptions-0.1.1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6b972618323771ce5d0b048aee5016cd
diff --git a/metadata/md5-cache/dev-haskell/fail-4.9.0.0 b/metadata/md5-cache/dev-haskell/fail-4.9.0.0
index 738849b..c0965a9 100644
--- a/metadata/md5-cache/dev-haskell/fail-4.9.0.0
+++ b/metadata/md5-cache/dev-haskell/fail-4.9.0.0
@@ -9,5 +9,5 @@
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/4.9.0.0
 SRC_URI=mirror://hackage/packages/archive/fail/4.9.0.0/fail-4.9.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e365ff9c9f8c2573687b70393645e884
diff --git a/metadata/md5-cache/dev-haskell/hostname-1.0 b/metadata/md5-cache/dev-haskell/hostname-1.0
index f9bbd93..a63908f 100644
--- a/metadata/md5-cache/dev-haskell/hostname-1.0
+++ b/metadata/md5-cache/dev-haskell/hostname-1.0
@@ -9,5 +9,5 @@
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hostname/1.0/hostname-1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6d5d171083389325f20c578d6878f473
diff --git a/metadata/md5-cache/dev-haskell/hunit-1.2.5.2 b/metadata/md5-cache/dev-haskell/hunit-1.2.5.2
index d24e11c..361c375 100644
--- a/metadata/md5-cache/dev-haskell/hunit-1.2.5.2
+++ b/metadata/md5-cache/dev-haskell/hunit-1.2.5.2
@@ -9,5 +9,5 @@
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.5.2
 SRC_URI=mirror://hackage/packages/archive/HUnit/1.2.5.2/HUnit-1.2.5.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9a64c02790d40bd6fb715cf8f1b6f09d
diff --git a/metadata/md5-cache/dev-haskell/json-0.9.1 b/metadata/md5-cache/dev-haskell/json-0.9.1
index 9947d7d..9b97da8 100644
--- a/metadata/md5-cache/dev-haskell/json-0.9.1
+++ b/metadata/md5-cache/dev-haskell/json-0.9.1
@@ -9,5 +9,5 @@
 RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= generic? ( >=dev-haskell/syb-0.3.3:=[profile?] ) parsec? ( dev-haskell/parsec:=[profile?] )
 SLOT=0/0.9.1
 SRC_URI=mirror://hackage/packages/archive/json/0.9.1/json-0.9.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3687a395493dfe7beaaa2fb1e328b8ea
diff --git a/metadata/md5-cache/dev-haskell/libxml-0.1.1 b/metadata/md5-cache/dev-haskell/libxml-0.1.1
index fa8d620..d1e3127 100644
--- a/metadata/md5-cache/dev-haskell/libxml-0.1.1
+++ b/metadata/md5-cache/dev-haskell/libxml-0.1.1
@@ -9,5 +9,5 @@
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:= dev-libs/libxml2
 SLOT=0/0.1.1
 SRC_URI=mirror://hackage/packages/archive/libxml/0.1.1/libxml-0.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5a3506b51d82bc11d9ba48f927aee41a
diff --git a/metadata/md5-cache/dev-haskell/mtl-2.2.1-r1 b/metadata/md5-cache/dev-haskell/mtl-2.2.1-r1
index ddcf43e..fb23491 100644
--- a/metadata/md5-cache/dev-haskell/mtl-2.2.1-r1
+++ b/metadata/md5-cache/dev-haskell/mtl-2.2.1-r1
@@ -9,5 +9,5 @@
 RDEPEND=>=dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/2.2.1
 SRC_URI=mirror://hackage/packages/archive/mtl/2.2.1/mtl-2.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a37483476ac89179bec5872d85fe4d04
diff --git a/metadata/md5-cache/dev-haskell/old-locale-1.0.0.7 b/metadata/md5-cache/dev-haskell/old-locale-1.0.0.7
index 952893f..ec3146c 100644
--- a/metadata/md5-cache/dev-haskell/old-locale-1.0.0.7
+++ b/metadata/md5-cache/dev-haskell/old-locale-1.0.0.7
@@ -9,5 +9,5 @@
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.0.7
 SRC_URI=mirror://hackage/packages/archive/old-locale/1.0.0.7/old-locale-1.0.0.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f4cf021361ffa75d365d6917cabc9f54
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.9.2 b/metadata/md5-cache/dev-haskell/quickcheck-2.9.2
index a41674e..7091ea8 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.9.2
+++ b/metadata/md5-cache/dev-haskell/quickcheck-2.9.2
@@ -10,5 +10,5 @@
 RESTRICT=test
 SLOT=2/2.9.2
 SRC_URI=mirror://hackage/packages/archive/QuickCheck/2.9.2/QuickCheck-2.9.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ca207ae7fc0ab9c0dd842ce4360418ef
diff --git a/metadata/md5-cache/dev-haskell/random-1.0.1.1-r1 b/metadata/md5-cache/dev-haskell/random-1.0.1.1-r1
index 611304b..0dc97a0 100644
--- a/metadata/md5-cache/dev-haskell/random-1.0.1.1-r1
+++ b/metadata/md5-cache/dev-haskell/random-1.0.1.1-r1
@@ -9,5 +9,5 @@
 RDEPEND=>=dev-lang/ghc-6.8.2:=
 SLOT=0/1.0.1.1
 SRC_URI=mirror://hackage/packages/archive/random/1.0.1.1/random-1.0.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4f0260b7e03d1f970b63d96d59206144
diff --git a/metadata/md5-cache/dev-haskell/regex-base-0.93.2-r1 b/metadata/md5-cache/dev-haskell/regex-base-0.93.2-r1
index 703b83e..2540690 100644
--- a/metadata/md5-cache/dev-haskell/regex-base-0.93.2-r1
+++ b/metadata/md5-cache/dev-haskell/regex-base-0.93.2-r1
@@ -9,5 +9,5 @@
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.93.2
 SRC_URI=mirror://hackage/packages/archive/regex-base/0.93.2/regex-base-0.93.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c4b18ef1060ee81b2a464adf9ee6fb53
diff --git a/metadata/md5-cache/dev-haskell/regex-posix-0.95.2 b/metadata/md5-cache/dev-haskell/regex-posix-0.95.2
index 5fc0759..fac18d4 100644
--- a/metadata/md5-cache/dev-haskell/regex-posix-0.95.2
+++ b/metadata/md5-cache/dev-haskell/regex-posix-0.95.2
@@ -9,5 +9,5 @@
 RDEPEND=>=dev-haskell/regex-base-0.93[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/regex-posix/0.95.2/regex-posix-0.95.2.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=93f4636dc96d6c74a8a8865f4e3209b6
diff --git a/metadata/md5-cache/dev-haskell/syb-0.4.4 b/metadata/md5-cache/dev-haskell/syb-0.4.4
index da9f8f0..9a56546 100644
--- a/metadata/md5-cache/dev-haskell/syb-0.4.4
+++ b/metadata/md5-cache/dev-haskell/syb-0.4.4
@@ -10,5 +10,5 @@
 RESTRICT=test
 SLOT=0/0.4.4
 SRC_URI=mirror://hackage/packages/archive/syb/0.4.4/syb-0.4.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1ab903a1d68ccbd107557a0907745ce1
diff --git a/metadata/md5-cache/dev-haskell/test-framework-0.8.1.1 b/metadata/md5-cache/dev-haskell/test-framework-0.8.1.1
index e24051a..72502c3 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-0.8.1.1
+++ b/metadata/md5-cache/dev-haskell/test-framework-0.8.1.1
@@ -10,5 +10,5 @@
 RESTRICT=test
 SLOT=0/0.8.1.1
 SRC_URI=mirror://hackage/packages/archive/test-framework/0.8.1.1/test-framework-0.8.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=64b47567df416f2fd398765f8c996378
diff --git a/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0 b/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0
index f564868..9c55a52 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0
+++ b/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0
@@ -9,5 +9,5 @@
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?] >=dev-haskell/test-framework-0.2.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.0
 SRC_URI=mirror://hackage/packages/archive/test-framework-hunit/0.3.0/test-framework-hunit-0.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d81e6e8001b070b12f1e30e8f575be98
diff --git a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.3-r2 b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.3-r2
index bbab273..031826d 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.3-r2
+++ b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.3-r2
@@ -9,5 +9,5 @@
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?] >=dev-haskell/quickcheck-2.4:2=[profile?] >=dev-haskell/random-1:=[profile?] >=dev-haskell/test-framework-0.7.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.0.3
 SRC_URI=mirror://hackage/packages/archive/test-framework-quickcheck2/0.3.0.3/test-framework-quickcheck2-0.3.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ff6639fe5aa883af644f9408108e8b88
diff --git a/metadata/md5-cache/dev-haskell/time-locale-compat-0.1.1.1 b/metadata/md5-cache/dev-haskell/time-locale-compat-0.1.1.1
index b210c44..bffaecc 100644
--- a/metadata/md5-cache/dev-haskell/time-locale-compat-0.1.1.1
+++ b/metadata/md5-cache/dev-haskell/time-locale-compat-0.1.1.1
@@ -9,5 +9,5 @@
 RDEPEND=dev-haskell/old-locale:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.1.1
 SRC_URI=mirror://hackage/packages/archive/time-locale-compat/0.1.1.1/time-locale-compat-0.1.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e6eb458bbb3129111c1e148fedfad4c1
diff --git a/metadata/md5-cache/dev-haskell/transformers-compat-0.5.1.4 b/metadata/md5-cache/dev-haskell/transformers-compat-0.5.1.4
index 72f5557..8e26de1 100644
--- a/metadata/md5-cache/dev-haskell/transformers-compat-0.5.1.4
+++ b/metadata/md5-cache/dev-haskell/transformers-compat-0.5.1.4
@@ -9,5 +9,5 @@
 RDEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/mtl-2.1:=[profile?] >=dev-haskell/transformers-0.3:=[profile?]
 SLOT=0/0.5.1.4
 SRC_URI=mirror://hackage/packages/archive/transformers-compat/0.5.1.4/transformers-compat-0.5.1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0b6275acf03f8b25f7020afe0452b1ec
diff --git a/metadata/md5-cache/dev-haskell/xml-1.3.13 b/metadata/md5-cache/dev-haskell/xml-1.3.13
index 0734a38..6768a42 100644
--- a/metadata/md5-cache/dev-haskell/xml-1.3.13
+++ b/metadata/md5-cache/dev-haskell/xml-1.3.13
@@ -9,5 +9,5 @@
 RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.3.13
 SRC_URI=mirror://hackage/packages/archive/xml/1.3.13/xml-1.3.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d9c1549240157281194b99733eb1d1ce
diff --git a/metadata/md5-cache/dev-java/java-config-2.2.0-r4 b/metadata/md5-cache/dev-java/java-config-2.2.0-r4
index 7425b76..dfec730 100644
--- a/metadata/md5-cache/dev-java/java-config-2.2.0-r4
+++ b/metadata/md5-cache/dev-java/java-config-2.2.0-r4
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=2
 SRC_URI=https://dev.gentoo.org/~gyakovlev/distfiles/java-config-2.2.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7a104a5df3c28caaaa4b3d72be65d7c3
diff --git a/metadata/md5-cache/dev-java/javatoolkit-0.6.1 b/metadata/md5-cache/dev-java/javatoolkit-0.6.1
index c0942da..0b67e0e 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.6.1
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.6.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/javatoolkit.git/snapshot/javatoolkit-0.6.1.tar.bz2
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a3eab527e79cb9eb99a3673e93c02f79
diff --git a/metadata/md5-cache/dev-lang/jimtcl-0.76 b/metadata/md5-cache/dev-lang/jimtcl-0.76
index 8cdf7a7..a8778d0 100644
--- a/metadata/md5-cache/dev-lang/jimtcl-0.76
+++ b/metadata/md5-cache/dev-lang/jimtcl-0.76
@@ -8,5 +8,5 @@
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=https://github.com/msteveb/jimtcl/zipball/0.76 -> jimtcl-0.76.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
 _md5_=48918199b8724d44194bead1c350839f
diff --git a/metadata/md5-cache/dev-lang/perl-5.24.4 b/metadata/md5-cache/dev-lang/perl-5.24.4
index 73f3f23..b9acbd7 100644
--- a/metadata/md5-cache/dev-lang/perl-5.24.4
+++ b/metadata/md5-cache/dev-lang/perl-5.24.4
@@ -10,5 +10,5 @@
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib
 SLOT=0/5.24
 SRC_URI=mirror://cpan/src/5.0/perl-5.24.4.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.24.4.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.24.4-patches-1/perl-5.24.4-patches-1.tar.xz mirror://gentoo/perl-5.24.4-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.24.4-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.9/perl-cross-1.1.9.tar.gz
-_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7aa19544ae8f1120b78ff3ba8328e640
diff --git a/metadata/md5-cache/dev-libs/boost-1.72.0-r1 b/metadata/md5-cache/dev-libs/boost-1.72.0-r1
index 894c61a..e1057fe 100644
--- a/metadata/md5-cache/dev-libs/boost-1.72.0-r1
+++ b/metadata/md5-cache/dev-libs/boost-1.72.0-r1
@@ -12,5 +12,5 @@
 RESTRICT=test
 SLOT=0/1.72.0
 SRC_URI=https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=172cb652b9655414782e7e7422c456e5
diff --git a/metadata/md5-cache/dev-libs/flatbuffers-1.12.0 b/metadata/md5-cache/dev-libs/flatbuffers-1.12.0
index 5aac192..94e4c06 100644
--- a/metadata/md5-cache/dev-libs/flatbuffers-1.12.0
+++ b/metadata/md5-cache/dev-libs/flatbuffers-1.12.0
@@ -9,5 +9,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/flatbuffers/archive/v1.12.0.tar.gz -> flatbuffers-1.12.0.tar.gz
-_eclasses_=cmake	b22e256fd899c7e0c747e8834eff121a	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	b22e256fd899c7e0c747e8834eff121a	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bdac1f1151bdfdba69aca690f4b8b702
diff --git a/metadata/md5-cache/dev-libs/fribidi-1.0.5 b/metadata/md5-cache/dev-libs/fribidi-1.0.5
deleted file mode 100644
index a3621ba..0000000
--- a/metadata/md5-cache/dev-libs/fribidi-1.0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?]
-DESCRIPTION=A free implementation of the unicode bidirectional algorithm
-EAPI=6
-HOMEPAGE=https://fribidi.org/
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
-KEYWORDS=*
-LICENSE=LGPL-2.1+
-SLOT=0
-SRC_URI=https://github.com/fribidi/fribidi/releases/download/v1.0.5/fribidi-1.0.5.tar.bz2
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7411a9934322b49de7b713c2fe524637
diff --git a/metadata/md5-cache/dev-libs/fribidi-1.0.9 b/metadata/md5-cache/dev-libs/fribidi-1.0.9
new file mode 100644
index 0000000..aea7cf9
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/fribidi-1.0.9
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=A free implementation of the unicode bidirectional algorithm
+EAPI=7
+HOMEPAGE=https://fribidi.org/
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=LGPL-2.1+
+SLOT=0
+SRC_URI=https://github.com/fribidi/fribidi/releases/download/v1.0.9/fribidi-1.0.9.tar.xz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9d23ccbe0c2cb01ae7553683b16a5621
diff --git a/metadata/md5-cache/dev-libs/json-c-0.14-r3 b/metadata/md5-cache/dev-libs/json-c-0.14-r3
index dbbc8f5..5be1de6 100644
--- a/metadata/md5-cache/dev-libs/json-c-0.14-r3
+++ b/metadata/md5-cache/dev-libs/json-c-0.14-r3
@@ -8,5 +8,5 @@
 LICENSE=MIT
 SLOT=0/5
 SRC_URI=https://s3.amazonaws.com/json-c_releases/releases/json-c-0.14.tar.gz
-_eclasses_=cmake	b22e256fd899c7e0c747e8834eff121a	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	b22e256fd899c7e0c747e8834eff121a	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e6bccea1aee7d376df5c4eb04a58e3a1
diff --git a/metadata/md5-cache/dev-libs/json-glib-1.4.4 b/metadata/md5-cache/dev-libs/json-glib-1.4.4
index 492d0b3..04d6faf 100644
--- a/metadata/md5-cache/dev-libs/json-glib-1.4.4
+++ b/metadata/md5-cache/dev-libs/json-glib-1.4.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) ~app-text/docbook-xml-dtd-4.1.2 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.20 ) >=sys-devel/gettext-0.18 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) ~app-text/docbook-xml-dtd-4.1.2 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.20 ) >=sys-devel/gettext-0.18 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DESCRIPTION=Library providing GLib serialization and deserialization for the JSON format
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/JsonGlib
@@ -9,5 +9,5 @@
 RDEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/json-glib/1.4/json-glib-1.4.4.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	686eaab303305a908fd57b2fd7617800	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	686eaab303305a908fd57b2fd7617800	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	5ec14fdbc5446b8767e87e186e3b1a52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=71b93181730761f2d699a5d8bf57102f
diff --git a/metadata/md5-cache/dev-libs/jsoncpp-1.9.3_pre20200412 b/metadata/md5-cache/dev-libs/jsoncpp-1.9.3_pre20200412
index 9f40d85..02b0b87 100644
--- a/metadata/md5-cache/dev-libs/jsoncpp-1.9.3_pre20200412
+++ b/metadata/md5-cache/dev-libs/jsoncpp-1.9.3_pre20200412
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) doc? ( app-doc/doxygen ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) doc? ( app-doc/doxygen ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install setup test
 DESCRIPTION=C++ JSON reader and writer
 EAPI=7
@@ -9,5 +9,5 @@
 RESTRICT=!test? ( test )
 SLOT=0/23
 SRC_URI=https://github.com/open-source-parsers/jsoncpp/archive/90ca694e4697497a8c2bc8c60a9c9f89e7290a10.tar.gz -> jsoncpp-1.9.3_pre20200412.tar.gz
-_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a0085f25f8bb13b48245755e9359ce49
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.6.1 b/metadata/md5-cache/dev-libs/leatherman-1.6.1
index c05de6c..66b7720 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.6.1
+++ b/metadata/md5-cache/dev-libs/leatherman-1.6.1
@@ -9,5 +9,5 @@
 RDEPEND=net-misc/curl
 SLOT=0/1.6.1
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.6.1.tar.gz -> leatherman-1.6.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1b70395b8178f30b42b3052df79086d3
diff --git a/metadata/md5-cache/dev-libs/libbsd-0.10.0 b/metadata/md5-cache/dev-libs/libbsd-0.10.0
new file mode 100644
index 0000000..44c6675
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libbsd-0.10.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install setup test
+DEPEND=>=sys-kernel/linux-headers-3.17
+DESCRIPTION=An library to provide useful functions commonly found on BSD systems
+EAPI=7
+HOMEPAGE=https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=BSD BSD-2 BSD-4 ISC
+SLOT=0
+SRC_URI=https://libbsd.freedesktop.org/releases/libbsd-0.10.0.tar.xz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=60b969283e038bd8dd1b6e296788fce7
diff --git a/metadata/md5-cache/dev-libs/libbsd-0.9.1 b/metadata/md5-cache/dev-libs/libbsd-0.9.1
deleted file mode 100644
index b0ab572..0000000
--- a/metadata/md5-cache/dev-libs/libbsd-0.9.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install setup test
-DEPEND=>=sys-kernel/linux-headers-3.17
-DESCRIPTION=An library to provide useful functions commonly found on BSD systems
-EAPI=6
-HOMEPAGE=https://libbsd.freedesktop.org/wiki/
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
-KEYWORDS=*
-LICENSE=BSD BSD-2 BSD-4 ISC
-SLOT=0
-SRC_URI=https://libbsd.freedesktop.org/releases/libbsd-0.9.1.tar.xz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0bacc29953ecae14e07ed43ceecec488
diff --git a/metadata/md5-cache/dev-libs/libev-4.23 b/metadata/md5-cache/dev-libs/libev-4.23
deleted file mode 100644
index d01f429..0000000
--- a/metadata/md5-cache/dev-libs/libev-4.23
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A high-performance event loop/event model with lots of feature
-EAPI=5
-HOMEPAGE=http://software.schmorp.de/pkg/libev.html
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
-KEYWORDS=*
-LICENSE=|| ( BSD GPL-2 )
-SLOT=0
-SRC_URI=http://dist.schmorp.de/libev/libev-4.23.tar.gz http://dist.schmorp.de/libev/Attic/libev-4.23.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2ec2ba0f0aa7bf9990794bc8002d03b2
diff --git a/metadata/md5-cache/dev-libs/libev-4.33 b/metadata/md5-cache/dev-libs/libev-4.33
new file mode 100644
index 0000000..2af8281
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libev-4.33
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A high-performance event loop/event model with lots of feature
+EAPI=7
+HOMEPAGE=http://software.schmorp.de/pkg/libev.html
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=|| ( BSD GPL-2 )
+SLOT=0
+SRC_URI=http://dist.schmorp.de/libev/libev-4.33.tar.gz http://dist.schmorp.de/libev/Attic/libev-4.33.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8dcfc09eb42acd326a52cce4e5ed1098
diff --git a/metadata/md5-cache/dev-libs/libevdev-1.11.0 b/metadata/md5-cache/dev-libs/libevdev-1.11.0
new file mode 100644
index 0000000..502c7d9
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libevdev-1.11.0
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) doc? ( app-doc/doxygen ) virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install setup test
+DEPEND=test? ( dev-libs/check[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
+DESCRIPTION=Handler library for evdev events
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev
+IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.freedesktop.org/software/libevdev/libevdev-1.11.0.tar.xz
+_eclasses_=meson	5ec14fdbc5446b8767e87e186e3b1a52	meson-multilib	485215fef459a86936e377c0eaa513a0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5259e8bd5d00b973fdef17fc6e799fa8
diff --git a/metadata/md5-cache/dev-libs/libfmt-7.0.3 b/metadata/md5-cache/dev-libs/libfmt-7.0.3
new file mode 100644
index 0000000..c1ae785
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libfmt-7.0.3
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Small, safe and fast formatting library
+EAPI=7
+HOMEPAGE=https://github.com/fmtlib/fmt
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0/7
+SRC_URI=https://github.com/fmtlib/fmt/archive/7.0.3.tar.gz -> libfmt-7.0.3.tar.gz
+_eclasses_=cmake	b22e256fd899c7e0c747e8834eff121a	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=240e8b2fa72c0545091a0188c1a3de87
diff --git a/metadata/md5-cache/dev-libs/libfmt-9999 b/metadata/md5-cache/dev-libs/libfmt-9999
new file mode 100644
index 0000000..a44c38a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libfmt-9999
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Small, safe and fast formatting library
+EAPI=7
+HOMEPAGE=https://github.com/fmtlib/fmt
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+LICENSE=MIT
+PROPERTIES=live
+RESTRICT=!test? ( test )
+SLOT=0/9999
+_eclasses_=cmake	b22e256fd899c7e0c747e8834eff121a	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-r3	c8f4649ab5a3c07ee2b75b12bc446f6a	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=384d7d7a631be8c252b8358d11d1e0e7
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.9.1-r1 b/metadata/md5-cache/dev-libs/libgcrypt-1.9.1-r1
new file mode 100644
index 0000000..a06f504
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.9.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( virtual/texi2dvi ) >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=General purpose crypto library based on the code used in GnuPG
+EAPI=7
+HOMEPAGE=http://www.gnupg.org/
+IUSE=+asm cpu_flags_arm_neon cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc o-flag-munging static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=LGPL-2.1 MIT
+RDEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?]
+SLOT=0/20
+SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.9.1.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=661e3369fc5ebf06632d7474234506c5
diff --git a/metadata/md5-cache/dev-libs/libgusb-0.3.5 b/metadata/md5-cache/dev-libs/libgusb-0.3.5
index 2d8a9a8..e615c1a 100644
--- a/metadata/md5-cache/dev-libs/libgusb-0.3.5
+++ b/metadata/md5-cache/dev-libs/libgusb-0.3.5
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8[xml(+)] dev-python/setuptools[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[xml(+)] dev-python/setuptools[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[xml(+)] dev-python/setuptools[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) gtk-doc? ( app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.4 dev-util/gtk-doc ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+BDEPEND=|| ( ( dev-lang/python:3.8[xml(+)] dev-python/setuptools[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[xml(+)] dev-python/setuptools[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[xml(+)] dev-python/setuptools[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) gtk-doc? ( app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.4 dev-util/gtk-doc ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] virtual/libusb:1[udev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) sys-apps/hwids
 DESCRIPTION=GObject wrapper for libusb
@@ -12,5 +12,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://people.freedesktop.org/~hughsient/releases/libgusb-0.3.5.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2f3804278870542119da624a5eded505
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	meson	5ec14fdbc5446b8767e87e186e3b1a52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2f3804278870542119da624a5eded505
 _md5_=acbeba8182bc6189f7c1608c2d7ae3d5
diff --git a/metadata/md5-cache/dev-libs/libmspack-0.10.1_alpha b/metadata/md5-cache/dev-libs/libmspack-0.10.1_alpha
new file mode 100644
index 0000000..97067f4
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libmspack-0.10.1_alpha
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A library for Microsoft compression formats
+EAPI=7
+HOMEPAGE=https://www.cabextract.org.uk/libmspack/
+IUSE=debug doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=https://www.cabextract.org.uk/libmspack/libmspack-0.10.1alpha.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5193fe9be8612f4015bc99437fa09a02
diff --git a/metadata/md5-cache/dev-libs/libnl-3.4.0 b/metadata/md5-cache/dev-libs/libnl-3.4.0
index d6a32b3..98238b5 100644
--- a/metadata/md5-cache/dev-libs/libnl-3.4.0
+++ b/metadata/md5-cache/dev-libs/libnl-3.4.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 ) )
 SLOT=3
 SRC_URI=https://github.com/thom311/libnl/releases/download/libnl3_4_0/libnl-3.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=afe9d110062987a08b2055e6ee730b64
diff --git a/metadata/md5-cache/dev-libs/libunistring-0.9.10 b/metadata/md5-cache/dev-libs/libunistring-0.9.10
new file mode 100644
index 0000000..744e363
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libunistring-0.9.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-portage/elt-patches-20170815
+DESCRIPTION=Library for manipulating Unicode and C strings according to Unicode standard
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/libunistring/
+IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=LGPL-3 GPL-3
+SLOT=0/2
+SRC_URI=mirror://gnu/libunistring/libunistring-0.9.10.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=54903d68b84f91209ae017f774ee1e89
diff --git a/metadata/md5-cache/dev-libs/libunistring-0.9.7 b/metadata/md5-cache/dev-libs/libunistring-0.9.7
deleted file mode 100644
index 68172b8..0000000
--- a/metadata/md5-cache/dev-libs/libunistring-0.9.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170815
-DESCRIPTION=Library for manipulating Unicode and C strings according to Unicode standard
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/libunistring/
-IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
-KEYWORDS=*
-LICENSE=LGPL-3 GPL-3
-SLOT=0/2
-SRC_URI=mirror://gnu/libunistring/libunistring-0.9.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=edf966ffda674b2105a5c37f7fc9e36d
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.12 b/metadata/md5-cache/dev-libs/libxml2-2.9.12
index 0714c69..b5e1a31 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.12
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.12
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig verify-sig? ( app-crypt/openpgp-keys-danielveillard ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) python? ( python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) readline? ( sys-libs/readline:= ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) python? ( python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) readline? ( sys-libs/readline:= ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=XML C parser and toolkit
 EAPI=7
 HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2
-IUSE=debug examples icu ipv6 lzma +python readline static-libs test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 verify-sig
+IUSE=debug examples icu ipv6 lzma +python readline static-libs test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 verify-sig
 KEYWORDS=*
 LICENSE=MIT
-RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) python? ( python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) readline? ( sys-libs/readline:= )
-REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
+RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) python? ( python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) readline? ( sys-libs/readline:= )
+REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz ) verify-sig? ( ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz.asc )
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=0a504425f0a2e5f75222d46355f316f8
+_md5_=9c16cde223c4530098cdfea7ceed6d4d
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.34 b/metadata/md5-cache/dev-libs/libxslt-1.1.34
deleted file mode 100644
index b091fb8..0000000
--- a/metadata/md5-cache/dev-libs/libxslt-1.1.34
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libxml2-2.9.10:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/libxml2:2[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=virtual/pkgconfig-1 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=XSLT libraries and tools
-EAPI=6
-HOMEPAGE=http://www.xmlsoft.org/
-IUSE=crypt debug examples python static-libs elibc_Darwin abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 python_targets_python2_7
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=>=dev-libs/libxml2-2.9.10:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/libxml2:2[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=ftp://xmlsoft.org/libxslt/libxslt-1.1.34.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bce9baa62292d684d0d3c301739028be
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.34-r1 b/metadata/md5-cache/dev-libs/libxslt-1.1.34-r1
new file mode 100644
index 0000000..fa3164b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libxslt-1.1.34-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=virtual/pkgconfig-1 verify-sig? ( app-crypt/openpgp-keys-danielveillard ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-libs/libxml2-2.9.10:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
+DESCRIPTION=XSLT libraries and tools
+EAPI=7
+HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxslt
+IUSE=crypt debug examples static-libs elibc_Darwin abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 verify-sig
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=>=dev-libs/libxml2-2.9.10:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
+SLOT=0
+SRC_URI=ftp://xmlsoft.org/libxslt/libxslt-1.1.34.tar.gz verify-sig? ( ftp://xmlsoft.org/libxslt/libxslt-1.1.34.tar.gz.asc )
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_md5_=cc7c632df96be34fefab5e7f88c76cc1
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.34-r2 b/metadata/md5-cache/dev-libs/libxslt-1.1.34-r2
deleted file mode 100644
index b091fb8..0000000
--- a/metadata/md5-cache/dev-libs/libxslt-1.1.34-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libxml2-2.9.10:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/libxml2:2[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=virtual/pkgconfig-1 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=XSLT libraries and tools
-EAPI=6
-HOMEPAGE=http://www.xmlsoft.org/
-IUSE=crypt debug examples python static-libs elibc_Darwin abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 python_targets_python2_7
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=>=dev-libs/libxml2-2.9.10:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/libxml2:2[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=ftp://xmlsoft.org/libxslt/libxslt-1.1.34.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bce9baa62292d684d0d3c301739028be
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.34-r3 b/metadata/md5-cache/dev-libs/libxslt-1.1.34-r3
new file mode 100644
index 0000000..fa3164b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libxslt-1.1.34-r3
@@ -0,0 +1,14 @@
+BDEPEND=>=virtual/pkgconfig-1 verify-sig? ( app-crypt/openpgp-keys-danielveillard ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-libs/libxml2-2.9.10:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
+DESCRIPTION=XSLT libraries and tools
+EAPI=7
+HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxslt
+IUSE=crypt debug examples static-libs elibc_Darwin abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 verify-sig
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=>=dev-libs/libxml2-2.9.10:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
+SLOT=0
+SRC_URI=ftp://xmlsoft.org/libxslt/libxslt-1.1.34.tar.gz verify-sig? ( ftp://xmlsoft.org/libxslt/libxslt-1.1.34.tar.gz.asc )
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_md5_=cc7c632df96be34fefab5e7f88c76cc1
diff --git a/metadata/md5-cache/dev-libs/libzip-1.7.1 b/metadata/md5-cache/dev-libs/libzip-1.7.1
deleted file mode 100644
index 2312426..0000000
--- a/metadata/md5-cache/dev-libs/libzip-1.7.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2:= ) lzma? ( app-arch/xz-utils ) ssl? ( gnutls? ( dev-libs/nettle:0= >=net-libs/gnutls-3.6.5:= ) !gnutls? ( mbedtls? ( net-libs/mbedtls:= ) !mbedtls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) )
-DESCRIPTION=Library for manipulating zip archives
-EAPI=7
-HOMEPAGE=https://nih.at/libzip/
-IUSE=bzip2 gnutls libressl lzma mbedtls ssl static-libs test tools
-KEYWORDS=*
-LICENSE=BSD
-RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2:= ) lzma? ( app-arch/xz-utils ) ssl? ( gnutls? ( dev-libs/nettle:0= >=net-libs/gnutls-3.6.5:= ) !gnutls? ( mbedtls? ( net-libs/mbedtls:= ) !mbedtls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) )
-REQUIRED_USE=test? ( tools )
-RESTRICT=!test? ( test )
-SLOT=0/5
-SRC_URI=https://www.nih.at/libzip/libzip-1.7.1.tar.xz
-_eclasses_=cmake	b22e256fd899c7e0c747e8834eff121a	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=894b82ada06deddd16f806923979c1b4
diff --git a/metadata/md5-cache/dev-libs/libzip-1.7.3-r1 b/metadata/md5-cache/dev-libs/libzip-1.7.3-r1
new file mode 100644
index 0000000..045b8e8
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libzip-1.7.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2:= ) lzma? ( app-arch/xz-utils ) ssl? ( gnutls? ( dev-libs/nettle:0= >=net-libs/gnutls-3.6.5:= ) !gnutls? ( mbedtls? ( net-libs/mbedtls:= ) !mbedtls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) )
+DESCRIPTION=Library for manipulating zip archives
+EAPI=7
+HOMEPAGE=https://nih.at/libzip/
+IUSE=bzip2 gnutls libressl lzma mbedtls ssl static-libs test tools
+KEYWORDS=*
+LICENSE=BSD
+RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2:= ) lzma? ( app-arch/xz-utils ) ssl? ( gnutls? ( dev-libs/nettle:0= >=net-libs/gnutls-3.6.5:= ) !gnutls? ( mbedtls? ( net-libs/mbedtls:= ) !mbedtls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) )
+REQUIRED_USE=test? ( tools )
+RESTRICT=!test? ( test )
+SLOT=0/5
+SRC_URI=https://www.nih.at/libzip/libzip-1.7.3.tar.xz
+_eclasses_=cmake	b22e256fd899c7e0c747e8834eff121a	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=231e86f611d35b7f0dd8ec9434918765
diff --git a/metadata/md5-cache/dev-libs/msgpack-3.1.1 b/metadata/md5-cache/dev-libs/msgpack-3.1.1
index 3d4676a..8d66c86 100644
--- a/metadata/md5-cache/dev-libs/msgpack-3.1.1
+++ b/metadata/md5-cache/dev-libs/msgpack-3.1.1
@@ -9,5 +9,5 @@
 RDEPEND=boost? ( dev-libs/boost[context,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
 SLOT=0/2
 SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/cpp-3.1.1/msgpack-3.1.1.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ee1a5a9dcd4daedb784108d2fa00f351
diff --git a/metadata/md5-cache/dev-libs/nettle-3.4.1-r1 b/metadata/md5-cache/dev-libs/nettle-3.4.1-r1
deleted file mode 100644
index 7e116fe..0000000
--- a/metadata/md5-cache/dev-libs/nettle-3.4.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=gmp? ( >=dev-libs/gmp-6.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Low-level cryptographic library
-EAPI=6
-HOMEPAGE=http://www.lysator.liu.se/~nisse/nettle/
-IUSE=doc +gmp neon static-libs test cpu_flags_x86_aes abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
-KEYWORDS=*
-LICENSE=|| ( LGPL-3 LGPL-2.1 )
-RDEPEND=gmp? ( >=dev-libs/gmp-6.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
-SLOT=0/6.2
-SRC_URI=mirror://gnu/nettle/nettle-3.4.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=91721ec09bc2849b68701ae426d590c5
diff --git a/metadata/md5-cache/dev-libs/nettle-3.7.2 b/metadata/md5-cache/dev-libs/nettle-3.7.2
new file mode 100644
index 0000000..f5a25b9
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/nettle-3.7.2
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( sys-apps/texinfo ) >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=gmp? ( >=dev-libs/gmp-6.1:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Low-level cryptographic library
+EAPI=7
+HOMEPAGE=http://www.lysator.liu.se/~nisse/nettle/
+IUSE=+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=|| ( LGPL-3 LGPL-2.1 )
+RDEPEND=gmp? ( >=dev-libs/gmp-6.1:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/8-6
+SRC_URI=mirror://gnu/nettle/nettle-3.7.2.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=412e8a7412ac19f2796180c345cb4cab
diff --git a/metadata/md5-cache/dev-libs/opensc-0.19.0-r4 b/metadata/md5-cache/dev-libs/opensc-0.19.0-r4
deleted file mode 100644
index 0de8f13..0000000
--- a/metadata/md5-cache/dev-libs/opensc-0.19.0-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install prepare
-DEPEND=zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( >=dev-libs/libressl-2.7.0:0= ) ) openct? ( >=dev-libs/openct-0.5.0 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 ) notify? ( dev-libs/glib:2= ) app-text/docbook-xsl-stylesheets dev-libs/libxslt test? ( dev-util/cmocka )
-DESCRIPTION=Libraries and applications to access smartcards
-EAPI=7
-HOMEPAGE=https://github.com/OpenSC/OpenSC/wiki
-IUSE=ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib
-KEYWORDS=*
-LICENSE=LGPL-2.1
-RDEPEND=zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( >=dev-libs/libressl-2.7.0:0= ) ) openct? ( >=dev-libs/openct-0.5.0 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 ) notify? ( dev-libs/glib:2= )
-REQUIRED_USE=pcsc-lite? ( !openct !ctapi ) openct? ( !pcsc-lite !ctapi ) ctapi? ( !pcsc-lite !openct ) || ( pcsc-lite openct ctapi )
-SLOT=0
-SRC_URI=https://github.com/OpenSC/OpenSC/releases/download/0.19.0/opensc-0.19.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c3b8d34f72fdce6267deb56035db324d
diff --git a/metadata/md5-cache/dev-libs/opensc-0.21.0 b/metadata/md5-cache/dev-libs/opensc-0.21.0
new file mode 100644
index 0000000..cd6b4ec
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/opensc-0.21.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install prepare
+DEPEND=zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( >=dev-libs/libressl-3.1.0:0= ) ) openct? ( >=dev-libs/openct-0.5.0 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 ) notify? ( dev-libs/glib:2 ) app-text/docbook-xsl-stylesheets dev-libs/libxslt test? ( dev-util/cmocka )
+DESCRIPTION=Libraries and applications to access smartcards
+EAPI=7
+HOMEPAGE=https://github.com/OpenSC/OpenSC/wiki
+IUSE=ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib
+KEYWORDS=*
+LICENSE=LGPL-2.1
+RDEPEND=zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( >=dev-libs/libressl-3.1.0:0= ) ) openct? ( >=dev-libs/openct-0.5.0 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 ) notify? ( dev-libs/glib:2 )
+REQUIRED_USE=pcsc-lite? ( !openct !ctapi ) openct? ( !pcsc-lite !ctapi ) ctapi? ( !pcsc-lite !openct ) || ( pcsc-lite openct ctapi )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/OpenSC/OpenSC/releases/download/0.21.0/opensc-0.21.0.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=346c17d880227f88faeacd1be6202a12
diff --git a/metadata/md5-cache/dev-libs/popt-1.16-r2 b/metadata/md5-cache/dev-libs/popt-1.16-r2
deleted file mode 100644
index 59b4d67..0000000
--- a/metadata/md5-cache/dev-libs/popt-1.16-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
-DESCRIPTION=Parse Options - Command line parser
-EAPI=5
-HOMEPAGE=http://rpm5.org/
-IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
-SLOT=0
-SRC_URI=http://rpm5.org/files/popt/popt-1.16.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e17919f67bf4ee2213f4ba27f32a8bee
diff --git a/metadata/md5-cache/dev-libs/popt-1.18 b/metadata/md5-cache/dev-libs/popt-1.18
new file mode 100644
index 0000000..e0fe360
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/popt-1.18
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
+DESCRIPTION=Parse Options - Command line parser
+EAPI=7
+HOMEPAGE=https://github.com/rpm-software-management/popt
+IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
+SLOT=0
+SRC_URI=http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f336967a0f77d81907e8501e8836c6fb
diff --git a/metadata/md5-cache/dev-libs/tinyxml2-8.0.0 b/metadata/md5-cache/dev-libs/tinyxml2-8.0.0
new file mode 100644
index 0000000..ddba31e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/tinyxml2-8.0.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A simple, small, efficient, C++ XML parser
+EAPI=7
+HOMEPAGE=http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=ZLIB
+RESTRICT=!test? ( test )
+SLOT=0/8
+SRC_URI=https://github.com/leethomason/tinyxml2/archive/8.0.0.tar.gz -> tinyxml2-8.0.0.tar.gz
+_eclasses_=cmake	b22e256fd899c7e0c747e8834eff121a	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1d59f54b04dd4a2317b9a8e99d498756
diff --git a/metadata/md5-cache/dev-libs/wayland-1.17.0 b/metadata/md5-cache/dev-libs/wayland-1.17.0
deleted file mode 100644
index e9c128c..0000000
--- a/metadata/md5-cache/dev-libs/wayland-1.17.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] dev-libs/libxml2:= >=virtual/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Wayland protocol libraries
-EAPI=6
-HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland
-IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] dev-libs/libxml2:= >=virtual/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] !<media-libs/mesa-18.1.1-r1
-SLOT=0
-SRC_URI=https://wayland.freedesktop.org/releases/wayland-1.17.0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7ec7085d125367d9649bbf7f1915e7c3
diff --git a/metadata/md5-cache/dev-libs/wayland-1.19.0-r1 b/metadata/md5-cache/dev-libs/wayland-1.19.0-r1
new file mode 100644
index 0000000..1dc1674
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/wayland-1.19.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=~dev-util/wayland-scanner-1.19.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] virtual/pkgconfig doc? ( >=app-doc/doxygen-1.6[dot] app-text/xmlto >=media-gfx/graphviz-2.26.0 ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] dev-libs/libxml2:= >=dev-libs/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?]
+DESCRIPTION=Wayland protocol libraries
+EAPI=7
+HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland
+IUSE=doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] dev-libs/libxml2:= >=dev-libs/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?]
+SLOT=0
+SRC_URI=https://wayland.freedesktop.org/releases/wayland-1.19.0.tar.xz
+_eclasses_=meson	5ec14fdbc5446b8767e87e186e3b1a52	meson-multilib	485215fef459a86936e377c0eaa513a0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0366a0dafa997670136853f4d3e05246
diff --git a/metadata/md5-cache/dev-libs/wayland-protocols-1.11 b/metadata/md5-cache/dev-libs/wayland-protocols-1.11
deleted file mode 100644
index 054be16..0000000
--- a/metadata/md5-cache/dev-libs/wayland-protocols-1.11
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/wayland virtual/pkgconfig >=app-portage/elt-patches-20170815
-DESCRIPTION=Wayland protocol files
-EAPI=5
-HOMEPAGE=https://wayland.freedesktop.org/
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=dev-libs/wayland
-SLOT=0
-SRC_URI=https://wayland.freedesktop.org/releases/wayland-protocols-1.11.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0c140f3fc8791c7e57900e9857be682c
diff --git a/metadata/md5-cache/dev-libs/wayland-protocols-1.20 b/metadata/md5-cache/dev-libs/wayland-protocols-1.20
new file mode 100644
index 0000000..3c1f0f6
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/wayland-protocols-1.20
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=prepare test
+DEPEND=dev-libs/wayland
+DESCRIPTION=Wayland protocol files
+EAPI=7
+HOMEPAGE=https://wayland.freedesktop.org/
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=dev-libs/wayland
+SLOT=0
+SRC_URI=https://wayland.freedesktop.org/releases/wayland-protocols-1.20.tar.xz
+_md5_=5958b3f49394fea3d94590d12ec0c713
diff --git a/metadata/md5-cache/dev-perl/Authen-SASL-2.160.0-r1 b/metadata/md5-cache/dev-perl/Authen-SASL-2.160.0-r1
index f163deb..36df492 100644
--- a/metadata/md5-cache/dev-perl/Authen-SASL-2.160.0-r1
+++ b/metadata/md5-cache/dev-perl/Authen-SASL-2.160.0-r1
@@ -9,5 +9,5 @@
 RDEPEND=dev-perl/Digest-HMAC kerberos? ( dev-perl/GSSAPI ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GB/GBARR/Authen-SASL-2.16.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6266365a572d0bff87ac17c6607c4092
diff --git a/metadata/md5-cache/dev-perl/Canary-Stability-2013.0.0 b/metadata/md5-cache/dev-perl/Canary-Stability-2013.0.0
new file mode 100644
index 0000000..d886811
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Canary-Stability-2013.0.0
@@ -0,0 +1,13 @@
+BDEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Canary to check perl compatibility for schmorp's modules
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Canary-Stability
+KEYWORDS=*
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/Canary-Stability-2013.tar.gz
+_eclasses_=multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=a7ef048678fe50a65d46fc384061a5c3
diff --git a/metadata/md5-cache/dev-perl/Crypt-PasswdMD5-1.300.0-r1 b/metadata/md5-cache/dev-perl/Crypt-PasswdMD5-1.300.0-r1
index 7a76a83..5fd945b 100644
--- a/metadata/md5-cache/dev-perl/Crypt-PasswdMD5-1.300.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-PasswdMD5-1.300.0-r1
@@ -8,5 +8,5 @@
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LU/LUISMUNOZ/Crypt-PasswdMD5-1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d304424f8e3cab3959536258533f722d
diff --git a/metadata/md5-cache/dev-perl/DBD-mysql-4.20.0-r1 b/metadata/md5-cache/dev-perl/DBD-mysql-4.20.0-r1
index dec8bd5..2b8e207 100644
--- a/metadata/md5-cache/dev-perl/DBD-mysql-4.20.0-r1
+++ b/metadata/md5-cache/dev-perl/DBD-mysql-4.20.0-r1
@@ -9,5 +9,5 @@
 RDEPEND=dev-perl/DBI virtual/mysql[embedded?] dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.020.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d1856a4330939021a3ad1d879f76241d
diff --git a/metadata/md5-cache/dev-perl/DBI-1.628.0 b/metadata/md5-cache/dev-perl/DBI-1.628.0
index 5c46cba..6ec3a6c 100644
--- a/metadata/md5-cache/dev-perl/DBI-1.628.0
+++ b/metadata/md5-cache/dev-perl/DBI-1.628.0
@@ -9,5 +9,5 @@
 RDEPEND=>=dev-perl/PlRPC-0.200.0 >=virtual/perl-Sys-Syslog-0.170.0 virtual/perl-File-Spec !<=dev-perl/SQL-Statement-1.330.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TIMB/DBI-1.628.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=16457bb93c72226cc9696b1efa06734c
diff --git a/metadata/md5-cache/dev-perl/Digest-HMAC-1.30.0-r1 b/metadata/md5-cache/dev-perl/Digest-HMAC-1.30.0-r1
index 4a9e0d5..8701185 100644
--- a/metadata/md5-cache/dev-perl/Digest-HMAC-1.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Digest-HMAC-1.30.0-r1
@@ -8,5 +8,5 @@
 RDEPEND=virtual/perl-Digest-MD5 virtual/perl-Digest-SHA dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Digest-HMAC-1.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4fb4f893bdad6c5225d8e16986f59c09
diff --git a/metadata/md5-cache/dev-perl/Digest-SHA1-2.130.0-r1 b/metadata/md5-cache/dev-perl/Digest-SHA1-2.130.0-r1
index fa71616..18fdda9 100644
--- a/metadata/md5-cache/dev-perl/Digest-SHA1-2.130.0-r1
+++ b/metadata/md5-cache/dev-perl/Digest-SHA1-2.130.0-r1
@@ -8,5 +8,5 @@
 RDEPEND=virtual/perl-Digest dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Digest-SHA1-2.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=32fba8a70569a79cda2f97d416d1fd99
diff --git a/metadata/md5-cache/dev-perl/Error-0.170.210 b/metadata/md5-cache/dev-perl/Error-0.170.210
index 2cfa650..911101a 100644
--- a/metadata/md5-cache/dev-perl/Error-0.170.210
+++ b/metadata/md5-cache/dev-perl/Error-0.170.210
@@ -9,5 +9,5 @@
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Error-0.17021.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a96f33decc5a2f58ae64373ba64710fe
diff --git a/metadata/md5-cache/dev-perl/File-Slurp-9999.190.0-r1 b/metadata/md5-cache/dev-perl/File-Slurp-9999.190.0-r1
index 72bc18f..52f0052 100644
--- a/metadata/md5-cache/dev-perl/File-Slurp-9999.190.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Slurp-9999.190.0-r1
@@ -8,5 +8,5 @@
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/U/UR/URI/File-Slurp-9999.19.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a113ca956bbdd63352334b71c3230c71
diff --git a/metadata/md5-cache/dev-perl/GD-2.460.0-r1 b/metadata/md5-cache/dev-perl/GD-2.460.0-r1
index acfac1d..9bde369 100644
--- a/metadata/md5-cache/dev-perl/GD-2.460.0-r1
+++ b/metadata/md5-cache/dev-perl/GD-2.460.0-r1
@@ -9,5 +9,5 @@
 RDEPEND=>=media-libs/gd-2.0.33 png? ( media-libs/gd[png] media-libs/libpng sys-libs/zlib ) jpeg? ( media-libs/gd[jpeg] virtual/jpeg ) truetype? ( media-libs/gd[truetype] media-libs/freetype:2 ) xpm? ( media-libs/gd[xpm] x11-libs/libXpm ) gif? ( media-libs/giflib ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/GD-2.46.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1ea002614fc4b67db9a19c47e5bdd295
diff --git a/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.66.0 b/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.66.0
index 260ff12..74544eb 100644
--- a/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.66.0
+++ b/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.66.0
@@ -9,5 +9,5 @@
 RDEPEND=dev-perl/Mozilla-CA >=dev-perl/Net-SSLeay-1.460.0 virtual/perl-Scalar-List-Utils idn? ( || ( >=dev-perl/URI-1.50 dev-perl/Net-LibIDN dev-perl/Net-IDN-Encode ) ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.066.tar.gz
-_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_eclasses_=multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
 _md5_=bbe3c111ebee29c8ac066c401322e85d
diff --git a/metadata/md5-cache/dev-perl/JSON-2.940.0 b/metadata/md5-cache/dev-perl/JSON-2.940.0
new file mode 100644
index 0000000..62950ad
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/JSON-2.940.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
+DESCRIPTION=JSON (JavaScript Object Notation) encoder/decoder
+EAPI=6
+HOMEPAGE=https://metacpan.org/release/JSON
+IUSE=test +xs examples
+KEYWORDS=*
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=xs? ( >=dev-perl/JSON-XS-2.340.0 ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-2.94.tar.gz
+_eclasses_=multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=9130264c6230b06633850c0681af4600
diff --git a/metadata/md5-cache/dev-perl/JSON-XS-3.40.0 b/metadata/md5-cache/dev-perl/JSON-XS-3.40.0
new file mode 100644
index 0000000..c05aa81
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/JSON-XS-3.40.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Types-Serialiser dev-perl/common-sense !<dev-perl/JSON-2.900.0 !<dev-perl/JSON-Any-1.310.0 dev-perl/Canary-Stability >=virtual/perl-ExtUtils-MakeMaker-6.520.0 test? ( virtual/perl-Test-Harness ) dev-lang/perl
+DESCRIPTION=JSON::XS - JSON serialising/deserialising, done correctly and fast
+EAPI=6
+HOMEPAGE=https://metacpan.org/release/JSON-XS
+IUSE=test examples
+KEYWORDS=*
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Types-Serialiser dev-perl/common-sense !<dev-perl/JSON-2.900.0 !<dev-perl/JSON-Any-1.310.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-3.04.tar.gz
+_eclasses_=multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=b3a287fd51e5f18830ffa1da1e91bb5f
diff --git a/metadata/md5-cache/dev-perl/Locale-gettext-1.50.0-r2 b/metadata/md5-cache/dev-perl/Locale-gettext-1.50.0-r2
index d8a748d..12e5e24 100644
--- a/metadata/md5-cache/dev-perl/Locale-gettext-1.50.0-r2
+++ b/metadata/md5-cache/dev-perl/Locale-gettext-1.50.0-r2
@@ -8,5 +8,5 @@
 RDEPEND=sys-devel/gettext dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d6ce103290bd025ac97251c83fc063fe
diff --git a/metadata/md5-cache/dev-perl/MailTools-2.190.0 b/metadata/md5-cache/dev-perl/MailTools-2.190.0
index e9a5796..df51151 100644
--- a/metadata/md5-cache/dev-perl/MailTools-2.190.0
+++ b/metadata/md5-cache/dev-perl/MailTools-2.190.0
@@ -9,5 +9,5 @@
 RDEPEND=dev-perl/TimeDate virtual/perl-IO >=virtual/perl-libnet-1.50.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/MailTools-2.19.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=35be3faf514dfe0d2c136bfb7cf9b1b5
diff --git a/metadata/md5-cache/dev-perl/Mozilla-CA-20999999 b/metadata/md5-cache/dev-perl/Mozilla-CA-20999999
index 825d82d..1fdd4de 100644
--- a/metadata/md5-cache/dev-perl/Mozilla-CA-20999999
+++ b/metadata/md5-cache/dev-perl/Mozilla-CA-20999999
@@ -8,5 +8,5 @@
 RDEPEND=app-misc/ca-certificates dev-lang/perl:=
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/Mozilla-CA-20999999.tar.gz
-_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_eclasses_=multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
 _md5_=a351c070e80e16e78b65218b4dee7ee9
diff --git a/metadata/md5-cache/dev-perl/Net-Daemon-0.480.0-r1 b/metadata/md5-cache/dev-perl/Net-Daemon-0.480.0-r1
index 53288cf..216ca41 100644
--- a/metadata/md5-cache/dev-perl/Net-Daemon-0.480.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-Daemon-0.480.0-r1
@@ -8,5 +8,5 @@
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MN/MNOONING/Net-Daemon-0.48.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9d328c0b5f1c0ceb076a78ad8b7e91eb
diff --git a/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.30.0 b/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.30.0
index 02e896a..21ec107 100644
--- a/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.30.0
+++ b/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.30.0
@@ -9,5 +9,5 @@
 RDEPEND=virtual/perl-libnet dev-perl/IO-Socket-SSL dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Net-SMTP-SSL-1.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=df0670d8d5a4e6f70cf3d8d21c66492d
diff --git a/metadata/md5-cache/dev-perl/Net-SSLeay-1.880.0 b/metadata/md5-cache/dev-perl/Net-SSLeay-1.880.0
index 33d564a..b122a3f 100644
--- a/metadata/md5-cache/dev-perl/Net-SSLeay-1.880.0
+++ b/metadata/md5-cache/dev-perl/Net-SSLeay-1.880.0
@@ -9,5 +9,5 @@
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) virtual/perl-MIME-Base64 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHRISN/Net-SSLeay-1.88.tar.gz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ffb7006ea978b75573d5b9d779a59f03
diff --git a/metadata/md5-cache/dev-perl/PerlIO-gzip-0.200.0 b/metadata/md5-cache/dev-perl/PerlIO-gzip-0.200.0
new file mode 100644
index 0000000..6e0d2a8
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PerlIO-gzip-0.200.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib dev-lang/perl
+DESCRIPTION=PerlIO layer to gzip/gunzip
+EAPI=6
+HOMEPAGE=https://metacpan.org/release/PerlIO-gzip
+KEYWORDS=*
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=sys-libs/zlib virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/N/NW/NWCLARK/PerlIO-gzip-0.20.tar.gz
+_eclasses_=multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=0d853f9768bdf139e35a07fba4fb1077
diff --git a/metadata/md5-cache/dev-perl/PlRPC-0.202.0-r2 b/metadata/md5-cache/dev-perl/PlRPC-0.202.0-r2
index 7f89e0a..5be84a0 100644
--- a/metadata/md5-cache/dev-perl/PlRPC-0.202.0-r2
+++ b/metadata/md5-cache/dev-perl/PlRPC-0.202.0-r2
@@ -8,5 +8,5 @@
 RDEPEND=>=virtual/perl-Storable-1.0.7 >=dev-perl/Net-Daemon-0.34 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MN/MNOONING/PlRPC/PlRPC-0.2020.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=79634f945c90944736d840f17ed4bd39
diff --git a/metadata/md5-cache/dev-perl/SGMLSpm-1.03-r7 b/metadata/md5-cache/dev-perl/SGMLSpm-1.03-r7
index c1299c8..d868196 100644
--- a/metadata/md5-cache/dev-perl/SGMLSpm-1.03-r7
+++ b/metadata/md5-cache/dev-perl/SGMLSpm-1.03-r7
@@ -8,5 +8,5 @@
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DM/DMEGG/SGMLSpm-1.03ii.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ebcbb2754dc062e9685c985cc34e0ade
diff --git a/metadata/md5-cache/dev-perl/TermReadKey-2.300.200-r1 b/metadata/md5-cache/dev-perl/TermReadKey-2.300.200-r1
index 91b373d..ff7a1af 100644
--- a/metadata/md5-cache/dev-perl/TermReadKey-2.300.200-r1
+++ b/metadata/md5-cache/dev-perl/TermReadKey-2.300.200-r1
@@ -8,5 +8,5 @@
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/ST/STSI/TermReadKey-2.30.02.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0dda49088c635e9ec7fe1255f60276bf
diff --git a/metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1 b/metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1
index 1aa34d1..de45018 100644
--- a/metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1
@@ -8,5 +8,5 @@
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KU/KUBOTA/Text-CharWidth-0.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c15758e87e9c971469cd5d53c27a559f
diff --git a/metadata/md5-cache/dev-perl/Text-Unidecode-0.40.0-r1 b/metadata/md5-cache/dev-perl/Text-Unidecode-0.40.0-r1
index 89e25c5..ad213a5 100644
--- a/metadata/md5-cache/dev-perl/Text-Unidecode-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Unidecode-0.40.0-r1
@@ -8,5 +8,5 @@
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SB/SBURKE/Text-Unidecode-0.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=752ac1787918ee002a7c0b05723ce63e
diff --git a/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1 b/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1
index 3e04219..59710f5 100644
--- a/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1
@@ -8,5 +8,5 @@
 RDEPEND=dev-perl/Text-CharWidth dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KU/KUBOTA/Text-WrapI18N-0.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9ddba3f0f9919ef1159282d0a7ce56d4
diff --git a/metadata/md5-cache/dev-perl/TimeDate-2.300.0 b/metadata/md5-cache/dev-perl/TimeDate-2.300.0
index e0e4968..6b9b5c1 100644
--- a/metadata/md5-cache/dev-perl/TimeDate-2.300.0
+++ b/metadata/md5-cache/dev-perl/TimeDate-2.300.0
@@ -8,5 +8,5 @@
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GB/GBARR/TimeDate-2.30.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=902893a4d625402e2c02d40d49ced5f4
diff --git a/metadata/md5-cache/dev-perl/Types-Serialiser-1.0.0-r1 b/metadata/md5-cache/dev-perl/Types-Serialiser-1.0.0-r1
new file mode 100644
index 0000000..212168a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Types-Serialiser-1.0.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/common-sense virtual/perl-ExtUtils-MakeMaker dev-lang/perl
+DESCRIPTION=simple data types for common serialisation formats
+EAPI=6
+HOMEPAGE=https://metacpan.org/release/Types-Serialiser
+KEYWORDS=*
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/common-sense dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/Types-Serialiser-1.0.tar.gz
+_eclasses_=multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=da9a6be8ab7121d11fbf407f57555881
diff --git a/metadata/md5-cache/dev-perl/URI-1.600.0-r1 b/metadata/md5-cache/dev-perl/URI-1.600.0-r1
index d83667c..f10abca 100644
--- a/metadata/md5-cache/dev-perl/URI-1.600.0-r1
+++ b/metadata/md5-cache/dev-perl/URI-1.600.0-r1
@@ -8,5 +8,5 @@
 RDEPEND=virtual/perl-MIME-Base64 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/URI-1.60.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=44f2c1abf8598222e5b37f53fa0e0ea0
diff --git a/metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-1.330.0-r1 b/metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-1.330.0-r1
index a0778eb..47497e2 100644
--- a/metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-1.330.0-r1
+++ b/metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-1.330.0-r1
@@ -8,5 +8,5 @@
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AU/AUDREYT/Unicode-EastAsianWidth-1.33.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c9747828c6af04789ed73ffa9563506b
diff --git a/metadata/md5-cache/dev-perl/XML-NamespaceSupport-1.120.0 b/metadata/md5-cache/dev-perl/XML-NamespaceSupport-1.120.0
index 8b3cf77..3f7aac1 100644
--- a/metadata/md5-cache/dev-perl/XML-NamespaceSupport-1.120.0
+++ b/metadata/md5-cache/dev-perl/XML-NamespaceSupport-1.120.0
@@ -10,5 +10,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-1.12.tar.gz
-_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_eclasses_=multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
 _md5_=f4cf394cfffa803eb2ff6f237e6a96e4
diff --git a/metadata/md5-cache/dev-perl/XML-Parser-2.410.0-r2 b/metadata/md5-cache/dev-perl/XML-Parser-2.410.0-r2
index 8e38ed0..90fee6f 100644
--- a/metadata/md5-cache/dev-perl/XML-Parser-2.410.0-r2
+++ b/metadata/md5-cache/dev-perl/XML-Parser-2.410.0-r2
@@ -8,5 +8,5 @@
 RDEPEND=>=dev-libs/expat-1.95.1-r1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.41.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e033167efa096937925986147320b4d8
diff --git a/metadata/md5-cache/dev-perl/XML-SAX-1.0.0 b/metadata/md5-cache/dev-perl/XML-SAX-1.0.0
index eb6baa9..b5d6ce5 100644
--- a/metadata/md5-cache/dev-perl/XML-SAX-1.0.0
+++ b/metadata/md5-cache/dev-perl/XML-SAX-1.0.0
@@ -8,5 +8,5 @@
 RDEPEND=>=dev-perl/XML-SAX-Base-1.50.0 >=dev-perl/XML-NamespaceSupport-1.40.0 >=dev-libs/libxml2-2.4.1 virtual/perl-File-Temp dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-1.00.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ed92e80248e49ea6f7a52bb720115c17
diff --git a/metadata/md5-cache/dev-perl/XML-SAX-Base-1.90.0 b/metadata/md5-cache/dev-perl/XML-SAX-Base-1.90.0
index 7874663..7c81b71 100644
--- a/metadata/md5-cache/dev-perl/XML-SAX-Base-1.90.0
+++ b/metadata/md5-cache/dev-perl/XML-SAX-Base-1.90.0
@@ -10,5 +10,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-Base-1.09.tar.gz
-_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_eclasses_=multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
 _md5_=106ab89ff83f9f55abc42e69f37c722c
diff --git a/metadata/md5-cache/dev-perl/XML-SAX-Expat-0.510.0 b/metadata/md5-cache/dev-perl/XML-SAX-Expat-0.510.0
index 7f77304..1e8ef28 100644
--- a/metadata/md5-cache/dev-perl/XML-SAX-Expat-0.510.0
+++ b/metadata/md5-cache/dev-perl/XML-SAX-Expat-0.510.0
@@ -10,5 +10,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BJ/BJOERN/XML-SAX-Expat-0.51.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c11050ec745913fee025b971e0377261
diff --git a/metadata/md5-cache/dev-perl/XML-Simple-2.250.0 b/metadata/md5-cache/dev-perl/XML-Simple-2.250.0
index f02ce48..1f9f83d 100644
--- a/metadata/md5-cache/dev-perl/XML-Simple-2.250.0
+++ b/metadata/md5-cache/dev-perl/XML-Simple-2.250.0
@@ -10,5 +10,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GRANTM/XML-Simple-2.25.tar.gz
-_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_eclasses_=multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
 _md5_=0b37fec45e2bb4158695e18e8bf3647e
diff --git a/metadata/md5-cache/dev-perl/YAML-Tiny-1.510.0-r1 b/metadata/md5-cache/dev-perl/YAML-Tiny-1.510.0-r1
index 55678af..441b533 100644
--- a/metadata/md5-cache/dev-perl/YAML-Tiny-1.510.0-r1
+++ b/metadata/md5-cache/dev-perl/YAML-Tiny-1.510.0-r1
@@ -8,5 +8,5 @@
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/YAML-Tiny-1.51.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=52f841d13b359bb576eb1c5679b0ee66
diff --git a/metadata/md5-cache/dev-perl/common-sense-3.740.0-r1 b/metadata/md5-cache/dev-perl/common-sense-3.740.0-r1
new file mode 100644
index 0000000..aa6202d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/common-sense-3.740.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
+DESCRIPTION=Save a tree AND a kitten, use common::sense!
+EAPI=6
+HOMEPAGE=https://metacpan.org/release/common-sense
+KEYWORDS=*
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/common-sense-3.74.tar.gz
+_eclasses_=multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=ba603bf9b9cbc8d5a9d9f689fcdc6317
diff --git a/metadata/md5-cache/dev-perl/libintl-perl-1.200.0-r1 b/metadata/md5-cache/dev-perl/libintl-perl-1.200.0-r1
index 1ef1f5b..0b37e34 100644
--- a/metadata/md5-cache/dev-perl/libintl-perl-1.200.0-r1
+++ b/metadata/md5-cache/dev-perl/libintl-perl-1.200.0-r1
@@ -8,5 +8,5 @@
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.20.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0ea755d1522e52f1f47f69d31b90e279
diff --git a/metadata/md5-cache/dev-perl/yaml-0.840.0-r1 b/metadata/md5-cache/dev-perl/yaml-0.840.0-r1
index f107302..ff22fc7 100644
--- a/metadata/md5-cache/dev-perl/yaml-0.840.0-r1
+++ b/metadata/md5-cache/dev-perl/yaml-0.840.0-r1
@@ -8,5 +8,5 @@
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSTROUT/YAML-0.84.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b9363eb56c8b9733ec32ebe6a1625abc
diff --git a/metadata/md5-cache/dev-python/Babel-2.8.0-r1 b/metadata/md5-cache/dev-python/Babel-2.8.0-r1
index 08c496f..3de07d2 100644
--- a/metadata/md5-cache/dev-python/Babel-2.8.0-r1
+++ b/metadata/md5-cache/dev-python/Babel-2.8.0-r1
@@ -12,5 +12,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/B/Babel/Babel-2.8.0.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4c5b1f1628ff4254430f35f82982ee33
diff --git a/metadata/md5-cache/dev-python/PySocks-1.6.7 b/metadata/md5-cache/dev-python/PySocks-1.6.7
index e1d7d46..e134be0 100644
--- a/metadata/md5-cache/dev-python/PySocks-1.6.7
+++ b/metadata/md5-cache/dev-python/PySocks-1.6.7
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PySocks/PySocks-1.6.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cf44289632240ccec34e962dc83cb15e
diff --git a/metadata/md5-cache/dev-python/PySocks-1.6.7-r1 b/metadata/md5-cache/dev-python/PySocks-1.6.7-r1
index e1d7d46..e134be0 100644
--- a/metadata/md5-cache/dev-python/PySocks-1.6.7-r1
+++ b/metadata/md5-cache/dev-python/PySocks-1.6.7-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PySocks/PySocks-1.6.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cf44289632240ccec34e962dc83cb15e
diff --git a/metadata/md5-cache/dev-python/alabaster-0.7.12 b/metadata/md5-cache/dev-python/alabaster-0.7.12
index e19e3d2..139b899 100644
--- a/metadata/md5-cache/dev-python/alabaster-0.7.12
+++ b/metadata/md5-cache/dev-python/alabaster-0.7.12
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/a/alabaster/alabaster-0.7.12.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=67d15acd173c0b6f91e7f6f9e05d2796
diff --git a/metadata/md5-cache/dev-python/appdirs-1.4.3 b/metadata/md5-cache/dev-python/appdirs-1.4.3
index 95558fe..ef3c30e 100644
--- a/metadata/md5-cache/dev-python/appdirs-1.4.3
+++ b/metadata/md5-cache/dev-python/appdirs-1.4.3
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/ActiveState/appdirs/archive/1.4.3.tar.gz -> appdirs-1.4.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6f390c09ea50095aa364b2fd2fa5ea1a
diff --git a/metadata/md5-cache/dev-python/argcomplete-1.9.4 b/metadata/md5-cache/dev-python/argcomplete-1.9.4
index c0062ab..fa0a8da 100644
--- a/metadata/md5-cache/dev-python/argcomplete-1.9.4
+++ b/metadata/md5-cache/dev-python/argcomplete-1.9.4
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/argcomplete/argcomplete-1.9.4.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad785fbfeee1149d2714f17aa565b8d7
diff --git a/metadata/md5-cache/dev-python/asn1crypto-0.22.0 b/metadata/md5-cache/dev-python/asn1crypto-0.22.0
deleted file mode 100644
index dcaecb7..0000000
--- a/metadata/md5-cache/dev-python/asn1crypto-0.22.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python ASN.1 library with a focus on performance and a pythonic API
-EAPI=6
-HOMEPAGE=https://github.com/wbond/asn1crypto/ https://pypi.python.org/pypi/asn1crypto/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/a/asn1crypto/asn1crypto-0.22.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=50c54048ba8e6fcd84e160e11b75ce4c
diff --git a/metadata/md5-cache/dev-python/asn1crypto-0.22.0-r2 b/metadata/md5-cache/dev-python/asn1crypto-0.22.0-r2
deleted file mode 100644
index dcaecb7..0000000
--- a/metadata/md5-cache/dev-python/asn1crypto-0.22.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python ASN.1 library with a focus on performance and a pythonic API
-EAPI=6
-HOMEPAGE=https://github.com/wbond/asn1crypto/ https://pypi.python.org/pypi/asn1crypto/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/a/asn1crypto/asn1crypto-0.22.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=50c54048ba8e6fcd84e160e11b75ce4c
diff --git a/metadata/md5-cache/dev-python/astroid-1.6.6 b/metadata/md5-cache/dev-python/astroid-1.6.6
index eb2418f..d2b3cc1 100644
--- a/metadata/md5-cache/dev-python/astroid-1.6.6
+++ b/metadata/md5-cache/dev-python/astroid-1.6.6
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/astroid/astroid-1.6.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb3f79dabfa636cfd74463c339bd429c
diff --git a/metadata/md5-cache/dev-python/atomicwrites-1.2.1 b/metadata/md5-cache/dev-python/atomicwrites-1.2.1
index 36dff05..55c8cb9 100644
--- a/metadata/md5-cache/dev-python/atomicwrites-1.2.1
+++ b/metadata/md5-cache/dev-python/atomicwrites-1.2.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/atomicwrites/atomicwrites-1.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f122319907b80934f0926b94d3997e42
diff --git a/metadata/md5-cache/dev-python/attrs-18.2.0 b/metadata/md5-cache/dev-python/attrs-18.2.0
deleted file mode 100644
index 47e7e98..0000000
--- a/metadata/md5-cache/dev-python/attrs-18.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) >=dev-python/hypothesis-3.6.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Attributes without boilerplate
-EAPI=6
-HOMEPAGE=https://github.com/hynek/attrs https://attrs.readthedocs.org/ https://pypi.org/project/attrs/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/a/attrs/attrs-18.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9450b083462bbd21d93bce76ec6cacb8
diff --git a/metadata/md5-cache/dev-python/attrs-20.3.0 b/metadata/md5-cache/dev-python/attrs-20.3.0
new file mode 100644
index 0000000..04942bf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/attrs-20.3.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-python/hypothesis-3.6.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.3.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Attributes without boilerplate
+EAPI=7
+HOMEPAGE=https://github.com/python-attrs/attrs https://attrs.readthedocs.io/ https://pypi.org/project/attrs/
+IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/attrs/attrs-20.3.0.tar.gz
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=80ba31632d8f3e0fa859de8947dac73d
diff --git a/metadata/md5-cache/dev-python/autopep8-1.3.2 b/metadata/md5-cache/dev-python/autopep8-1.3.2
index fe47c69..3b30c64 100644
--- a/metadata/md5-cache/dev-python/autopep8-1.3.2
+++ b/metadata/md5-cache/dev-python/autopep8-1.3.2
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/autopep8/autopep8-1.3.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=93f3177a2d81b95cf7cbfd0d005f3038
diff --git a/metadata/md5-cache/dev-python/awscli-1.18.142 b/metadata/md5-cache/dev-python/awscli-1.18.142
index 93d51cb..c749cb2 100644
--- a/metadata/md5-cache/dev-python/awscli-1.18.142
+++ b/metadata/md5-cache/dev-python/awscli-1.18.142
@@ -12,5 +12,5 @@
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/aws/aws-cli/archive/1.18.142.tar.gz -> awscli-1.18.142.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3901f9e4621dccb6a6b2d98f0c4cc65e
diff --git a/metadata/md5-cache/dev-python/backports-1.0 b/metadata/md5-cache/dev-python/backports-1.0
index 9336ed9..dce0426 100644
--- a/metadata/md5-cache/dev-python/backports-1.0
+++ b/metadata/md5-cache/dev-python/backports-1.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~radhermit/dist/backports-1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=493c2f1a35031a96bd164ccd7136f0dc
diff --git a/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.3 b/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.3
index 248128c..243c2e2 100644
--- a/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.3
+++ b/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.3
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.functools_lru_cache/backports.functools_lru_cache-1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e10a9709b22a9d1484aa21c0967a3a0d
diff --git a/metadata/md5-cache/dev-python/backports-lzma-0.0.8 b/metadata/md5-cache/dev-python/backports-lzma-0.0.8
deleted file mode 100644
index 91752eb..0000000
--- a/metadata/md5-cache/dev-python/backports-lzma-0.0.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/xz-utils dev-python/backports[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Backport of Python 3.3's lzma module for XZ/LZMA compressed files
-EAPI=5
-HOMEPAGE=https://github.com/peterjc/backports.lzma/ https://pypi.python.org/pypi/backports.lzma/
-IUSE=python_targets_python2_7
-KEYWORDS=*
-LICENSE=BSD
-RDEPEND=app-arch/xz-utils dev-python/backports[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/b/backports.lzma/backports.lzma-0.0.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=49d26d30d516c0cd3bee0224a939283c
diff --git a/metadata/md5-cache/dev-python/backports-shutil_get_terminal_size-1.0.0-r1 b/metadata/md5-cache/dev-python/backports-shutil_get_terminal_size-1.0.0-r1
deleted file mode 100644
index 691f36d..0000000
--- a/metadata/md5-cache/dev-python/backports-shutil_get_terminal_size-1.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A backport of the get_terminal_size function from Python 3.3's shutil
-EAPI=5
-HOMEPAGE=https://pypi.org/project/backports.shutil_get_terminal_size/ https://github.com/chrippa/backports.shutil_get_terminal_size
-IUSE=python_targets_python2_7
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=dev-python/backports[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/b/backports.shutil_get_terminal_size/backports.shutil_get_terminal_size-1.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=47dfb516e993f21362888ed2a3008779
diff --git a/metadata/md5-cache/dev-python/backports-ssl-match-hostname-3.4.0.2 b/metadata/md5-cache/dev-python/backports-ssl-match-hostname-3.4.0.2
index a1e0602..ce585ab 100644
--- a/metadata/md5-cache/dev-python/backports-ssl-match-hostname-3.4.0.2
+++ b/metadata/md5-cache/dev-python/backports-ssl-match-hostname-3.4.0.2
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.ssl_match_hostname/backports.ssl_match_hostname-3.4.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=766ffddfdbe7cd91b6af29fb8bf4f876
diff --git a/metadata/md5-cache/dev-python/blinker-1.4 b/metadata/md5-cache/dev-python/blinker-1.4
index e45bc31..c6ced3d 100644
--- a/metadata/md5-cache/dev-python/blinker-1.4
+++ b/metadata/md5-cache/dev-python/blinker-1.4
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blinker/blinker-1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=461a6e9f45a89641c1565a4dd9587060
diff --git a/metadata/md5-cache/dev-python/boto-2.49.0 b/metadata/md5-cache/dev-python/boto-2.49.0
deleted file mode 100644
index 98abcbf..0000000
--- a/metadata/md5-cache/dev-python/boto-2.49.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=Amazon Web Services API
-EAPI=7
-HOMEPAGE=https://github.com/boto/boto https://pypi.org/project/boto/
-IUSE=doc test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/b/boto/boto-2.49.0.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8c252b6742576bdab72a66a9ec840817
diff --git a/metadata/md5-cache/dev-python/boto-2.49.0-r4 b/metadata/md5-cache/dev-python/boto-2.49.0-r4
new file mode 100644
index 0000000..430fdee
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto-2.49.0-r4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/httpretty[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/keyring[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/rsa[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/selenium[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Amazon Web Services API
+EAPI=7
+HOMEPAGE=https://github.com/boto/boto https://pypi.org/project/boto/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=>=dev-python/six-1.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/boto/boto-2.49.0.tar.gz
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=16f110cdf31dfde1b9db9b4b39fe33ea
diff --git a/metadata/md5-cache/dev-python/botocore-1.18.10 b/metadata/md5-cache/dev-python/botocore-1.18.10
index 3f40085..0683eb6 100644
--- a/metadata/md5-cache/dev-python/botocore-1.18.10
+++ b/metadata/md5-cache/dev-python/botocore-1.18.10
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.18.10.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d8ad34d4db9d3b8d72b4f8c94a0b4dd5
diff --git a/metadata/md5-cache/dev-python/bottle-0.12.18 b/metadata/md5-cache/dev-python/bottle-0.12.18
index 6804c62..2c87aa3 100644
--- a/metadata/md5-cache/dev-python/bottle-0.12.18
+++ b/metadata/md5-cache/dev-python/bottle-0.12.18
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bottle/bottle-0.12.18.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e32a4d15dd2791f9cc848b1b6c8d6f0c
diff --git a/metadata/md5-cache/dev-python/cached-property-1.5.1 b/metadata/md5-cache/dev-python/cached-property-1.5.1
index 3b3bbfd..a248763 100644
--- a/metadata/md5-cache/dev-python/cached-property-1.5.1
+++ b/metadata/md5-cache/dev-python/cached-property-1.5.1
@@ -12,5 +12,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cached-property/cached-property-1.5.1.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=af0e1bb37f664b421a7a2f5259b83e3f
diff --git a/metadata/md5-cache/dev-python/cachetools-2.1.0 b/metadata/md5-cache/dev-python/cachetools-2.1.0
index ebe0ccf..e37fdbe 100644
--- a/metadata/md5-cache/dev-python/cachetools-2.1.0
+++ b/metadata/md5-cache/dev-python/cachetools-2.1.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cachetools/cachetools-2.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a39947e37ab754f0a2383d7cedb4253e
diff --git a/metadata/md5-cache/dev-python/cairocffi-0.8.0 b/metadata/md5-cache/dev-python/cairocffi-0.8.0
index 47492d6..c80afdf 100644
--- a/metadata/md5-cache/dev-python/cairocffi-0.8.0
+++ b/metadata/md5-cache/dev-python/cairocffi-0.8.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cairocffi/cairocffi-0.8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e9162f65645513120b4e12863a5fa972	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e9162f65645513120b4e12863a5fa972	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fa23ef3e955c2d66a249c70039ea062c
diff --git a/metadata/md5-cache/dev-python/certifi-10001 b/metadata/md5-cache/dev-python/certifi-10001
new file mode 100644
index 0000000..8c42cb4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/certifi-10001
@@ -0,0 +1,15 @@
+BDEPEND=test? ( app-misc/ca-certificates ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Thin replacement for certifi using system certificate store
+EAPI=7
+HOMEPAGE=https://github.com/mgorny/certifi-shim https://pypi.org/project/certifi
+IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=*
+LICENSE=CC0-1.0
+RDEPEND=app-misc/ca-certificates python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mgorny/certifi-shim/archive/v10001.tar.gz -> certifi-shim-10001.tar.gz
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=22c0f3990593d6e09b33292b59befba0
diff --git a/metadata/md5-cache/dev-python/certifi-2017.4.17-r1 b/metadata/md5-cache/dev-python/certifi-2017.4.17-r1
deleted file mode 100644
index 2e17f26..0000000
--- a/metadata/md5-cache/dev-python/certifi-2017.4.17-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python package for providing Mozilla's CA Bundle
-EAPI=5
-HOMEPAGE=http://certifi.io/ https://pypi.python.org/pypi/certifi
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
-KEYWORDS=*
-LICENSE=LGPL-2.1
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/c/certifi/certifi-2017.4.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2127a6f153637124a1abe6459975e085
diff --git a/metadata/md5-cache/dev-python/certifi-2017.4.17-r2 b/metadata/md5-cache/dev-python/certifi-2017.4.17-r2
deleted file mode 100644
index 2e17f26..0000000
--- a/metadata/md5-cache/dev-python/certifi-2017.4.17-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python package for providing Mozilla's CA Bundle
-EAPI=5
-HOMEPAGE=http://certifi.io/ https://pypi.python.org/pypi/certifi
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
-KEYWORDS=*
-LICENSE=LGPL-2.1
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/c/certifi/certifi-2017.4.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2127a6f153637124a1abe6459975e085
diff --git a/metadata/md5-cache/dev-python/cffi-1.14.0-r2 b/metadata/md5-cache/dev-python/cffi-1.14.0-r2
index b458202..2f095e4 100644
--- a/metadata/md5-cache/dev-python/cffi-1.14.0-r2
+++ b/metadata/md5-cache/dev-python/cffi-1.14.0-r2
@@ -12,5 +12,5 @@
 RESTRICT=!test? ( test )
 SLOT=0/1.14.0
 SRC_URI=mirror://pypi/c/cffi/cffi-1.14.0.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d116cbd6c1ce7bfb3335eb71d980380a
diff --git a/metadata/md5-cache/dev-python/chardet-3.0.4 b/metadata/md5-cache/dev-python/chardet-3.0.4
index 951e0b0..82fcf8e 100644
--- a/metadata/md5-cache/dev-python/chardet-3.0.4
+++ b/metadata/md5-cache/dev-python/chardet-3.0.4
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/chardet/chardet/archive/3.0.4.tar.gz -> chardet-3.0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=07b7df611bc643839a02847bd987fa14
diff --git a/metadata/md5-cache/dev-python/chardet-3.0.4-r1 b/metadata/md5-cache/dev-python/chardet-3.0.4-r1
index 951e0b0..82fcf8e 100644
--- a/metadata/md5-cache/dev-python/chardet-3.0.4-r1
+++ b/metadata/md5-cache/dev-python/chardet-3.0.4-r1
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/chardet/chardet/archive/3.0.4.tar.gz -> chardet-3.0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=07b7df611bc643839a02847bd987fa14
diff --git a/metadata/md5-cache/dev-python/cheroot-8.2.1-r1 b/metadata/md5-cache/dev-python/cheroot-8.2.1-r1
index c38d834..0675630 100644
--- a/metadata/md5-cache/dev-python/cheroot-8.2.1-r1
+++ b/metadata/md5-cache/dev-python/cheroot-8.2.1-r1
@@ -12,5 +12,5 @@
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/C/Cheroot/cheroot-8.2.1.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6f3460f5a5765ecff83a0922abc9e277
diff --git a/metadata/md5-cache/dev-python/click-7.0 b/metadata/md5-cache/dev-python/click-7.0
index 85d68ce..3581d59 100644
--- a/metadata/md5-cache/dev-python/click-7.0
+++ b/metadata/md5-cache/dev-python/click-7.0
@@ -12,5 +12,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/click/archive/7.0.tar.gz -> click-7.0.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e409169b0751a392d6764f38ca443493
diff --git a/metadata/md5-cache/dev-python/colorama-0.3.3 b/metadata/md5-cache/dev-python/colorama-0.3.3
index 7d1b06e..80f7a20 100644
--- a/metadata/md5-cache/dev-python/colorama-0.3.3
+++ b/metadata/md5-cache/dev-python/colorama-0.3.3
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/colorama/colorama-0.3.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aa4b7aec954f4acc9d41216da117e899
diff --git a/metadata/md5-cache/dev-python/configobj-5.0.6 b/metadata/md5-cache/dev-python/configobj-5.0.6
index 03c2d2d..2385aea 100644
--- a/metadata/md5-cache/dev-python/configobj-5.0.6
+++ b/metadata/md5-cache/dev-python/configobj-5.0.6
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/configobj/configobj-5.0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2761417b283d270bff7a0770146e0060
diff --git a/metadata/md5-cache/dev-python/configparser-3.5.0-r1 b/metadata/md5-cache/dev-python/configparser-3.5.0-r1
deleted file mode 100644
index 00e09a8..0000000
--- a/metadata/md5-cache/dev-python/configparser-3.5.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Backport of Python-3 built-in configparser
-EAPI=6
-HOMEPAGE=https://pypi.python.org/pypi/configparser/
-IUSE=python_targets_python2_7
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=dev-python/backports[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/c/configparser/configparser-3.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3ea038d323e4dfc8a3e8fe534141bdfe
diff --git a/metadata/md5-cache/dev-python/constantly-15.1.0-r1 b/metadata/md5-cache/dev-python/constantly-15.1.0-r1
index 3aa39b3..7b89895 100644
--- a/metadata/md5-cache/dev-python/constantly-15.1.0-r1
+++ b/metadata/md5-cache/dev-python/constantly-15.1.0-r1
@@ -12,5 +12,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/twisted/constantly/archive/15.1.0.tar.gz -> constantly-15.1.0.gh.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ccb687e8b4f29da46f7de75bddf8cb70
diff --git a/metadata/md5-cache/dev-python/contextlib2-0.5.5 b/metadata/md5-cache/dev-python/contextlib2-0.5.5
index b9cf9cf..aa1443a 100644
--- a/metadata/md5-cache/dev-python/contextlib2-0.5.5
+++ b/metadata/md5-cache/dev-python/contextlib2-0.5.5
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/contextlib2/contextlib2-0.5.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4a8c180895961292aab7274eb175e922
diff --git a/metadata/md5-cache/dev-python/coverage-4.5.2 b/metadata/md5-cache/dev-python/coverage-4.5.2
index 9ea0f11..7454ffe 100644
--- a/metadata/md5-cache/dev-python/coverage-4.5.2
+++ b/metadata/md5-cache/dev-python/coverage-4.5.2
@@ -11,5 +11,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/coverage/coverage-4.5.2.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8131489e95072f75b25032c7e45a3559
diff --git a/metadata/md5-cache/dev-python/crcmod-1.7-r2 b/metadata/md5-cache/dev-python/crcmod-1.7-r2
index 03e32cf..cceadc7 100644
--- a/metadata/md5-cache/dev-python/crcmod-1.7-r2
+++ b/metadata/md5-cache/dev-python/crcmod-1.7-r2
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/crcmod/crcmod-1.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9363ebd43ca5e4f94d25a0f2801d4f51
diff --git a/metadata/md5-cache/dev-python/cryptography-2.8-r1 b/metadata/md5-cache/dev-python/cryptography-2.8-r1
index b3c8c9b..34ff589 100644
--- a/metadata/md5-cache/dev-python/cryptography-2.8-r1
+++ b/metadata/md5-cache/dev-python/cryptography-2.8-r1
@@ -12,5 +12,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography/cryptography-2.8.tar.gz test? ( mirror://pypi/c/cryptography_vectors/cryptography_vectors-2.8.tar.gz )
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f78540dc20417afbb1fba2211a1f2666
diff --git a/metadata/md5-cache/dev-python/ctypesgen-0_p72-r1 b/metadata/md5-cache/dev-python/ctypesgen-0_p72-r1
index c6ada57..d189e0d 100644
--- a/metadata/md5-cache/dev-python/ctypesgen-0_p72-r1
+++ b/metadata/md5-cache/dev-python/ctypesgen-0_p72-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/ctypesgen-0_p72.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e41d62d90573d90297324bf0f297224e
diff --git a/metadata/md5-cache/dev-python/cycler-0.10.0 b/metadata/md5-cache/dev-python/cycler-0.10.0
index 763a90e..3b35c2a 100644
--- a/metadata/md5-cache/dev-python/cycler-0.10.0
+++ b/metadata/md5-cache/dev-python/cycler-0.10.0
@@ -11,5 +11,5 @@
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/C/Cycler/cycler-0.10.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9196011b93ee620629eb68d19a410151
diff --git a/metadata/md5-cache/dev-python/cython-0.29.4 b/metadata/md5-cache/dev-python/cython-0.29.4
index 68d4f3d..7732422 100644
--- a/metadata/md5-cache/dev-python/cython-0.29.4
+++ b/metadata/md5-cache/dev-python/cython-0.29.4
@@ -12,5 +12,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/C/Cython/Cython-0.29.4.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	elisp-common	3322f14f031ddc95feccd9089c9adc59	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	elisp-common	3322f14f031ddc95feccd9089c9adc59	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=13cbd59c62f6fc8caef4bf2892fafecc
diff --git a/metadata/md5-cache/dev-python/decorator-4.4.2-r1 b/metadata/md5-cache/dev-python/decorator-4.4.2-r1
index 323f1e8..908b97d 100644
--- a/metadata/md5-cache/dev-python/decorator-4.4.2-r1
+++ b/metadata/md5-cache/dev-python/decorator-4.4.2-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/decorator/decorator-4.4.2.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6415dc372f10d8f7249931d2f4db2717
diff --git a/metadata/md5-cache/dev-python/django-1.5.12 b/metadata/md5-cache/dev-python/django-1.5.12
index 1be5bef..67e593b 100644
--- a/metadata/md5-cache/dev-python/django-1.5.12
+++ b/metadata/md5-cache/dev-python/django-1.5.12
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=dev-python/imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] postgres? ( python_targets_python2_7? ( dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) mysql? ( python_targets_python2_7? ( >=dev-python/mysql-python-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) doc? ( >=dev-python/sphinx-1.0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-admin/webapp-config-1.50.15
+DEPEND=( python_targets_python2_7? ( dev-python/imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ( python_targets_python3_6? ( dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) postgres? ( python_targets_python2_7? ( dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) mysql? ( python_targets_python2_7? ( >=dev-python/mysql-python-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/mysql-python-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/mysql-python-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) doc? ( >=dev-python/sphinx-1.0.7[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-admin/webapp-config-1.50.15
 DESCRIPTION=High-level Python web framework
 EAPI=5
 HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
-IUSE=doc mysql postgres sqlite test python_targets_python2_7
+IUSE=doc mysql postgres sqlite test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=*
 LICENSE=BSD
-RDEPEND=dev-python/imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] postgres? ( python_targets_python2_7? ( dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) mysql? ( python_targets_python2_7? ( >=dev-python/mysql-python-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=mysql? ( python_targets_python2_7 ) postgres? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 )
+RDEPEND=( python_targets_python2_7? ( dev-python/imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ( python_targets_python3_6? ( dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) postgres? ( python_targets_python2_7? ( dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) mysql? ( python_targets_python2_7? ( >=dev-python/mysql-python-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/mysql-python-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/mysql-python-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=mysql? ( python_targets_python2_7 ) postgres? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/1.5/Django-1.5.12.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	webapp	b5c5b98a2289a6050810cf6022ac00be	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e572dcd91d09be84147850800b59edb6
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	webapp	b5c5b98a2289a6050810cf6022ac00be	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e6e6a1b56e55964e5626fc0789bf7fb7
diff --git a/metadata/md5-cache/dev-python/django-1.5.12-r1 b/metadata/md5-cache/dev-python/django-1.5.12-r1
deleted file mode 100644
index 1be5bef..0000000
--- a/metadata/md5-cache/dev-python/django-1.5.12-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=dev-python/imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] postgres? ( python_targets_python2_7? ( dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) mysql? ( python_targets_python2_7? ( >=dev-python/mysql-python-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) doc? ( >=dev-python/sphinx-1.0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-admin/webapp-config-1.50.15
-DESCRIPTION=High-level Python web framework
-EAPI=5
-HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
-IUSE=doc mysql postgres sqlite test python_targets_python2_7
-KEYWORDS=*
-LICENSE=BSD
-RDEPEND=dev-python/imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] postgres? ( python_targets_python2_7? ( dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) mysql? ( python_targets_python2_7? ( >=dev-python/mysql-python-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=mysql? ( python_targets_python2_7 ) postgres? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://www.djangoproject.com/m/releases/1.5/Django-1.5.12.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	webapp	b5c5b98a2289a6050810cf6022ac00be	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e572dcd91d09be84147850800b59edb6
diff --git a/metadata/md5-cache/dev-python/django-1.5.12-r3 b/metadata/md5-cache/dev-python/django-1.5.12-r3
new file mode 100644
index 0000000..67e593b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-1.5.12-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=( python_targets_python2_7? ( dev-python/imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ( python_targets_python3_6? ( dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) postgres? ( python_targets_python2_7? ( dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) mysql? ( python_targets_python2_7? ( >=dev-python/mysql-python-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/mysql-python-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/mysql-python-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) doc? ( >=dev-python/sphinx-1.0.7[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-admin/webapp-config-1.50.15
+DESCRIPTION=High-level Python web framework
+EAPI=5
+HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
+IUSE=doc mysql postgres sqlite test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=*
+LICENSE=BSD
+RDEPEND=( python_targets_python2_7? ( dev-python/imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ( python_targets_python3_6? ( dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) postgres? ( python_targets_python2_7? ( dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) mysql? ( python_targets_python2_7? ( >=dev-python/mysql-python-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/mysql-python-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/mysql-python-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=mysql? ( python_targets_python2_7 ) postgres? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://www.djangoproject.com/m/releases/1.5/Django-1.5.12.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	webapp	b5c5b98a2289a6050810cf6022ac00be	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e6e6a1b56e55964e5626fc0789bf7fb7
diff --git a/metadata/md5-cache/dev-python/dnspython-1.16.0 b/metadata/md5-cache/dev-python/dnspython-1.16.0
index 6fb5736..60307fb 100644
--- a/metadata/md5-cache/dev-python/dnspython-1.16.0
+++ b/metadata/md5-cache/dev-python/dnspython-1.16.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/rthalley/dnspython/archive/v1.16.0.tar.gz -> dnspython-1.16.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bf562050e8add37147d09acb7c1b5a9e
diff --git a/metadata/md5-cache/dev-python/docopt-0.6.2-r3 b/metadata/md5-cache/dev-python/docopt-0.6.2-r3
index e4fc89f..c72558f 100644
--- a/metadata/md5-cache/dev-python/docopt-0.6.2-r3
+++ b/metadata/md5-cache/dev-python/docopt-0.6.2-r3
@@ -12,5 +12,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docopt/docopt/archive/0.6.2.tar.gz -> docopt-0.6.2.gh.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9e7cf7510547b5c59f8127224993adc1
diff --git a/metadata/md5-cache/dev-python/docutils-0.14 b/metadata/md5-cache/dev-python/docutils-0.14
index dd89379..e4e6501 100644
--- a/metadata/md5-cache/dev-python/docutils-0.14
+++ b/metadata/md5-cache/dev-python/docutils-0.14
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/docutils/docutils-0.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4bc5fed58421a5c431ffd575438e699c
diff --git a/metadata/md5-cache/dev-python/dpkt-1.9.1 b/metadata/md5-cache/dev-python/dpkt-1.9.1
index bd7719d..b135438 100644
--- a/metadata/md5-cache/dev-python/dpkt-1.9.1
+++ b/metadata/md5-cache/dev-python/dpkt-1.9.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dpkt/dpkt-1.9.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=597afd1c1631c0c8a70a316c5c81bc12
diff --git a/metadata/md5-cache/dev-python/ecdsa-0.13 b/metadata/md5-cache/dev-python/ecdsa-0.13
index 685b78f..3b65e19 100644
--- a/metadata/md5-cache/dev-python/ecdsa-0.13
+++ b/metadata/md5-cache/dev-python/ecdsa-0.13
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/e/ecdsa/ecdsa-0.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0c17a121e71b7b118cb07e7236690449
diff --git a/metadata/md5-cache/dev-python/elementtree-1.2.6-r3 b/metadata/md5-cache/dev-python/elementtree-1.2.6-r3
deleted file mode 100644
index 685dc48..0000000
--- a/metadata/md5-cache/dev-python/elementtree-1.2.6-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A light-weight XML object model for Python
-EAPI=5
-HOMEPAGE=http://effbot.org/zone/element-index.htm https://pypi.org/project/elementtree/
-IUSE=python_targets_python2_7
-KEYWORDS=*
-LICENSE=ElementTree
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://effbot.org/downloads/elementtree-1.2.6-20050316.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9ca9dad46ef69f306afd759722979e1f
diff --git a/metadata/md5-cache/dev-python/entrypoints-0.2.3 b/metadata/md5-cache/dev-python/entrypoints-0.2.3
index 3f2d20f..003aa09 100644
--- a/metadata/md5-cache/dev-python/entrypoints-0.2.3
+++ b/metadata/md5-cache/dev-python/entrypoints-0.2.3
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com//takluyver/entrypoints/archive/0.2.3.tar.gz -> entrypoints-0.2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a6ab6f0b9a84e9d5a36cb51fe189f89c
diff --git a/metadata/md5-cache/dev-python/enum34-1.1.6 b/metadata/md5-cache/dev-python/enum34-1.1.6
index 30098ad..7816ed8 100644
--- a/metadata/md5-cache/dev-python/enum34-1.1.6
+++ b/metadata/md5-cache/dev-python/enum34-1.1.6
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/e/enum34/enum34-1.1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ab4ed00b10a9c4c248f49dba979dd5f3
diff --git a/metadata/md5-cache/dev-python/enum34-1.1.6-r1 b/metadata/md5-cache/dev-python/enum34-1.1.6-r1
index 30098ad..7816ed8 100644
--- a/metadata/md5-cache/dev-python/enum34-1.1.6-r1
+++ b/metadata/md5-cache/dev-python/enum34-1.1.6-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/e/enum34/enum34-1.1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ab4ed00b10a9c4c248f49dba979dd5f3
diff --git a/metadata/md5-cache/dev-python/extras-1.0.0 b/metadata/md5-cache/dev-python/extras-1.0.0
index 5b43209..abb56d7 100644
--- a/metadata/md5-cache/dev-python/extras-1.0.0
+++ b/metadata/md5-cache/dev-python/extras-1.0.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/e/extras/extras-1.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fc1c0bbfe1808ae26fa823edb3e362ef
diff --git a/metadata/md5-cache/dev-python/fasteners-0.14.1 b/metadata/md5-cache/dev-python/fasteners-0.14.1
index fb4b0a5..5292c97 100644
--- a/metadata/md5-cache/dev-python/fasteners-0.14.1
+++ b/metadata/md5-cache/dev-python/fasteners-0.14.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fasteners/fasteners-0.14.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=78f69a989ac02476586cc4cbd43f2425
diff --git a/metadata/md5-cache/dev-python/feedparser-6.0.0_beta1 b/metadata/md5-cache/dev-python/feedparser-6.0.0_beta1
index e8eb883..d98c588 100644
--- a/metadata/md5-cache/dev-python/feedparser-6.0.0_beta1
+++ b/metadata/md5-cache/dev-python/feedparser-6.0.0_beta1
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kurtmckee/feedparser/archive/6.0.0b1.tar.gz -> feedparser-6.0.0b1.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9eda542504afb255c217bd2a9f6f7a31
diff --git a/metadata/md5-cache/dev-python/fixtures-3.0.0 b/metadata/md5-cache/dev-python/fixtures-3.0.0
index fa5af89..fda10ca 100644
--- a/metadata/md5-cache/dev-python/fixtures-3.0.0
+++ b/metadata/md5-cache/dev-python/fixtures-3.0.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fixtures/fixtures-3.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=152bca8d4249616b8ec0e093f17dd300
diff --git a/metadata/md5-cache/dev-python/flake8-3.6.0 b/metadata/md5-cache/dev-python/flake8-3.6.0
index a1e946a..a3eed42 100644
--- a/metadata/md5-cache/dev-python/flake8-3.6.0
+++ b/metadata/md5-cache/dev-python/flake8-3.6.0
@@ -11,5 +11,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8/flake8-3.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=03ac5431acdc7e378461b5487f16235a
diff --git a/metadata/md5-cache/dev-python/flask-1.0.4 b/metadata/md5-cache/dev-python/flask-1.0.4
index f182a6d..8078c73 100644
--- a/metadata/md5-cache/dev-python/flask-1.0.4
+++ b/metadata/md5-cache/dev-python/flask-1.0.4
@@ -12,5 +12,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask/Flask-1.0.4.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4ef1034ce58f10d6774214c752cac821
diff --git a/metadata/md5-cache/dev-python/funcsigs-1.0.2-r1 b/metadata/md5-cache/dev-python/funcsigs-1.0.2-r1
index 37b84bc..5f8e2de 100644
--- a/metadata/md5-cache/dev-python/funcsigs-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/funcsigs-1.0.2-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/f/funcsigs/funcsigs-1.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=753bcb2694630a568ae2cb5590e1a8cc
diff --git a/metadata/md5-cache/dev-python/functools32-3.2.3 b/metadata/md5-cache/dev-python/functools32-3.2.3
index fd46aca..c221e64 100644
--- a/metadata/md5-cache/dev-python/functools32-3.2.3
+++ b/metadata/md5-cache/dev-python/functools32-3.2.3
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/f/functools32/functools32-3.2.3-2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3e8b0bb8f3573a4fac6d75ca47ad04de
diff --git a/metadata/md5-cache/dev-python/future-0.17.0 b/metadata/md5-cache/dev-python/future-0.17.0
index e4805bc..27cf617 100644
--- a/metadata/md5-cache/dev-python/future-0.17.0
+++ b/metadata/md5-cache/dev-python/future-0.17.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/f/future/future-0.17.0.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e8769016dc58cb9a5c56cd76006257b1
diff --git a/metadata/md5-cache/dev-python/futures-3.1.1 b/metadata/md5-cache/dev-python/futures-3.1.1
index 2cf5059..2029431 100644
--- a/metadata/md5-cache/dev-python/futures-3.1.1
+++ b/metadata/md5-cache/dev-python/futures-3.1.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/f/futures/futures-3.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fbb9a07e0a7098bf347038821fb36a2e
diff --git a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5 b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5
deleted file mode 100644
index 241522d..0000000
--- a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/freezegun[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library
-EAPI=7
-HOMEPAGE=https://pypi.org/project/gcs-oauth2-boto-plugin/
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=*
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/boto-2.29.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/google-reauth-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/httplib2-0.8[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oauth2client-1.5.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !=dev-python/oauth2client-2.0* >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/retry-decorator-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/PySocks-1.01[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.12.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=59dafc6bd7e5d0fac18a708ace14c5b3
diff --git a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.7 b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.7
new file mode 100644
index 0000000..1737497
--- /dev/null
+++ b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.7
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library
+EAPI=7
+HOMEPAGE=https://pypi.org/project/gcs-oauth2-boto-plugin/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=*
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/boto-2.29.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/google-reauth-python-0.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/httplib2-0.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/oauth2client-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.13[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/retry-decorator-1.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.7.tar.gz
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9401b5a09989d30420aebdb05ca8f102
diff --git a/metadata/md5-cache/dev-python/gevent-1.2.1 b/metadata/md5-cache/dev-python/gevent-1.2.1
index 59d16ce..6ef8a92 100644
--- a/metadata/md5-cache/dev-python/gevent-1.2.1
+++ b/metadata/md5-cache/dev-python/gevent-1.2.1
@@ -11,5 +11,5 @@
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent/gevent-1.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=84a5cab40657df8a8c8a6b7dd9c52c85
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-1.3.1 b/metadata/md5-cache/dev-python/google-api-python-client-1.3.1
deleted file mode 100644
index 27780e3..0000000
--- a/metadata/md5-cache/dev-python/google-api-python-client-1.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/python-gflags[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/httplib2-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/oauth2client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/uritemplate[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Google API Client for Python
-EAPI=5
-HOMEPAGE=http://code.google.com/p/google-api-python-client/ https://github.com/google/google-api-python-client
-IUSE=python_targets_python2_7
-KEYWORDS=*
-LICENSE=Apache-2.0
-RDEPEND=dev-python/python-gflags[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/httplib2-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/oauth2client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/uritemplate[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/google/google-api-python-client/archive/v1.3.1.tar.gz -> google-api-python-client-1.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0c51fe24482645d57bb82939c4554e04
diff --git a/metadata/md5-cache/dev-python/google-apitools-0.5.30 b/metadata/md5-cache/dev-python/google-apitools-0.5.30
index fed40ac..92ee4dd 100644
--- a/metadata/md5-cache/dev-python/google-apitools-0.5.30
+++ b/metadata/md5-cache/dev-python/google-apitools-0.5.30
@@ -12,5 +12,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/apitools/archive/v0.5.30.tar.gz -> google-apitools-0.5.30.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=02b9825f1676b4e07e2d7146e42d7d0b
diff --git a/metadata/md5-cache/dev-python/google-apputils-0.4.0 b/metadata/md5-cache/dev-python/google-apputils-0.4.0
deleted file mode 100644
index 4e0fae3..0000000
--- a/metadata/md5-cache/dev-python/google-apputils-0.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-gflags[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mox[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Collection of utilities for building Python applications
-EAPI=5
-HOMEPAGE=http://code.google.com/p/google-apputils-python/
-IUSE=test python_targets_python2_7
-KEYWORDS=*
-LICENSE=Apache-2.0
-RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-gflags[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://google-apputils-python.googlecode.com/files/google-apputils-0.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=808b72757fc9a44ff53683fe6b3d88e1
diff --git a/metadata/md5-cache/dev-python/google-auth-1.20.1 b/metadata/md5-cache/dev-python/google-auth-1.20.1
index ce723da..00c110f 100644
--- a/metadata/md5-cache/dev-python/google-auth-1.20.1
+++ b/metadata/md5-cache/dev-python/google-auth-1.20.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-auth/google-auth-1.20.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=88d49dd828cf4d86a1728a118e3a9bb0
diff --git a/metadata/md5-cache/dev-python/google-reauth-python-0.1.0 b/metadata/md5-cache/dev-python/google-reauth-python-0.1.0
index 66d1610..c088605 100644
--- a/metadata/md5-cache/dev-python/google-reauth-python-0.1.0
+++ b/metadata/md5-cache/dev-python/google-reauth-python-0.1.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/google/google-reauth-python/archive/0.1.0.tar.gz -> google-reauth-python-0.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=23fdb7dbfa89ab827a01a3284a90964e
diff --git a/metadata/md5-cache/dev-python/greenlet-0.4.15 b/metadata/md5-cache/dev-python/greenlet-0.4.15
index 06de5c7..e8ba1fc 100644
--- a/metadata/md5-cache/dev-python/greenlet-0.4.15
+++ b/metadata/md5-cache/dev-python/greenlet-0.4.15
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/greenlet/greenlet-0.4.15.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=57cf05c56748e04dd56965697a8100d3
diff --git a/metadata/md5-cache/dev-python/grpcio-tools-1.23.0 b/metadata/md5-cache/dev-python/grpcio-tools-1.23.0
index 08a8f76..641d072 100644
--- a/metadata/md5-cache/dev-python/grpcio-tools-1.23.0
+++ b/metadata/md5-cache/dev-python/grpcio-tools-1.23.0
@@ -11,5 +11,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grpcio-tools/grpcio-tools-1.23.0.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4f277040350e2813f3263a39b9922aee
diff --git a/metadata/md5-cache/dev-python/httplib2-0.11.3 b/metadata/md5-cache/dev-python/httplib2-0.11.3
deleted file mode 100644
index daebb49..0000000
--- a/metadata/md5-cache/dev-python/httplib2-0.11.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A comprehensive HTTP client library
-EAPI=6
-HOMEPAGE=https://pypi.org/project/httplib2/ https://github.com/jcgregorio/httplib2
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=app-misc/ca-certificates python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/h/httplib2/httplib2-0.11.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0878c8e003ba67a6b3844ed36dbf38f4
diff --git a/metadata/md5-cache/dev-python/httplib2-0.19.0-r1 b/metadata/md5-cache/dev-python/httplib2-0.19.0-r1
new file mode 100644
index 0000000..95c90b4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/httplib2-0.19.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] app-misc/ca-certificates dev-python/pyparsing[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A comprehensive HTTP client library
+EAPI=7
+HOMEPAGE=https://pypi.org/project/httplib2/
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=app-misc/ca-certificates dev-python/pyparsing[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/h/httplib2/httplib2-0.19.0.tar.gz
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ab08a8be7559568f137b390359c68d45
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.43.4 b/metadata/md5-cache/dev-python/hypothesis-5.43.4
new file mode 100644
index 0000000..57ecbb7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-5.43.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cli? ( python_targets_python3_6? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pytest-6.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !!<dev-python/typing-3.7.4.1 ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=7
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
+IUSE=cli test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=*
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cli? ( python_targets_python3_6? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-5.43.4.tar.gz
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	optfeature	f4941a15f8b66955c45f7b0e7c4ae890	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=668b66439540249f5eb4211742ff4e1c
diff --git a/metadata/md5-cache/dev-python/idna-2.5 b/metadata/md5-cache/dev-python/idna-2.5
index d55e150..01a6879 100644
--- a/metadata/md5-cache/dev-python/idna-2.5
+++ b/metadata/md5-cache/dev-python/idna-2.5
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/idna/idna-2.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7acaa6dd5c445cf25153f3e5a0856e34
diff --git a/metadata/md5-cache/dev-python/idna-2.5-r2 b/metadata/md5-cache/dev-python/idna-2.5-r2
index d55e150..01a6879 100644
--- a/metadata/md5-cache/dev-python/idna-2.5-r2
+++ b/metadata/md5-cache/dev-python/idna-2.5-r2
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/idna/idna-2.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7acaa6dd5c445cf25153f3e5a0856e34
diff --git a/metadata/md5-cache/dev-python/imagesize-1.1.0 b/metadata/md5-cache/dev-python/imagesize-1.1.0
index 0c83f40..defc383 100644
--- a/metadata/md5-cache/dev-python/imagesize-1.1.0
+++ b/metadata/md5-cache/dev-python/imagesize-1.1.0
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/imagesize/imagesize-1.1.0.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=12580595faf5a02e8c1eb04146be9894
diff --git a/metadata/md5-cache/dev-python/imaging-1.1.7-r5 b/metadata/md5-cache/dev-python/imaging-1.1.7-r5
index 4336520..fed5652 100644
--- a/metadata/md5-cache/dev-python/imaging-1.1.7-r5
+++ b/metadata/md5-cache/dev-python/imaging-1.1.7-r5
@@ -10,5 +10,5 @@
 REQUIRED_USE=test? ( jpeg tiff zlib ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.effbot.org/downloads/Imaging-1.1.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3cb1be2bd6bfc08e6052fba8b2074254
diff --git a/metadata/md5-cache/dev-python/imaging-1.1.7-r7 b/metadata/md5-cache/dev-python/imaging-1.1.7-r7
index 4336520..fed5652 100644
--- a/metadata/md5-cache/dev-python/imaging-1.1.7-r7
+++ b/metadata/md5-cache/dev-python/imaging-1.1.7-r7
@@ -10,5 +10,5 @@
 REQUIRED_USE=test? ( jpeg tiff zlib ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.effbot.org/downloads/Imaging-1.1.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3cb1be2bd6bfc08e6052fba8b2074254
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-1.7.0-r1 b/metadata/md5-cache/dev-python/importlib_metadata-1.7.0-r1
index 5ab6764..9a6419b 100644
--- a/metadata/md5-cache/dev-python/importlib_metadata-1.7.0-r1
+++ b/metadata/md5-cache/dev-python/importlib_metadata-1.7.0-r1
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-1.7.0.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=577603766006b5cdeb3458d9a83f3a26
diff --git a/metadata/md5-cache/dev-python/incremental-17.5.0 b/metadata/md5-cache/dev-python/incremental-17.5.0
index 8714af7..2e335e9 100644
--- a/metadata/md5-cache/dev-python/incremental-17.5.0
+++ b/metadata/md5-cache/dev-python/incremental-17.5.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/i/incremental/incremental-17.5.0.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1bfe6595c57eb40e0179f92794e26bb8
diff --git a/metadata/md5-cache/dev-python/intelhex-2.2.1 b/metadata/md5-cache/dev-python/intelhex-2.2.1
index 3766c13..776b90d 100644
--- a/metadata/md5-cache/dev-python/intelhex-2.2.1
+++ b/metadata/md5-cache/dev-python/intelhex-2.2.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/I/IntelHex/intelhex-2.2.1.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ad37ca213ebd6dd2cb1eb6ddf264e11a
diff --git a/metadata/md5-cache/dev-python/ipaddress-1.0.16 b/metadata/md5-cache/dev-python/ipaddress-1.0.16
index 1e022bf..416bc39 100644
--- a/metadata/md5-cache/dev-python/ipaddress-1.0.16
+++ b/metadata/md5-cache/dev-python/ipaddress-1.0.16
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipaddress/ipaddress-1.0.16.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=31211de3420cac6d67f829bc7ecfcda6
diff --git a/metadata/md5-cache/dev-python/ipaddress-1.0.16-r1 b/metadata/md5-cache/dev-python/ipaddress-1.0.16-r1
index 1e022bf..416bc39 100644
--- a/metadata/md5-cache/dev-python/ipaddress-1.0.16-r1
+++ b/metadata/md5-cache/dev-python/ipaddress-1.0.16-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipaddress/ipaddress-1.0.16.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=31211de3420cac6d67f829bc7ecfcda6
diff --git a/metadata/md5-cache/dev-python/ipy-1.00 b/metadata/md5-cache/dev-python/ipy-1.00
index da22ab9..b0395c3 100644
--- a/metadata/md5-cache/dev-python/ipy-1.00
+++ b/metadata/md5-cache/dev-python/ipy-1.00
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/I/IPy/IPy-1.00.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0b21a0712770a87a7e55f56ccd0e3b93
diff --git a/metadata/md5-cache/dev-python/ipyparallel-6.0.2-r1 b/metadata/md5-cache/dev-python/ipyparallel-6.0.2-r1
index dab92ec..7c9ce99 100644
--- a/metadata/md5-cache/dev-python/ipyparallel-6.0.2-r1
+++ b/metadata/md5-cache/dev-python/ipyparallel-6.0.2-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipyparallel/ipyparallel-6.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4893d64a62d22c7a93e1cbeb2768c6d1
diff --git a/metadata/md5-cache/dev-python/ipython-5.4.1-r2 b/metadata/md5-cache/dev-python/ipython-5.4.1-r2
index 4ad6045..63209e9 100644
--- a/metadata/md5-cache/dev-python/ipython-5.4.1-r2
+++ b/metadata/md5-cache/dev-python/ipython-5.4.1-r2
@@ -11,5 +11,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-5.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0c0ab9eefd070a448f0045795683401c
diff --git a/metadata/md5-cache/dev-python/ipython_genutils-0.2.0 b/metadata/md5-cache/dev-python/ipython_genutils-0.2.0
index edb26c9..aac19c9 100644
--- a/metadata/md5-cache/dev-python/ipython_genutils-0.2.0
+++ b/metadata/md5-cache/dev-python/ipython_genutils-0.2.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython_genutils/ipython_genutils-0.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=54b9a65e9378898115271f34bcb484b2
diff --git a/metadata/md5-cache/dev-python/isort-4.3.15 b/metadata/md5-cache/dev-python/isort-4.3.15
index 04f38aa..4e9c66e 100644
--- a/metadata/md5-cache/dev-python/isort-4.3.15
+++ b/metadata/md5-cache/dev-python/isort-4.3.15
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/isort/isort-4.3.15.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a74085bc615914920a191839fb5114c3
diff --git a/metadata/md5-cache/dev-python/itsdangerous-0.24-r1 b/metadata/md5-cache/dev-python/itsdangerous-0.24-r1
index 26fb64f..c7f5acf 100644
--- a/metadata/md5-cache/dev-python/itsdangerous-0.24-r1
+++ b/metadata/md5-cache/dev-python/itsdangerous-0.24-r1
@@ -11,5 +11,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/itsdangerous/itsdangerous-0.24.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fb2eb8cec6f2d395269a6d9bc112b76c
diff --git a/metadata/md5-cache/dev-python/jaraco-functools-2.0 b/metadata/md5-cache/dev-python/jaraco-functools-2.0
index 79e9d09..a180b55 100644
--- a/metadata/md5-cache/dev-python/jaraco-functools-2.0
+++ b/metadata/md5-cache/dev-python/jaraco-functools-2.0
@@ -11,5 +11,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.functools/jaraco.functools-2.0.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2dd4b2bf1b82236cdc568b2e88447825
diff --git a/metadata/md5-cache/dev-python/jedi-0.10.2 b/metadata/md5-cache/dev-python/jedi-0.10.2
index 27ea141..a2ff846 100644
--- a/metadata/md5-cache/dev-python/jedi-0.10.2
+++ b/metadata/md5-cache/dev-python/jedi-0.10.2
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/jedi/archive/v0.10.2.tar.gz -> jedi-0.10.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7544ba8cb4babf93a52975b3e45c1ebd
diff --git a/metadata/md5-cache/dev-python/jinja-2.11.3 b/metadata/md5-cache/dev-python/jinja-2.11.3
index f3151e0..92460bf 100644
--- a/metadata/md5-cache/dev-python/jinja-2.11.3
+++ b/metadata/md5-cache/dev-python/jinja-2.11.3
@@ -1,15 +1,15 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx-issues[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/pallets-sphinx-themes[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx-issues[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/pallets-sphinx-themes[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[threads(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx-issues[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pallets-sphinx-themes[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( >=dev-python/pypy3-7.3.0:0[threads(+)] dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinx-issues[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/pallets-sphinx-themes[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-python/jinja:compat ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx-issues[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/pallets-sphinx-themes[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx-issues[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/pallets-sphinx-themes[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[threads(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx-issues[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pallets-sphinx-themes[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[threads(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx-issues[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pallets-sphinx-themes[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/sphinx-issues[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pallets-sphinx-themes[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-7.3.0:0[threads(+)] dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinx-issues[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/pallets-sphinx-themes[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-python/jinja:compat ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=A full-featured template engine for Python
 EAPI=7
 HOMEPAGE=https://jinja.palletsprojects.com/ https://pypi.org/project/Jinja2/
-IUSE=examples doc test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=examples doc test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=*
 LICENSE=BSD
-RDEPEND=dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-python/jinja:compat python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-python/jinja:compat python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/jinja/archive/2.11.3.tar.gz -> jinja-2.11.3.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9aeb213da4193c937e7f05b3510219e2
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e895f1abfea438e8ec0e99a419cc4038
diff --git a/metadata/md5-cache/dev-python/jinja-2.11.3-r1 b/metadata/md5-cache/dev-python/jinja-2.11.3-r1
new file mode 100644
index 0000000..92460bf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jinja-2.11.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx-issues[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/pallets-sphinx-themes[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx-issues[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/pallets-sphinx-themes[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[threads(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx-issues[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pallets-sphinx-themes[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[threads(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx-issues[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pallets-sphinx-themes[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/sphinx-issues[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pallets-sphinx-themes[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-7.3.0:0[threads(+)] dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinx-issues[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/pallets-sphinx-themes[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-python/jinja:compat ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A full-featured template engine for Python
+EAPI=7
+HOMEPAGE=https://jinja.palletsprojects.com/ https://pypi.org/project/Jinja2/
+IUSE=examples doc test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=*
+LICENSE=BSD
+RDEPEND=dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-python/jinja:compat python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pallets/jinja/archive/2.11.3.tar.gz -> jinja-2.11.3.tar.gz
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e895f1abfea438e8ec0e99a419cc4038
diff --git a/metadata/md5-cache/dev-python/jinja-2.11.3-r2 b/metadata/md5-cache/dev-python/jinja-2.11.3-r2
new file mode 100644
index 0000000..92460bf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jinja-2.11.3-r2
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx-issues[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/pallets-sphinx-themes[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx-issues[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/pallets-sphinx-themes[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[threads(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx-issues[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pallets-sphinx-themes[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[threads(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx-issues[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pallets-sphinx-themes[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/sphinx-issues[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pallets-sphinx-themes[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-7.3.0:0[threads(+)] dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinx-issues[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/pallets-sphinx-themes[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-python/jinja:compat ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A full-featured template engine for Python
+EAPI=7
+HOMEPAGE=https://jinja.palletsprojects.com/ https://pypi.org/project/Jinja2/
+IUSE=examples doc test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=*
+LICENSE=BSD
+RDEPEND=dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-python/jinja:compat python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pallets/jinja/archive/2.11.3.tar.gz -> jinja-2.11.3.tar.gz
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e895f1abfea438e8ec0e99a419cc4038
diff --git a/metadata/md5-cache/dev-python/jmespath-0.10.0 b/metadata/md5-cache/dev-python/jmespath-0.10.0
index 64a0a15..3d2209d 100644
--- a/metadata/md5-cache/dev-python/jmespath-0.10.0
+++ b/metadata/md5-cache/dev-python/jmespath-0.10.0
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmespath/jmespath.py/archive/0.10.0.tar.gz -> jmespath.py-0.10.0.gh.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a08dd17733cced3df4f1fe671a4cdbe6
diff --git a/metadata/md5-cache/dev-python/jsonpatch-1.23 b/metadata/md5-cache/dev-python/jsonpatch-1.23
index 2b1ca14..f5a4690 100644
--- a/metadata/md5-cache/dev-python/jsonpatch-1.23
+++ b/metadata/md5-cache/dev-python/jsonpatch-1.23
@@ -12,5 +12,5 @@
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpatch/jsonpatch-1.23.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1976e5451337e7f35113bba74b7ab75e
diff --git a/metadata/md5-cache/dev-python/jsonpickle-1.4.1-r1 b/metadata/md5-cache/dev-python/jsonpickle-1.4.1-r1
index 42066f1..d13699f 100644
--- a/metadata/md5-cache/dev-python/jsonpickle-1.4.1-r1
+++ b/metadata/md5-cache/dev-python/jsonpickle-1.4.1-r1
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpickle/jsonpickle-1.4.1.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e598d4a80a36cf2f44120b2f68b0d3e0
diff --git a/metadata/md5-cache/dev-python/jsonpointer-2.0 b/metadata/md5-cache/dev-python/jsonpointer-2.0
index 8b96df6..47584e5 100644
--- a/metadata/md5-cache/dev-python/jsonpointer-2.0
+++ b/metadata/md5-cache/dev-python/jsonpointer-2.0
@@ -11,5 +11,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpointer/jsonpointer-2.0.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=296a0236d26dfb139f302219073d3642
diff --git a/metadata/md5-cache/dev-python/jsonrpclib-0.3.1 b/metadata/md5-cache/dev-python/jsonrpclib-0.3.1
index bf73dd1..be7d545 100644
--- a/metadata/md5-cache/dev-python/jsonrpclib-0.3.1
+++ b/metadata/md5-cache/dev-python/jsonrpclib-0.3.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/tcalmant/jsonrpclib/archive/v0.3.1.tar.gz -> jsonrpclib-0.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c01c98ad819feb273d4c7a3eedb7ca62
diff --git a/metadata/md5-cache/dev-python/jsonschema-3.2.0 b/metadata/md5-cache/dev-python/jsonschema-3.2.0
index 43e23c3..e1da497 100644
--- a/metadata/md5-cache/dev-python/jsonschema-3.2.0
+++ b/metadata/md5-cache/dev-python/jsonschema-3.2.0
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonschema/jsonschema-3.2.0.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=96be7a2fb06ca9a35e9af424bcb0a4b6
diff --git a/metadata/md5-cache/dev-python/kconfiglib-14.1.0 b/metadata/md5-cache/dev-python/kconfiglib-14.1.0
index e5f97a9..d17c4b9 100644
--- a/metadata/md5-cache/dev-python/kconfiglib-14.1.0
+++ b/metadata/md5-cache/dev-python/kconfiglib-14.1.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/ulfalizer/Kconfiglib/archive/v14.1.0.tar.gz -> kconfiglib-14.1.0.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=aadde7a3c6d429f0cba7ee21620c8d00
diff --git a/metadata/md5-cache/dev-python/keyring-12.0.0 b/metadata/md5-cache/dev-python/keyring-12.0.0
index 99150f4..31b5040 100644
--- a/metadata/md5-cache/dev-python/keyring-12.0.0
+++ b/metadata/md5-cache/dev-python/keyring-12.0.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keyring/keyring-12.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4a727bf2e66a7a89d215b582ec5ae03b
diff --git a/metadata/md5-cache/dev-python/kiwisolver-1.0.1 b/metadata/md5-cache/dev-python/kiwisolver-1.0.1
index 9d4d4f2..37ba70a 100644
--- a/metadata/md5-cache/dev-python/kiwisolver-1.0.1
+++ b/metadata/md5-cache/dev-python/kiwisolver-1.0.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/nucleic/kiwi/archive/1.0.1.tar.gz -> kiwisolver-1.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74b22a3281ccff03d1a1e079ca12ff24
diff --git a/metadata/md5-cache/dev-python/lazy-object-proxy-1.3.1 b/metadata/md5-cache/dev-python/lazy-object-proxy-1.3.1
index 1a5497d..5f1ab98 100644
--- a/metadata/md5-cache/dev-python/lazy-object-proxy-1.3.1
+++ b/metadata/md5-cache/dev-python/lazy-object-proxy-1.3.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lazy-object-proxy/lazy-object-proxy-1.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d58e1866aadd0c2a01156ccfc62a8db5
diff --git a/metadata/md5-cache/dev-python/linecache2-1.0.0 b/metadata/md5-cache/dev-python/linecache2-1.0.0
index e980265..456b8ca 100644
--- a/metadata/md5-cache/dev-python/linecache2-1.0.0
+++ b/metadata/md5-cache/dev-python/linecache2-1.0.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/l/linecache2/linecache2-1.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6d5f50455f0317f562f5d00c805e9800
diff --git a/metadata/md5-cache/dev-python/lockfile-0.12.2-r1 b/metadata/md5-cache/dev-python/lockfile-0.12.2-r1
index ea146f7..a9832ec 100644
--- a/metadata/md5-cache/dev-python/lockfile-0.12.2-r1
+++ b/metadata/md5-cache/dev-python/lockfile-0.12.2-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lockfile/lockfile-0.12.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=720ea03c116402fbdb81f5735bb9a4c9
diff --git a/metadata/md5-cache/dev-python/logbook-1.4.0 b/metadata/md5-cache/dev-python/logbook-1.4.0
index 04368ff..7cd96e5 100644
--- a/metadata/md5-cache/dev-python/logbook-1.4.0
+++ b/metadata/md5-cache/dev-python/logbook-1.4.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/getlogbook/logbook/archive/1.4.0.tar.gz -> logbook-1.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=853b8bf48513bf126e36fddd6f7cd3a2
diff --git a/metadata/md5-cache/dev-python/lxml-4.2.5 b/metadata/md5-cache/dev-python/lxml-4.2.5
index 8fc81e2..afe2c4e 100644
--- a/metadata/md5-cache/dev-python/lxml-4.2.5
+++ b/metadata/md5-cache/dev-python/lxml-4.2.5
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lxml/lxml-4.2.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=41009749028718b0a0b30df5a5cf134c
diff --git a/metadata/md5-cache/dev-python/m2crypto-0.35.2 b/metadata/md5-cache/dev-python/m2crypto-0.35.2
index 3b1d72e..8301a80 100644
--- a/metadata/md5-cache/dev-python/m2crypto-0.35.2
+++ b/metadata/md5-cache/dev-python/m2crypto-0.35.2
@@ -11,5 +11,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/M/M2Crypto/M2Crypto-0.35.2.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=68c8ba5b2813b408c10140c59eda3fd1
diff --git a/metadata/md5-cache/dev-python/mako-1.0.6 b/metadata/md5-cache/dev-python/mako-1.0.6
index 4591882..416af42 100644
--- a/metadata/md5-cache/dev-python/mako-1.0.6
+++ b/metadata/md5-cache/dev-python/mako-1.0.6
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/M/Mako/Mako-1.0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=88081e0ddda8f69caf384cd99bf639c5
diff --git a/metadata/md5-cache/dev-python/markdown-3.1.1 b/metadata/md5-cache/dev-python/markdown-3.1.1
index 09d1522..e8088f0 100644
--- a/metadata/md5-cache/dev-python/markdown-3.1.1
+++ b/metadata/md5-cache/dev-python/markdown-3.1.1
@@ -12,5 +12,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-3.1.1.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b48f783234155d73476fcb2fb5abc2bd
diff --git a/metadata/md5-cache/dev-python/markupsafe-1.0 b/metadata/md5-cache/dev-python/markupsafe-1.0
index 0e52e1b..b87e62d 100644
--- a/metadata/md5-cache/dev-python/markupsafe-1.0
+++ b/metadata/md5-cache/dev-python/markupsafe-1.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/M/MarkupSafe/MarkupSafe-1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9a733e6390f5b50b4ab291b91f666bf0
diff --git a/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1 b/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1
index 52851ef..bd69503 100644
--- a/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1
+++ b/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) excel? ( || ( python_targets_python2_7 ) ) gtk2? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo latex qt5 tk wxwidgets || ( gtk2 gtk3 ) ) || ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/matplotlib/matplotlib-2.2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e9162f65645513120b4e12863a5fa972	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e9162f65645513120b4e12863a5fa972	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=23aeb7531f7982ba41ef83ba328d1310
diff --git a/metadata/md5-cache/dev-python/matplotlib-2.2.2-r2 b/metadata/md5-cache/dev-python/matplotlib-2.2.2-r2
index 52851ef..bd69503 100644
--- a/metadata/md5-cache/dev-python/matplotlib-2.2.2-r2
+++ b/metadata/md5-cache/dev-python/matplotlib-2.2.2-r2
@@ -10,5 +10,5 @@
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) excel? ( || ( python_targets_python2_7 ) ) gtk2? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo latex qt5 tk wxwidgets || ( gtk2 gtk3 ) ) || ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/matplotlib/matplotlib-2.2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e9162f65645513120b4e12863a5fa972	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e9162f65645513120b4e12863a5fa972	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=23aeb7531f7982ba41ef83ba328d1310
diff --git a/metadata/md5-cache/dev-python/mccabe-0.6.1 b/metadata/md5-cache/dev-python/mccabe-0.6.1
index 7169bd5..a5b6a5f 100644
--- a/metadata/md5-cache/dev-python/mccabe-0.6.1
+++ b/metadata/md5-cache/dev-python/mccabe-0.6.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mccabe/mccabe-0.6.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9714fa8fa9d2697147f5d086329974dc
diff --git a/metadata/md5-cache/dev-python/mimeparse-1.6.0 b/metadata/md5-cache/dev-python/mimeparse-1.6.0
index a430522..675b135 100644
--- a/metadata/md5-cache/dev-python/mimeparse-1.6.0
+++ b/metadata/md5-cache/dev-python/mimeparse-1.6.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-mimeparse/python-mimeparse-1.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ddb2601b1e68652b96e4ce0c12217851
diff --git a/metadata/md5-cache/dev-python/mock-2.0.0 b/metadata/md5-cache/dev-python/mock-2.0.0
index 96d999e..6f8cf8b 100644
--- a/metadata/md5-cache/dev-python/mock-2.0.0
+++ b/metadata/md5-cache/dev-python/mock-2.0.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mock/mock-2.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b2f56e222a30dd4241953f932658704a
diff --git a/metadata/md5-cache/dev-python/monotonic-1.4 b/metadata/md5-cache/dev-python/monotonic-1.4
index 0a36589..e25bb62 100644
--- a/metadata/md5-cache/dev-python/monotonic-1.4
+++ b/metadata/md5-cache/dev-python/monotonic-1.4
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/monotonic/monotonic-1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=271d886104d17c5e8fc550536878a363
diff --git a/metadata/md5-cache/dev-python/more-itertools-4.2.0-r1 b/metadata/md5-cache/dev-python/more-itertools-4.2.0-r1
index 0e5cf7d..361ec2b 100644
--- a/metadata/md5-cache/dev-python/more-itertools-4.2.0-r1
+++ b/metadata/md5-cache/dev-python/more-itertools-4.2.0-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/more-itertools/more-itertools-4.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f36d3459720f6b7bc1718da788510c00
diff --git a/metadata/md5-cache/dev-python/mox-0.5.3-r1 b/metadata/md5-cache/dev-python/mox-0.5.3-r1
index a85a4dc..271e78d 100644
--- a/metadata/md5-cache/dev-python/mox-0.5.3-r1
+++ b/metadata/md5-cache/dev-python/mox-0.5.3-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mox/mox-0.5.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b9ed45cd10e65fea8e020020b4c80d06
diff --git a/metadata/md5-cache/dev-python/mypy-0.781 b/metadata/md5-cache/dev-python/mypy-0.781
index c917a91..88a1e23 100644
--- a/metadata/md5-cache/dev-python/mypy-0.781
+++ b/metadata/md5-cache/dev-python/mypy-0.781
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python/mypy/archive/v0.781.tar.gz -> mypy-0.781.tar.gz https://api.github.com/repos/python/typeshed/tarball/e199c2e -> mypy-typeshed-0.781-e199c2e.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=187544123e3ba7e86ad83264ebd877c5
diff --git a/metadata/md5-cache/dev-python/mypy_extensions-0.4.3 b/metadata/md5-cache/dev-python/mypy_extensions-0.4.3
index 2deee86..87f589a 100644
--- a/metadata/md5-cache/dev-python/mypy_extensions-0.4.3
+++ b/metadata/md5-cache/dev-python/mypy_extensions-0.4.3
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python/mypy_extensions/archive/0.4.3.tar.gz -> mypy_extensions-0.4.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1679476a26d929a19f103c5cd0c2005b
diff --git a/metadata/md5-cache/dev-python/netaddr-0.7.19 b/metadata/md5-cache/dev-python/netaddr-0.7.19
index 5dc5be7..5f23550 100644
--- a/metadata/md5-cache/dev-python/netaddr-0.7.19
+++ b/metadata/md5-cache/dev-python/netaddr-0.7.19
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/netaddr/netaddr-0.7.19.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb96f7e61ee4e0a0281d6fe8d9280aa3
diff --git a/metadata/md5-cache/dev-python/netifaces-0.10.9 b/metadata/md5-cache/dev-python/netifaces-0.10.9
index 55b6210..1d4d7b1 100644
--- a/metadata/md5-cache/dev-python/netifaces-0.10.9
+++ b/metadata/md5-cache/dev-python/netifaces-0.10.9
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/n/netifaces/netifaces-0.10.9.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=478c6bf99b07c8b01f8577559257d231
diff --git a/metadata/md5-cache/dev-python/networkx-2.5 b/metadata/md5-cache/dev-python/networkx-2.5
index 4865854..a9754b3 100644
--- a/metadata/md5-cache/dev-python/networkx-2.5
+++ b/metadata/md5-cache/dev-python/networkx-2.5
@@ -12,5 +12,5 @@
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/networkx/networkx-2.5.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e9162f65645513120b4e12863a5fa972
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e9162f65645513120b4e12863a5fa972
 _md5_=89628d7a2053aaab56bc52a68aba0d1e
diff --git a/metadata/md5-cache/dev-python/nose-1.3.7-r3 b/metadata/md5-cache/dev-python/nose-1.3.7-r3
index 9d9dacd..2048cea 100644
--- a/metadata/md5-cache/dev-python/nose-1.3.7-r3
+++ b/metadata/md5-cache/dev-python/nose-1.3.7-r3
@@ -10,5 +10,5 @@
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose/nose-1.3.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a899369e88e8fa209567057b2ca47d20
diff --git a/metadata/md5-cache/dev-python/numpy-1.9.2 b/metadata/md5-cache/dev-python/numpy-1.9.2
index 45214bd..1b68f54 100644
--- a/metadata/md5-cache/dev-python/numpy-1.9.2
+++ b/metadata/md5-cache/dev-python/numpy-1.9.2
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.9.2.tar.gz doc? ( http://docs.scipy.org/doc/numpy-1.9.1/numpy-html-1.9.1.zip http://docs.scipy.org/doc/numpy-1.9.1/numpy-ref-1.9.1.pdf http://docs.scipy.org/doc/numpy-1.9.1/numpy-user-1.9.1.pdf )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=04eb7c49e284300a40dcbe72e0f119dc
diff --git a/metadata/md5-cache/dev-python/numpy-1.9.2-r1 b/metadata/md5-cache/dev-python/numpy-1.9.2-r1
index 45214bd..1b68f54 100644
--- a/metadata/md5-cache/dev-python/numpy-1.9.2-r1
+++ b/metadata/md5-cache/dev-python/numpy-1.9.2-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.9.2.tar.gz doc? ( http://docs.scipy.org/doc/numpy-1.9.1/numpy-html-1.9.1.zip http://docs.scipy.org/doc/numpy-1.9.1/numpy-ref-1.9.1.pdf http://docs.scipy.org/doc/numpy-1.9.1/numpy-user-1.9.1.pdf )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=04eb7c49e284300a40dcbe72e0f119dc
diff --git a/metadata/md5-cache/dev-python/oauth-1.0.1-r1 b/metadata/md5-cache/dev-python/oauth-1.0.1-r1
deleted file mode 100644
index e83463d..0000000
--- a/metadata/md5-cache/dev-python/oauth-1.0.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python OAuth module
-EAPI=5
-HOMEPAGE=http://pypi.python.org/pypi/oauth
-IUSE=python_targets_python2_7
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oauth/oauth-1.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=056ccbec54ed27d33b911422e9174009
diff --git a/metadata/md5-cache/dev-python/oauth2client-4.1.3 b/metadata/md5-cache/dev-python/oauth2client-4.1.3
index cc69a42..219f0b2 100644
--- a/metadata/md5-cache/dev-python/oauth2client-4.1.3
+++ b/metadata/md5-cache/dev-python/oauth2client-4.1.3
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/oauth2client/archive/v4.1.3.tar.gz -> oauth2client-4.1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7ecc0a2aeaf3aba7384e96187e248e7a
diff --git a/metadata/md5-cache/dev-python/olefile-0.46 b/metadata/md5-cache/dev-python/olefile-0.46
index 2cc58ec..4ffd22a 100644
--- a/metadata/md5-cache/dev-python/olefile-0.46
+++ b/metadata/md5-cache/dev-python/olefile-0.46
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/decalage2/olefile/archive/v0.46.tar.gz -> olefile-0.46.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c6f1df9671e9d05a6323805e8bfe65b2
diff --git a/metadata/md5-cache/dev-python/packaging-18.0 b/metadata/md5-cache/dev-python/packaging-18.0
index b021b34..d25dc87 100644
--- a/metadata/md5-cache/dev-python/packaging-18.0
+++ b/metadata/md5-cache/dev-python/packaging-18.0
@@ -11,5 +11,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/packaging/packaging-18.0.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c2b8778e29b6ec268134f30491fbbef0
diff --git a/metadata/md5-cache/dev-python/path-py-11.0.1 b/metadata/md5-cache/dev-python/path-py-11.0.1
index bdeed2b..9bb281b 100644
--- a/metadata/md5-cache/dev-python/path-py-11.0.1
+++ b/metadata/md5-cache/dev-python/path-py-11.0.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/path.py/path.py-11.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7696acba2a50a239c123406df474f5b4
diff --git a/metadata/md5-cache/dev-python/pathlib-1.0.1-r1 b/metadata/md5-cache/dev-python/pathlib-1.0.1-r1
index 9eddd22..df18ac9 100644
--- a/metadata/md5-cache/dev-python/pathlib-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/pathlib-1.0.1-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathlib/pathlib-1.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7b0a605e730f8af18f06fc230d3a62a0
diff --git a/metadata/md5-cache/dev-python/pathlib2-2.3.2 b/metadata/md5-cache/dev-python/pathlib2-2.3.2
index 647989e..d50e897 100644
--- a/metadata/md5-cache/dev-python/pathlib2-2.3.2
+++ b/metadata/md5-cache/dev-python/pathlib2-2.3.2
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathlib2/pathlib2-2.3.2.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=78239157ea451bc251349d495e33b18f
diff --git a/metadata/md5-cache/dev-python/pbr-5.4.5 b/metadata/md5-cache/dev-python/pbr-5.4.5
index bdc511c..ef68b54 100644
--- a/metadata/md5-cache/dev-python/pbr-5.4.5
+++ b/metadata/md5-cache/dev-python/pbr-5.4.5
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-5.4.5.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=28f076aa6763258dda155a54e46134c9
diff --git a/metadata/md5-cache/dev-python/pep8-1.7.0 b/metadata/md5-cache/dev-python/pep8-1.7.0
index 2ab9f70..7cae43d 100644
--- a/metadata/md5-cache/dev-python/pep8-1.7.0
+++ b/metadata/md5-cache/dev-python/pep8-1.7.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pep8/pep8-1.7.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cdd6bca5267556faa9bf56568c90e8c1
diff --git a/metadata/md5-cache/dev-python/pexpect-4.2.1 b/metadata/md5-cache/dev-python/pexpect-4.2.1
index 29801f1..d1f748c 100644
--- a/metadata/md5-cache/dev-python/pexpect-4.2.1
+++ b/metadata/md5-cache/dev-python/pexpect-4.2.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pexpect/pexpect-4.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6a47921d15efdf6391a9965814ba48e1
diff --git a/metadata/md5-cache/dev-python/pickleshare-0.7.4-r1 b/metadata/md5-cache/dev-python/pickleshare-0.7.4-r1
index 875acb6..955dd38 100644
--- a/metadata/md5-cache/dev-python/pickleshare-0.7.4-r1
+++ b/metadata/md5-cache/dev-python/pickleshare-0.7.4-r1
@@ -11,5 +11,5 @@
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pickleshare/pickleshare-0.7.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e65233c9afb96f0fa08a7e6882fcd3d
diff --git a/metadata/md5-cache/dev-python/pillow-7.2.0 b/metadata/md5-cache/dev-python/pillow-7.2.0
index a6f65b2..f19f91a 100644
--- a/metadata/md5-cache/dev-python/pillow-7.2.0
+++ b/metadata/md5-cache/dev-python/pillow-7.2.0
@@ -12,5 +12,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-pillow/Pillow/archive/7.2.0.tar.gz -> pillow-7.2.0.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e9162f65645513120b4e12863a5fa972
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e9162f65645513120b4e12863a5fa972
 _md5_=513559ede4c101e4fe28cc2c84650d1d
diff --git a/metadata/md5-cache/dev-python/pip-9.0.1-r1 b/metadata/md5-cache/dev-python/pip-9.0.1-r1
index 5c5c23f..e748f4f 100644
--- a/metadata/md5-cache/dev-python/pip-9.0.1-r1
+++ b/metadata/md5-cache/dev-python/pip-9.0.1-r1
@@ -11,5 +11,5 @@
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pip/pip-9.0.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6c512bedfcd00d7c2a8a081f6230c27b
diff --git a/metadata/md5-cache/dev-python/pluggy-0.9.0 b/metadata/md5-cache/dev-python/pluggy-0.9.0
index af7f5a5..5655f42 100644
--- a/metadata/md5-cache/dev-python/pluggy-0.9.0
+++ b/metadata/md5-cache/dev-python/pluggy-0.9.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pluggy/pluggy-0.9.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=96195fb8e847201f1afda4e73d6cf165
diff --git a/metadata/md5-cache/dev-python/ply-3.9 b/metadata/md5-cache/dev-python/ply-3.9
index c3b927b..bc97405 100644
--- a/metadata/md5-cache/dev-python/ply-3.9
+++ b/metadata/md5-cache/dev-python/ply-3.9
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0/3.9
 SRC_URI=mirror://pypi/p/ply/ply-3.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a17c04210b2f2199a0361dbf9db1fac6
diff --git a/metadata/md5-cache/dev-python/portend-2.2-r1 b/metadata/md5-cache/dev-python/portend-2.2-r1
index c1a1337..8ff2d07 100644
--- a/metadata/md5-cache/dev-python/portend-2.2-r1
+++ b/metadata/md5-cache/dev-python/portend-2.2-r1
@@ -11,5 +11,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/portend/portend-2.2.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=03795ae6ce61e62cdd80584b574c9d1b
diff --git a/metadata/md5-cache/dev-python/prettytable-0.7.2 b/metadata/md5-cache/dev-python/prettytable-0.7.2
index 12f19be..dbbea33 100644
--- a/metadata/md5-cache/dev-python/prettytable-0.7.2
+++ b/metadata/md5-cache/dev-python/prettytable-0.7.2
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PrettyTable/prettytable-0.7.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74e642629d02aa46721ecebaa1d98c29
diff --git a/metadata/md5-cache/dev-python/prompt_toolkit-1.0.15 b/metadata/md5-cache/dev-python/prompt_toolkit-1.0.15
index 67d5d3a..5a88dea 100644
--- a/metadata/md5-cache/dev-python/prompt_toolkit-1.0.15
+++ b/metadata/md5-cache/dev-python/prompt_toolkit-1.0.15
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/prompt_toolkit/prompt_toolkit-1.0.15.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f4a4717234cfe4adca06b6cda28a7dae
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.11.4 b/metadata/md5-cache/dev-python/protobuf-python-3.11.4
index 06b1609..4f52cdf 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.11.4
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.11.4
@@ -11,5 +11,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0/22
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.11.4.tar.gz -> protobuf-3.11.4.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=703cdab3a01549b43d509cab3e746f06
diff --git a/metadata/md5-cache/dev-python/psutil-5.5.0 b/metadata/md5-cache/dev-python/psutil-5.5.0
index 6284050..570229a 100644
--- a/metadata/md5-cache/dev-python/psutil-5.5.0
+++ b/metadata/md5-cache/dev-python/psutil-5.5.0
@@ -11,5 +11,5 @@
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/psutil/psutil-5.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3283f7b57ed82e6c2a72f07e587db851
diff --git a/metadata/md5-cache/dev-python/ptyprocess-0.5.1 b/metadata/md5-cache/dev-python/ptyprocess-0.5.1
index 5204d0e..ed9f2cb 100644
--- a/metadata/md5-cache/dev-python/ptyprocess-0.5.1
+++ b/metadata/md5-cache/dev-python/ptyprocess-0.5.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/ptyprocess/ptyprocess-0.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d2d8ba2dbf58db106b581559887d4d58
diff --git a/metadata/md5-cache/dev-python/py-1.5.4 b/metadata/md5-cache/dev-python/py-1.5.4
index 219b5f3..173ac1d 100644
--- a/metadata/md5-cache/dev-python/py-1.5.4
+++ b/metadata/md5-cache/dev-python/py-1.5.4
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/py/py-1.5.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7b4d5e2281a96496755b8682261e5bfd
diff --git a/metadata/md5-cache/dev-python/pyasn1-0.4.2 b/metadata/md5-cache/dev-python/pyasn1-0.4.2
index b59d079..13dd51c 100644
--- a/metadata/md5-cache/dev-python/pyasn1-0.4.2
+++ b/metadata/md5-cache/dev-python/pyasn1-0.4.2
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyasn1/pyasn1-0.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7edf5578ea980a4fefd30a86d9d17a66
diff --git a/metadata/md5-cache/dev-python/pyasn1-modules-0.2.1 b/metadata/md5-cache/dev-python/pyasn1-modules-0.2.1
index 7667696..50d1482 100644
--- a/metadata/md5-cache/dev-python/pyasn1-modules-0.2.1
+++ b/metadata/md5-cache/dev-python/pyasn1-modules-0.2.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyasn1-modules/pyasn1-modules-0.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e4c7ef96ef5c50169bf62e540a5fa731
diff --git a/metadata/md5-cache/dev-python/pyblake2-1.1.2-r1 b/metadata/md5-cache/dev-python/pyblake2-1.1.2-r1
index 78f0dd9..b105554 100644
--- a/metadata/md5-cache/dev-python/pyblake2-1.1.2-r1
+++ b/metadata/md5-cache/dev-python/pyblake2-1.1.2-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyblake2/pyblake2-1.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=389adc24e04cc837c257151f2e17b915
diff --git a/metadata/md5-cache/dev-python/pybluez-0.18-r1 b/metadata/md5-cache/dev-python/pybluez-0.18-r1
deleted file mode 100644
index ffa85ed..0000000
--- a/metadata/md5-cache/dev-python/pybluez-0.18-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-wireless/bluez python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python bindings for Bluez Bluetooth Stack
-EAPI=5
-HOMEPAGE=https://github.com/karulis/pybluez
-IUSE=examples python_targets_python2_7
-KEYWORDS=*
-LICENSE=GPL-2
-RDEPEND=net-wireless/bluez python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://pybluez.googlecode.com/files/PyBluez-0.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9044d9ae242d9645170e6cda5c924b3a
diff --git a/metadata/md5-cache/dev-python/pycairo-1.17.0-r1 b/metadata/md5-cache/dev-python/pycairo-1.17.0-r1
index 661efe6..03632e9 100644
--- a/metadata/md5-cache/dev-python/pycairo-1.17.0-r1
+++ b/metadata/md5-cache/dev-python/pycairo-1.17.0-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/pygobject/pycairo/releases/download/v1.17.0/pycairo-1.17.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2176abf2792bc354aaf6f1efccf10af5
diff --git a/metadata/md5-cache/dev-python/pycodestyle-2.4.0 b/metadata/md5-cache/dev-python/pycodestyle-2.4.0
index 555357a..3d97e5d 100644
--- a/metadata/md5-cache/dev-python/pycodestyle-2.4.0
+++ b/metadata/md5-cache/dev-python/pycodestyle-2.4.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycodestyle/pycodestyle-2.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=db6e1c176d09613ca889e28971420c0a
diff --git a/metadata/md5-cache/dev-python/pycparser-2.20 b/metadata/md5-cache/dev-python/pycparser-2.20
index 9d0c5bd..dddcbbc 100644
--- a/metadata/md5-cache/dev-python/pycparser-2.20
+++ b/metadata/md5-cache/dev-python/pycparser-2.20
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycparser/pycparser-2.20.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dce14fbececebea3309b9540338164cd
diff --git a/metadata/md5-cache/dev-python/pycryptodome-3.7.3 b/metadata/md5-cache/dev-python/pycryptodome-3.7.3
index 49eb368..289056a 100644
--- a/metadata/md5-cache/dev-python/pycryptodome-3.7.3
+++ b/metadata/md5-cache/dev-python/pycryptodome-3.7.3
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycryptodome/pycryptodome-3.7.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=55b7c78a1d556e562e4fca05b2e8ad6e
diff --git a/metadata/md5-cache/dev-python/pyelftools-0.24 b/metadata/md5-cache/dev-python/pyelftools-0.24
index 455ecc0..ee433f4 100644
--- a/metadata/md5-cache/dev-python/pyelftools-0.24
+++ b/metadata/md5-cache/dev-python/pyelftools-0.24
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyelftools/pyelftools-0.24.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a9f6108a3cc4de487bf8f99216f44d44
diff --git a/metadata/md5-cache/dev-python/pyflakes-2.0.0 b/metadata/md5-cache/dev-python/pyflakes-2.0.0
index efb77d9..7982ce3 100644
--- a/metadata/md5-cache/dev-python/pyflakes-2.0.0
+++ b/metadata/md5-cache/dev-python/pyflakes-2.0.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyflakes/pyflakes-2.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e34b4b8e0dec2a520d418abb65cb158f
diff --git a/metadata/md5-cache/dev-python/pygit2-1.2.1 b/metadata/md5-cache/dev-python/pygit2-1.2.1
index 534433a..10d56fc 100644
--- a/metadata/md5-cache/dev-python/pygit2-1.2.1
+++ b/metadata/md5-cache/dev-python/pygit2-1.2.1
@@ -12,5 +12,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygit2/pygit2-1.2.1.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d1e25ed92e4f8f1acdd39bffef9248bf
diff --git a/metadata/md5-cache/dev-python/pygments-2.2.0 b/metadata/md5-cache/dev-python/pygments-2.2.0
index 150527e..02184c5 100644
--- a/metadata/md5-cache/dev-python/pygments-2.2.0
+++ b/metadata/md5-cache/dev-python/pygments-2.2.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pygments/Pygments-2.2.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=80ea2f889260ca926a72431534e9abdb
diff --git a/metadata/md5-cache/dev-python/pyinotify-0.9.6 b/metadata/md5-cache/dev-python/pyinotify-0.9.6
index ae08aff..09f4dc8 100644
--- a/metadata/md5-cache/dev-python/pyinotify-0.9.6
+++ b/metadata/md5-cache/dev-python/pyinotify-0.9.6
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://seb.dbzteam.org/pub/pyinotify/releases/pyinotify-0.9.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=753dd077a9870f9f0bcfa37d5d60be14
diff --git a/metadata/md5-cache/dev-python/pyinotify-0.9.6-r1 b/metadata/md5-cache/dev-python/pyinotify-0.9.6-r1
index ae08aff..09f4dc8 100644
--- a/metadata/md5-cache/dev-python/pyinotify-0.9.6-r1
+++ b/metadata/md5-cache/dev-python/pyinotify-0.9.6-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://seb.dbzteam.org/pub/pyinotify/releases/pyinotify-0.9.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=753dd077a9870f9f0bcfa37d5d60be14
diff --git a/metadata/md5-cache/dev-python/pykwalify-1.7.0 b/metadata/md5-cache/dev-python/pykwalify-1.7.0
index 4349fac..565873a 100644
--- a/metadata/md5-cache/dev-python/pykwalify-1.7.0
+++ b/metadata/md5-cache/dev-python/pykwalify-1.7.0
@@ -12,5 +12,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pykwalify/pykwalify-1.7.0.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c38d03e6f7c27a4d47880ef943ba1ac6
diff --git a/metadata/md5-cache/dev-python/pylint-1.9.5 b/metadata/md5-cache/dev-python/pylint-1.9.5
index dfd6c50..c3328b6 100644
--- a/metadata/md5-cache/dev-python/pylint-1.9.5
+++ b/metadata/md5-cache/dev-python/pylint-1.9.5
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pylint/pylint-1.9.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=16ee1db12b118e6ec869a7d44dfdb549
diff --git a/metadata/md5-cache/dev-python/pyopenssl-19.1.0 b/metadata/md5-cache/dev-python/pyopenssl-19.1.0
index 5fa7059..4bacecf 100644
--- a/metadata/md5-cache/dev-python/pyopenssl-19.1.0
+++ b/metadata/md5-cache/dev-python/pyopenssl-19.1.0
@@ -12,5 +12,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyOpenSSL/pyOpenSSL-19.1.0.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dd1c984afe51b943f1163b03b7496fb6
diff --git a/metadata/md5-cache/dev-python/pyparsing-2.2.0-r1 b/metadata/md5-cache/dev-python/pyparsing-2.2.0-r1
deleted file mode 100644
index db5f0c3..0000000
--- a/metadata/md5-cache/dev-python/pyparsing-2.2.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare test
-DEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Easy-to-use Python module for text parsing
-EAPI=5
-HOMEPAGE=http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing
-IUSE=doc examples python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/pyparsing/pyparsing-2.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=00123f1ef47249d17d21151a361165dd
diff --git a/metadata/md5-cache/dev-python/pyparsing-2.2.0-r2 b/metadata/md5-cache/dev-python/pyparsing-2.2.0-r2
deleted file mode 100644
index db5f0c3..0000000
--- a/metadata/md5-cache/dev-python/pyparsing-2.2.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare test
-DEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Easy-to-use Python module for text parsing
-EAPI=5
-HOMEPAGE=http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing
-IUSE=doc examples python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/pyparsing/pyparsing-2.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=00123f1ef47249d17d21151a361165dd
diff --git a/metadata/md5-cache/dev-python/pyparsing-2.4.7-r1 b/metadata/md5-cache/dev-python/pyparsing-2.4.7-r1
new file mode 100644
index 0000000..bafcffe
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyparsing-2.4.7-r1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Easy-to-use Python module for text parsing
+EAPI=7
+HOMEPAGE=https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/
+IUSE=examples python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/pyparsing/pyparsing/archive/pyparsing_2.4.7.tar.gz
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=041f4514e854aafb19fec79cca06b64f
diff --git a/metadata/md5-cache/dev-python/pyrsistent-0.14.4 b/metadata/md5-cache/dev-python/pyrsistent-0.14.4
index e49b160..558e2ed 100644
--- a/metadata/md5-cache/dev-python/pyrsistent-0.14.4
+++ b/metadata/md5-cache/dev-python/pyrsistent-0.14.4
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyrsistent/pyrsistent-0.14.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3b5ebac0bb85ec8dfe9190d497aa7be1
diff --git a/metadata/md5-cache/dev-python/pyserial-3.2.1 b/metadata/md5-cache/dev-python/pyserial-3.2.1
index 5090fc8..4e14bc4 100644
--- a/metadata/md5-cache/dev-python/pyserial-3.2.1
+++ b/metadata/md5-cache/dev-python/pyserial-3.2.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyserial/pyserial-3.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=837b9de35cf5c5bece97cc183a4d4cde
diff --git a/metadata/md5-cache/dev-python/pyshark-0.3.7.2-r1 b/metadata/md5-cache/dev-python/pyshark-0.3.7.2-r1
index 912dff3..8099d67 100644
--- a/metadata/md5-cache/dev-python/pyshark-0.3.7.2-r1
+++ b/metadata/md5-cache/dev-python/pyshark-0.3.7.2-r1
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/KimiNewt/pyshark/archive/v0.3.7.2.tar.gz -> pyshark-0.3.7.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb77061753b610bdeed2567821a4e2db
diff --git a/metadata/md5-cache/dev-python/pytest-4.4.0 b/metadata/md5-cache/dev-python/pytest-4.4.0
index 7c69d73..077cda8 100644
--- a/metadata/md5-cache/dev-python/pytest-4.4.0
+++ b/metadata/md5-cache/dev-python/pytest-4.4.0
@@ -11,5 +11,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-4.4.0.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ef12f04cafe5d9e1902721ad02ca1285
diff --git a/metadata/md5-cache/dev-python/pytest-4.4.0-r1 b/metadata/md5-cache/dev-python/pytest-4.4.0-r1
index 7c69d73..077cda8 100644
--- a/metadata/md5-cache/dev-python/pytest-4.4.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-4.4.0-r1
@@ -11,5 +11,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-4.4.0.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ef12f04cafe5d9e1902721ad02ca1285
diff --git a/metadata/md5-cache/dev-python/python-daemon-2.1.2 b/metadata/md5-cache/dev-python/python-daemon-2.1.2
index 457731c..b19eb51 100644
--- a/metadata/md5-cache/dev-python/python-daemon-2.1.2
+++ b/metadata/md5-cache/dev-python/python-daemon-2.1.2
@@ -11,5 +11,5 @@
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-daemon/python-daemon-2.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=00e6a426841de977d83637987ce0e8f2
diff --git a/metadata/md5-cache/dev-python/python-dateutil-2.7.2-r1 b/metadata/md5-cache/dev-python/python-dateutil-2.7.2-r1
index 4eb3c2c..5790a53 100644
--- a/metadata/md5-cache/dev-python/python-dateutil-2.7.2-r1
+++ b/metadata/md5-cache/dev-python/python-dateutil-2.7.2-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dateutil/python-dateutil-2.7.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b2bdec0a2fc6cfc17c6b249b410d2147
diff --git a/metadata/md5-cache/dev-python/python-editor-1.0.3 b/metadata/md5-cache/dev-python/python-editor-1.0.3
index e104f0f..480acad 100644
--- a/metadata/md5-cache/dev-python/python-editor-1.0.3
+++ b/metadata/md5-cache/dev-python/python-editor-1.0.3
@@ -11,5 +11,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-editor/python-editor-1.0.3.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=47712c9c7ce86fbdf22ece27a4d14f86
diff --git a/metadata/md5-cache/dev-python/python-evdev-1.3.0 b/metadata/md5-cache/dev-python/python-evdev-1.3.0
index 55077ed..9995f69 100644
--- a/metadata/md5-cache/dev-python/python-evdev-1.3.0
+++ b/metadata/md5-cache/dev-python/python-evdev-1.3.0
@@ -11,5 +11,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/gvalkov/python-evdev/archive/v1.3.0.tar.gz -> python-evdev-1.3.0.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b7c14d5259935685494c0685198c204e
diff --git a/metadata/md5-cache/dev-python/python-gflags-3.1.2 b/metadata/md5-cache/dev-python/python-gflags-3.1.2
index 9dbc7ba..dada231 100644
--- a/metadata/md5-cache/dev-python/python-gflags-3.1.2
+++ b/metadata/md5-cache/dev-python/python-gflags-3.1.2
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gflags/python-gflags-3.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=12a5731c6d4050ade9c13733d2d53c17
diff --git a/metadata/md5-cache/dev-python/python-gnupg-0.4.3 b/metadata/md5-cache/dev-python/python-gnupg-0.4.3
index 84b5e0a..18d11c1 100644
--- a/metadata/md5-cache/dev-python/python-gnupg-0.4.3
+++ b/metadata/md5-cache/dev-python/python-gnupg-0.4.3
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gnupg/python-gnupg-0.4.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e4c20dcf7aa63660673b770782e87222
diff --git a/metadata/md5-cache/dev-python/pytz-2018.4 b/metadata/md5-cache/dev-python/pytz-2018.4
index 426c9a4..4460fd1 100644
--- a/metadata/md5-cache/dev-python/pytz-2018.4
+++ b/metadata/md5-cache/dev-python/pytz-2018.4
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytz/pytz-2018.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=685ec9903664802b6bdcfdc0a5518705
diff --git a/metadata/md5-cache/dev-python/pyu2f-0.1.4 b/metadata/md5-cache/dev-python/pyu2f-0.1.4
index 516c2ce..cfe15fe 100644
--- a/metadata/md5-cache/dev-python/pyu2f-0.1.4
+++ b/metadata/md5-cache/dev-python/pyu2f-0.1.4
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/google/pyu2f/archive/0.1.4.tar.gz -> pyu2f-0.1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2aebf20a4979fb64847ef7c043b16513
diff --git a/metadata/md5-cache/dev-python/pyudev-0.21.0 b/metadata/md5-cache/dev-python/pyudev-0.21.0
index e5fb1eb..ffc7741 100644
--- a/metadata/md5-cache/dev-python/pyudev-0.21.0
+++ b/metadata/md5-cache/dev-python/pyudev-0.21.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=pygobject? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyudev/pyudev-0.21.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a2fcd0ae37b6073330050a1e67ce3bd9
diff --git a/metadata/md5-cache/dev-python/pyudev-0.21.0-r1 b/metadata/md5-cache/dev-python/pyudev-0.21.0-r1
index e5fb1eb..ffc7741 100644
--- a/metadata/md5-cache/dev-python/pyudev-0.21.0-r1
+++ b/metadata/md5-cache/dev-python/pyudev-0.21.0-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=pygobject? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyudev/pyudev-0.21.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a2fcd0ae37b6073330050a1e67ce3bd9
diff --git a/metadata/md5-cache/dev-python/pyusb-1.0.2 b/metadata/md5-cache/dev-python/pyusb-1.0.2
index 73bcdbf..c75bcdc 100644
--- a/metadata/md5-cache/dev-python/pyusb-1.0.2
+++ b/metadata/md5-cache/dev-python/pyusb-1.0.2
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/walac/pyusb/archive/v1.0.2.tar.gz -> pyusb-1.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bce2ac4f8a8de6b8cd3e08647cd6390f
diff --git a/metadata/md5-cache/dev-python/pyxattr-0.6.0-r1 b/metadata/md5-cache/dev-python/pyxattr-0.6.0-r1
index e6e3786..88a2c48 100644
--- a/metadata/md5-cache/dev-python/pyxattr-0.6.0-r1
+++ b/metadata/md5-cache/dev-python/pyxattr-0.6.0-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyxattr/pyxattr-0.6.0.tar.gz https://pyxattr.k1024.org/downloads/pyxattr-0.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eac594bf2eb3e5023cf28007a11d8223
diff --git a/metadata/md5-cache/dev-python/pyyaml-3.13 b/metadata/md5-cache/dev-python/pyyaml-3.13
index 3b31c93..9219322 100644
--- a/metadata/md5-cache/dev-python/pyyaml-3.13
+++ b/metadata/md5-cache/dev-python/pyyaml-3.13
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://pyyaml.org/download/pyyaml/PyYAML-3.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=131737da23ed7a5c82b515e6eb27d2a3
diff --git a/metadata/md5-cache/dev-python/pyzmq-16.0.2 b/metadata/md5-cache/dev-python/pyzmq-16.0.2
index c2a4eb1..02825dc 100644
--- a/metadata/md5-cache/dev-python/pyzmq-16.0.2
+++ b/metadata/md5-cache/dev-python/pyzmq-16.0.2
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyzmq/pyzmq-16.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=866308c32f088e8ac05dbc8072cebb10
diff --git a/metadata/md5-cache/dev-python/qrcode-6.1 b/metadata/md5-cache/dev-python/qrcode-6.1
index ab5063a..55d3bc7 100644
--- a/metadata/md5-cache/dev-python/qrcode-6.1
+++ b/metadata/md5-cache/dev-python/qrcode-6.1
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/q/qrcode/qrcode-6.1.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c30cc9897f34e243400472f7de45fa74
diff --git a/metadata/md5-cache/dev-python/redis-py-3.2.1 b/metadata/md5-cache/dev-python/redis-py-3.2.1
index e393c36..cb22c13 100644
--- a/metadata/md5-cache/dev-python/redis-py-3.2.1
+++ b/metadata/md5-cache/dev-python/redis-py-3.2.1
@@ -11,5 +11,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/redis/redis-3.2.1.tar.gz -> redis-py-3.2.1.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=db1fc709cb9969e4f1781219f94c6ca7
diff --git a/metadata/md5-cache/dev-python/regex-2017.04.05 b/metadata/md5-cache/dev-python/regex-2017.04.05
index 69407f6..d5caab0 100644
--- a/metadata/md5-cache/dev-python/regex-2017.04.05
+++ b/metadata/md5-cache/dev-python/regex-2017.04.05
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/regex/regex-2017.04.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c3eb4f95512bca11ae6a486162e34744
diff --git a/metadata/md5-cache/dev-python/requests-2.24.0 b/metadata/md5-cache/dev-python/requests-2.24.0
index 014c20f..26f7f77 100644
--- a/metadata/md5-cache/dev-python/requests-2.24.0
+++ b/metadata/md5-cache/dev-python/requests-2.24.0
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-2.24.0.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=be690a3df55ae43d420351330ba9a137
diff --git a/metadata/md5-cache/dev-python/retry-decorator-1.0.0 b/metadata/md5-cache/dev-python/retry-decorator-1.0.0
deleted file mode 100644
index 96a0374..0000000
--- a/metadata/md5-cache/dev-python/retry-decorator-1.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Decorator for retrying when exceptions occur
-EAPI=5
-HOMEPAGE=https://github.com/pnpnpn/retry-decorator
-IUSE=python_targets_python2_7 python_targets_python3_6
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/pnpnpn/retry-decorator/archive/v1.0.0.tar.gz -> retry-decorator-1.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a7eaddd75e8b7f826e90faa356be9d1a
diff --git a/metadata/md5-cache/dev-python/retry-decorator-1.1.1 b/metadata/md5-cache/dev-python/retry-decorator-1.1.1
new file mode 100644
index 0000000..9b89768
--- /dev/null
+++ b/metadata/md5-cache/dev-python/retry-decorator-1.1.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Decorator for retrying when exceptions occur
+EAPI=7
+HOMEPAGE=https://github.com/pnpnpn/retry-decorator
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pnpnpn/retry-decorator/archive/v1.1.1.tar.gz -> retry-decorator-1.1.1.tar.gz
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=94eccef61c3e9e871f7a0b9d610fdb22
diff --git a/metadata/md5-cache/dev-python/rfc3339-validator-0.1.2 b/metadata/md5-cache/dev-python/rfc3339-validator-0.1.2
index 7d5441c..3cfe44d 100644
--- a/metadata/md5-cache/dev-python/rfc3339-validator-0.1.2
+++ b/metadata/md5-cache/dev-python/rfc3339-validator-0.1.2
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/naimetti/rfc3339-validator/archive/v0.1.2.tar.gz -> rfc3339-validator-0.1.2.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c6d670e9d7e590cae1b239fa86bc73f5
diff --git a/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1 b/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
index e3cefaf..30a7e84 100644
--- a/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
+++ b/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3986_validator/rfc3986_validator-0.1.1.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e3cbf15c779c710a470a57dfdceec13a
diff --git a/metadata/md5-cache/dev-python/rfc3987-1.3.7 b/metadata/md5-cache/dev-python/rfc3987-1.3.7
index 682c40c..f27d80d 100644
--- a/metadata/md5-cache/dev-python/rfc3987-1.3.7
+++ b/metadata/md5-cache/dev-python/rfc3987-1.3.7
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3987/rfc3987-1.3.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0039a488f6fd15723e1c57a3d9ee1f42
diff --git a/metadata/md5-cache/dev-python/rsa-3.2.3-r1 b/metadata/md5-cache/dev-python/rsa-3.2.3-r1
index bd83249..a378f3b 100644
--- a/metadata/md5-cache/dev-python/rsa-3.2.3-r1
+++ b/metadata/md5-cache/dev-python/rsa-3.2.3-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rsa/rsa-3.2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7085ae9e932bc4bd28de42d48c8c9228
diff --git a/metadata/md5-cache/dev-python/rtslib-fb-2.1.66-r1 b/metadata/md5-cache/dev-python/rtslib-fb-2.1.66-r1
index d0ac4fa..847e323 100644
--- a/metadata/md5-cache/dev-python/rtslib-fb-2.1.66-r1
+++ b/metadata/md5-cache/dev-python/rtslib-fb-2.1.66-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rtslib-fb/rtslib-fb-2.1.66.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b7748f25275345473a4df05955744caf
diff --git a/metadata/md5-cache/dev-python/s3transfer-0.3.3 b/metadata/md5-cache/dev-python/s3transfer-0.3.3
index 9872113..ec51188 100644
--- a/metadata/md5-cache/dev-python/s3transfer-0.3.3
+++ b/metadata/md5-cache/dev-python/s3transfer-0.3.3
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/s3transfer/s3transfer-0.3.3.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=24d570f769a23b4636e4e017b44b19e4
diff --git a/metadata/md5-cache/dev-python/scandir-1.9.0 b/metadata/md5-cache/dev-python/scandir-1.9.0
index 37cdbea..f0fbe7d 100644
--- a/metadata/md5-cache/dev-python/scandir-1.9.0
+++ b/metadata/md5-cache/dev-python/scandir-1.9.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scandir/scandir-1.9.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5d08ad2effe4d89675d0780b78d55a62
diff --git a/metadata/md5-cache/dev-python/secretstorage-2.3.1 b/metadata/md5-cache/dev-python/secretstorage-2.3.1
index bdb1c1a..e95d6c6 100644
--- a/metadata/md5-cache/dev-python/secretstorage-2.3.1
+++ b/metadata/md5-cache/dev-python/secretstorage-2.3.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SecretStorage/SecretStorage-2.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3914c1c6d45b7b99842031eee8642ce4
diff --git a/metadata/md5-cache/dev-python/selenium-3.0.2 b/metadata/md5-cache/dev-python/selenium-3.0.2
index 6ff3f35..b141d6b 100644
--- a/metadata/md5-cache/dev-python/selenium-3.0.2
+++ b/metadata/md5-cache/dev-python/selenium-3.0.2
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/selenium/selenium-3.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1e51e8b251086065c0ae08d8320c62e2
diff --git a/metadata/md5-cache/dev-python/selenium-3.0.2-r1 b/metadata/md5-cache/dev-python/selenium-3.0.2-r1
index 6ff3f35..b141d6b 100644
--- a/metadata/md5-cache/dev-python/selenium-3.0.2-r1
+++ b/metadata/md5-cache/dev-python/selenium-3.0.2-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/selenium/selenium-3.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1e51e8b251086065c0ae08d8320c62e2
diff --git a/metadata/md5-cache/dev-python/service_identity-18.1.0 b/metadata/md5-cache/dev-python/service_identity-18.1.0
index ebd8cd2..352c706 100644
--- a/metadata/md5-cache/dev-python/service_identity-18.1.0
+++ b/metadata/md5-cache/dev-python/service_identity-18.1.0
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyca/service-identity/archive/18.1.0.tar.gz -> service_identity-18.1.0.gh.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=985638e71842d483d2fb0f1094e6807f
diff --git a/metadata/md5-cache/dev-python/setproctitle-1.1.10-r1 b/metadata/md5-cache/dev-python/setproctitle-1.1.10-r1
index 8f38714..5a34051 100644
--- a/metadata/md5-cache/dev-python/setproctitle-1.1.10-r1
+++ b/metadata/md5-cache/dev-python/setproctitle-1.1.10-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/setproctitle/setproctitle-1.1.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d30d5aa3bc39fd89ffa651ad7c588e67
diff --git a/metadata/md5-cache/dev-python/setuptools-44.0.0 b/metadata/md5-cache/dev-python/setuptools-44.0.0
index ba37c1b..0748649 100644
--- a/metadata/md5-cache/dev-python/setuptools-44.0.0
+++ b/metadata/md5-cache/dev-python/setuptools-44.0.0
@@ -12,5 +12,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-44.0.0.zip
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9b39d9322b56e8f204c483eb632898cb
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-1.16.1 b/metadata/md5-cache/dev-python/setuptools_scm-1.16.1
index 683e9d3..a78860a 100644
--- a/metadata/md5-cache/dev-python/setuptools_scm-1.16.1
+++ b/metadata/md5-cache/dev-python/setuptools_scm-1.16.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-1.16.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c47f275ebfb2c73ded5aa2d4bfa08c98
diff --git a/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.0 b/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.0
index b7c4e1f..69dc36a 100644
--- a/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.0
+++ b/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.0
@@ -11,5 +11,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/Changaco/setuptools_scm_git_archive/archive/1.0.tar.gz -> setuptools_scm_git_archive-1.0.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d1a1b7e44b02e245112b9a19cbebf491
diff --git a/metadata/md5-cache/dev-python/sgmllib3k-1.0.0 b/metadata/md5-cache/dev-python/sgmllib3k-1.0.0
index 2f0cbaf..b9b5656 100644
--- a/metadata/md5-cache/dev-python/sgmllib3k-1.0.0
+++ b/metadata/md5-cache/dev-python/sgmllib3k-1.0.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sgmllib3k/sgmllib3k-1.0.0.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d3097f077fbbde1e4e5621b1f9ba3e3e
diff --git a/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1 b/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
index f2cc76e..94bb14c 100644
--- a/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
+++ b/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simplegeneric/simplegeneric-0.8.1.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=569078e84041a11ef4110722bd499bd4
diff --git a/metadata/md5-cache/dev-python/simplejson-3.13.2 b/metadata/md5-cache/dev-python/simplejson-3.13.2
index 1102b49..93a4982 100644
--- a/metadata/md5-cache/dev-python/simplejson-3.13.2
+++ b/metadata/md5-cache/dev-python/simplejson-3.13.2
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simplejson/simplejson-3.13.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ecd83cb34d05715ba925243a145ad46e
diff --git a/metadata/md5-cache/dev-python/singledispatch-3.4.0.3 b/metadata/md5-cache/dev-python/singledispatch-3.4.0.3
deleted file mode 100644
index 6b36912..0000000
--- a/metadata/md5-cache/dev-python/singledispatch-3.4.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A library to bring functools.singledispatch from Python 3.4 to Python 2.6-3.3
-EAPI=5
-HOMEPAGE=https://docs.python.org/3/library/functools.html#functools.singledispatch
-IUSE=python_targets_python2_7
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/s/singledispatch/singledispatch-3.4.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a5894ad379ad4fd2169dda7a4e04d5ff
diff --git a/metadata/md5-cache/dev-python/six-1.12.0 b/metadata/md5-cache/dev-python/six-1.12.0
index 94154df..19f7e89 100644
--- a/metadata/md5-cache/dev-python/six-1.12.0
+++ b/metadata/md5-cache/dev-python/six-1.12.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/six/six-1.12.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b0c5ee58f211eca7a48d41113ebc4e95
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.8.3 b/metadata/md5-cache/dev-python/snakeoil-0.8.3
index bea265a..c363931 100644
--- a/metadata/md5-cache/dev-python/snakeoil-0.8.3
+++ b/metadata/md5-cache/dev-python/snakeoil-0.8.3
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/snakeoil/snakeoil-0.8.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=098cc9ab9311e530ba297b7aca736690
diff --git a/metadata/md5-cache/dev-python/snowballstemmer-2.0.0 b/metadata/md5-cache/dev-python/snowballstemmer-2.0.0
index c2c8dc1..b4f82bb 100644
--- a/metadata/md5-cache/dev-python/snowballstemmer-2.0.0
+++ b/metadata/md5-cache/dev-python/snowballstemmer-2.0.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/snowballstemmer/snowballstemmer-2.0.0.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f4351cdd62fef95637d3627cd1b205e9
diff --git a/metadata/md5-cache/dev-python/sortedcontainers-2.3.0 b/metadata/md5-cache/dev-python/sortedcontainers-2.3.0
new file mode 100644
index 0000000..ef48680
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sortedcontainers-2.3.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python library to sort collections and containers
+EAPI=7
+HOMEPAGE=http://www.grantjenks.com/docs/sortedcontainers/ https://pypi.org/project/sortedcontainers/ https://github.com/grantjenks/python-sortedcontainers/
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=*
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/grantjenks/python-sortedcontainers/archive/v2.3.0.tar.gz -> python-sortedcontainers-2.3.0.gh.tar.gz
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c2379d00ff667a5a4565c73a652e84dd
diff --git a/metadata/md5-cache/dev-python/sphinx-2.0.1-r1 b/metadata/md5-cache/dev-python/sphinx-2.0.1-r1
index 8dc72d0..853bc4e 100644
--- a/metadata/md5-cache/dev-python/sphinx-2.0.1-r1
+++ b/metadata/md5-cache/dev-python/sphinx-2.0.1-r1
@@ -12,5 +12,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/Sphinx/Sphinx-2.0.1.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dba3460cd81e25e49030e61ea797c384
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.2 b/metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.2
index 3b7bb6d..518c404 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.2
@@ -13,5 +13,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6a072d011a278ffc1a1f063bf21b3642
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.2 b/metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.2
index 6795e5c..604a91d 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.2
@@ -13,5 +13,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6e3a4fc5eb5ca0e49f9e9dc3255ec9ae
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-1.0.3 b/metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-1.0.3
index 92cb11a..852025a 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-1.0.3
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-1.0.3
@@ -12,5 +12,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2489fbfd356c561d797ba9b858f1d56d
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r1 b/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r1
index a031f15..e679e9f 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r1
@@ -13,5 +13,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2b28ce89a52948d86ef4fa96069677b4
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3 b/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3
index c815f6f..72391e0 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3
@@ -13,5 +13,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7bb790da5c444c5c2706f595172d8d1b
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.3 b/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.3
index 721f79e..880f708 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.3
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.3
@@ -12,5 +12,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.3.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4b293cd779ab4a42f3a7ed9073f24adb
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-0.9.2 b/metadata/md5-cache/dev-python/sqlalchemy-0.9.2
index a89cdbd..4db79c2 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-0.9.2
+++ b/metadata/md5-cache/dev-python/sqlalchemy-0.9.2
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-0.9.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aec05647474b46aa969882d4b944b3fd
diff --git a/metadata/md5-cache/dev-python/strict-rfc3339-0.6 b/metadata/md5-cache/dev-python/strict-rfc3339-0.6
index 2169df4..1e874b8 100644
--- a/metadata/md5-cache/dev-python/strict-rfc3339-0.6
+++ b/metadata/md5-cache/dev-python/strict-rfc3339-0.6
@@ -11,5 +11,5 @@
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/strict-rfc3339/strict-rfc3339-0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c7020cf57276d3676a96caf6592d7407
diff --git a/metadata/md5-cache/dev-python/subprocess32-3.2.7 b/metadata/md5-cache/dev-python/subprocess32-3.2.7
index 8b46ee7..31a1a04 100644
--- a/metadata/md5-cache/dev-python/subprocess32-3.2.7
+++ b/metadata/md5-cache/dev-python/subprocess32-3.2.7
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/subprocess32/subprocess32-3.2.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d98b421806107ccba94266656be18a2b
diff --git a/metadata/md5-cache/dev-python/subunit-1.2.0-r1 b/metadata/md5-cache/dev-python/subunit-1.2.0-r1
index f78d767..ed31757 100644
--- a/metadata/md5-cache/dev-python/subunit-1.2.0-r1
+++ b/metadata/md5-cache/dev-python/subunit-1.2.0-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/subunit/trunk/1.2/+download/subunit-1.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6dab83f692eb2ad97141aae3c3a2e9b5
diff --git a/metadata/md5-cache/dev-python/tempita-0.5.3-r1 b/metadata/md5-cache/dev-python/tempita-0.5.3-r1
index 70e6f70..d5dcf84 100644
--- a/metadata/md5-cache/dev-python/tempita-0.5.3-r1
+++ b/metadata/md5-cache/dev-python/tempita-0.5.3-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/T/Tempita/Tempita-0.5.3dev.tar.gz -> tempita-0.5.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=693bc31c433ef302051cff4c793bcc4e
diff --git a/metadata/md5-cache/dev-python/tempora-1.14.1 b/metadata/md5-cache/dev-python/tempora-1.14.1
index 1ab0a25..1a1ab5d 100644
--- a/metadata/md5-cache/dev-python/tempora-1.14.1
+++ b/metadata/md5-cache/dev-python/tempora-1.14.1
@@ -11,5 +11,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tempora/tempora-1.14.1.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=63c458d421ff484f791ff41d44c6472a
diff --git a/metadata/md5-cache/dev-python/testfixtures-6.17.1 b/metadata/md5-cache/dev-python/testfixtures-6.17.1
new file mode 100644
index 0000000..0ed007d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/testfixtures-6.17.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) dev-python/django[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-django[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sybil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/twisted-18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A collection of helpers and mock objects for unit tests and doc tests
+EAPI=7
+HOMEPAGE=https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures
+IUSE=-test doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/testfixtures/testfixtures-6.17.1.tar.gz
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=883605b50889d2f5d18d017b1f2d0e75
diff --git a/metadata/md5-cache/dev-python/testtools-2.3.0 b/metadata/md5-cache/dev-python/testtools-2.3.0
index 70dea49..563de91 100644
--- a/metadata/md5-cache/dev-python/testtools-2.3.0
+++ b/metadata/md5-cache/dev-python/testtools-2.3.0
@@ -11,5 +11,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/testtools/testtools-2.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1e012237ee0dd1dcce830225ff3d2108
diff --git a/metadata/md5-cache/dev-python/toml-0.10.1 b/metadata/md5-cache/dev-python/toml-0.10.1
index d93025e..93cddae 100644
--- a/metadata/md5-cache/dev-python/toml-0.10.1
+++ b/metadata/md5-cache/dev-python/toml-0.10.1
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/uiri/toml/archive/0.10.1.tar.gz -> toml-0.10.1-1.tar.gz test? ( https://github.com/BurntSushi/toml-test/archive/280497fa5f12e43d7233aed0d74e07ca61ef176b.tar.gz -> toml-test-280497fa5f12e43d7233aed0d74e07ca61ef176b.tar.gz )
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b9fdb653bcd940cc6e99f783dc297cd6
diff --git a/metadata/md5-cache/dev-python/traceback2-1.4.0 b/metadata/md5-cache/dev-python/traceback2-1.4.0
index 31567ca..aa1468d 100644
--- a/metadata/md5-cache/dev-python/traceback2-1.4.0
+++ b/metadata/md5-cache/dev-python/traceback2-1.4.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/traceback2/traceback2-1.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb5d7ab351a9b38b52246a820af6f604
diff --git a/metadata/md5-cache/dev-python/traitlets-4.3.2 b/metadata/md5-cache/dev-python/traitlets-4.3.2
index 865abab..ed65967 100644
--- a/metadata/md5-cache/dev-python/traitlets-4.3.2
+++ b/metadata/md5-cache/dev-python/traitlets-4.3.2
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/traitlets/traitlets-4.3.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a62c12f756838bb68b40d8c30614830a
diff --git a/metadata/md5-cache/dev-python/trollius-2.1 b/metadata/md5-cache/dev-python/trollius-2.1
index 85856d1..576994f 100644
--- a/metadata/md5-cache/dev-python/trollius-2.1
+++ b/metadata/md5-cache/dev-python/trollius-2.1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/trollius/trollius-2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=56525674181174c657d96e638ec465d6
diff --git a/metadata/md5-cache/dev-python/twisted-16.6.0-r3 b/metadata/md5-cache/dev-python/twisted-16.6.0-r3
index b7552dff1..6be8e5f 100644
--- a/metadata/md5-cache/dev-python/twisted-16.6.0-r3
+++ b/metadata/md5-cache/dev-python/twisted-16.6.0-r3
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Twisted/16.6/Twisted-16.6.0.tar.bz2 https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b522541430cb2cb852833f4530393224
diff --git a/metadata/md5-cache/dev-python/twisted-core-13.2.0 b/metadata/md5-cache/dev-python/twisted-core-13.2.0
deleted file mode 100644
index d7bb111..0000000
--- a/metadata/md5-cache/dev-python/twisted-core-13.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-python/zope-interface-3.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] crypt? ( >=dev-python/pyopenssl-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) serial? ( dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=An asynchronous networking framework written in Python
-EAPI=5
-HOMEPAGE=http://www.twistedmatrix.com/
-IUSE=crypt gtk serial python_targets_python2_7
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=>=dev-python/zope-interface-3.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] crypt? ( >=dev-python/pyopenssl-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) serial? ( dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !dev-python/twisted python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://twistedmatrix.com/Releases/TwistedCore/13.2/TwistedCore-13.2.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	twisted-r1	bde9a73867c7a158256f71398888feee	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ca57f0f77daa92844642c8c83c2bdfa3
diff --git a/metadata/md5-cache/dev-python/twisted-web-13.2.0 b/metadata/md5-cache/dev-python/twisted-web-13.2.0
deleted file mode 100644
index ab8d1fd..0000000
--- a/metadata/md5-cache/dev-python/twisted-web-13.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-python/twisted-core-13.2*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] soap? ( dev-python/soappy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Twisted web server, programmable in Python
-EAPI=5
-HOMEPAGE=http://www.twistedmatrix.com/
-IUSE=soap python_targets_python2_7
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND==dev-python/twisted-core-13.2*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] soap? ( dev-python/soappy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !dev-python/twisted python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://twistedmatrix.com/Releases/TwistedWeb/13.2/TwistedWeb-13.2.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	twisted-r1	bde9a73867c7a158256f71398888feee	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6672d41a6249de650a97b8a984f98763
diff --git a/metadata/md5-cache/dev-python/typed-ast-1.4.1 b/metadata/md5-cache/dev-python/typed-ast-1.4.1
index 7e3386e..4a5a126 100644
--- a/metadata/md5-cache/dev-python/typed-ast-1.4.1
+++ b/metadata/md5-cache/dev-python/typed-ast-1.4.1
@@ -12,5 +12,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/typed_ast/typed_ast-1.4.1.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d7dafc1fb4fd40e9d8d9637640d00f9b
diff --git a/metadata/md5-cache/dev-python/typing-3.6.4-r1 b/metadata/md5-cache/dev-python/typing-3.6.4-r1
deleted file mode 100644
index 2ad416e..0000000
--- a/metadata/md5-cache/dev-python/typing-3.6.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Type Hints for Python
-EAPI=6
-HOMEPAGE=https://docs.python.org/3/library/typing.html https://pypi.org/project/typing/
-IUSE=python_targets_python2_7
-KEYWORDS=*
-LICENSE=PSF-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/t/typing/typing-3.6.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ba3117991799d9717e54ed10965acf00
diff --git a/metadata/md5-cache/dev-python/typing-extensions-3.7.4.1 b/metadata/md5-cache/dev-python/typing-extensions-3.7.4.1
index 2404ea2..2faa2bb 100644
--- a/metadata/md5-cache/dev-python/typing-extensions-3.7.4.1
+++ b/metadata/md5-cache/dev-python/typing-extensions-3.7.4.1
@@ -11,5 +11,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/t/typing_extensions/typing_extensions-3.7.4.1.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2d511933236d5ded15dc0b33181da7db
diff --git a/metadata/md5-cache/dev-python/ujson-3.0.0 b/metadata/md5-cache/dev-python/ujson-3.0.0
index 3fcdaed..a2b4f68 100644
--- a/metadata/md5-cache/dev-python/ujson-3.0.0
+++ b/metadata/md5-cache/dev-python/ujson-3.0.0
@@ -12,5 +12,5 @@
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/ujson/ujson-3.0.0.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6499761b914704b42ce943b3d7f923c9
diff --git a/metadata/md5-cache/dev-python/unittest2-1.1.0 b/metadata/md5-cache/dev-python/unittest2-1.1.0
index a827786..bb17bfb 100644
--- a/metadata/md5-cache/dev-python/unittest2-1.1.0
+++ b/metadata/md5-cache/dev-python/unittest2-1.1.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/u/unittest2/unittest2-1.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a965dd936d0db1e11ec118ba0a1d205b
diff --git a/metadata/md5-cache/dev-python/uritemplate-3.0.0 b/metadata/md5-cache/dev-python/uritemplate-3.0.0
index f755846..c8c2051 100644
--- a/metadata/md5-cache/dev-python/uritemplate-3.0.0
+++ b/metadata/md5-cache/dev-python/uritemplate-3.0.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/u/uritemplate/uritemplate-3.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=727ebd55d624e64823d0ff2150209efe
diff --git a/metadata/md5-cache/dev-python/urllib3-1.25.10 b/metadata/md5-cache/dev-python/urllib3-1.25.10
index de7e094..d46a3c6 100644
--- a/metadata/md5-cache/dev-python/urllib3-1.25.10
+++ b/metadata/md5-cache/dev-python/urllib3-1.25.10
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/urllib3/urllib3-1.25.10.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b95bd51a6f9838a6d681473c6655de14
diff --git a/metadata/md5-cache/dev-python/versioneer-0.16 b/metadata/md5-cache/dev-python/versioneer-0.16
index 1c3fb1b..4b5ed04 100644
--- a/metadata/md5-cache/dev-python/versioneer-0.16
+++ b/metadata/md5-cache/dev-python/versioneer-0.16
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/v/versioneer/versioneer-0.16.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=79cf189c82cc227b02586f05f920297b
diff --git a/metadata/md5-cache/dev-python/virtualenv-15.1.0 b/metadata/md5-cache/dev-python/virtualenv-15.1.0
index 539e42e..96d70d7 100644
--- a/metadata/md5-cache/dev-python/virtualenv-15.1.0
+++ b/metadata/md5-cache/dev-python/virtualenv-15.1.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/pypa/virtualenv/archive/15.1.0.tar.gz -> virtualenv-15.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aaa06f8328c6270678b6ae0947cd966c
diff --git a/metadata/md5-cache/dev-python/wcwidth-0.1.7-r1 b/metadata/md5-cache/dev-python/wcwidth-0.1.7-r1
index cd67875..c7f2543 100644
--- a/metadata/md5-cache/dev-python/wcwidth-0.1.7-r1
+++ b/metadata/md5-cache/dev-python/wcwidth-0.1.7-r1
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/w/wcwidth/wcwidth-0.1.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ac8fdb087ba6227450621dcd263ca7e2
diff --git a/metadata/md5-cache/dev-python/webcolors-1.5 b/metadata/md5-cache/dev-python/webcolors-1.5
index 2eafe51..1f21fa1 100644
--- a/metadata/md5-cache/dev-python/webcolors-1.5
+++ b/metadata/md5-cache/dev-python/webcolors-1.5
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/w/webcolors/webcolors-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eed1cf1933a4e2133491cb8b462f3902
diff --git a/metadata/md5-cache/dev-python/werkzeug-0.15.5 b/metadata/md5-cache/dev-python/werkzeug-0.15.5
index ccb4440..2f6f7f3 100644
--- a/metadata/md5-cache/dev-python/werkzeug-0.15.5
+++ b/metadata/md5-cache/dev-python/werkzeug-0.15.5
@@ -12,5 +12,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/Werkzeug/Werkzeug-0.15.5.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=af5f6ba9cf1d2ab0039072e19655e09b
diff --git a/metadata/md5-cache/dev-python/wrapt-1.10.11 b/metadata/md5-cache/dev-python/wrapt-1.10.11
index 9460b7b..f4ce7f8 100644
--- a/metadata/md5-cache/dev-python/wrapt-1.10.11
+++ b/metadata/md5-cache/dev-python/wrapt-1.10.11
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/GrahamDumpleton/wrapt/archive/1.10.11.tar.gz -> wrapt-1.10.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=112feb6e4dde338d82a2ff709afd4a68
diff --git a/metadata/md5-cache/dev-python/xcffib-0.6.0 b/metadata/md5-cache/dev-python/xcffib-0.6.0
index 86a4db2..7df27e3 100644
--- a/metadata/md5-cache/dev-python/xcffib-0.6.0
+++ b/metadata/md5-cache/dev-python/xcffib-0.6.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xcffib/xcffib-0.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7f8c5438ddeb2f04eb76778416f8ec20
diff --git a/metadata/md5-cache/dev-python/zc-lockfile-1.4 b/metadata/md5-cache/dev-python/zc-lockfile-1.4
index 89389be..f5211a0 100644
--- a/metadata/md5-cache/dev-python/zc-lockfile-1.4
+++ b/metadata/md5-cache/dev-python/zc-lockfile-1.4
@@ -11,5 +11,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/z/zc.lockfile/zc.lockfile-1.4.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=24038fbef32b31f73c0b46ce528ce9bb
diff --git a/metadata/md5-cache/dev-python/zipp-1.0.0 b/metadata/md5-cache/dev-python/zipp-1.0.0
index fbbcc12..e638553 100644
--- a/metadata/md5-cache/dev-python/zipp-1.0.0
+++ b/metadata/md5-cache/dev-python/zipp-1.0.0
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zipp/zipp-1.0.0.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3b95319e05a31e7ae2b634a4e87d6e57
diff --git a/metadata/md5-cache/dev-python/zope-interface-4.4.3 b/metadata/md5-cache/dev-python/zope-interface-4.4.3
index ad87a43..06144ee 100644
--- a/metadata/md5-cache/dev-python/zope-interface-4.4.3
+++ b/metadata/md5-cache/dev-python/zope-interface-4.4.3
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.interface/zope.interface-4.4.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2c22aeb0a793bd726d869ca63ed2d816
diff --git a/metadata/md5-cache/dev-util/bazel-0.24.1 b/metadata/md5-cache/dev-util/bazel-0.24.1
index 21c08d1..1d301fc 100644
--- a/metadata/md5-cache/dev-util/bazel-0.24.1
+++ b/metadata/md5-cache/dev-util/bazel-0.24.1
@@ -10,5 +10,5 @@
 RESTRICT=strip test? ( network-sandbox ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bazelbuild/bazel/releases/download/0.24.1/bazel-0.24.1-dist.zip
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0f4de8726ac51e661a846ed366c9708b
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2e808a8ef1790189a33d1e3d84259e06
diff --git a/metadata/md5-cache/dev-util/bazel-0.24.1-r2 b/metadata/md5-cache/dev-util/bazel-0.24.1-r2
deleted file mode 100644
index 21c08d1..0000000
--- a/metadata/md5-cache/dev-util/bazel-0.24.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.8:* app-arch/unzip app-arch/zip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Fast and correct automated build system
-EAPI=6
-HOMEPAGE=https://bazel.build/
-IUSE=examples test tools elibc_FreeBSD
-KEYWORDS=*
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
-RESTRICT=strip test? ( network-sandbox ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/bazelbuild/bazel/releases/download/0.24.1/bazel-0.24.1-dist.zip
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0f4de8726ac51e661a846ed366c9708b
diff --git a/metadata/md5-cache/dev-util/bazel-0.24.1-r3 b/metadata/md5-cache/dev-util/bazel-0.24.1-r3
new file mode 100644
index 0000000..1d301fc
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bazel-0.24.1-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* app-arch/unzip app-arch/zip >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Fast and correct automated build system
+EAPI=6
+HOMEPAGE=https://bazel.build/
+IUSE=examples test tools elibc_FreeBSD
+KEYWORDS=*
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
+RESTRICT=strip test? ( network-sandbox ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/bazelbuild/bazel/releases/download/0.24.1/bazel-0.24.1-dist.zip
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2e808a8ef1790189a33d1e3d84259e06
diff --git a/metadata/md5-cache/dev-util/bazel-3.2.0 b/metadata/md5-cache/dev-util/bazel-3.2.0
deleted file mode 100644
index 061804a..0000000
--- a/metadata/md5-cache/dev-util/bazel-3.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.8:* app-arch/unzip app-arch/zip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Fast and correct automated build system
-EAPI=7
-HOMEPAGE=https://bazel.build/
-IUSE=examples tools elibc_FreeBSD
-KEYWORDS=*
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/bazelbuild/bazel/releases/download/3.2.0/bazel-3.2.0-dist.zip
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6567ad9180621d2a11e0d53ff939b033
diff --git a/metadata/md5-cache/dev-util/bazel-3.2.0-r1 b/metadata/md5-cache/dev-util/bazel-3.2.0-r1
deleted file mode 100644
index 061804a..0000000
--- a/metadata/md5-cache/dev-util/bazel-3.2.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.8:* app-arch/unzip app-arch/zip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Fast and correct automated build system
-EAPI=7
-HOMEPAGE=https://bazel.build/
-IUSE=examples tools elibc_FreeBSD
-KEYWORDS=*
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/bazelbuild/bazel/releases/download/3.2.0/bazel-3.2.0-dist.zip
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6567ad9180621d2a11e0d53ff939b033
diff --git a/metadata/md5-cache/dev-util/bazel-3.7.2 b/metadata/md5-cache/dev-util/bazel-3.7.2
new file mode 100644
index 0000000..e92839d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bazel-3.7.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* app-arch/unzip app-arch/zip >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Fast and correct automated build system
+EAPI=7
+HOMEPAGE=https://bazel.build/
+IUSE=examples tools prefix static-libs elibc_FreeBSD
+KEYWORDS=*
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
+REQUIRED_USE=prefix? ( static-libs )
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/bazelbuild/bazel/releases/download/3.7.2/bazel-3.7.2-dist.zip
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=17bc943a2f8675fcc1d331bcf63788d3
diff --git a/metadata/md5-cache/dev-util/bazel-3.7.2-r1 b/metadata/md5-cache/dev-util/bazel-3.7.2-r1
new file mode 100644
index 0000000..e92839d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bazel-3.7.2-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* app-arch/unzip app-arch/zip >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Fast and correct automated build system
+EAPI=7
+HOMEPAGE=https://bazel.build/
+IUSE=examples tools prefix static-libs elibc_FreeBSD
+KEYWORDS=*
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
+REQUIRED_USE=prefix? ( static-libs )
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/bazelbuild/bazel/releases/download/3.7.2/bazel-3.7.2-dist.zip
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=17bc943a2f8675fcc1d331bcf63788d3
diff --git a/metadata/md5-cache/dev-util/cmake-3.14.3 b/metadata/md5-cache/dev-util/cmake-3.14.3
index d23012e..9393678 100644
--- a/metadata/md5-cache/dev-util/cmake-3.14.3
+++ b/metadata/md5-cache/dev-util/cmake-3.14.3
@@ -9,5 +9,5 @@
 RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.14/cmake-3.14.3.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	3322f14f031ddc95feccd9089c9adc59	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e9162f65645513120b4e12863a5fa972	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	3322f14f031ddc95feccd9089c9adc59	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e9162f65645513120b4e12863a5fa972	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=06b2304ef318c245d348c98d6ffd2078
diff --git a/metadata/md5-cache/dev-util/cmocka-1.1.5 b/metadata/md5-cache/dev-util/cmocka-1.1.5
index 859690f..eb76ec4 100644
--- a/metadata/md5-cache/dev-util/cmocka-1.1.5
+++ b/metadata/md5-cache/dev-util/cmocka-1.1.5
@@ -8,5 +8,5 @@
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://cmocka.org/files/1.1/cmocka-1.1.5.tar.xz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=45b1897c49db28561236bf4f86f00230
diff --git a/metadata/md5-cache/dev-util/codespell-1.16.0 b/metadata/md5-cache/dev-util/codespell-1.16.0
index 18b48f6..52fce87 100644
--- a/metadata/md5-cache/dev-util/codespell-1.16.0
+++ b/metadata/md5-cache/dev-util/codespell-1.16.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/codespell-project/codespell/archive/v1.16.0.tar.gz -> codespell-1.16.0.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fdcf5b3139e189456b02c3899f3418c1
diff --git a/metadata/md5-cache/dev-util/dwarves-1.17 b/metadata/md5-cache/dev-util/dwarves-1.17
index ae4702e..e377e76 100644
--- a/metadata/md5-cache/dev-util/dwarves-1.17
+++ b/metadata/md5-cache/dev-util/dwarves-1.17
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-libs/elfutils-0.178 sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-libs/elfutils-0.178 sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
 EAPI=6
 HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
-IUSE=debug python_single_target_python3_7 python_single_target_python3_8
+IUSE=debug python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=*
 LICENSE=GPL-2
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-libs/elfutils-0.178 sys-libs/zlib
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-libs/elfutils-0.178 sys-libs/zlib
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=http://fedorapeople.org/~acme/dwarves/dwarves-1.17.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3097952cde03b868d8ecf38e21264683
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=02ba74ff63972057a02ead648283c3f8
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.66.7 b/metadata/md5-cache/dev-util/gdbus-codegen-2.66.7
deleted file mode 100644
index 16cc906..0000000
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.66.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/libxslt app-text/docbook-xsl-stylesheets app-arch/xz-utils python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-DESCRIPTION=GDBus code and documentation generator
-EAPI=7
-HOMEPAGE=https://www.gtk.org/
-IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=*
-LICENSE=LGPL-2+
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/glib/2.66/glib-2.66.7.tar.xz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	gnome.org	532d56d07b9eace4831aaa817d2b756a	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c28227ce616a6cd1bf997879d266f5f6
diff --git a/metadata/md5-cache/dev-util/glslang-11.2.0 b/metadata/md5-cache/dev-util/glslang-11.2.0
new file mode 100644
index 0000000..0477163
--- /dev/null
+++ b/metadata/md5-cache/dev-util/glslang-11.2.0
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator
+EAPI=7
+HOMEPAGE=https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=BSD
+RDEPEND=!<media-libs/shaderc-2020.1
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/KhronosGroup/glslang/archive/11.2.0.tar.gz -> glslang-11.2.0.tar.gz
+_eclasses_=cmake	b22e256fd899c7e0c747e8834eff121a	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a1882e53d338d8ad51fc4050ad44f82b
diff --git a/metadata/md5-cache/dev-util/glslang-8.13.3743-r1 b/metadata/md5-cache/dev-util/glslang-8.13.3743-r1
deleted file mode 100644
index cee58ee..0000000
--- a/metadata/md5-cache/dev-util/glslang-8.13.3743-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator
-EAPI=7
-HOMEPAGE=https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
-KEYWORDS=*
-LICENSE=BSD
-RDEPEND=!<media-libs/shaderc-2020.1
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/glslang/archive/8.13.3743.tar.gz -> glslang-8.13.3743.tar.gz
-_eclasses_=cmake	b22e256fd899c7e0c747e8834eff121a	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=29906333d877482179ed53d1820fee92
diff --git a/metadata/md5-cache/dev-util/glslang-9999 b/metadata/md5-cache/dev-util/glslang-9999
deleted file mode 100644
index cf939b6..0000000
--- a/metadata/md5-cache/dev-util/glslang-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DESCRIPTION=Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator
-EAPI=7
-HOMEPAGE=https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
-LICENSE=BSD
-PROPERTIES=live
-RDEPEND=!<media-libs/shaderc-2020.1
-RESTRICT=test
-SLOT=0
-_eclasses_=cmake	b22e256fd899c7e0c747e8834eff121a	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-r3	c8f4649ab5a3c07ee2b75b12bc446f6a	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a6ab85ca8ee679ce5c9e0d1b5ffb4f1c
diff --git a/metadata/md5-cache/dev-util/lcov-1.10 b/metadata/md5-cache/dev-util/lcov-1.10
deleted file mode 100644
index af1bd8e..0000000
--- a/metadata/md5-cache/dev-util/lcov-1.10
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=A graphical front-end for GCC's coverage testing tool gcov
-EAPI=4
-HOMEPAGE=http://ltp.sourceforge.net/coverage/lcov.php
-KEYWORDS=*
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5 dev-perl/GD[png]
-SLOT=0
-SRC_URI=mirror://sourceforge/ltp/lcov-1.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b93cd9c5ab591b916509290945fbfba3
diff --git a/metadata/md5-cache/dev-util/lcov-1.15 b/metadata/md5-cache/dev-util/lcov-1.15
new file mode 100644
index 0000000..756cd85
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lcov-1.15
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst prepare
+DESCRIPTION=A graphical front-end for GCC's coverage testing tool gcov
+EAPI=7
+HOMEPAGE=http://ltp.sourceforge.net/coverage/lcov.php
+KEYWORDS=*
+LICENSE=GPL-2+
+RDEPEND=dev-lang/perl dev-perl/JSON dev-perl/PerlIO-gzip
+SLOT=0
+SRC_URI=https://github.com/linux-test-project/lcov/releases/download/v1.15/lcov-1.15.tar.gz
+_eclasses_=optfeature	f4941a15f8b66955c45f7b0e7c4ae890	prefix	e51c7882b7b721e54e684f7eb143cbfe
+_md5_=48ada93700a8e844d5ecb8caa12d4f66
diff --git a/metadata/md5-cache/dev-util/meson-0.55.3 b/metadata/md5-cache/dev-util/meson-0.55.3
deleted file mode 100644
index 9a0e38e..0000000
--- a/metadata/md5-cache/dev-util/meson-0.55.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-libs/glib:2 dev-libs/gobject-introspection dev-util/ninja dev-vcs/git sys-libs/zlib[static-libs(+)] virtual/pkgconfig )
-DESCRIPTION=Open source build system
-EAPI=7
-HOMEPAGE=https://mesonbuild.com/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=*
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/meson/meson-0.55.3.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2cc64a5042f5512d5a99597aede12e93
diff --git a/metadata/md5-cache/dev-util/meson-0.57.2 b/metadata/md5-cache/dev-util/meson-0.57.2
new file mode 100644
index 0000000..9611e82
--- /dev/null
+++ b/metadata/md5-cache/dev-util/meson-0.57.2
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-libs/glib:2 dev-libs/gobject-introspection dev-util/ninja dev-vcs/git sys-libs/zlib[static-libs(+)] virtual/pkgconfig )
+DESCRIPTION=Open source build system
+EAPI=7
+HOMEPAGE=https://mesonbuild.com/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=*
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/m/meson/meson-0.57.2.tar.gz
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3626d2939010fe5ce50bf7c891f01f60
diff --git a/metadata/md5-cache/dev-util/meson-format-array-0 b/metadata/md5-cache/dev-util/meson-format-array-0
new file mode 100644
index 0000000..28bc188
--- /dev/null
+++ b/metadata/md5-cache/dev-util/meson-format-array-0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=Format shell expressions into a meson array
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=*
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=cbafe44179145fcc2754c405f733ec49
diff --git a/metadata/md5-cache/dev-util/scons-3.0.5-r1 b/metadata/md5-cache/dev-util/scons-3.0.5-r1
index 73eec08..71ff32d 100644
--- a/metadata/md5-cache/dev-util/scons-3.0.5-r1
+++ b/metadata/md5-cache/dev-util/scons-3.0.5-r1
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/scons/scons-3.0.5.tar.gz doc? ( http://www.scons.org/doc/3.0.5/PDF/scons-user.pdf -> scons-3.0.5-user.pdf http://www.scons.org/doc/3.0.5/HTML/scons-user.html -> scons-3.0.5-user.html ) test? ( https://github.com/scons/scons/archive/3.0.5.tar.gz -> scons-3.0.5.gh.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=88545e89411e5e6b154342d74092b629
diff --git a/metadata/md5-cache/dev-util/shflags-1.0.3 b/metadata/md5-cache/dev-util/shflags-1.0.3
deleted file mode 100644
index d111444..0000000
--- a/metadata/md5-cache/dev-util/shflags-1.0.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install test
-DESCRIPTION=Command-line flags module for Unix shell scripts
-EAPI=4
-HOMEPAGE=http://code.google.com/p/shflags/
-IUSE=examples
-KEYWORDS=*
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=http://shflags.googlecode.com/files/shflags-1.0.3.tgz
-_md5_=0c4ea98fd844a21604e2960b040329a7
diff --git a/metadata/md5-cache/dev-util/shflags-1.2.3 b/metadata/md5-cache/dev-util/shflags-1.2.3
new file mode 100644
index 0000000..8de18dd
--- /dev/null
+++ b/metadata/md5-cache/dev-util/shflags-1.2.3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install test
+DESCRIPTION=Command-line flags module for Unix shell scripts
+EAPI=7
+HOMEPAGE=https://github.com/kward/shflags
+IUSE=examples
+KEYWORDS=*
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=https://github.com/kward/shflags/archive/v1.2.3.tar.gz -> shflags-1.2.3.tgz
+_md5_=f47b4514c13aea51b85071336e3c571e
diff --git a/metadata/md5-cache/dev-util/spirv-headers-1.5.4.1 b/metadata/md5-cache/dev-util/spirv-headers-1.5.4.1
new file mode 100644
index 0000000..0b9469d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/spirv-headers-1.5.4.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!<x11-drivers/opengles-headers-0.0.1-r35
+DESCRIPTION=Machine-readable files for the SPIR-V Registry
+EAPI=7
+HOMEPAGE=https://www.khronos.org/registry/spir-v/
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=!<x11-drivers/opengles-headers-0.0.1-r35
+SLOT=0
+SRC_URI=https://github.com/KhronosGroup/SPIRV-Headers/archive/f027d53ded7e230e008d37c8b47ede7cd308e19d.tar.gz -> spirv-headers-1.5.4.1.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=38deab350796987da70d2898be50593d
diff --git a/metadata/md5-cache/dev-util/spirv-tools-2020.6 b/metadata/md5-cache/dev-util/spirv-tools-2020.6
new file mode 100644
index 0000000..32fc300
--- /dev/null
+++ b/metadata/md5-cache/dev-util/spirv-tools-2020.6
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) >=dev-util/spirv-headers-1.5.4.1 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-util/spirv-headers-1.5.4.1
+DESCRIPTION=Provides an API and commands for processing SPIR-V modules
+EAPI=7
+HOMEPAGE=https://github.com/KhronosGroup/SPIRV-Tools
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/KhronosGroup/SPIRV-Tools/archive/v2020.6.tar.gz -> spirv-tools-2020.6.tar.gz
+_eclasses_=cmake	b22e256fd899c7e0c747e8834eff121a	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f191cdd53ae45c259e60f3724d5a572c
diff --git a/metadata/md5-cache/dev-util/vulkan-headers-1.1.92.0 b/metadata/md5-cache/dev-util/vulkan-headers-1.1.92.0
deleted file mode 100644
index 2492c32..0000000
--- a/metadata/md5-cache/dev-util/vulkan-headers-1.1.92.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Vulkan Header files and API registry
-EAPI=6
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Headers
-KEYWORDS=*
-LICENSE=Apache-2.0
-RDEPEND=!<=media-libs/vulkan-loader-1.1.70.0-r999
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-Headers/archive/114c3546e195819bd53a34b39f5194b2989a5b12.tar.gz -> vulkan-headers-1.1.92.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eca32500dd600c5f12aea3671c60e980
diff --git a/metadata/md5-cache/dev-util/vulkan-headers-1.2.162 b/metadata/md5-cache/dev-util/vulkan-headers-1.2.162
new file mode 100644
index 0000000..41e3cd6
--- /dev/null
+++ b/metadata/md5-cache/dev-util/vulkan-headers-1.2.162
@@ -0,0 +1,11 @@
+BDEPEND=>=dev-util/cmake-3.10.2 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Vulkan Header files and API registry
+EAPI=7
+HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Headers
+KEYWORDS=*
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.2.162.tar.gz -> vulkan-headers-1.2.162.tar.gz
+_eclasses_=cmake	b22e256fd899c7e0c747e8834eff121a	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e1bf3517025b972f9d8903fead3ff3f2
diff --git a/metadata/md5-cache/dev-util/wayland-scanner-1.19.0 b/metadata/md5-cache/dev-util/wayland-scanner-1.19.0
new file mode 100644
index 0000000..cfc8bd8
--- /dev/null
+++ b/metadata/md5-cache/dev-util/wayland-scanner-1.19.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=!<dev-libs/wayland-1.19.0 >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?]
+DESCRIPTION=wayland-scanner tool
+EAPI=7
+HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=!<dev-libs/wayland-1.19.0 >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?]
+SLOT=0
+SRC_URI=https://wayland.freedesktop.org/releases/wayland-1.19.0.tar.xz
+_eclasses_=meson	5ec14fdbc5446b8767e87e186e3b1a52	meson-multilib	485215fef459a86936e377c0eaa513a0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=71001864a4e3babb85b9425a49272dc3
diff --git a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r6 b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r6
deleted file mode 100644
index 1998f94..0000000
--- a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( virtual/pam )
-DESCRIPTION=Concurrent Versions System - source code revision control tools
-EAPI=0
-HOMEPAGE=http://www.nongnu.org/cvs/
-IUSE=crypt doc kerberos nls pam server
-KEYWORDS=*
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( virtual/pam )
-SLOT=0
-SRC_URI=mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cvs-1.12.12.tar.bz2 doc? ( mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.html.tar.bz2 mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.pdf mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.ps )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	3f746974e1cc47cabe3bd488c08cdc8e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9e0482a61b78b10b6ccc043d10a6bb16
diff --git a/metadata/md5-cache/dev-vcs/git-2.29.2 b/metadata/md5-cache/dev-vcs/git-2.29.2
deleted file mode 100644
index 1ba0189..0000000
--- a/metadata/md5-cache/dev-vcs/git-2.29.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv )
-DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
-EAPI=7
-HOMEPAGE=https://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=*
-LICENSE=GPL-2
-RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) subversion? ( perl ) webdav? ( curl )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.29.2.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.29.2.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.29.2.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	3322f14f031ddc95feccd9089c9adc59	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6c8e7357a9e70249094d68c4377a9186
diff --git a/metadata/md5-cache/dev-vcs/git-2.31.0-r1 b/metadata/md5-cache/dev-vcs/git-2.31.0-r1
new file mode 100644
index 0000000..122dea1
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-2.31.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) emacs? ( >=app-editors/emacs-23.1:* ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre2 ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv )
+DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
+EAPI=7
+HOMEPAGE=https://www.git-scm.com/
+IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=*
+LICENSE=GPL-2
+RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre2 ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL virtual/perl-libnet cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) subversion? ( perl ) webdav? ( curl )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.31.0.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.31.0.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.31.0.tar.xz )
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	3322f14f031ddc95feccd9089c9adc59	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7bb0e26547deec161aa33e758c7eed57
diff --git a/metadata/md5-cache/dev-vcs/repo-2.11 b/metadata/md5-cache/dev-vcs/repo-2.11
deleted file mode 100644
index 688c5f4..0000000
--- a/metadata/md5-cache/dev-vcs/repo-2.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Google tool for managing git, particularly multiple repos
-EAPI=7
-HOMEPAGE=https://gerrit.googlesource.com/git-repo
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=*
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !app-admin/radmind !dev-util/repo
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=nomirror
-SLOT=0
-SRC_URI=https://storage.googleapis.com/git-repo-downloads/repo-2.11
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=84aab8418f0f4c526ed8944ad111ab8a
diff --git a/metadata/md5-cache/dev-vcs/repo-2.15 b/metadata/md5-cache/dev-vcs/repo-2.15
new file mode 100644
index 0000000..7b0e31c
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/repo-2.15
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Google tool for managing git, particularly multiple repos
+EAPI=7
+HOMEPAGE=https://gerrit.googlesource.com/git-repo
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=*
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !app-admin/radmind !dev-util/repo
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://storage.googleapis.com/git-repo-downloads/repo-2.15 https://gerrit.googlesource.com/git-repo/+/511a0e54f5801a3f36c00fac478a596d83867d10/completion.bash?format=TEXT -> repo-511a0e54f5801a3f36c00fac478a596d83867d10-bash-completion.sh.base64
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=36abbbe79dc9f4b1cf231ea6aa310244
diff --git a/metadata/md5-cache/games-emulation/snes9x-1.53 b/metadata/md5-cache/games-emulation/snes9x-1.53
deleted file mode 100644
index 4d3e84b..0000000
--- a/metadata/md5-cache/games-emulation/snes9x-1.53
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext png? ( >=media-libs/libpng-1.2.43:0 ) gtk? ( >=x11-libs/gtk+-2.10:2 x11-misc/xdg-utils portaudio? ( >=media-libs/portaudio-19_pre ) joystick? ( >=media-libs/libsdl-1.2.12[joystick] ) opengl? ( virtual/opengl ) xv? ( x11-libs/libXv ) xrandr? ( x11-libs/libXrandr ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) ) x11-proto/xproto gtk? ( virtual/pkgconfig xv? ( x11-proto/videoproto ) ) nls? ( dev-util/intltool ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Super Nintendo Entertainment System (SNES) emulator
-EAPI=2
-HOMEPAGE=http://code.google.com/p/snes9x-gtk/
-IUSE=alsa debug gtk joystick multilib netplay nls opengl oss png pulseaudio portaudio +xv +xrandr zlib
-KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd
-LICENSE=HPND GPL-2+ LGPL-2.1+
-RDEPEND=x11-libs/libX11 x11-libs/libXext png? ( >=media-libs/libpng-1.2.43:0 ) gtk? ( >=x11-libs/gtk+-2.10:2 x11-misc/xdg-utils portaudio? ( >=media-libs/portaudio-19_pre ) joystick? ( >=media-libs/libsdl-1.2.12[joystick] ) opengl? ( virtual/opengl ) xv? ( x11-libs/libXv ) xrandr? ( x11-libs/libXrandr ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) )
-SLOT=0
-SRC_URI=http://snes9x-gtk.googlecode.com/files/snes9x-1.53-src.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	ec46b36a6f6fd1d0b505a33e0b74e413	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	games	dd242b42e6cf30a93dce9ab15dfea1ca	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4bebf58be38a30716bc6f010664216d2
diff --git a/metadata/md5-cache/mail-client/mailx-8.1.2.20050715-r6 b/metadata/md5-cache/mail-client/mailx-8.1.2.20050715-r6
deleted file mode 100644
index f52e2ef..0000000
--- a/metadata/md5-cache/mail-client/mailx-8.1.2.20050715-r6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=>=net-libs/liblockfile-1.03 virtual/mta mail-client/mailx-support
-DESCRIPTION=The /bin/mail program, which is used to send mail via shell scripts
-EAPI=0
-HOMEPAGE=http://www.debian.org/
-KEYWORDS=*
-LICENSE=BSD
-RDEPEND=>=net-libs/liblockfile-1.03 virtual/mta mail-client/mailx-support !mail-client/nail !net-mail/mailutils
-SLOT=0
-SRC_URI=mirror://gentoo/mailx_8.1.2-0.20050715cvs.orig.tar.gz mirror://gentoo/mailx_8.1.2-0.20050715cvs-1.diff.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=720bfcc6336b6a75b0d1c55c445d68fe
diff --git a/metadata/md5-cache/mail-client/mailx-support-20060102-r1 b/metadata/md5-cache/mail-client/mailx-support-20060102-r1
deleted file mode 100644
index 9879f80..0000000
--- a/metadata/md5-cache/mail-client/mailx-support-20060102-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Provides lockspool utility
-EAPI=0
-HOMEPAGE=http://www.openbsd.org/
-KEYWORDS=*
-LICENSE=BSD
-SLOT=0
-SRC_URI=mirror://gentoo/mailx-support-20060102.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1c2a8d531b42df55d3917b52a2df79ea
diff --git a/metadata/md5-cache/media-fonts/encodings-1.0.3 b/metadata/md5-cache/media-fonts/encodings-1.0.3
deleted file mode 100644
index 9170afd..0000000
--- a/metadata/md5-cache/media-fonts/encodings-1.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=x11-apps/mkfontscale >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
-DESCRIPTION=X.Org font encodings
-EAPI=0
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=debug
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=!<=x11-base/xorg-x11-6.9
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/font/encodings-1.0.3.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
-_md5_=e377b878c52053ad5d23762dfb7f1e0e
diff --git a/metadata/md5-cache/media-libs/freeglut-2.4.0-r3 b/metadata/md5-cache/media-libs/freeglut-2.4.0-r3
deleted file mode 100644
index 8d68f68..0000000
--- a/metadata/md5-cache/media-libs/freeglut-2.4.0-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=virtual/opengl virtual/glu !media-libs/glut >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library
-EAPI=0
-HOMEPAGE=http://freeglut.sourceforge.net/
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=virtual/opengl virtual/glu !media-libs/glut
-SLOT=0
-SRC_URI=mirror://sourceforge/freeglut/freeglut-2.4.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=515327c61951eaa5f5121dd76e549bb7
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.8.1 b/metadata/md5-cache/media-libs/harfbuzz-2.8.1
new file mode 100644
index 0000000..dfaf7b7
--- /dev/null
+++ b/metadata/md5-cache/media-libs/harfbuzz-2.8.1
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) virtual/pkgconfig doc? ( dev-util/gtk-doc ) introspection? ( dev-util/glib-utils ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) >=dev-libs/gobject-introspection-common-1.34
+DESCRIPTION=An OpenType text shaping engine
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
+IUSE=+cairo debug doc +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=Old-MIT ISC icu
+RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
+REQUIRED_USE=introspection? ( glib )
+RESTRICT=!test? ( test )
+SLOT=0/0.9.18
+SRC_URI=https://github.com/harfbuzz/harfbuzz/archive/2.8.1.tar.gz -> harfbuzz-2.8.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	meson	5ec14fdbc5446b8767e87e186e3b1a52	meson-multilib	485215fef459a86936e377c0eaa513a0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4cf1b13c4aa9a3b8496852199077dcda
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.3 b/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.3
index ae4a565..c7610b7 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.3
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.3
@@ -10,5 +10,5 @@
 RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-2.0.3.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	java-pkg-opt-2	be255db325e3af8fbf3506cf63998341	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	java-pkg-opt-2	be255db325e3af8fbf3506cf63998341	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cf95b6b8de79323305812ee1a778553f
diff --git a/metadata/md5-cache/media-libs/libsdl-1.2.15-r2 b/metadata/md5-cache/media-libs/libsdl-1.2.15-r2
deleted file mode 100644
index c38ff54..0000000
--- a/metadata/md5-cache/media-libs/libsdl-1.2.15-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=audio? ( >=media-libs/audiofile-0.1.9 ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas x11-libs/libXt x11-libs/libXext x11-libs/libX11 ) X? ( x11-libs/libXt x11-libs/libXext x11-libs/libX11 x11-libs/libXrandr ) directfb? ( >=dev-libs/DirectFB-0.9.19 ) ggi? ( >=media-libs/libggi-2.0_beta3 ) svga? ( >=media-libs/svgalib-1.4.2 ) aalib? ( media-libs/aalib ) libcaca? ( >=media-libs/libcaca-0.9-r1 ) opengl? ( virtual/opengl virtual/glu ) ppc64? ( ps3? ( sys-libs/libspe2 ) ) tslib? ( x11-libs/tslib ) pulseaudio? ( media-sound/pulseaudio ) nas? ( x11-proto/xextproto x11-proto/xproto ) X? ( x11-proto/xextproto x11-proto/xproto ) x86? ( || ( >=dev-lang/yasm-0.6.0 >=dev-lang/nasm-0.98.39-r3 ) ) >=app-portage/elt-patches-20170815
-DESCRIPTION=Simple Direct Media Layer
-EAPI=2
-HOMEPAGE=http://www.libsdl.org/
-IUSE=oss alsa nas X dga xv xinerama fbcon directfb ggi svga tslib aalib opengl libcaca +audio +video +joystick custom-cflags pulseaudio ps3 static-libs
-KEYWORDS=*
-LICENSE=LGPL-2.1
-RDEPEND=audio? ( >=media-libs/audiofile-0.1.9 ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas x11-libs/libXt x11-libs/libXext x11-libs/libX11 ) X? ( x11-libs/libXt x11-libs/libXext x11-libs/libX11 x11-libs/libXrandr ) directfb? ( >=dev-libs/DirectFB-0.9.19 ) ggi? ( >=media-libs/libggi-2.0_beta3 ) svga? ( >=media-libs/svgalib-1.4.2 ) aalib? ( media-libs/aalib ) libcaca? ( >=media-libs/libcaca-0.9-r1 ) opengl? ( virtual/opengl virtual/glu ) ppc64? ( ps3? ( sys-libs/libspe2 ) ) tslib? ( x11-libs/tslib ) pulseaudio? ( media-sound/pulseaudio )
-SLOT=0
-SRC_URI=http://www.libsdl.org/release/SDL-1.2.15.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=58d1e9dda65d5b1ba32f7f7ccc44dc8a
diff --git a/metadata/md5-cache/media-libs/openjpeg-2.3.0-r1 b/metadata/md5-cache/media-libs/openjpeg-2.3.0-r1
index c1129c2..7529622 100644
--- a/metadata/md5-cache/media-libs/openjpeg-2.3.0-r1
+++ b/metadata/md5-cache/media-libs/openjpeg-2.3.0-r1
@@ -9,5 +9,5 @@
 RDEPEND=media-libs/lcms:2 media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib
 SLOT=2/7
 SRC_URI=https://github.com/uclouvain/openjpeg/archive/v2.3.0.tar.gz -> openjpeg-2.3.0.tar.gz test? ( https://github.com/uclouvain/openjpeg-data/archive/c07f38fae1e67adc288c2d6679df5d3652017fbe.tar.gz -> openjpeg-data_20170814.tar.gz )
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=75b5379fd6979b8289ce05b749cf0d74
diff --git a/metadata/md5-cache/media-libs/qhull-2015.2 b/metadata/md5-cache/media-libs/qhull-2015.2
index bd304f8..e326d6f 100644
--- a/metadata/md5-cache/media-libs/qhull-2015.2
+++ b/metadata/md5-cache/media-libs/qhull-2015.2
@@ -8,5 +8,5 @@
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.qhull.org/download/qhull-2015-src-7.2.0.tgz -> qhull-2015.2.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9469bace8db88d350832495d2c18c3f6
diff --git a/metadata/md5-cache/media-libs/speex-1.2_rc1 b/metadata/md5-cache/media-libs/speex-1.2_rc1
deleted file mode 100644
index b728545..0000000
--- a/metadata/md5-cache/media-libs/speex-1.2_rc1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=ogg? ( media-libs/libogg ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Audio compression format designed for speech.
-EAPI=0
-HOMEPAGE=http://www.speex.org
-IUSE=ogg sse
-KEYWORDS=*
-LICENSE=BSD
-RDEPEND=ogg? ( media-libs/libogg )
-SLOT=0
-SRC_URI=http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e5a9bf7a7e9c8f459ca2cba869d987f3
diff --git a/metadata/md5-cache/media-libs/tiff-4.0.10-r4 b/metadata/md5-cache/media-libs/tiff-4.0.10-r4
deleted file mode 100644
index e84b508..0000000
--- a/metadata/md5-cache/media-libs/tiff-4.0.10-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=jbig? ( >=media-libs/jbigkit-2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) zstd? ( >=app-arch/zstd-1.3.7-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Tag Image File Format (TIFF) library
-EAPI=6
-HOMEPAGE=http://libtiff.maptools.org
-IUSE=+cxx jbig jpeg lzma static-libs test webp zlib zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
-KEYWORDS=*
-LICENSE=libtiff
-RDEPEND=jbig? ( >=media-libs/jbigkit-2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) zstd? ( >=app-arch/zstd-1.3.7-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
-REQUIRED_USE=test? ( jpeg )
-SLOT=0
-SRC_URI=https://download.osgeo.org/libtiff/tiff-4.0.10.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=53f363e828b37e3381b9aaba343a4ded
diff --git a/metadata/md5-cache/media-libs/tiff-4.2.0 b/metadata/md5-cache/media-libs/tiff-4.2.0
new file mode 100644
index 0000000..cc885c5
--- /dev/null
+++ b/metadata/md5-cache/media-libs/tiff-4.2.0
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=jbig? ( >=media-libs/jbigkit-2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) zstd? ( >=app-arch/zstd-1.3.7-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Tag Image File Format (TIFF) library
+EAPI=7
+HOMEPAGE=http://libtiff.maptools.org
+IUSE=+cxx jbig jpeg lzma static-libs test webp zlib zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=libtiff
+RDEPEND=jbig? ( >=media-libs/jbigkit-2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) zstd? ( >=app-arch/zstd-1.3.7-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
+REQUIRED_USE=test? ( jpeg )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.osgeo.org/libtiff/tiff-4.2.0.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4281a90d6b0e413ea4dd299f1f826a4a
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.8.1_pre1-r1 b/metadata/md5-cache/net-analyzer/net-snmp-5.8.1_pre1-r1
index a34fd9b..0fc0632 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.8.1_pre1-r1
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.8.1_pre1-r1
@@ -12,5 +12,5 @@
 RESTRICT=test
 SLOT=0/35
 SRC_URI=mirror://sourceforge/project/net-snmp/net-snmp/5.8.1-pre-releases/net-snmp-5.8.1.pre1.tar.gz https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=044769b074dc9e3c9821d50ddda520ef
diff --git a/metadata/md5-cache/net-analyzer/speedtest-cli-2.0.0 b/metadata/md5-cache/net-analyzer/speedtest-cli-2.0.0
index 52c85ac..4bbbc11 100644
--- a/metadata/md5-cache/net-analyzer/speedtest-cli-2.0.0
+++ b/metadata/md5-cache/net-analyzer/speedtest-cli-2.0.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/sivel/speedtest-cli/archive/v2.0.0.tar.gz -> speedtest-cli-2.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8829781389300d7403f809f110059bad
diff --git a/metadata/md5-cache/net-dns/libidn2-2.0.4-r1 b/metadata/md5-cache/net-dns/libidn2-2.0.4-r1
deleted file mode 100644
index 7f920d1..0000000
--- a/metadata/md5-cache/net-dns/libidn2-2.0.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libunistring[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] dev-lang/perl sys-apps/help2man
-DESCRIPTION=An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/jas/libidn2
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
-KEYWORDS=*
-LICENSE=GPL-2+ LGPL-3+
-RDEPEND=dev-libs/libunistring[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?]
-SLOT=0
-SRC_URI=mirror://gnu/libidn/libidn2-2.0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=75fb2722cca726e4f6d35e3b3e9e550c
diff --git a/metadata/md5-cache/net-dns/libidn2-2.3.0 b/metadata/md5-cache/net-dns/libidn2-2.3.0
new file mode 100644
index 0000000..5599e44
--- /dev/null
+++ b/metadata/md5-cache/net-dns/libidn2-2.3.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-lang/perl sys-apps/help2man
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libunistring[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?]
+DESCRIPTION=An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=GPL-2+ LGPL-3+
+RDEPEND=dev-libs/libunistring[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?]
+SLOT=0
+SRC_URI=mirror://gnu/libidn/libidn2-2.3.0.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=50e925973a07b98004ac5eac57e2b655
diff --git a/metadata/md5-cache/net-firewall/ebtables-2.0.11-r2 b/metadata/md5-cache/net-firewall/ebtables-2.0.11-r2
deleted file mode 100644
index fbda2f3..0000000
--- a/metadata/md5-cache/net-firewall/ebtables-2.0.11-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-eselect/eselect-iptables-20200508 >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install postinst prepare prerm setup
-DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Controls Ethernet frame filtering on a Linux bridge, MAC NAT and brouting
-EAPI=7
-HOMEPAGE=http://ebtables.sourceforge.net/
-IUSE=+perl static
-KEYWORDS=*
-LICENSE=GPL-2
-RDEPEND=>=app-eselect/eselect-iptables-20200508 perl? ( dev-lang/perl ) net-misc/ethertypes
-SLOT=0
-SRC_URI=ftp://ftp.netfilter.org/pub/ebtables/ebtables-2.0.11.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=da0a0e77269e7420e7ccd340a5c5ba83
diff --git a/metadata/md5-cache/net-firewall/ebtables-2.0.11-r3 b/metadata/md5-cache/net-firewall/ebtables-2.0.11-r3
index c6b95d1..065fb39 100644
--- a/metadata/md5-cache/net-firewall/ebtables-2.0.11-r3
+++ b/metadata/md5-cache/net-firewall/ebtables-2.0.11-r3
@@ -3,12 +3,12 @@
 DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Controls Ethernet frame filtering on a Linux bridge, MAC NAT and brouting
 EAPI=7
-HOMEPAGE=http://ebtables.sourceforge.net/
+HOMEPAGE=https://ebtables.netfilter.org/
 IUSE=+perl static
 KEYWORDS=*
 LICENSE=GPL-2
 RDEPEND=>=app-eselect/eselect-iptables-20200508 perl? ( dev-lang/perl ) net-misc/ethertypes
 SLOT=0
-SRC_URI=ftp://ftp.netfilter.org/pub/ebtables/ebtables-2.0.11.tar.gz
+SRC_URI=http://ftp.netfilter.org/pub/ebtables/ebtables-2.0.11.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1c5e7043cd8e8bc4890d0c9d4926fe58
+_md5_=c0c06bd214991bf05b2e09a690c63704
diff --git a/metadata/md5-cache/net-fs/autofs-5.1.4 b/metadata/md5-cache/net-fs/autofs-5.1.4
index 4b76099..6a3cf02 100644
--- a/metadata/md5-cache/net-fs/autofs-5.1.4
+++ b/metadata/md5-cache/net-fs/autofs-5.1.4
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install postinst prepare setup
+DEFINED_PHASES=compile configure install postinst prepare setup
 DEPEND=>=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) libtirpc? ( net-libs/libtirpc ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) sys-devel/flex virtual/yacc libtirpc? ( net-libs/rpcsvc-proto ) virtual/pkgconfig
 DESCRIPTION=Kernel based automounter
 EAPI=6
@@ -11,4 +11,4 @@
 SLOT=0
 SRC_URI=mirror://kernel/linux/daemons/autofs/v5/autofs-5.1.4.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	327865b9921771330775d971263dc234	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=89a70959daa13024d2e60cd54a9e66e8
+_md5_=c6631c3039e8dd6479b7d6dc53d4f699
diff --git a/metadata/md5-cache/net-fs/autofs-5.1.4-r1 b/metadata/md5-cache/net-fs/autofs-5.1.4-r1
new file mode 100644
index 0000000..6a3cf02
--- /dev/null
+++ b/metadata/md5-cache/net-fs/autofs-5.1.4-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) libtirpc? ( net-libs/libtirpc ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) sys-devel/flex virtual/yacc libtirpc? ( net-libs/rpcsvc-proto ) virtual/pkgconfig
+DESCRIPTION=Kernel based automounter
+EAPI=6
+HOMEPAGE=http://www.linux-consulting.com/Amd_AutoFS/autofs.html
+IUSE=-dmalloc ldap +libtirpc mount-locking sasl kernel_linux
+KEYWORDS=*
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) libtirpc? ( net-libs/libtirpc ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
+REQUIRED_USE=sasl? ( ldap )
+SLOT=0
+SRC_URI=mirror://kernel/linux/daemons/autofs/v5/autofs-5.1.4.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	327865b9921771330775d971263dc234	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c6631c3039e8dd6479b7d6dc53d4f699
diff --git a/metadata/md5-cache/net-fs/cifs-utils-6.11 b/metadata/md5-cache/net-fs/cifs-utils-6.11-r1
similarity index 100%
rename from metadata/md5-cache/net-fs/cifs-utils-6.11
rename to metadata/md5-cache/net-fs/cifs-utils-6.11-r1
diff --git a/metadata/md5-cache/net-libs/gnutls-3.6.15 b/metadata/md5-cache/net-libs/gnutls-3.6.15
deleted file mode 100644
index 3740a8a..0000000
--- a/metadata/md5-cache/net-libs/gnutls-3.6.15
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=virtual/pkgconfig-0-r1 doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) tools? ( sys-devel/autogen ) valgrind? ( dev-util/valgrind ) test-full? ( app-crypt/dieharder >=app-misc/datefudge-1.22 dev-libs/softhsm:2[-bindist] net-dialup/ppp net-misc/socat ) >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/libtasn1-4.9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=dev-libs/nettle-3.4.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=dev-libs/gmp-5.1.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] tools? ( sys-devel/autogen:= ) dane? ( >=net-dns/unbound-1.4.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) guile? ( >=dev-scheme/guile-2:=[networking] ) nls? ( >=virtual/libintl-0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) test? ( seccomp? ( sys-libs/libseccomp ) )
-DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
-EAPI=7
-HOMEPAGE=http://www.gnutls.org/
-IUSE=+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
-KEYWORDS=*
-LICENSE=GPL-3 LGPL-2.1+
-RDEPEND=>=dev-libs/libtasn1-4.9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=dev-libs/nettle-3.4.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=dev-libs/gmp-5.1.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] tools? ( sys-devel/autogen:= ) dane? ( >=net-dns/unbound-1.4.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) guile? ( >=dev-scheme/guile-2:=[networking] ) nls? ( >=virtual/libintl-0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
-REQUIRED_USE=test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )
-RESTRICT=!test? ( test )
-SLOT=0/30
-SRC_URI=mirror://gnupg/gnutls/v3.6/gnutls-3.6.15.tar.xz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=23c9717eabb35e3ca5ee911688fb8b57
diff --git a/metadata/md5-cache/net-libs/gnutls-3.7.1 b/metadata/md5-cache/net-libs/gnutls-3.7.1
new file mode 100644
index 0000000..fb1fc8f
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gnutls-3.7.1
@@ -0,0 +1,16 @@
+BDEPEND=>=virtual/pkgconfig-0-r1 doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) tools? ( sys-devel/autogen ) valgrind? ( dev-util/valgrind ) test-full? ( app-crypt/dieharder >=app-misc/datefudge-1.22 dev-libs/softhsm:2[-bindist] net-dialup/ppp net-misc/socat ) >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/libtasn1-4.9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=dev-libs/nettle-3.6:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=dev-libs/gmp-5.1.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] tools? ( sys-devel/autogen:= ) dane? ( >=net-dns/unbound-1.4.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) guile? ( >=dev-scheme/guile-2:=[networking] ) nls? ( >=virtual/libintl-0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) test? ( seccomp? ( sys-libs/libseccomp ) )
+DESCRIPTION=A secure communications library implementing the SSL, TLS and DTLS protocols
+EAPI=7
+HOMEPAGE=https://www.gnutls.org/
+IUSE=+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=GPL-3 LGPL-2.1+
+RDEPEND=>=dev-libs/libtasn1-4.9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=dev-libs/nettle-3.6:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=dev-libs/gmp-5.1.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] tools? ( sys-devel/autogen:= ) dane? ( >=net-dns/unbound-1.4.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) guile? ( >=dev-scheme/guile-2:=[networking] ) nls? ( >=virtual/libintl-0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
+REQUIRED_USE=test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )
+RESTRICT=!test? ( test )
+SLOT=0/30
+SRC_URI=mirror://gnupg/gnutls/v3.7/gnutls-3.7.1.tar.xz
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b5bfe27ec8608693ab3688164f333827
diff --git a/metadata/md5-cache/net-libs/libnfsidmap-0.24 b/metadata/md5-cache/net-libs/libnfsidmap-0.24
deleted file mode 100644
index bff34fa..0000000
--- a/metadata/md5-cache/net-libs/libnfsidmap-0.24
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=ldap? ( net-nds/openldap ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=NFSv4 ID <-> name mapping library
-EAPI=2
-HOMEPAGE=http://www.citi.umich.edu/projects/nfsv4/linux/
-IUSE=ldap static-libs
-KEYWORDS=*
-LICENSE=BSD
-RDEPEND=ldap? ( net-nds/openldap ) !<net-fs/nfs-utils-1.2.2 !net-fs/idmapd
-SLOT=0
-SRC_URI=http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidmap-0.24.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bbd6c3b6b19449bfaa6fec01327e845a
diff --git a/metadata/md5-cache/net-libs/libproxy-0.4.13-r2 b/metadata/md5-cache/net-libs/libproxy-0.4.13-r2
index 1aaeb4a..9de66de 100644
--- a/metadata/md5-cache/net-libs/libproxy-0.4.13-r2
+++ b/metadata/md5-cache/net-libs/libproxy-0.4.13-r2
@@ -11,5 +11,5 @@
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=https://github.com/libproxy/libproxy/archive/0.4.13.tar.gz -> libproxy-0.4.13.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c12d2e85416ae33f76c76989c9e149ad
diff --git a/metadata/md5-cache/net-libs/libslirp-4.3.1-r1 b/metadata/md5-cache/net-libs/libslirp-4.3.1-r1
new file mode 100644
index 0000000..70793a2
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libslirp-4.3.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/glib:=
+DESCRIPTION=A general purpose TCP-IP emulator used by virtual machine hypervisors to provide virtual networking services.
+EAPI=7
+HOMEPAGE=https://gitlab.freedesktop.org/slirp/libslirp
+IUSE=static-libs
+KEYWORDS=*
+LICENSE=BSD
+RDEPEND=dev-libs/glib:=
+SLOT=0
+SRC_URI=https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v4.3.1/libslirp-v4.3.1.tar.gz -> libslirp-4.3.1.tar.gz
+_eclasses_=meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=29a8dbe61500254ea094a15abdc3d389
diff --git a/metadata/md5-cache/net-libs/libvncserver-0.9.13 b/metadata/md5-cache/net-libs/libvncserver-0.9.13
index c1c401e..f02ebd0 100644
--- a/metadata/md5-cache/net-libs/libvncserver-0.9.13
+++ b/metadata/md5-cache/net-libs/libvncserver-0.9.13
@@ -11,5 +11,5 @@
 REQUIRED_USE=filetransfer? ( threads ) jpeg? ( zlib ) png? ( zlib ) ssl? ( !gnutls? ( threads ) )
 SLOT=0
 SRC_URI=https://github.com/LibVNC/libvncserver/archive/LibVNCServer-0.9.13.tar.gz
-_eclasses_=cmake	b22e256fd899c7e0c747e8834eff121a	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	b22e256fd899c7e0c747e8834eff121a	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a5954d27f7bafb09893ff8325fa64303
diff --git a/metadata/md5-cache/net-misc/curl-7.74.0-r2 b/metadata/md5-cache/net-misc/curl-7.74.0-r2
deleted file mode 100644
index c69c4f7..0000000
--- a/metadata/md5-cache/net-misc/curl-7.74.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] app-misc/ca-certificates ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) libressl? ( dev-libs/libressl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) ) nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A Client that groks URLs
-EAPI=7
-HOMEPAGE=https://curl.haxx.se/
-IUSE=adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap libressl mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads winssl zstd curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl nghttp3 quiche elibc_Winnt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
-KEYWORDS=*
-LICENSE=curl
-RDEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] app-misc/ca-certificates ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) libressl? ( dev-libs/libressl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) ) nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
-REQUIRED_USE=winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://curl.haxx.se/download/curl-7.74.0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f48740584d4550d4907e40a0300878be
diff --git a/metadata/md5-cache/net-misc/curl-7.77.0 b/metadata/md5-cache/net-misc/curl-7.77.0
new file mode 100644
index 0000000..187b954
--- /dev/null
+++ b/metadata/md5-cache/net-misc/curl-7.77.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] app-misc/ca-certificates ) openssl? ( dev-libs/openssl:0=[sslv3=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A Client that groks URLs
+EAPI=7
+HOMEPAGE=https://curl.haxx.se/
+IUSE=adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl nghttp3 quiche elibc_Winnt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=curl
+RDEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] app-misc/ca-certificates ) openssl? ( dev-libs/openssl:0=[sslv3=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
+REQUIRED_USE=winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://curl.haxx.se/download/curl-7.77.0.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9b6afb2e67a1556fdd9dc76622f534ac
diff --git a/metadata/md5-cache/net-misc/gsutil-4.47 b/metadata/md5-cache/net-misc/gsutil-4.47
deleted file mode 100644
index 57bf045..0000000
--- a/metadata/md5-cache/net-misc/gsutil-4.47
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/argcomplete-1.9.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/boto-2.49.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/crcmod-1.7[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/fasteners-0.14.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/gcs-oauth2-boto-plugin-2.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/google-apitools-0.5.30[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/google-reauth-python-0.1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/httplib2-0.11.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/mock-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/monotonic-1.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/oauth2client-4.1.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/retry-decorator-1.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/six-1.12.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/PySocks-1.01[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=command line tool for interacting with cloud storage services
-EAPI=7
-HOMEPAGE=https://github.com/GoogleCloudPlatform/gsutil
-IUSE=test python_targets_python3_6
-KEYWORDS=*
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/argcomplete-1.9.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/boto-2.49.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/crcmod-1.7[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/fasteners-0.14.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/gcs-oauth2-boto-plugin-2.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/google-apitools-0.5.30[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/google-reauth-python-0.1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/httplib2-0.11.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/mock-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/monotonic-1.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/oauth2client-4.1.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/retry-decorator-1.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/six-1.12.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/PySocks-1.01[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://commondatastorage.googleapis.com/pub/gsutil_4.47.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=dc593885c05f6a65b5a14b686d081c00
diff --git a/metadata/md5-cache/net-misc/gsutil-4.60 b/metadata/md5-cache/net-misc/gsutil-4.60
new file mode 100644
index 0000000..7b649c9
--- /dev/null
+++ b/metadata/md5-cache/net-misc/gsutil-4.60
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/argcomplete-1.9.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/boto-2.49.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/crcmod-1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/fasteners-0.14.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/gcs-oauth2-boto-plugin-2.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/google-apitools-0.5.30[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/google-reauth-python-0.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/httplib2-0.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/mock-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/monotonic-1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.13[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/retry-decorator-1.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=command line tool for interacting with cloud storage services
+EAPI=7
+HOMEPAGE=https://github.com/GoogleCloudPlatform/gsutil
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=*
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/argcomplete-1.9.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/boto-2.49.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/crcmod-1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/fasteners-0.14.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/gcs-oauth2-boto-plugin-2.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/google-apitools-0.5.30[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/google-reauth-python-0.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/httplib2-0.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/mock-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/monotonic-1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.13[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/retry-decorator-1.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test ) test
+SLOT=0
+SRC_URI=http://commondatastorage.googleapis.com/pub/gsutil_4.60.tar.gz
+_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c44129371bd1d2817258dd55b6f58990
diff --git a/metadata/md5-cache/net-misc/iputils-20171016_pre b/metadata/md5-cache/net-misc/iputils-20171016_pre
index b3648b1..28d5056 100644
--- a/metadata/md5-cache/net-misc/iputils-20171016_pre
+++ b/metadata/md5-cache/net-misc/iputils-20171016_pre
@@ -10,5 +10,5 @@
 REQUIRED_USE=ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )
 SLOT=0
 SRC_URI=https://github.com/iputils/iputils/archive/67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf.tar.gz -> iputils-20171016_pre.tar.gz https://dev.gentoo.org/~whissi/dist/iputils/iputils-manpages-20171016_pre.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	eeefea88d5fef2853d4c1e3770340302	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	4a09528c0754e152c1dbab8e9af16ea6	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f3b074f32eb8854c2202e398273f15ed
diff --git a/metadata/md5-cache/net-misc/openssh-8.5_p1 b/metadata/md5-cache/net-misc/openssh-8.5_p1
index 61da1b2..746bcf3 100644
--- a/metadata/md5-cache/net-misc/openssh-8.5_p1
+++ b/metadata/md5-cache/net-misc/openssh-8.5_p1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig sys-devel/autoconf >=app-portage/elt-patches-20170815 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst preinst prepare pretend test
-DEPEND=acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) security-key? ( >=dev-libs/libfido2-1.5.0:= ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( !libressl? ( || ( ( >=dev-libs/openssl-1.0.1:0[bindist=] <dev-libs/openssl-1.1.0:0[bindist=] ) >=dev-libs/openssl-1.1.0g:0[bindist=] ) dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) virtual/os-headers kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) static? ( audit? ( sys-process/audit[static-libs(+)] ) ldns? ( net-libs/ldns[static-libs(+)] !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:=[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) ssl? ( !libressl? ( || ( ( >=dev-libs/openssl-1.0.1:0[bindist=] <dev-libs/openssl-1.1.0:0[bindist=] ) >=dev-libs/openssl-1.1.0g:0[bindist=] ) dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) virtual/libcrypt:=[static-libs(+)] >=sys-libs/zlib-1.2.3:=[static-libs(+)] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) security-key? ( >=dev-libs/libfido2-1.5.0:= ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( !libressl? ( || ( ( >=dev-libs/openssl-1.0.1:0[bindist=] <dev-libs/openssl-1.1.0:0[bindist=] ) >=dev-libs/openssl-1.1.0g:0[bindist=] ) dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) virtual/os-headers kernel_linux? ( !prefix-guest? ( sys-kernel/linux-headers ) ) static? ( audit? ( sys-process/audit[static-libs(+)] ) ldns? ( net-libs/ldns[static-libs(+)] !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:=[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) ssl? ( !libressl? ( || ( ( >=dev-libs/openssl-1.0.1:0[bindist=] <dev-libs/openssl-1.1.0:0[bindist=] ) >=dev-libs/openssl-1.1.0g:0[bindist=] ) dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) virtual/libcrypt:=[static-libs(+)] >=sys-libs/zlib-1.2.3:=[static-libs(+)] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Port of OpenBSD's free SSH release
 EAPI=7
 HOMEPAGE=https://www.openssh.com/
@@ -13,4 +13,4 @@
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-8.5p1.tar.gz sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-8.5p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v1%208.4p1/openssh-8_4_P1-hpn-DynWinNoneSwitch-15.1.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v1%208.4p1/openssh-8_4_P1-hpn-AES-CTR-15.1.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v1%208.4p1/openssh-8_4_P1-hpn-PeakTput-15.1.diff ) X509? ( https://roumenpetrov.info/openssh/x509-13.0/openssh-8.5p1+x509-13.0.diff.gz )
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=3054ef214a6fad87270ac3351b60bb48
+_md5_=34b27dc88eea576b07b11113b4ab15ad
diff --git a/metadata/md5-cache/net-misc/rsync-3.1.3 b/metadata/md5-cache/net-misc/rsync-3.1.3
deleted file mode 100644
index 9324c3b..0000000
--- a/metadata/md5-cache/net-misc/rsync-3.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv ) static? ( acl? ( virtual/acl[static-libs(+)] ) xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) ) >=dev-libs/popt-1.5[static-libs(+)] ) virtual/pkgconfig
-DESCRIPTION=File transfer program to keep remote files into sync
-EAPI=5
-HOMEPAGE=https://rsync.samba.org/
-IUSE=acl examples iconv ipv6 static stunnel xattr
-KEYWORDS=*
-LICENSE=GPL-3
-RDEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv )
-SLOT=0
-SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ccf71233e2a0bc6523c433c144f2f70f
diff --git a/metadata/md5-cache/net-misc/rsync-3.2.3-r3 b/metadata/md5-cache/net-misc/rsync-3.2.3-r3
new file mode 100644
index 0000000..cc0986c
--- /dev/null
+++ b/metadata/md5-cache/net-misc/rsync-3.2.3-r3
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=acl? ( virtual/acl ) lz4? ( app-arch/lz4 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( dev-libs/xxhash ) zstd? ( >=app-arch/zstd-1.4 ) >=dev-libs/popt-1.5 iconv? ( virtual/libiconv )
+DESCRIPTION=File transfer program to keep remote files into sync
+EAPI=7
+HOMEPAGE=https://rsync.samba.org/
+IUSE=acl examples iconv ipv6 libressl lz4 ssl stunnel system-zlib xattr xxhash zstd
+KEYWORDS=*
+LICENSE=GPL-3
+RDEPEND=acl? ( virtual/acl ) lz4? ( app-arch/lz4 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( dev-libs/xxhash ) zstd? ( >=app-arch/zstd-1.4 ) >=dev-libs/popt-1.5 iconv? ( virtual/libiconv )
+SLOT=0
+SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.2.3.tar.gz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=14648bf8bb9ad595af6175ceb176f270
diff --git a/metadata/md5-cache/net-misc/rsync-3.2.3-r4 b/metadata/md5-cache/net-misc/rsync-3.2.3-r4
new file mode 100644
index 0000000..cc0986c
--- /dev/null
+++ b/metadata/md5-cache/net-misc/rsync-3.2.3-r4
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=acl? ( virtual/acl ) lz4? ( app-arch/lz4 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( dev-libs/xxhash ) zstd? ( >=app-arch/zstd-1.4 ) >=dev-libs/popt-1.5 iconv? ( virtual/libiconv )
+DESCRIPTION=File transfer program to keep remote files into sync
+EAPI=7
+HOMEPAGE=https://rsync.samba.org/
+IUSE=acl examples iconv ipv6 libressl lz4 ssl stunnel system-zlib xattr xxhash zstd
+KEYWORDS=*
+LICENSE=GPL-3
+RDEPEND=acl? ( virtual/acl ) lz4? ( app-arch/lz4 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( dev-libs/xxhash ) zstd? ( >=app-arch/zstd-1.4 ) >=dev-libs/popt-1.5 iconv? ( virtual/libiconv )
+SLOT=0
+SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.2.3.tar.gz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=14648bf8bb9ad595af6175ceb176f270
diff --git a/metadata/md5-cache/net-misc/vconfig-1.9 b/metadata/md5-cache/net-misc/vconfig-1.9
deleted file mode 100644
index 39c2f2b..0000000
--- a/metadata/md5-cache/net-misc/vconfig-1.9
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DESCRIPTION=802.1Q vlan control utility
-EAPI=0
-HOMEPAGE=http://www.candelatech.com/~greear/vlan.html
-IUSE=static
-KEYWORDS=*
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.candelatech.com/~greear/vlan/vlan.1.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=876edb9cafc61159d665afec124210dc
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.50 b/metadata/md5-cache/net-nds/openldap-2.4.50
deleted file mode 100644
index d747b49..0000000
--- a/metadata/md5-cache/net-nds/openldap-2.4.50
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.18:= tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) perl? ( dev-lang/perl:=[-build(-)] ) samba? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) berkdb? ( <sys-libs/db-6.0:= || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 ) ) smbkrb5passwd? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) ) cxx? ( dev-libs/cyrus-sasl:= ) ) sys-apps/groff !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl ) sys-apps/baselayout
-DESCRIPTION=LDAP suite of application and development tools
-EAPI=7
-HOMEPAGE=https://www.OpenLDAP.org/
-IUSE=crypt samba tcpd experimental minimal +berkdb overlays perl gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux static-libs test smbkrb5passwd kerberos kinit pbkdf2 sha2 -cxx abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 ssl
-KEYWORDS=*
-LICENSE=OPENLDAP GPL-2
-RDEPEND=ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.18:= tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) perl? ( dev-lang/perl:=[-build(-)] ) samba? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) berkdb? ( <sys-libs/db-6.0:= || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 ) ) smbkrb5passwd? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) ) cxx? ( dev-libs/cyrus-sasl:= ) ) selinux? ( sec-policy/selinux-ldap ) sys-apps/baselayout
-REQUIRED_USE=cxx? ( sasl ) pbkdf2? ( ssl ) test? ( berkdb ) ?? ( test minimal )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.50.tgz http://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/openldap-2.4.50.tgz http://repository.linagora.org/OpenLDAP/openldap-release/openldap-2.4.50.tgz http://mirror.eu.oneandone.net/software/openldap/openldap-release/openldap-2.4.50.tgz mirror://gentoo/rfc2307bis.schema-20140524
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	db-use	9879c16e695a6adb640e428a40dfd26e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	031d86ef31449c1482f12ddd8aa0d4eb	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7c566af8c48023219fd63246e88d6621
-_md5_=e5638617e9a4c5c5684900d859144689
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.57 b/metadata/md5-cache/net-nds/openldap-2.4.57
new file mode 100644
index 0000000..3f75de6
--- /dev/null
+++ b/metadata/md5-cache/net-nds/openldap-2.4.57
@@ -0,0 +1,16 @@
+BDEPEND=!minimal? ( acct-group/ldap acct-user/ldap ) >=app-portage/elt-patches-20170815 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( dev-libs/libltdl sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.18:= tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) perl? ( dev-lang/perl:=[-build(-)] ) samba? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) berkdb? ( <sys-libs/db-6.0:= || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 ) ) smbkrb5passwd? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) ) cxx? ( dev-libs/cyrus-sasl:= ) ) sys-apps/groff !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl )
+DESCRIPTION=LDAP suite of application and development tools
+EAPI=7
+HOMEPAGE=https://www.OpenLDAP.org/
+IUSE=crypt samba tcpd experimental minimal +berkdb overlays perl gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux static-libs test smbkrb5passwd kerberos kinit pbkdf2 sha2 -cxx abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 ssl
+KEYWORDS=*
+LICENSE=OPENLDAP GPL-2
+RDEPEND=ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( dev-libs/libltdl sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.18:= tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) perl? ( dev-lang/perl:=[-build(-)] ) samba? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) berkdb? ( <sys-libs/db-6.0:= || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 ) ) smbkrb5passwd? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) ) cxx? ( dev-libs/cyrus-sasl:= ) ) selinux? ( sec-policy/selinux-ldap )
+REQUIRED_USE=cxx? ( sasl ) pbkdf2? ( ssl ) test? ( berkdb ) ?? ( test minimal )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.57.tgz http://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/openldap-2.4.57.tgz http://repository.linagora.org/OpenLDAP/openldap-release/openldap-2.4.57.tgz http://mirror.eu.oneandone.net/software/openldap/openldap-release/openldap-2.4.57.tgz mirror://gentoo/rfc2307bis.schema-20140524
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	db-use	9879c16e695a6adb640e428a40dfd26e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	031d86ef31449c1482f12ddd8aa0d4eb	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e9ff5283a80bff02916d47290dfd6045
diff --git a/metadata/md5-cache/net-print/foomatic-db-engine-4.0.11 b/metadata/md5-cache/net-print/foomatic-db-engine-4.0.11
index 8f3c133..6a0b1f2 100644
--- a/metadata/md5-cache/net-print/foomatic-db-engine-4.0.11
+++ b/metadata/md5-cache/net-print/foomatic-db-engine-4.0.11
@@ -9,5 +9,5 @@
 RDEPEND=dev-libs/libxml2 || ( >=net-print/cups-filters-1.0.43-r1[foomatic] net-print/foomatic-filters ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/foomatic/foomatic-db-engine-4.0.11.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=f720f13aaedc408abed02fc18f9f4b64
diff --git a/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200319 b/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200319
new file mode 100644
index 0000000..42b1f15
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200319
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install postinst setup
+DESCRIPTION=Required tools for WireGuard, such as wg(8) and wg-quick(8)
+EAPI=7
+HOMEPAGE=https://www.wireguard.com/
+IUSE=+wg-quick kernel_linux
+KEYWORDS=*
+LICENSE=GPL-2
+RDEPEND=wg-quick? ( || ( net-firewall/nftables net-firewall/iptables ) net-dns/openresolv ) !<virtual/wireguard-1
+SLOT=0
+SRC_URI=https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-1.0.20200319.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	linux-info	327865b9921771330775d971263dc234	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3886e488e4f68300393a8214968fe575
diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0-r1 b/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0-r1
index d9d8506..eafd324 100644
--- a/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0-r1
+++ b/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0-r1
@@ -8,5 +8,5 @@
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://github.com/steve-m/librtlsdr/archive/0.6.0.tar.gz -> rtl-sdr-0.6.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ef8b77e8e06d22b943e34c9d3a29951c
diff --git a/metadata/md5-cache/perl-core/Archive-Tar-1.900.0-r1 b/metadata/md5-cache/perl-core/Archive-Tar-1.900.0-r1
index 5a7fc44..9914666 100644
--- a/metadata/md5-cache/perl-core/Archive-Tar-1.900.0-r1
+++ b/metadata/md5-cache/perl-core/Archive-Tar-1.900.0-r1
@@ -8,5 +8,5 @@
 RDEPEND=>=virtual/perl-IO-Zlib-1.01 virtual/perl-IO-Compress virtual/perl-Package-Constants dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Archive-Tar-1.90.tar.gz
-_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=88d037b05d4617782742e8875564b718
diff --git a/metadata/md5-cache/perl-core/Compress-Raw-Bzip2-2.60.0 b/metadata/md5-cache/perl-core/Compress-Raw-Bzip2-2.60.0
index 766311c..cc922ac 100644
--- a/metadata/md5-cache/perl-core/Compress-Raw-Bzip2-2.60.0
+++ b/metadata/md5-cache/perl-core/Compress-Raw-Bzip2-2.60.0
@@ -8,5 +8,5 @@
 RDEPEND=app-arch/bzip2 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.060.tar.gz
-_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6c55f65adb8dc8bedad130fffdef00c5
diff --git a/metadata/md5-cache/perl-core/Compress-Raw-Zlib-2.60.0 b/metadata/md5-cache/perl-core/Compress-Raw-Zlib-2.60.0
index 46a33a9..7f62f2d 100644
--- a/metadata/md5-cache/perl-core/Compress-Raw-Zlib-2.60.0
+++ b/metadata/md5-cache/perl-core/Compress-Raw-Zlib-2.60.0
@@ -8,5 +8,5 @@
 RDEPEND=>=sys-libs/zlib-1.2.5 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.060.tar.gz
-_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5f5391eea5a584991d9f8abc7ff0b53b
diff --git a/metadata/md5-cache/perl-core/Digest-SHA-5.820.0 b/metadata/md5-cache/perl-core/Digest-SHA-5.820.0
index c45ec92..7da2999 100644
--- a/metadata/md5-cache/perl-core/Digest-SHA-5.820.0
+++ b/metadata/md5-cache/perl-core/Digest-SHA-5.820.0
@@ -8,5 +8,5 @@
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSHELOR/Digest-SHA-5.82.tar.gz
-_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7b4695b4950ca49d50a364a792d8ce98
diff --git a/metadata/md5-cache/perl-core/ExtUtils-CBuilder-0.280.205-r1 b/metadata/md5-cache/perl-core/ExtUtils-CBuilder-0.280.205-r1
index b992424..cffc287 100644
--- a/metadata/md5-cache/perl-core/ExtUtils-CBuilder-0.280.205-r1
+++ b/metadata/md5-cache/perl-core/ExtUtils-CBuilder-0.280.205-r1
@@ -8,5 +8,5 @@
 RDEPEND=virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IPC-Cmd virtual/perl-Perl-OSType dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/ExtUtils-CBuilder-0.280205.tar.gz
-_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f97207f43fd576f091cf74a7dc9b3a21
diff --git a/metadata/md5-cache/perl-core/ExtUtils-ParseXS-3.180.0-r1 b/metadata/md5-cache/perl-core/ExtUtils-ParseXS-3.180.0-r1
index 6a73776..cf7c782 100644
--- a/metadata/md5-cache/perl-core/ExtUtils-ParseXS-3.180.0-r1
+++ b/metadata/md5-cache/perl-core/ExtUtils-ParseXS-3.180.0-r1
@@ -8,5 +8,5 @@
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-ParseXS-3.18.tar.gz
-_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2d8d770ba2b088301136b90edb8daf34
diff --git a/metadata/md5-cache/perl-core/File-Path-2.130.0 b/metadata/md5-cache/perl-core/File-Path-2.130.0
index 83123fa..63f93d1 100644
--- a/metadata/md5-cache/perl-core/File-Path-2.130.0
+++ b/metadata/md5-cache/perl-core/File-Path-2.130.0
@@ -8,5 +8,5 @@
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JK/JKEENAN/File-Path-2.13.tar.gz
-_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=973906e031eedf714746bc19eb92e2ca
diff --git a/metadata/md5-cache/perl-core/File-Spec-3.400.0 b/metadata/md5-cache/perl-core/File-Spec-3.400.0
index bd75036..e321fbb 100644
--- a/metadata/md5-cache/perl-core/File-Spec-3.400.0
+++ b/metadata/md5-cache/perl-core/File-Spec-3.400.0
@@ -8,5 +8,5 @@
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/PathTools-3.40.tar.gz
-_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b42daf1ae402506f35d46d0b9d55bb42
diff --git a/metadata/md5-cache/perl-core/File-Temp-0.230.400-r1 b/metadata/md5-cache/perl-core/File-Temp-0.230.400-r1
index aa65206..1d4fca5 100644
--- a/metadata/md5-cache/perl-core/File-Temp-0.230.400-r1
+++ b/metadata/md5-cache/perl-core/File-Temp-0.230.400-r1
@@ -8,5 +8,5 @@
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/File-Temp-0.2304.tar.gz
-_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=26a0b21e75ee00c500e9d575d1eccd8d
diff --git a/metadata/md5-cache/perl-core/IO-Compress-2.60.0 b/metadata/md5-cache/perl-core/IO-Compress-2.60.0
index b048a3a..993eadc 100644
--- a/metadata/md5-cache/perl-core/IO-Compress-2.60.0
+++ b/metadata/md5-cache/perl-core/IO-Compress-2.60.0
@@ -8,5 +8,5 @@
 RDEPEND=virtual/perl-Scalar-List-Utils >=virtual/perl-Compress-Raw-Zlib-2.60.0 >=virtual/perl-Compress-Raw-Bzip2-2.60.0 !perl-core/Compress-Zlib !perl-core/IO-Compress-Zlib !perl-core/IO-Compress-Bzip2 !perl-core/IO-Compress-Base dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.060.tar.gz
-_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=33c07f7614afee65532f432850c82b77
diff --git a/metadata/md5-cache/perl-core/IO-Zlib-1.100.0 b/metadata/md5-cache/perl-core/IO-Zlib-1.100.0
index 4d34ff2..39ee0c7 100644
--- a/metadata/md5-cache/perl-core/IO-Zlib-1.100.0
+++ b/metadata/md5-cache/perl-core/IO-Zlib-1.100.0
@@ -8,5 +8,5 @@
 RDEPEND=virtual/perl-IO-Compress dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOMHUGHES/IO-Zlib-1.10.tar.gz
-_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=11ba1c0b12fea2795a56e3be06b63ef1
diff --git a/metadata/md5-cache/perl-core/Module-Build-0.400.300-r1 b/metadata/md5-cache/perl-core/Module-Build-0.400.300-r1
index ab0d75b..6467d62 100644
--- a/metadata/md5-cache/perl-core/Module-Build-0.400.300-r1
+++ b/metadata/md5-cache/perl-core/Module-Build-0.400.300-r1
@@ -9,5 +9,5 @@
 RDEPEND=>=virtual/perl-CPAN-Meta-2.110.420 >=virtual/perl-CPAN-Meta-YAML-0.3.0 >=virtual/perl-Parse-CPAN-Meta-1.440.100 >=virtual/perl-Module-Metadata-1.0.2 >=virtual/perl-Perl-OSType-1 >=virtual/perl-ExtUtils-CBuilder-0.27 >=virtual/perl-ExtUtils-ParseXS-2.22.05 >=virtual/perl-Archive-Tar-1.09 >=virtual/perl-Test-Harness-3.16 >=virtual/perl-version-0.87 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4003.tar.gz
-_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8eb1b68115d59ba2104e1e89261851db
diff --git a/metadata/md5-cache/perl-core/Package-Constants-0.20.0-r1 b/metadata/md5-cache/perl-core/Package-Constants-0.20.0-r1
index 5c0c340..67965ae 100644
--- a/metadata/md5-cache/perl-core/Package-Constants-0.20.0-r1
+++ b/metadata/md5-cache/perl-core/Package-Constants-0.20.0-r1
@@ -8,5 +8,5 @@
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KANE/Package-Constants-0.02.tar.gz
-_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=99eae349815ef1855c54b3965389ef6f
diff --git a/metadata/md5-cache/perl-core/Scalar-List-Utils-1.270.0 b/metadata/md5-cache/perl-core/Scalar-List-Utils-1.270.0
index ea593c7..9cf70a6 100644
--- a/metadata/md5-cache/perl-core/Scalar-List-Utils-1.270.0
+++ b/metadata/md5-cache/perl-core/Scalar-List-Utils-1.270.0
@@ -8,5 +8,5 @@
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.27.tar.gz
-_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0bf6ca037b14fe18d5a978c252a778c0
diff --git a/metadata/md5-cache/perl-core/Storable-2.390.0-r1 b/metadata/md5-cache/perl-core/Storable-2.390.0-r1
index 3be6b48..0e1f8c6 100644
--- a/metadata/md5-cache/perl-core/Storable-2.390.0-r1
+++ b/metadata/md5-cache/perl-core/Storable-2.390.0-r1
@@ -8,5 +8,5 @@
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AM/AMS/Storable-2.39.tar.gz
-_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f80100571cca1749d24910a496730052
diff --git a/metadata/md5-cache/perl-core/Sys-Syslog-0.320.0-r1 b/metadata/md5-cache/perl-core/Sys-Syslog-0.320.0-r1
index 988746c..5f6c11b 100644
--- a/metadata/md5-cache/perl-core/Sys-Syslog-0.320.0-r1
+++ b/metadata/md5-cache/perl-core/Sys-Syslog-0.320.0-r1
@@ -8,5 +8,5 @@
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SAPER/Sys-Syslog-0.32.tar.gz
-_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9ed860a765a4790f3dc3341229ba69e5
diff --git a/metadata/md5-cache/perl-core/Term-ANSIColor-4.20.0 b/metadata/md5-cache/perl-core/Term-ANSIColor-4.20.0
index b020bfd..f63989b 100644
--- a/metadata/md5-cache/perl-core/Term-ANSIColor-4.20.0
+++ b/metadata/md5-cache/perl-core/Term-ANSIColor-4.20.0
@@ -8,5 +8,5 @@
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RR/RRA/Term-ANSIColor-4.02.tar.gz
-_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e06a1d59b9b7c253d7a530d6180354bb
diff --git a/metadata/md5-cache/perl-core/Test-Harness-3.260.0 b/metadata/md5-cache/perl-core/Test-Harness-3.260.0
index 5cbba89..caa2922 100644
--- a/metadata/md5-cache/perl-core/Test-Harness-3.260.0
+++ b/metadata/md5-cache/perl-core/Test-Harness-3.260.0
@@ -8,5 +8,5 @@
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OV/OVID/Test-Harness-3.26.tar.gz
-_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=552325c31a797888fb4090c5e6bccf93
diff --git a/metadata/md5-cache/perl-core/Test-Simple-0.980.0-r1 b/metadata/md5-cache/perl-core/Test-Simple-0.980.0-r1
index b8bdf33..7b4ea91 100644
--- a/metadata/md5-cache/perl-core/Test-Simple-0.980.0-r1
+++ b/metadata/md5-cache/perl-core/Test-Simple-0.980.0-r1
@@ -8,5 +8,5 @@
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWERN/Test-Simple-0.98.tar.gz
-_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	eb864f6e50a20036e4cd47c8fd8f64d1	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d62f666f2d50c950d9ec5b11ad73d5d8
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r5 b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r5
index e1df903..803e3a4 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r5
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r5
@@ -10,5 +10,5 @@
 REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) python? ( || ( python_targets_python2_7 ) ) qt5? ( cxx )
 SLOT=0/23
 SRC_URI=mirror://nongnu/gpsd/gpsd-3.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	scons-utils	988e24b9e2e4642189b4e97c03e5ae71	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	user	7c566af8c48023219fd63246e88d6621	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	scons-utils	988e24b9e2e4642189b4e97c03e5ae71	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	user	7c566af8c48023219fd63246e88d6621	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d011d6867d67d2a99ab22e37a30e2afe
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-4.6.3 b/metadata/md5-cache/sci-visualization/gnuplot-4.6.3
deleted file mode 100644
index 2a6be9a..0000000
--- a/metadata/md5-cache/sci-visualization/gnuplot-4.6.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) emacs? ( virtual/emacs ) !emacs? ( xemacs? ( app-editors/xemacs app-xemacs/xemacs-base ) ) gd? ( >=media-libs/gd-2.0.35-r3[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) lua? ( dev-lang/lua ) plotutils? ( media-libs/plotutils ) qt4? ( >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 >=dev-qt/qtsvg-4.5:4 ) readline? ( sys-libs/readline ) svga? ( media-libs/svgalib ) wxwidgets? ( x11-libs/wxGTK:2.8[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:2 ) X? ( x11-libs/libXaw ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-latexextra app-text/ghostscript-gpl ) !emacs? ( xemacs? ( app-xemacs/texinfo ) )
-DESCRIPTION=Command-line driven interactive plotting program
-EAPI=5
-HOMEPAGE=http://www.gnuplot.info/
-IUSE=aqua bitmap cairo doc emacs examples +gd ggi latex lua plotutils qt4 readline svga thin-splines wxwidgets X xemacs
-KEYWORDS=*
-LICENSE=gnuplot GPL-2 bitmap? ( free-noncomm )
-RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) emacs? ( virtual/emacs ) !emacs? ( xemacs? ( app-editors/xemacs app-xemacs/xemacs-base ) ) gd? ( >=media-libs/gd-2.0.35-r3[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) lua? ( dev-lang/lua ) plotutils? ( media-libs/plotutils ) qt4? ( >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 >=dev-qt/qtsvg-4.5:4 ) readline? ( sys-libs/readline ) svga? ( media-libs/svgalib ) wxwidgets? ( x11-libs/wxGTK:2.8[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:2 ) X? ( x11-libs/libXaw )
-SLOT=0
-SRC_URI=mirror://sourceforge/gnuplot/gnuplot-4.6.3.tar.gz mirror://gentoo/gnuplot.info-4.6.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	3322f14f031ddc95feccd9089c9adc59	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89
-_md5_=dead1727a3d88c46da3b19bd15ad28e0
diff --git a/metadata/md5-cache/sys-apps/busybox-1.29.3 b/metadata/md5-cache/sys-apps/busybox-1.29.3
deleted file mode 100644
index 12e81ae..0000000
--- a/metadata/md5-cache/sys-apps/busybox-1.29.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare
-DEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) >=sys-kernel/linux-headers-2.6.39
-DESCRIPTION=Utilities for rescue and embedded systems
-EAPI=6
-HOMEPAGE=https://www.busybox.net/
-IUSE=debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd savedconfig
-KEYWORDS=*
-LICENSE=GPL-2
-RDEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) mdev? ( !<sys-apps/openrc-0.13 )
-REQUIRED_USE=pam? ( !static )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.busybox.net/downloads/busybox-1.29.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	536c5e70c5fb252ed3b769e04aa3f05b	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b8ac21506cdac0ee985c354895e1f1f8
diff --git a/metadata/md5-cache/sys-apps/busybox-1.32.1 b/metadata/md5-cache/sys-apps/busybox-1.32.1
new file mode 100644
index 0000000..f1f32a0
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/busybox-1.32.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare
+DEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) virtual/libcrypt:= static? ( virtual/libcrypt[static-libs] selinux? ( sys-libs/libselinux[static-libs(+)] ) ) >=sys-kernel/linux-headers-2.6.39
+DESCRIPTION=Utilities for rescue and embedded systems
+EAPI=7
+HOMEPAGE=https://www.busybox.net/
+IUSE=debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd savedconfig
+KEYWORDS=*
+LICENSE=GPL-2
+RDEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) virtual/libcrypt:= mdev? ( !<sys-apps/openrc-0.13 )
+REQUIRED_USE=pam? ( !static )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.busybox.net/downloads/busybox-1.32.1.tar.bz2
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3e1acde188c933bf08b8f81cde93f274
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.25 b/metadata/md5-cache/sys-apps/coreutils-8.25
deleted file mode 100644
index 2ed8782..0000000
--- a/metadata/md5-cache/sys-apps/coreutils-8.25
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp ) xattr? ( !userland_BSD? ( sys-apps/attr ) ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) static? ( acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp[static-libs] ) xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) ) ) app-arch/xz-utils
-DESCRIPTION=Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)
-EAPI=4
-HOMEPAGE=https://www.gnu.org/software/coreutils/
-IUSE=acl caps gmp hostname kill multicall nls selinux static userland_BSD vanilla xattr
-KEYWORDS=*
-LICENSE=GPL-3
-RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp ) xattr? ( !userland_BSD? ( sys-apps/attr ) ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) hostname? ( !sys-apps/net-tools[hostname] ) kill? ( !sys-apps/util-linux[kill] !sys-process/procps[kill] ) !app-misc/realpath !<sys-apps/util-linux-2.13 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4
-SLOT=0
-SRC_URI=mirror://gnu/coreutils/coreutils-8.25.tar.xz mirror://gentoo/coreutils-8.25-patches-1.1.tar.xz https://dev.gentoo.org/~vapier/dist/coreutils-8.25-patches-1.1.tar.xz mirror://gentoo/coreutils-8.25-man.tar.xz https://dev.gentoo.org/~vapier/dist/coreutils-8.25-man.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a2230d165146da27a85a1268c5eedcf0
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.32-r1 b/metadata/md5-cache/sys-apps/coreutils-8.32-r1
new file mode 100644
index 0000000..0a718ab
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/coreutils-8.32-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/xz-utils test? ( dev-lang/perl dev-perl/Expect dev-util/strace || ( dev-lang/python:3.8 dev-lang/python:3.7 ) )
+DEFINED_PHASES=configure install postinst prepare setup test
+DEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( sys-apps/attr ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) static? ( acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:=[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) )
+DESCRIPTION=Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/coreutils/
+IUSE=acl caps gmp hostname kill multicall nls selinux static test vanilla xattr
+KEYWORDS=*
+LICENSE=GPL-3
+RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( sys-apps/attr ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) hostname? ( !sys-apps/net-tools[hostname] ) kill? ( !sys-apps/util-linux[kill] !sys-process/procps[kill] ) !app-misc/realpath !<sys-apps/util-linux-2.13 !<sys-apps/sandbox-2.10-r4 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnu/coreutils/coreutils-8.32.tar.xz !vanilla? ( mirror://gentoo/coreutils-8.30-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/coreutils-8.30-patches-01.tar.xz )
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f2464be06a85e7a8e3e6d7bce8f57965
diff --git a/metadata/md5-cache/sys-apps/fbset-2.1 b/metadata/md5-cache/sys-apps/fbset-2.1
deleted file mode 100644
index 4ce322d..0000000
--- a/metadata/md5-cache/sys-apps/fbset-2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=sys-devel/bison sys-devel/flex
-DESCRIPTION=A utility to set the framebuffer videomode
-EAPI=0
-HOMEPAGE=http://users.telenet.be/geertu/Linux/fbdev/
-IUSE=static
-KEYWORDS=*
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://users.telenet.be/geertu/Linux/fbdev/fbset-2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d2ffc31ed4baba683c82c6694edd573c
diff --git a/metadata/md5-cache/sys-apps/file-5.34 b/metadata/md5-cache/sys-apps/file-5.34
index 12fbc13..39a7cbc 100644
--- a/metadata/md5-cache/sys-apps/file-5.34
+++ b/metadata/md5-cache/sys-apps/file-5.34
@@ -10,5 +10,5 @@
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.34.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d22e4b8139ae17bba58d4c7cc7d7ef61
diff --git a/metadata/md5-cache/sys-apps/hdparm-9.52 b/metadata/md5-cache/sys-apps/hdparm-9.52
deleted file mode 100644
index d5aaee8..0000000
--- a/metadata/md5-cache/sys-apps/hdparm-9.52
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Utility to change hard drive performance parameters
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/hdparm/
-IUSE=static
-KEYWORDS=*
-LICENSE=BSD GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/hdparm/hdparm-9.52.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9dc2fcc20b1d0b3f5fac0a25782731a8
diff --git a/metadata/md5-cache/sys-apps/hdparm-9.58 b/metadata/md5-cache/sys-apps/hdparm-9.58
new file mode 100644
index 0000000..fc4db77
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/hdparm-9.58
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=Utility to change hard drive performance parameters
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/hdparm/
+IUSE=static
+KEYWORDS=*
+LICENSE=BSD GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/hdparm/hdparm-9.58.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1f2ea1ea220dcf0e6e0e54d43f19631f
diff --git a/metadata/md5-cache/sys-apps/i2c-tools-4.0 b/metadata/md5-cache/sys-apps/i2c-tools-4.0
index 1cfe0d3..013dc40 100644
--- a/metadata/md5-cache/sys-apps/i2c-tools-4.0
+++ b/metadata/md5-cache/sys-apps/i2c-tools-4.0
@@ -10,5 +10,5 @@
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/utils/i2c-tools/i2c-tools-4.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aa7befd76fe44d3270f8032f9fbec199
diff --git a/metadata/md5-cache/sys-apps/less-487 b/metadata/md5-cache/sys-apps/less-487
deleted file mode 100644
index ee8148a..0000000
--- a/metadata/md5-cache/sys-apps/less-487
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install preinst prepare
-DEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre )
-DESCRIPTION=Excellent text file viewer
-EAPI=5
-HOMEPAGE=http://www.greenwoodsoftware.com/less/
-IUSE=pcre unicode
-KEYWORDS=*
-LICENSE=|| ( GPL-3 BSD-2 )
-RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre )
-SLOT=0
-SRC_URI=http://www.greenwoodsoftware.com/less/less-487.tar.gz
-_md5_=eea2566b3f113eae224c92165324906b
diff --git a/metadata/md5-cache/sys-apps/less-581.2 b/metadata/md5-cache/sys-apps/less-581.2
new file mode 100644
index 0000000..609d402
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/less-581.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install preinst
+DEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre2 )
+DESCRIPTION=Excellent text file viewer
+EAPI=7
+HOMEPAGE=http://www.greenwoodsoftware.com/less/
+IUSE=pcre unicode
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~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
+LICENSE=|| ( GPL-3 BSD-2 )
+RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre2 )
+SLOT=0
+SRC_URI=http://www.greenwoodsoftware.com/less/less-581.2.tar.gz
+_md5_=32255ef963885cb2751da3f99a888d71
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.10.6 b/metadata/md5-cache/sys-apps/pkgcore-0.10.6
index 31d58eb..38ba65f 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-0.10.6
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.10.6
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.10.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5ba9c47a59ccef0b64c3bfadd8b3adcf
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.11-r2 b/metadata/md5-cache/sys-apps/sandbox-2.11-r2
deleted file mode 100644
index f46aa88..0000000
--- a/metadata/md5-cache/sys-apps/sandbox-2.11-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=app-arch/xz-utils >=app-misc/pax-utils-0.1.19
-DESCRIPTION=sandbox'd LD_PRELOAD hack
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/proj/en/portage/sandbox/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
-KEYWORDS=*
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/sandbox-2.11.tar.xz https://dev.gentoo.org/~vapier/dist/sandbox-2.11.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	3551398d6ede2b572568832730cc2a45	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=33eb257c2a0146c18eecf2748d9ff67e
diff --git a/metadata/md5-cache/sys-apps/sed-4.7 b/metadata/md5-cache/sys-apps/sed-4.7
deleted file mode 100644
index ff6c5b3..0000000
--- a/metadata/md5-cache/sys-apps/sed-4.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=!static? ( acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) ) nls? ( sys-devel/gettext ) static? ( acl? ( virtual/acl[static-libs(+)] ) nls? ( virtual/libintl[static-libs(+)] ) selinux? ( sys-libs/libselinux[static-libs(+)] ) )
-DESCRIPTION=Super-useful stream editor
-EAPI=6
-HOMEPAGE=http://sed.sourceforge.net/
-IUSE=acl nls selinux static
-KEYWORDS=*
-LICENSE=GPL-3
-RDEPEND=!static? ( acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) )
-SLOT=0
-SRC_URI=mirror://gnu/sed/sed-4.7.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2e2f0fb86ed18cb291bdaf2c51099825
diff --git a/metadata/md5-cache/sys-apps/sed-4.8 b/metadata/md5-cache/sys-apps/sed-4.8
new file mode 100644
index 0000000..dc6593f
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/sed-4.8
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure
+DEPEND=!static? ( acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) ) static? ( acl? ( virtual/acl[static-libs(+)] ) nls? ( virtual/libintl[static-libs(+)] ) selinux? ( sys-libs/libselinux[static-libs(+)] ) )
+DESCRIPTION=Super-useful stream editor
+EAPI=7
+HOMEPAGE=http://sed.sourceforge.net/
+IUSE=acl nls selinux static
+KEYWORDS=*
+LICENSE=GPL-3
+RDEPEND=!static? ( acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) )
+SLOT=0
+SRC_URI=mirror://gnu/sed/sed-4.8.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=98755c97ef0086c5c82596cf73f22da8
diff --git a/metadata/md5-cache/sys-apps/systemd-tmpfiles-246-r1 b/metadata/md5-cache/sys-apps/systemd-tmpfiles-246-r1
index 217405b..f2bae27 100644
--- a/metadata/md5-cache/sys-apps/systemd-tmpfiles-246-r1
+++ b/metadata/md5-cache/sys-apps/systemd-tmpfiles-246-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 >=dev-util/meson-0.46 >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 sys-devel/m4 virtual/pkgconfig test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+BDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 >=dev-util/meson-0.46 >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 sys-devel/m4 virtual/pkgconfig test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst prepare setup test
 DEPEND=sys-apps/acl:0= >=sys-apps/util-linux-2.30:0= >=sys-kernel/linux-headers-3.11 sys-libs/libcap:0= selinux? ( sys-libs/libselinux:0= )
 DESCRIPTION=Creates, deletes and cleans up volatile and temporary files and directories
@@ -11,5 +11,5 @@
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v246.tar.gz -> systemd-246.tar.gz elibc_musl? ( https://dev.gentoo.org/~gyakovlev/distfiles/systemd-tmpfiles-246-musl.tar.xz )
-_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1a5ee29d1c88db10d6f0eb3d4b9d8e33
diff --git a/metadata/md5-cache/sys-apps/systemd-tmpfiles-246-r2 b/metadata/md5-cache/sys-apps/systemd-tmpfiles-246-r2
new file mode 100644
index 0000000..f2bae27
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-tmpfiles-246-r2
@@ -0,0 +1,15 @@
+BDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 >=dev-util/meson-0.46 >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 sys-devel/m4 virtual/pkgconfig test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=sys-apps/acl:0= >=sys-apps/util-linux-2.30:0= >=sys-kernel/linux-headers-3.11 sys-libs/libcap:0= selinux? ( sys-libs/libselinux:0= )
+DESCRIPTION=Creates, deletes and cleans up volatile and temporary files and directories
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+IUSE=selinux test
+KEYWORDS=*
+LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT public-domain
+RDEPEND=sys-apps/acl:0= >=sys-apps/util-linux-2.30:0= >=sys-kernel/linux-headers-3.11 sys-libs/libcap:0= selinux? ( sys-libs/libselinux:0= ) !sys-apps/opentmpfiles !sys-apps/systemd
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/systemd/systemd/archive/v246.tar.gz -> systemd-246.tar.gz elibc_musl? ( https://dev.gentoo.org/~gyakovlev/distfiles/systemd-tmpfiles-246-musl.tar.xz )
+_eclasses_=meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1a5ee29d1c88db10d6f0eb3d4b9d8e33
diff --git a/metadata/md5-cache/sys-apps/toybox-0.7.6-r1 b/metadata/md5-cache/sys-apps/toybox-0.7.6-r1
index 0e93225..4c1cdd5 100644
--- a/metadata/md5-cache/sys-apps/toybox-0.7.6-r1
+++ b/metadata/md5-cache/sys-apps/toybox-0.7.6-r1
@@ -8,5 +8,5 @@
 RESTRICT=test
 SLOT=0
 SRC_URI=http://landley.net/code/toybox/downloads/toybox-0.7.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	portability	536c5e70c5fb252ed3b769e04aa3f05b	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	portability	536c5e70c5fb252ed3b769e04aa3f05b	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=038fca0d73f025a2f558dbde76f2ec10
diff --git a/metadata/md5-cache/sys-apps/usbutils-013 b/metadata/md5-cache/sys-apps/usbutils-013
new file mode 100644
index 0000000..7700e6c
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/usbutils-013
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/xz-utils virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install prepare setup
+DEPEND=virtual/libusb:1= virtual/libudev:= !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=USB enumeration utilities
+EAPI=7
+HOMEPAGE=https://www.kernel.org/pub/linux/utils/usb/usbutils/ https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/
+IUSE=python python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=*
+LICENSE=GPL-2
+RDEPEND=virtual/libusb:1= virtual/libudev:= sys-apps/hwids python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/utils/usb/usbutils/usbutils-013.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ed12f061e14347126c60cb578178f6b4
diff --git a/metadata/md5-cache/sys-auth/consolekit-0.4.4 b/metadata/md5-cache/sys-auth/consolekit-0.4.4
deleted file mode 100644
index abef5e8..0000000
--- a/metadata/md5-cache/sys-auth/consolekit-0.4.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.20:2 sys-libs/zlib x11-libs/libX11 pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.96-r1 ) dev-util/pkgconfig dev-libs/libxslt doc? ( app-text/xmlto ) test? ( app-text/docbook-xml-dtd:4.1.2 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Framework for defining and tracking users, login sessions and seats.
-EAPI=3
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/ConsoleKit
-IUSE=debug doc kernel_linux pam policykit test kernel_linux
-KEYWORDS=*
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.20:2 sys-libs/zlib x11-libs/libX11 pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.96-r1 )
-SLOT=0
-SRC_URI=http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.4.4.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	327865b9921771330775d971263dc234	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	3f746974e1cc47cabe3bd488c08cdc8e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4037f3cd701b845825303e0a8dfd1f7a
diff --git a/metadata/md5-cache/sys-auth/consolekit-0.4.5 b/metadata/md5-cache/sys-auth/consolekit-0.4.5
deleted file mode 100644
index e92b44b..0000000
--- a/metadata/md5-cache/sys-auth/consolekit-0.4.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.20:2 sys-libs/zlib x11-libs/libX11 pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.101-r1 ) dev-util/pkgconfig dev-libs/libxslt doc? ( app-text/xmlto ) test? ( app-text/docbook-xml-dtd:4.1.2 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Framework for defining and tracking users, login sessions and seats.
-EAPI=4
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/ConsoleKit
-IUSE=debug doc kernel_linux pam policykit test kernel_linux
-KEYWORDS=*
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.20:2 sys-libs/zlib x11-libs/libX11 pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.101-r1 )
-SLOT=0
-SRC_URI=http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.4.5.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	327865b9921771330775d971263dc234	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	3f746974e1cc47cabe3bd488c08cdc8e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fe887005332695a1c7870da1c946f1f9
diff --git a/metadata/md5-cache/sys-auth/nss-mdns-0.13 b/metadata/md5-cache/sys-auth/nss-mdns-0.13
deleted file mode 100644
index b1375cc..0000000
--- a/metadata/md5-cache/sys-auth/nss-mdns-0.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst test
-DEPEND=>=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] test? ( >=dev-libs/check-0.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
-DESCRIPTION=Name Service Switch module for Multicast DNS
-EAPI=6
-HOMEPAGE=https://github.com/lathiat/nss-mdns
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
-KEYWORDS=*
-LICENSE=GPL-2
-RDEPEND=>=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?]
-SLOT=0
-SRC_URI=https://github.com/lathiat/nss-mdns/releases/download/v0.13/nss-mdns-0.13.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=83a642555585098d30513e94d9632d34
diff --git a/metadata/md5-cache/sys-boot/gnu-efi-3.0.12 b/metadata/md5-cache/sys-boot/gnu-efi-3.0.12
new file mode 100644
index 0000000..a23a6e8
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/gnu-efi-3.0.12
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Library for build EFI Applications
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/gnu-efi/
+IUSE=abi_x86_32 abi_x86_64 custom-cflags
+KEYWORDS=*
+LICENSE=GPL-2+ BSD BSD-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/gnu-efi/gnu-efi-3.0.12.tar.bz2
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d72ab025d6c8b8f191a00b7053820a35
diff --git a/metadata/md5-cache/sys-boot/gnu-efi-3.0.3 b/metadata/md5-cache/sys-boot/gnu-efi-3.0.3
deleted file mode 100644
index d25f11f..0000000
--- a/metadata/md5-cache/sys-boot/gnu-efi-3.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-apps/pciutils
-DESCRIPTION=Library for build EFI Applications
-EAPI=5
-HOMEPAGE=http://gnu-efi.sourceforge.net/
-IUSE=abi_x86_32 abi_x86_64
-KEYWORDS=*
-LICENSE=GPL-2
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://sourceforge/gnu-efi/gnu-efi-3.0.3.tar.bz2
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e04e4d4370e1686e2e538c2fc31ca361
diff --git a/metadata/md5-cache/sys-boot/syslinux-6.03 b/metadata/md5-cache/sys-boot/syslinux-6.03
deleted file mode 100644
index 0d0d241..0000000
--- a/metadata/md5-cache/sys-boot/syslinux-6.03
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=sys-fs/mtools dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1 dev-lang/nasm >=sys-boot/gnu-efi-3.0u virtual/os-headers
-DESCRIPTION=SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders
-EAPI=5
-HOMEPAGE=http://www.syslinux.org/
-IUSE=custom-cflags
-KEYWORDS=*
-LICENSE=GPL-2
-RDEPEND=sys-fs/mtools dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/boot/syslinux/6.xx/syslinux-6.03.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ee289c4e5785fdc91598ced01f5adc7f
diff --git a/metadata/md5-cache/sys-boot/syslinux-6.04_pre1-r3 b/metadata/md5-cache/sys-boot/syslinux-6.04_pre1-r3
new file mode 100644
index 0000000..d5e971c
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/syslinux-6.04_pre1-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-fs/mtools dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1 dev-lang/nasm sys-apps/util-linux:= >=sys-boot/gnu-efi-3.0u virtual/os-headers
+DESCRIPTION=SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders
+EAPI=7
+HOMEPAGE=https://www.syslinux.org/
+IUSE=custom-cflags
+KEYWORDS=-* amd64 x86
+LICENSE=GPL-2
+RDEPEND=sys-fs/mtools dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/utils/boot/syslinux/Testing/6.04/syslinux-6.04-pre1.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=88bbde65047bcea7b42d141a505008e6
diff --git a/metadata/md5-cache/sys-devel/bison-3.0.4-r1 b/metadata/md5-cache/sys-devel/bison-3.0.4-r1
deleted file mode 100644
index 6e6151a..0000000
--- a/metadata/md5-cache/sys-devel/bison-3.0.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=sys-devel/m4-1.4.16 sys-devel/flex examples? ( dev-lang/perl ) nls? ( sys-devel/gettext ) test? ( dev-lang/perl )
-DESCRIPTION=A general-purpose (yacc-compatible) parser generator
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/bison/
-IUSE=examples nls static test
-KEYWORDS=*
-LICENSE=GPL-2
-RDEPEND=>=sys-devel/m4-1.4.16
-SLOT=0
-SRC_URI=mirror://gnu/bison/bison-3.0.4.tar.xz https://dev.gentoo.org/~mgorny/dist/bison-3.0.4-patchset.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ec8fd655f168eb581e4b82f1a2308230
diff --git a/metadata/md5-cache/sys-devel/bison-3.7.3 b/metadata/md5-cache/sys-devel/bison-3.7.3
new file mode 100644
index 0000000..f699748
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/bison-3.7.3
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/flex examples? ( dev-lang/perl ) test? ( dev-lang/perl )
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=>=sys-devel/m4-1.4.16 >=sys-devel/gettext-0.21
+DESCRIPTION=A general-purpose (yacc-compatible) parser generator
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/bison/
+IUSE=examples nls static test
+KEYWORDS=*
+LICENSE=GPL-2
+RDEPEND=>=sys-devel/m4-1.4.16 >=sys-devel/gettext-0.21
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnu/bison/bison-3.7.3.tar.xz https://dev.gentoo.org/~whissi/dist/bison/bison-3.7.3-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/bison/bison-3.7.3-patches-01.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8eb889673cbc21ba9df23d710d51b2a4
diff --git a/metadata/md5-cache/sys-devel/m4-1.4.16 b/metadata/md5-cache/sys-devel/m4-1.4.16
deleted file mode 100644
index e3dcb28..0000000
--- a/metadata/md5-cache/sys-devel/m4-1.4.16
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=app-arch/xz-utils
-DESCRIPTION=GNU macro processor
-EAPI=3
-HOMEPAGE=http://www.gnu.org/software/m4/m4.html
-IUSE=examples
-KEYWORDS=*
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://gnu/m4/m4-1.4.16.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=23ddf6287351f9b7bda4d1441c55ba76
diff --git a/metadata/md5-cache/sys-devel/m4-1.4.18-r1 b/metadata/md5-cache/sys-devel/m4-1.4.18-r1
new file mode 100644
index 0000000..bad5ea6
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/m4-1.4.18-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=app-arch/xz-utils
+DESCRIPTION=GNU macro processor
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/m4/m4.html
+IUSE=examples
+KEYWORDS=*
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=mirror://gnu/m4/m4-1.4.18.tar.xz
+_md5_=07a8461ed982b3684c19c833c670b79f
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.11.0 b/metadata/md5-cache/sys-firmware/seabios-1.11.0
deleted file mode 100644
index 4cca783..0000000
--- a/metadata/md5-cache/sys-firmware/seabios-1.11.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install pretend setup unpack
-DEPEND=!binary? ( amd64? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) x86? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) )
-DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
-EAPI=6
-HOMEPAGE=https://www.seabios.org/
-IUSE=+binary debug +seavgabios
-KEYWORDS=*
-LICENSE=LGPL-3 GPL-3
-REQUIRED_USE=debug? ( !binary ) !amd64? ( !x86? ( binary ) )
-SLOT=0
-SRC_URI=!binary? ( https://code.coreboot.org/p/seabios/downloads/get/seabios-1.11.0.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/seabios-1.11.0-bin.tar.xz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c0273c2bb3384917ef74768fe2359248
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.14.0 b/metadata/md5-cache/sys-firmware/seabios-1.14.0
new file mode 100644
index 0000000..0e37c62
--- /dev/null
+++ b/metadata/md5-cache/sys-firmware/seabios-1.14.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare pretend setup unpack
+DEPEND=!binary? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) )
+DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
+EAPI=7
+HOMEPAGE=https://www.seabios.org/
+IUSE=+binary debug +seavgabios
+KEYWORDS=*
+LICENSE=LGPL-3 GPL-3
+REQUIRED_USE=debug? ( !binary )
+SLOT=0
+SRC_URI=!binary? ( https://www.seabios.org/downloads/seabios-1.14.0.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/seabios-1.14.0-bin.tar.xz )
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=afcc2b2d71376a1e98464e5e413897f9
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.3.2 b/metadata/md5-cache/sys-fs/cryptsetup-2.3.2
deleted file mode 100644
index ff81296..0000000
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install prepare pretend setup test
-DEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) static? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Tool to setup encrypted devices with dm-crypt
-EAPI=7
-HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
-IUSE=gcrypt kernel nettle +openssl +argon2 libressl luks1_default nls pwquality reencrypt static static-libs +udev urandom kernel_linux
-KEYWORDS=*
-LICENSE=GPL-2+
-RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev )
-REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) libressl? ( openssl ) static? ( !gcrypt )
-SLOT=0/12
-SRC_URI=https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.2.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	327865b9921771330775d971263dc234	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d56449d07ceabef90c4c1074900f9e0b
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.3.4 b/metadata/md5-cache/sys-fs/cryptsetup-2.3.4
new file mode 100644
index 0000000..e8708fa
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.3.4
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install prepare setup test
+DEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) static? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Tool to setup encrypted devices with dm-crypt
+EAPI=7
+HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
+IUSE=gcrypt kernel nettle +openssl +argon2 libressl nls pwquality reencrypt static static-libs +udev urandom kernel_linux
+KEYWORDS=*
+LICENSE=GPL-2+
+RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev )
+REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) libressl? ( openssl ) static? ( !gcrypt )
+SLOT=0/12
+SRC_URI=https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.4.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	327865b9921771330775d971263dc234	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2baeb81e21840a6fc5259bbaf6d39f9e
diff --git a/metadata/md5-cache/sys-fs/dosfstools-4.1 b/metadata/md5-cache/sys-fs/dosfstools-4.1
deleted file mode 100644
index 6b372b3..0000000
--- a/metadata/md5-cache/sys-fs/dosfstools-4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=udev? ( virtual/libudev ) test? ( app-editors/vim-core ) udev? ( virtual/pkgconfig )
-DESCRIPTION=DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat
-EAPI=5
-HOMEPAGE=https://github.com/dosfstools/dosfstools
-IUSE=compat test +udev
-KEYWORDS=*
-LICENSE=GPL-3
-RDEPEND=udev? ( virtual/libudev )
-SLOT=0
-SRC_URI=https://github.com/dosfstools/dosfstools/releases/download/v4.1/dosfstools-4.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c016a7e9bac385744ddb1bfd4cc789bd
diff --git a/metadata/md5-cache/sys-fs/dosfstools-4.2 b/metadata/md5-cache/sys-fs/dosfstools-4.2
new file mode 100644
index 0000000..1154590
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/dosfstools-4.2
@@ -0,0 +1,13 @@
+BDEPEND=test? ( app-editors/vim-core ) iconv? ( virtual/libiconv )
+DEFINED_PHASES=configure install
+DESCRIPTION=DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat
+EAPI=7
+HOMEPAGE=https://github.com/dosfstools/dosfstools
+IUSE=compat +iconv test
+KEYWORDS=*
+LICENSE=GPL-3
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dosfstools/dosfstools/releases/download/v4.2/dosfstools-4.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7d064338bbc38e1ffdf97674923ebfd0
diff --git a/metadata/md5-cache/sys-fs/fuse-exfat-1.3.0 b/metadata/md5-cache/sys-fs/fuse-exfat-1.3.0
deleted file mode 100644
index d27c11a..0000000
--- a/metadata/md5-cache/sys-fs/fuse-exfat-1.3.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=sys-fs/fuse:0 virtual/pkgconfig
-DESCRIPTION=exFAT filesystem FUSE module
-EAPI=6
-HOMEPAGE=https://github.com/relan/exfat
-KEYWORDS=*
-LICENSE=GPL-2+
-RDEPEND=sys-fs/fuse:0
-SLOT=0
-SRC_URI=https://github.com/relan/exfat/releases/download/v1.3.0/fuse-exfat-1.3.0.tar.gz
-_md5_=5959ffe529227489f2408a45c270198e
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.187-r3 b/metadata/md5-cache/sys-fs/lvm2-2.02.187-r3
new file mode 100644
index 0000000..6fe7f81
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.187-r3
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/autoconf-archive virtual/pkgconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !static? ( dev-libs/libaio[static-libs?] ) readline? ( sys-libs/readline:0= ) sanlock? ( sys-cluster/sanlock ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs(-)?] ) >=sys-devel/binutils-2.20.1-r1 static? ( selinux? ( sys-libs/libselinux[static-libs] ) udev? ( >=sys-fs/eudev-3.1.2[static-libs] ) >=sys-apps/util-linux-2.16[static-libs] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=User-land utilities for LVM2 (device-mapper) software
+EAPI=7
+HOMEPAGE=https://sourceware.org/lvm2/
+IUSE=readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only kernel_linux
+KEYWORDS=*
+LICENSE=GPL-2
+RDEPEND=dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !static? ( dev-libs/libaio[static-libs?] ) readline? ( sys-libs/readline:0= ) sanlock? ( sys-cluster/sanlock ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs(-)?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
+REQUIRED_USE=device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) systemd? ( udev )
+SLOT=0
+SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.187.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.187.tgz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	327865b9921771330775d971263dc234	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=8f996e2681c3c15fd328381618d32ceb
diff --git a/metadata/md5-cache/sys-libs/binutils-libs-2.34-r1 b/metadata/md5-cache/sys-libs/binutils-libs-2.34-r1
deleted file mode 100644
index 2bae2e7..0000000
--- a/metadata/md5-cache/sys-libs/binutils-libs-2.34-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?]
-DESCRIPTION=Core binutils libraries (libbfd, libopcodes, libiberty) for external packages
-EAPI=7
-HOMEPAGE=https://sourceware.org/binutils/
-IUSE=64-bit-bfd multitarget nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
-KEYWORDS=*
-LICENSE=|| ( GPL-3 LGPL-3 )
-RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=sys-devel/binutils-config-5
-SLOT=0/2.34
-SRC_URI=mirror://gnu/binutils/binutils-2.34.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.34-patches-4.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9b1b485a737de4f95a9ffae4e37aae19
diff --git a/metadata/md5-cache/sys-libs/binutils-libs-2.35.2 b/metadata/md5-cache/sys-libs/binutils-libs-2.35.2
new file mode 100644
index 0000000..d32c1ea
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/binutils-libs-2.35.2
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?]
+DESCRIPTION=Core binutils libraries (libbfd, libopcodes, libiberty) for external packages
+EAPI=7
+HOMEPAGE=https://sourceware.org/binutils/
+IUSE=64-bit-bfd cet multitarget nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=|| ( GPL-3 LGPL-3 )
+RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=sys-devel/binutils-config-5
+SLOT=0/2.35.2
+SRC_URI=mirror://gnu/binutils/binutils-2.35.2.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.35.2-patches-1.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9d8a50410c41754f198b38ebedbe70d1
diff --git a/metadata/md5-cache/sys-libs/cracklib-2.9.6-r1 b/metadata/md5-cache/sys-libs/cracklib-2.9.6-r1
index f701057..4b3257c 100644
--- a/metadata/md5-cache/sys-libs/cracklib-2.9.6-r1
+++ b/metadata/md5-cache/sys-libs/cracklib-2.9.6-r1
@@ -9,5 +9,5 @@
 RDEPEND=zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r6 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=https://github.com/cracklib/cracklib/releases/download/cracklib-2.9.6/cracklib-2.9.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2c985354d3e4f42df2a2da7faa4e3458
diff --git a/metadata/md5-cache/sys-libs/ldb-2.0.12 b/metadata/md5-cache/sys-libs/ldb-2.0.12
deleted file mode 100644
index 657132d..0000000
--- a/metadata/md5-cache/sys-libs/ldb-2.0.12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=sys-libs/talloc-2.2.0[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=sys-libs/tdb-1.4.2[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=sys-libs/tevent-0.10.0[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ldap? ( net-nds/openldap ) lmdb? ( >=dev-db/lmdb-0.9.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
-DESCRIPTION=An LDAP-like embedded database
-EAPI=6
-HOMEPAGE=https://ldb.samba.org
-IUSE=doc +ldap +lmdb python test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
-KEYWORDS=*
-LICENSE=LGPL-3
-RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=sys-libs/talloc-2.2.0[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=sys-libs/tdb-1.4.2[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=sys-libs/tevent-0.10.0[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ldap? ( net-nds/openldap ) lmdb? ( >=dev-db/lmdb-0.9.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) test? ( python )
-RESTRICT=!test? ( test )
-SLOT=0/2.0.12
-SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-2.0.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	0af0bf9207f47292d40e888b9687763c
-_md5_=08b8fc54ea0cafdf7c43cb57cf700de3
diff --git a/metadata/md5-cache/sys-libs/libapparmor-2.13.3 b/metadata/md5-cache/sys-libs/libapparmor-2.13.3
index 8153a19..b48bd32 100644
--- a/metadata/md5-cache/sys-libs/libapparmor-2.13.3
+++ b/metadata/md5-cache/sys-libs/libapparmor-2.13.3
@@ -11,5 +11,5 @@
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/apparmor/2.13/2.13.3/+download/apparmor-2.13.3.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=15406fbbeb7c8294d5138e53805ebe0c
diff --git a/metadata/md5-cache/sys-libs/libxcrypt-4.4.16 b/metadata/md5-cache/sys-libs/libxcrypt-4.4.16
new file mode 100644
index 0000000..be6a62d
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libxcrypt-4.4.16
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/findutils test? ( || ( ( dev-lang/python:3.8 dev-python/passlib[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/passlib[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/passlib[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=system? ( elibc_glibc? ( sys-libs/glibc[-crypt(+)] ) !sys-libs/musl ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Extended crypt library for descrypt, md5crypt, bcrypt, and others
+EAPI=7
+HOMEPAGE=https://github.com/besser82/libxcrypt
+IUSE=+compat split-usr +static-libs system test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=LGPL-2.1+ public-domain BSD BSD-2
+RDEPEND=system? ( elibc_glibc? ( sys-libs/glibc[-crypt(+)] ) !sys-libs/musl )
+REQUIRED_USE=split-usr? ( system )
+RESTRICT=!test? ( test )
+SLOT=0/1
+SRC_URI=https://github.com/besser82/libxcrypt/archive/v4.4.16.tar.gz -> libxcrypt-4.4.16.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=95ec4b35a5ee9a4644040ec89e6d9463
diff --git a/metadata/md5-cache/sys-libs/pam-1.5.1 b/metadata/md5-cache/sys-libs/pam-1.5.1
index c16677c..fb4939a 100644
--- a/metadata/md5-cache/sys-libs/pam-1.5.1
+++ b/metadata/md5-cache/sys-libs/pam-1.5.1
@@ -11,5 +11,5 @@
 RDEPEND=virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] audit? ( >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) nis? ( net-libs/libnsl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=net-libs/libtirpc-0.2.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
 SLOT=0
 SRC_URI=https://github.com/linux-pam/linux-pam/releases/download/v1.5.1/Linux-PAM-1.5.1.tar.xz https://github.com/linux-pam/linux-pam/releases/download/v1.5.1/Linux-PAM-1.5.1-docs.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	db-use	9879c16e695a6adb640e428a40dfd26e	fcaps	eeefea88d5fef2853d4c1e3770340302	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	db-use	9879c16e695a6adb640e428a40dfd26e	fcaps	4a09528c0754e152c1dbab8e9af16ea6	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
 _md5_=3c82bd2b9c11c056f6c2b68d0bca9079
diff --git a/metadata/md5-cache/sys-libs/talloc-2.3.1 b/metadata/md5-cache/sys-libs/talloc-2.3.1
index f6e6fde..93191cd 100644
--- a/metadata/md5-cache/sys-libs/talloc-2.3.1
+++ b/metadata/md5-cache/sys-libs/talloc-2.3.1
@@ -11,5 +11,5 @@
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/talloc/talloc-2.3.1.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	waf-utils	0af0bf9207f47292d40e888b9687763c
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	waf-utils	0af0bf9207f47292d40e888b9687763c
 _md5_=36f909e80a8ad8580aa76c14be2152aa
diff --git a/metadata/md5-cache/sys-libs/tdb-1.4.3 b/metadata/md5-cache/sys-libs/tdb-1.4.3
index a3c5d24..12fb394 100644
--- a/metadata/md5-cache/sys-libs/tdb-1.4.3
+++ b/metadata/md5-cache/sys-libs/tdb-1.4.3
@@ -11,5 +11,5 @@
 RESTRICT=test
 SLOT=0
 SRC_URI=http://samba.org/ftp/tdb/tdb-1.4.3.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	waf-utils	0af0bf9207f47292d40e888b9687763c
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	waf-utils	0af0bf9207f47292d40e888b9687763c
 _md5_=a910d52a1317080a3ab0591b57497aa4
diff --git a/metadata/md5-cache/sys-libs/tevent-0.10.2 b/metadata/md5-cache/sys-libs/tevent-0.10.2
index cf0472d..5570684 100644
--- a/metadata/md5-cache/sys-libs/tevent-0.10.2
+++ b/metadata/md5-cache/sys-libs/tevent-0.10.2
@@ -11,5 +11,5 @@
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/tevent/tevent-0.10.2.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	waf-utils	0af0bf9207f47292d40e888b9687763c
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	waf-utils	0af0bf9207f47292d40e888b9687763c
 _md5_=0ca9aeef9a7a4cd185fb38ec88e319fa
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2020a b/metadata/md5-cache/sys-libs/timezone-data-2020a
deleted file mode 100644
index 7f473ed..0000000
--- a/metadata/md5-cache/sys-libs/timezone-data-2020a
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare test
-DEPEND=nls? ( virtual/libintl )
-DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)
-EAPI=7
-HOMEPAGE=https://www.iana.org/time-zones
-IUSE=nls leaps-timezone elibc_FreeBSD
-KEYWORDS=*
-LICENSE=BSD public-domain
-RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)]
-SLOT=0
-SRC_URI=https://www.iana.org/time-zones/repository/releases/tzdata2020a.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2020a.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f0fcc854b610fc498c90382cb8c75251
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2020f b/metadata/md5-cache/sys-libs/timezone-data-2020f
new file mode 100644
index 0000000..d6a9f11
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/timezone-data-2020f
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare test
+DEPEND=nls? ( virtual/libintl )
+DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)
+EAPI=7
+HOMEPAGE=https://www.iana.org/time-zones
+IUSE=nls leaps-timezone elibc_FreeBSD zic-slim
+KEYWORDS=*
+LICENSE=BSD public-domain
+RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)]
+SLOT=0
+SRC_URI=https://www.iana.org/time-zones/repository/releases/tzdata2020f.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2020f.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=06e59bda7cb100b98940f99ca912b8f5
diff --git a/metadata/md5-cache/sys-power/powertop-2.13-r1 b/metadata/md5-cache/sys-power/powertop-2.13-r1
index 77dedc1..d1bbfb5 100644
--- a/metadata/md5-cache/sys-power/powertop-2.13-r1
+++ b/metadata/md5-cache/sys-power/powertop-2.13-r1
@@ -11,4 +11,4 @@
 SLOT=0
 SRC_URI=https://github.com/fenrus75/powertop/archive/v2.13.tar.gz -> powertop-2.13.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	327865b9921771330775d971263dc234	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5fa82f3487af082ddc313c8f86cb061b
+_md5_=8d07150db90d388503ee74579b5cf03b
diff --git a/metadata/md5-cache/sys-power/uhubctl-1.8-r1 b/metadata/md5-cache/sys-power/uhubctl-1.8-r1
deleted file mode 100644
index 281e631..0000000
--- a/metadata/md5-cache/sys-power/uhubctl-1.8-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=virtual/libusb:1
-DESCRIPTION=USB hub per-port power control
-EAPI=6
-HOMEPAGE=https://github.com/mvp/uhubctl
-KEYWORDS=*
-LICENSE=GPL-2
-RDEPEND=virtual/libusb:1
-SLOT=0
-SRC_URI=https://github.com/mvp/uhubctl/archive/v1.8.tar.gz -> uhubctl-1.8.tar.gz
-_md5_=8337edc99a57a287d7af1051e00f73b6
diff --git a/metadata/md5-cache/sys-power/uhubctl-2.4.0 b/metadata/md5-cache/sys-power/uhubctl-2.4.0
new file mode 100644
index 0000000..6f6c270
--- /dev/null
+++ b/metadata/md5-cache/sys-power/uhubctl-2.4.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile prepare
+DEPEND=virtual/libusb:1
+DESCRIPTION=USB hub per-port power control
+EAPI=7
+HOMEPAGE=https://github.com/mvp/uhubctl
+KEYWORDS=*
+LICENSE=GPL-2
+RDEPEND=virtual/libusb:1
+SLOT=0
+SRC_URI=https://github.com/mvp/uhubctl/archive/v2.4.0.tar.gz -> uhubctl-2.4.0.tar.gz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e48e6e794cc37261003540b78e6e1532
diff --git a/metadata/md5-cache/sys-process/iotop-0.6 b/metadata/md5-cache/sys-process/iotop-0.6
index c99fe50..5e9e350 100644
--- a/metadata/md5-cache/sys-process/iotop-0.6
+++ b/metadata/md5-cache/sys-process/iotop-0.6
@@ -10,5 +10,5 @@
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://guichaz.free.fr/iotop/files/iotop-0.6.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	327865b9921771330775d971263dc234	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	327865b9921771330775d971263dc234	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=44fdf6b5d9265ebdee6fb6d527c7ecb1
diff --git a/metadata/md5-cache/sys-process/lsof-4.91 b/metadata/md5-cache/sys-process/lsof-4.91
deleted file mode 100644
index 7dedb82..0000000
--- a/metadata/md5-cache/sys-process/lsof-4.91
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=rpc? ( net-libs/libtirpc ) selinux? ( sys-libs/libselinux ) rpc? ( virtual/pkgconfig )
-DESCRIPTION=Lists open files for running Unix processes
-EAPI=6
-HOMEPAGE=ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
-IUSE=examples ipv6 rpc selinux
-KEYWORDS=*
-LICENSE=lsof
-RDEPEND=rpc? ( net-libs/libtirpc ) selinux? ( sys-libs/libselinux )
-SLOT=0
-SRC_URI=ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.91.tar.bz2 ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/lsof_4.91.tar.bz2 http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.91.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dc4fab23793ad21831fc5eeccaa6be50
diff --git a/metadata/md5-cache/sys-process/lsof-4.94.0-r1 b/metadata/md5-cache/sys-process/lsof-4.94.0-r1
new file mode 100644
index 0000000..31e051b
--- /dev/null
+++ b/metadata/md5-cache/sys-process/lsof-4.94.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/groff rpc? ( virtual/pkgconfig )
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=rpc? ( net-libs/libtirpc ) selinux? ( sys-libs/libselinux )
+DESCRIPTION=Lists open files for running Unix processes
+EAPI=7
+HOMEPAGE=https://github.com/lsof-org/lsof
+IUSE=examples ipv6 rpc selinux
+KEYWORDS=*
+LICENSE=lsof
+RDEPEND=rpc? ( net-libs/libtirpc ) selinux? ( sys-libs/libselinux )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/lsof-org/lsof/archive/4.94.0.tar.gz -> lsof-4.94.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7c74078f4d83ab44eb68e994ca26987d
diff --git a/metadata/md5-cache/sys-process/time-1.7.2 b/metadata/md5-cache/sys-process/time-1.7.2
deleted file mode 100644
index 4894fe9..0000000
--- a/metadata/md5-cache/sys-process/time-1.7.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=sys-apps/texinfo >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Displays info about resources used by a program
-EAPI=6
-HOMEPAGE=https://www.gnu.org/directory/time.html
-KEYWORDS=*
-LICENSE=GPL-3+
-SLOT=0
-SRC_URI=http://git.savannah.gnu.org/cgit/time.git/snapshot/time-1.7.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7e70bf3f6ac4418754140d35dec7b9c1
diff --git a/metadata/md5-cache/sys-process/time-1.9 b/metadata/md5-cache/sys-process/time-1.9
new file mode 100644
index 0000000..29b89b4
--- /dev/null
+++ b/metadata/md5-cache/sys-process/time-1.9
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DEPEND=sys-apps/texinfo
+DESCRIPTION=Displays info about resources used by a program
+EAPI=6
+HOMEPAGE=https://www.gnu.org/directory/time.html
+KEYWORDS=*
+LICENSE=GPL-3+
+SLOT=0
+SRC_URI=http://ftp.gnu.org/pub/gnu/time/time-1.9.tar.gz
+_md5_=a127f6164b2d1cf4551b8f55eab2a3a5
diff --git a/metadata/md5-cache/virtual/awk-1 b/metadata/md5-cache/virtual/awk-1
index 0b1dafb..c11ec0d 100644
--- a/metadata/md5-cache/virtual/awk-1
+++ b/metadata/md5-cache/virtual/awk-1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for awk implementation
-EAPI=0
+EAPI=7
 KEYWORDS=*
-RDEPEND=|| ( >=sys-apps/gawk-4.0.1-r1 sys-apps/mawk sys-apps/nawk sys-apps/busybox ) !<sys-apps/gawk-4.0.1-r1
+RDEPEND=|| ( >=sys-apps/gawk-4.0.1-r1 sys-apps/mawk sys-apps/nawk sys-apps/busybox )
 SLOT=0
-_md5_=9cbb5451d4e1d770f8dbe4a09b670c62
+_md5_=ecf74f9cb928494701580b5cc5f01197
diff --git a/metadata/md5-cache/virtual/editor-0 b/metadata/md5-cache/virtual/editor-0
deleted file mode 100644
index 40c8f90..0000000
--- a/metadata/md5-cache/virtual/editor-0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for editor
-EAPI=0
-KEYWORDS=*
-RDEPEND=|| ( app-editors/nano app-editors/dav app-editors/e3 app-editors/easyedit app-editors/efte app-editors/elvis app-editors/emacs app-editors/emacs-vcs app-editors/emact app-editors/ersatz-emacs app-editors/fe app-editors/gvim app-editors/jasspa-microemacs app-editors/jed app-editors/joe app-editors/jove app-editors/le app-editors/levee app-editors/lpe app-editors/mg app-editors/ne app-editors/ng app-editors/nvi app-editors/qemacs app-editors/teco app-editors/uemacs-pk app-editors/vile app-editors/vim app-editors/xemacs app-editors/zile app-misc/mc dev-lisp/cmucl mail-client/pine sys-apps/busybox sys-apps/ed )
-SLOT=0
-_md5_=f4fbdc82adf43609e27dec32d16ccda5
diff --git a/metadata/md5-cache/virtual/editor-0-r3 b/metadata/md5-cache/virtual/editor-0-r3
new file mode 100644
index 0000000..9508144
--- /dev/null
+++ b/metadata/md5-cache/virtual/editor-0-r3
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for editor
+EAPI=7
+KEYWORDS=*
+RDEPEND=|| ( app-editors/nano app-editors/dav app-editors/e3 app-editors/ee app-editors/elvis app-editors/emacs:* app-editors/emact app-editors/ersatz-emacs app-editors/fe app-editors/jasspa-microemacs app-editors/jed app-editors/joe app-editors/jove app-editors/kakoune app-editors/le app-editors/levee app-editors/lpe app-editors/mg app-editors/moe app-editors/ne app-editors/neovim app-editors/ng app-editors/qemacs app-editors/teco app-editors/uemacs-pk app-editors/vile app-editors/vim app-editors/gvim app-editors/vis app-editors/xemacs app-editors/zile app-misc/mc[edit] dev-lisp/cmucl mail-client/alpine[-onlyalpine] )
+SLOT=0
+_md5_=9e13f0d734f20361cb6909938bd9e3de
diff --git a/metadata/md5-cache/virtual/glut-1.0 b/metadata/md5-cache/virtual/glut-1.0
deleted file mode 100644
index 12708b7..0000000
--- a/metadata/md5-cache/virtual/glut-1.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for OpenGL utility toolkit
-EAPI=0
-KEYWORDS=*
-RDEPEND=media-libs/freeglut
-SLOT=0
-_md5_=658a249c10983335058424d58416ea6e
diff --git a/metadata/md5-cache/virtual/pager-0 b/metadata/md5-cache/virtual/pager-0
index a7b0fcf..4751e32 100644
--- a/metadata/md5-cache/virtual/pager-0
+++ b/metadata/md5-cache/virtual/pager-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for command-line pagers
-EAPI=0
+EAPI=6
 KEYWORDS=*
-RDEPEND=|| ( sys-apps/less sys-apps/more sys-apps/most sys-apps/util-linux app-text/lv )
+RDEPEND=|| ( sys-apps/less sys-apps/most sys-apps/util-linux[ncurses] app-text/lv app-editors/vim[vim-pager] )
 SLOT=0
-_md5_=0d6cbf94f04025b78fa3978b3e66823e
+_md5_=0b92aa1440df48785e688f31d8509493
diff --git a/metadata/md5-cache/virtual/shadow-0 b/metadata/md5-cache/virtual/shadow-0
deleted file mode 100644
index 134d299..0000000
--- a/metadata/md5-cache/virtual/shadow-0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for user account management utilities
-EAPI=0
-KEYWORDS=*
-RDEPEND=!prefix? ( || ( >=sys-apps/shadow-4.1 sys-apps/hardened-shadow ) )
-SLOT=0
-_md5_=73918da0a3d5dd12ad3f086b009d6423
diff --git a/metadata/md5-cache/virtual/yacc-0 b/metadata/md5-cache/virtual/yacc-0
index f0a616a..fcc7472 100644
--- a/metadata/md5-cache/virtual/yacc-0
+++ b/metadata/md5-cache/virtual/yacc-0
@@ -1,8 +1,7 @@
 DEFINED_PHASES=-
-DEPEND=|| ( sys-devel/bison dev-util/yacc )
-DESCRIPTION=virtual for yacc (yet another compiler compiler)
-EAPI=0
+DESCRIPTION=Virtual for yacc (yet another compiler compiler)
+EAPI=7
 KEYWORDS=*
-RDEPEND=|| ( sys-devel/bison dev-util/yacc )
+RDEPEND=|| ( sys-devel/bison dev-util/byacc dev-util/yacc )
 SLOT=0
-_md5_=dbf77671e674eb36821bb4cd1850b086
+_md5_=5ea017f22c1e5998cba76a25619242d5
diff --git a/metadata/md5-cache/www-servers/nginx-1.10.3 b/metadata/md5-cache/www-servers/nginx-1.10.3
index 78222c4..819db85 100644
--- a/metadata/md5-cache/www-servers/nginx-1.10.3
+++ b/metadata/md5-cache/www-servers/nginx-1.10.3
@@ -12,5 +12,5 @@
 RESTRICT=test
 SLOT=0
 SRC_URI=https://nginx.org/download/nginx-1.10.3.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.0.tar.gz -> ngx_devel_kit-0.3.0-r1.tar.gz nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.32.tar.gz -> ngx_http_headers_more-0.32.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.1.tar.gz -> ngx_http_fancyindex-0.4.1.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.7.tar.gz -> ngx_http_lua-0.10.7.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/v0.3.0-10-gf3bdb7b.tar.gz -> ngx_http_upstream_check-0.3.0-10-gf3bdb7b.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.55.1.tar.gz -> ngx_http_naxsi-0.55.1.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.1.10.tar.gz -> ngx_rtmp-1.1.10.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v0.0.3.tar.gz -> ngx_http_dav_ext-0.0.3.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.60.tar.gz -> ngx_http_echo-0.60.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.1/modsecurity-2.9.1.tar.gz -> modsecurity-2.9.1.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.2.tar.gz -> ngx_http_push_stream-0.5.2.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.17.tar.gz -> ngx_memc_module-0.17.tar.gz ) nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz -> nginx-auth-ldap-49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	031d86ef31449c1482f12ddd8aa0d4eb	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	user	7c566af8c48023219fd63246e88d6621	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	031d86ef31449c1482f12ddd8aa0d4eb	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	04385b0f181c42fa9c18ec0e31729d1f	user	7c566af8c48023219fd63246e88d6621	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=e05bbcd377424f6717f911d47061bca2
diff --git a/metadata/md5-cache/x11-base/xorg-proto-2020.1 b/metadata/md5-cache/x11-base/xorg-proto-2020.1
deleted file mode 100644
index a457c5f..0000000
--- a/metadata/md5-cache/x11-base/xorg-proto-2020.1
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=>=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DEFINED_PHASES=compile configure install test
-DESCRIPTION=X.Org combined protocol headers
-EAPI=7
-HOMEPAGE=https://gitlab.freedesktop.org/xorg/proto/xorgproto
-KEYWORDS=*
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2020.1.tar.gz
-_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=243c858f410007973c458eb0eeb8aa9d
diff --git a/metadata/md5-cache/x11-base/xorg-proto-2021.4 b/metadata/md5-cache/x11-base/xorg-proto-2021.4
new file mode 100644
index 0000000..757de59
--- /dev/null
+++ b/metadata/md5-cache/x11-base/xorg-proto-2021.4
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install setup test
+DEPEND=test? ( || ( ( dev-lang/python:3.9 dev-python/python-libevdev[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/python-libevdev[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/python-libevdev[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/python-libevdev[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) )
+DESCRIPTION=X.Org combined protocol headers
+EAPI=7
+HOMEPAGE=https://gitlab.freedesktop.org/xorg/proto/xorgproto
+IUSE=test
+KEYWORDS=*
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2021.4.tar.gz
+_eclasses_=meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b107a2ee93880c618078345cb17a0feb
diff --git a/metadata/md5-cache/x11-libs/cairo-1.14.12-r1 b/metadata/md5-cache/x11-libs/cairo-1.14.12-r1
deleted file mode 100644
index f86ec02..0000000
--- a/metadata/md5-cache/x11-libs/cairo-1.14.12-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/lzo-2.06-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/pixman-0.32.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] gles2? ( >=media-libs/mesa-9.1.6[gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) glib? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) opengl? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) virtual/pkgconfig >=sys-devel/libtool-2 X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A vector graphics library with cross-device output support
-EAPI=6
-HOMEPAGE=https://www.cairographics.org
-IUSE=X aqua debug gles2 +glib opengl static-libs +svg valgrind xcb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
-KEYWORDS=*
-LICENSE=|| ( LGPL-2.1 MPL-1.1 )
-RDEPEND=>=dev-libs/lzo-2.06-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/pixman-0.32.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] gles2? ( >=media-libs/mesa-9.1.6[gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) glib? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) opengl? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
-REQUIRED_USE=gles2? ( !opengl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.cairographics.org/releases/cairo-1.14.12.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7dc6622054ea4ff05067c096a1226554
diff --git a/metadata/md5-cache/x11-libs/cairo-9999 b/metadata/md5-cache/x11-libs/cairo-9999
deleted file mode 100644
index d02c143..0000000
--- a/metadata/md5-cache/x11-libs/cairo-9999
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/pixman-0.32.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] gles2? ( >=media-libs/mesa-9.1.6[gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) glib? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) opengl? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) utils? ( >=dev-libs/lzo-2.06-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) virtual/pkgconfig >=sys-devel/libtool-2 X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A vector graphics library with cross-device output support
-EAPI=6
-HOMEPAGE=https://www.cairographics.org
-IUSE=X aqua debug gles2 +glib opengl static-libs +svg utils valgrind xcb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
-KEYWORDS=~*
-LICENSE=|| ( LGPL-2.1 MPL-1.1 )
-PROPERTIES=live
-RDEPEND=>=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/pixman-0.32.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] gles2? ( >=media-libs/mesa-9.1.6[gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) glib? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) opengl? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) utils? ( >=dev-libs/lzo-2.06-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
-REQUIRED_USE=gles2? ( !opengl )
-RESTRICT=test
-SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-r3	c8f4649ab5a3c07ee2b75b12bc446f6a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c8ba55ac3554cc366b004427e0977367
diff --git a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.6 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.6
new file mode 100644
index 0000000..248adda
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.6
@@ -0,0 +1,14 @@
+BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/glib:2 dev-libs/libxslt dev-util/glib-utils gtk-doc? ( app-text/docbook-xml-dtd:4.3 dev-util/gi-docgen ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=dev-util/meson-0.55.3 app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.56.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] x11-misc/shared-mime-info >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Image loading library for GTK+
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gdk-pixbuf
+IUSE=gtk-doc +introspection jpeg tiff abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.56.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] x11-misc/shared-mime-info >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) !<x11-libs/gtk+-2.90.4:3
+SLOT=2
+SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.6.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	5ec14fdbc5446b8767e87e186e3b1a52	meson-multilib	485215fef459a86936e377c0eaa513a0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4bf6ca0e3168fcdbb62ad6bf1d4ebe0d
diff --git a/metadata/md5-cache/x11-libs/libICE-1.0.10 b/metadata/md5-cache/x11-libs/libICE-1.0.10
new file mode 100644
index 0000000..d8dd2d9
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libICE-1.0.10
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-base/xorg-proto x11-libs/xtrans !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=X.Org Inter-Client Exchange library
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libICE
+IUSE=ipv6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=x11-base/xorg-proto x11-libs/xtrans elibc_glibc? ( dev-libs/libbsd )
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libICE-1.0.10.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
+_md5_=bf7b9b352654bb3544fb59055bd4eb10
diff --git a/metadata/md5-cache/x11-libs/libICE-1.0.9-r2 b/metadata/md5-cache/x11-libs/libICE-1.0.9-r2
deleted file mode 100644
index 951f26d..0000000
--- a/metadata/md5-cache/x11-libs/libICE-1.0.9-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-base/xorg-proto x11-libs/xtrans elibc_glibc? ( dev-libs/libbsd ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X.Org Inter-Client Exchange library
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=ipv6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs doc
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=x11-base/xorg-proto x11-libs/xtrans elibc_glibc? ( dev-libs/libbsd ) abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libICE-1.0.9.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	50dd640df6d0554c259daa81531ed3ee
-_md5_=c877a63fae32e297627173d43f64c8a5
diff --git a/metadata/md5-cache/x11-libs/libSM-1.2.3 b/metadata/md5-cache/x11-libs/libSM-1.2.3
deleted file mode 100644
index 23295ae..0000000
--- a/metadata/md5-cache/x11-libs/libSM-1.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-proto >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] x11-libs/xtrans !elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( uuid? ( >=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) ) ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X.Org Session Management library
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=doc ipv6 +uuid abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs doc
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=x11-base/xorg-proto >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] x11-libs/xtrans !elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( uuid? ( >=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) ) ) ) abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libSM-1.2.3.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	50dd640df6d0554c259daa81531ed3ee
-_md5_=36114bc4dec8718b97fbbbb8b63e420b
diff --git a/metadata/md5-cache/x11-libs/libSM-1.2.3-r1 b/metadata/md5-cache/x11-libs/libSM-1.2.3-r1
new file mode 100644
index 0000000..14bca1a
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libSM-1.2.3-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-base/xorg-proto >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] x11-libs/xtrans uuid? ( elibc_Darwin? ( sys-libs/native-uuid ) !elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( >=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) ) ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=X.Org Session Management library
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libSM
+IUSE=ipv6 +uuid abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs doc
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=x11-base/xorg-proto >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] x11-libs/xtrans uuid? ( elibc_Darwin? ( sys-libs/native-uuid ) !elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( >=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) ) ) )
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libSM-1.2.3.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
+_md5_=53ab2b51bb8c176988c47b1126cae826
diff --git a/metadata/md5-cache/x11-libs/libX11-1.6.12 b/metadata/md5-cache/x11-libs/libX11-1.6.12
deleted file mode 100644
index 97e5b84..0000000
--- a/metadata/md5-cache/x11-libs/libX11-1.6.12
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-lang/perl ) >=app-portage/elt-patches-20170815 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] !<x11-base/xorg-proto-2019.2 x11-base/xorg-proto x11-libs/xtrans !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=X.Org X11 library
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libX11
-IUSE=ipv6 test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs doc
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=>=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] !<x11-base/xorg-proto-2019.2
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.6.12.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
-_md5_=894b19c7a3496b582ae85245dfdaa0f4
diff --git a/metadata/md5-cache/x11-libs/libX11-1.7.2 b/metadata/md5-cache/x11-libs/libX11-1.7.2
new file mode 100644
index 0000000..fe143c2
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libX11-1.7.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-lang/perl ) >=app-portage/elt-patches-20170815 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] !<x11-base/xorg-proto-2019.2 x11-misc/compose-tables x11-base/xorg-proto x11-libs/xtrans !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=X.Org X11 library
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libX11
+IUSE=ipv6 test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs doc
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=>=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] !<x11-base/xorg-proto-2019.2 x11-misc/compose-tables
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.7.2.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
+_md5_=d1e6c816c7864b7a67a09d0509a24229
diff --git a/metadata/md5-cache/x11-libs/libXau-1.0.8-r1 b/metadata/md5-cache/x11-libs/libXau-1.0.8-r1
deleted file mode 100644
index f9a2230..0000000
--- a/metadata/md5-cache/x11-libs/libXau-1.0.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-proto >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org X authorization library
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=x11-base/xorg-proto abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXau-1.0.8.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	50dd640df6d0554c259daa81531ed3ee
-_md5_=52c9059637c90a2acecb40abb6450bb7
diff --git a/metadata/md5-cache/x11-libs/libXau-1.0.9-r1 b/metadata/md5-cache/x11-libs/libXau-1.0.9-r1
new file mode 100644
index 0000000..763cd27
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libXau-1.0.9-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-base/xorg-proto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=X.Org X authorization library
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXau
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs doc
+KEYWORDS=*
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libXau-1.0.9.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
+_md5_=33cc77b19537c1032c8d3738349e3202
diff --git a/metadata/md5-cache/x11-libs/libXaw-1.0.13-r1 b/metadata/md5-cache/x11-libs/libXaw-1.0.13-r1
deleted file mode 100644
index d374ced..0000000
--- a/metadata/md5-cache/x11-libs/libXaw-1.0.13-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXpm-3.5.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X.Org Xaw library
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=deprecated abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs doc
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXpm-3.5.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.13.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	50dd640df6d0554c259daa81531ed3ee
-_md5_=b363e4b63905b8ce32459b36b63cbf45
diff --git a/metadata/md5-cache/x11-libs/libXcomposite-0.4.3-r1 b/metadata/md5-cache/x11-libs/libXcomposite-0.4.3-r1
deleted file mode 100644
index b779903..0000000
--- a/metadata/md5-cache/x11-libs/libXcomposite-0.4.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXfixes >=x11-proto/compositeproto-0.4 x11-proto/xproto >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X.Org Xcomposite library
-EAPI=4
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=static-libs doc
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXfixes >=x11-proto/compositeproto-0.4 x11-proto/xproto
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXcomposite-0.4.3.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	50dd640df6d0554c259daa81531ed3ee
-_md5_=257b6c6bce8d69a2fcaa224099bce397
diff --git a/metadata/md5-cache/x11-libs/libXcursor-1.1.14 b/metadata/md5-cache/x11-libs/libXcursor-1.1.14
deleted file mode 100644
index cd814a8..0000000
--- a/metadata/md5-cache/x11-libs/libXcursor-1.1.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libXfixes x11-libs/libX11 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org Xcursor library
-EAPI=4
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libXfixes x11-libs/libX11 abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXcursor-1.1.14.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	50dd640df6d0554c259daa81531ed3ee
-_md5_=c9ce21c8d0b27f356deb03fcde74c92f
diff --git a/metadata/md5-cache/x11-libs/libXcursor-1.2.0 b/metadata/md5-cache/x11-libs/libXcursor-1.2.0
new file mode 100644
index 0000000..77a4ade
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libXcursor-1.2.0
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=X.Org Xcursor library
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXcursor
+IUSE=doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=>=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?]
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libXcursor-1.2.0.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
+_md5_=4e197716257b5bcbe6e6d7ae1ea38590
diff --git a/metadata/md5-cache/x11-libs/libXdamage-1.1.4-r2 b/metadata/md5-cache/x11-libs/libXdamage-1.1.4-r2
deleted file mode 100644
index b6ec15b..0000000
--- a/metadata/md5-cache/x11-libs/libXdamage-1.1.4-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org Xdamage library
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXdamage-1.1.4.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	50dd640df6d0554c259daa81531ed3ee
-_md5_=64a2dbe564e50a033a1f896ffffe4ace
diff --git a/metadata/md5-cache/x11-libs/libXdamage-1.1.5 b/metadata/md5-cache/x11-libs/libXdamage-1.1.5
new file mode 100644
index 0000000..361fa26
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libXdamage-1.1.5
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] x11-base/xorg-proto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=X.Org Xdamage library
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXdamage
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?]
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libXdamage-1.1.5.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
+_md5_=2627c8b30a29b609e4ed680f1861a3d3
diff --git a/metadata/md5-cache/x11-libs/libXdmcp-1.1.2-r2 b/metadata/md5-cache/x11-libs/libXdmcp-1.1.2-r2
deleted file mode 100644
index f331f2e..0000000
--- a/metadata/md5-cache/x11-libs/libXdmcp-1.1.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-base/xorg-proto elibc_glibc? ( dev-libs/libbsd ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X.Org X Display Manager Control Protocol library
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs doc
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=x11-base/xorg-proto elibc_glibc? ( dev-libs/libbsd ) abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXdmcp-1.1.2.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	50dd640df6d0554c259daa81531ed3ee
-_md5_=d05deb572febcc87480273e4fbba497f
diff --git a/metadata/md5-cache/x11-libs/libXdmcp-1.1.3 b/metadata/md5-cache/x11-libs/libXdmcp-1.1.3
new file mode 100644
index 0000000..e2eadb1
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libXdmcp-1.1.3
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=elibc_glibc? ( dev-libs/libbsd ) x11-base/xorg-proto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=X.Org X Display Manager Control Protocol library
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXdmcp
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs doc
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=elibc_glibc? ( dev-libs/libbsd )
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libXdmcp-1.1.3.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
+_md5_=645c73503fdd934c953769f09166558a
diff --git a/metadata/md5-cache/x11-libs/libXext-1.3.3-r1 b/metadata/md5-cache/x11-libs/libXext-1.3.3-r1
deleted file mode 100644
index 1697e09..0000000
--- a/metadata/md5-cache/x11-libs/libXext-1.3.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X.Org Xext library
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs doc
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXext-1.3.3.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	50dd640df6d0554c259daa81531ed3ee
-_md5_=1125a14983f794e43882f614c3579d17
diff --git a/metadata/md5-cache/x11-libs/libXext-1.3.4 b/metadata/md5-cache/x11-libs/libXext-1.3.4
new file mode 100644
index 0000000..a8d434a
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libXext-1.3.4
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] x11-base/xorg-proto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=X.Org Xext library
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXext
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs doc
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=>=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?]
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libXext-1.3.4.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
+_md5_=5fd3a58c36a1a9f3408dc914cca7c66f
diff --git a/metadata/md5-cache/x11-libs/libXfixes-5.0.3-r1 b/metadata/md5-cache/x11-libs/libXfixes-5.0.3-r1
deleted file mode 100644
index ee8a2f0..0000000
--- a/metadata/md5-cache/x11-libs/libXfixes-5.0.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org Xfixes library
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXfixes-5.0.3.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	50dd640df6d0554c259daa81531ed3ee
-_md5_=990d687882a1a5606db69d309749e2e2
diff --git a/metadata/md5-cache/x11-libs/libXfixes-6.0.0 b/metadata/md5-cache/x11-libs/libXfixes-6.0.0
new file mode 100644
index 0000000..3228434
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libXfixes-6.0.0
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-base/xorg-proto-2021.4 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=X.Org Xfixes library
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXfixes
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs doc
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?]
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libXfixes-6.0.0.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
+_md5_=39558138ec6ee0073e2976793eb95efc
diff --git a/metadata/md5-cache/x11-libs/libXfont2-2.0.3-r1 b/metadata/md5-cache/x11-libs/libXfont2-2.0.3-r1
deleted file mode 100644
index 0d4bded..0000000
--- a/metadata/md5-cache/x11-libs/libXfont2-2.0.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=sys-libs/zlib x11-base/xorg-proto x11-libs/libfontenc x11-libs/xtrans bzip2? ( app-arch/bzip2 ) truetype? ( >=media-libs/freetype-2 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X.Org Xfont library
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=bzip2 ipv6 truetype static-libs doc
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=sys-libs/zlib x11-base/xorg-proto x11-libs/libfontenc x11-libs/xtrans bzip2? ( app-arch/bzip2 ) truetype? ( >=media-libs/freetype-2 )
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXfont2-2.0.3.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	50dd640df6d0554c259daa81531ed3ee
-_md5_=eaa5d985f60f32f7b5b78a4deba4767b
diff --git a/metadata/md5-cache/x11-libs/libXfont2-2.0.4 b/metadata/md5-cache/x11-libs/libXfont2-2.0.4
new file mode 100644
index 0000000..a6bc58e
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libXfont2-2.0.4
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=sys-libs/zlib x11-base/xorg-proto x11-libs/libfontenc bzip2? ( app-arch/bzip2 ) truetype? ( >=media-libs/freetype-2 ) x11-base/xorg-proto x11-libs/xtrans !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=X.Org Xfont library
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libxfont
+IUSE=bzip2 ipv6 truetype static-libs doc
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=sys-libs/zlib x11-base/xorg-proto x11-libs/libfontenc bzip2? ( app-arch/bzip2 ) truetype? ( >=media-libs/freetype-2 )
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libXfont2-2.0.4.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
+_md5_=2615ce43a4ec78ca1348bdff0ae025f6
diff --git a/metadata/md5-cache/x11-libs/libXi-1.7.10 b/metadata/md5-cache/x11-libs/libXi-1.7.10
new file mode 100644
index 0000000..f572289
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libXi-1.7.10
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] x11-base/xorg-proto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=X.Org Xi library
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXi
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs doc
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?]
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libXi-1.7.10.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
+_md5_=301daeddf96a9492329c056ceda219a6
diff --git a/metadata/md5-cache/x11-libs/libXi-1.7.9-r1 b/metadata/md5-cache/x11-libs/libXi-1.7.9-r1
deleted file mode 100644
index a154a5c..0000000
--- a/metadata/md5-cache/x11-libs/libXi-1.7.9-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X.Org Xi library
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs doc
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXi-1.7.9.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	50dd640df6d0554c259daa81531ed3ee
-_md5_=3623f202db61c676cb6eb73ee343094f
diff --git a/metadata/md5-cache/x11-libs/libXinerama-1.1.3 b/metadata/md5-cache/x11-libs/libXinerama-1.1.3
deleted file mode 100644
index b3959c0..0000000
--- a/metadata/md5-cache/x11-libs/libXinerama-1.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto >=x11-proto/xineramaproto-1.2 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org Xinerama library
-EAPI=4
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto >=x11-proto/xineramaproto-1.2 abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXinerama-1.1.3.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	50dd640df6d0554c259daa81531ed3ee
-_md5_=a93c43209433231a59b5a3f22d9ea893
diff --git a/metadata/md5-cache/x11-libs/libXmu-1.1.3 b/metadata/md5-cache/x11-libs/libXmu-1.1.3
deleted file mode 100644
index 158bae4..0000000
--- a/metadata/md5-cache/x11-libs/libXmu-1.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] x11-base/xorg-proto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=X.Org Xmu library
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXmu
-IUSE=ipv6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs doc
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?]
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libXmu-1.1.3.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
-_md5_=e90d06112860397a782cffa983b418c9
diff --git a/metadata/md5-cache/x11-libs/libXpm-3.5.13 b/metadata/md5-cache/x11-libs/libXpm-3.5.13
deleted file mode 100644
index ca8f6ba..0000000
--- a/metadata/md5-cache/x11-libs/libXpm-3.5.13
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gettext >=app-portage/elt-patches-20170815 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] x11-base/xorg-proto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=X.Org Xpm library
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXpm
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?]
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libXpm-3.5.13.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
-_md5_=7d1c857533ad77a5c92ec37692a21a38
diff --git a/metadata/md5-cache/x11-libs/libXrandr-1.5.1-r1 b/metadata/md5-cache/x11-libs/libXrandr-1.5.1-r1
deleted file mode 100644
index f8e4400..0000000
--- a/metadata/md5-cache/x11-libs/libXrandr-1.5.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org Xrandr library
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXrandr-1.5.1.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	50dd640df6d0554c259daa81531ed3ee
-_md5_=6b38b7dfbc5bbb21c6c0832fe34264c1
diff --git a/metadata/md5-cache/x11-libs/libXrandr-1.5.2 b/metadata/md5-cache/x11-libs/libXrandr-1.5.2
new file mode 100644
index 0000000..eb9a767
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libXrandr-1.5.2
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] x11-base/xorg-proto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=X.Org Xrandr library
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXrandr
+IUSE=doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?]
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libXrandr-1.5.2.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
+_md5_=51ffa2bfa5c53c6daf8e192b147d667c
diff --git a/metadata/md5-cache/x11-libs/libXrender-0.9.10-r1 b/metadata/md5-cache/x11-libs/libXrender-0.9.10-r1
deleted file mode 100644
index 6c40a0e..0000000
--- a/metadata/md5-cache/x11-libs/libXrender-0.9.10-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org Xrender library
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXrender-0.9.10.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	50dd640df6d0554c259daa81531ed3ee
-_md5_=50da1eb9a9ef13fb80c64600f5d200cb
diff --git a/metadata/md5-cache/x11-libs/libXrender-0.9.10-r2 b/metadata/md5-cache/x11-libs/libXrender-0.9.10-r2
new file mode 100644
index 0000000..f03eea3
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libXrender-0.9.10-r2
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=X.Org Xrender library
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXrender
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?]
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libXrender-0.9.10.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
+_md5_=dc6ac89c08cd88c2ca469b019c4d2f25
diff --git a/metadata/md5-cache/x11-libs/libXt-1.1.5-r1 b/metadata/md5-cache/x11-libs/libXt-1.1.5-r1
deleted file mode 100644
index 10eab96..0000000
--- a/metadata/md5-cache/x11-libs/libXt-1.1.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-proto >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] test? ( dev-libs/glib ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org X Toolkit Intrinsics library
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=x11-base/xorg-proto >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXt-1.1.5.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	50dd640df6d0554c259daa81531ed3ee
-_md5_=736faac02409223dc27904ee35f607f8
diff --git a/metadata/md5-cache/x11-libs/libXtst-1.2.3-r1 b/metadata/md5-cache/x11-libs/libXtst-1.2.3-r1
deleted file mode 100644
index c7435d5..0000000
--- a/metadata/md5-cache/x11-libs/libXtst-1.2.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X.Org Xlib-based client API for the XTEST & RECORD extensions library
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs doc
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXtst-1.2.3.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	50dd640df6d0554c259daa81531ed3ee
-_md5_=4735a9a52923ae2d868632c19194d0f5
diff --git a/metadata/md5-cache/x11-libs/libXtst-1.2.3-r2 b/metadata/md5-cache/x11-libs/libXtst-1.2.3-r2
new file mode 100644
index 0000000..3e2682b
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libXtst-1.2.3-r2
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] x11-base/xorg-proto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=X.Org Xlib-based client API for the XTEST & RECORD extensions library
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXtst
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs doc
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?]
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libXtst-1.2.3.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
+_md5_=81f6de9e93e4ae2f840db67bf0b3a37f
diff --git a/metadata/md5-cache/x11-libs/libXv-1.0.9 b/metadata/md5-cache/x11-libs/libXv-1.0.9
deleted file mode 100644
index 2d91535..0000000
--- a/metadata/md5-cache/x11-libs/libXv-1.0.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/videoproto x11-proto/xproto >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org Xv library
-EAPI=4
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/videoproto x11-proto/xproto abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXv-1.0.9.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	50dd640df6d0554c259daa81531ed3ee
-_md5_=8dba4d69c113f413d1df7cabcade6e08
diff --git a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.4-r1 b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.4-r1
deleted file mode 100644
index 910e9c7..0000000
--- a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org Xxf86vm library
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-1.1.4.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	50dd640df6d0554c259daa81531ed3ee
-_md5_=df2559bbca8a692e717c116711ac260e
diff --git a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.4-r2 b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.4-r2
new file mode 100644
index 0000000..45858d7
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.4-r2
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=X.Org Xxf86vm library
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXxf86vm
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs doc
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?]
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libXxf86vm-1.1.4.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
+_md5_=06cf6069251335a590304b46e48f3bde
diff --git a/metadata/md5-cache/x11-libs/libfontenc-1.1.3-r1 b/metadata/md5-cache/x11-libs/libfontenc-1.1.3-r1
deleted file mode 100644
index dc8317c..0000000
--- a/metadata/md5-cache/x11-libs/libfontenc-1.1.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=sys-libs/zlib x11-base/xorg-proto >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org fontenc library
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=static-libs
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=sys-libs/zlib
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libfontenc-1.1.3.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	50dd640df6d0554c259daa81531ed3ee
-_md5_=652f0a29a2c10073e65912c551d800b3
diff --git a/metadata/md5-cache/x11-libs/libfontenc-1.1.4 b/metadata/md5-cache/x11-libs/libfontenc-1.1.4
new file mode 100644
index 0000000..0c41c65
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libfontenc-1.1.4
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=sys-libs/zlib x11-base/xorg-proto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=X.Org fontenc library
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libfontenc
+IUSE=static-libs
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=sys-libs/zlib
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libfontenc-1.1.4.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
+_md5_=1f118535f60a456c0bbd0faf35ed9d92
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.14 b/metadata/md5-cache/x11-libs/libxcb-1.14
index 4e59186..9dadd6e 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.14
+++ b/metadata/md5-cache/x11-libs/libxcb-1.14
@@ -1,6 +1,6 @@
-BDEPEND=|| ( dev-lang/python:3.8[xml] dev-lang/python:3.7[xml] dev-lang/python:3.6[xml] ) || ( ( dev-lang/python:3.8[xml] >=x11-base/xcb-proto-1.14[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[xml] >=x11-base/xcb-proto-1.14[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[xml] >=x11-base/xcb-proto-1.14[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=app-portage/elt-patches-20170815 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+BDEPEND=|| ( dev-lang/python:3.8[xml] dev-lang/python:3.7[xml] dev-lang/python:3.6[xml] ) || ( ( dev-lang/python:3.8[xml] >=x11-base/xcb-proto-1.14[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[xml] >=x11-base/xcb-proto-1.14[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[xml] >=x11-base/xcb-proto-1.14[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) doc? ( app-doc/doxygen[dot] ) test? ( dev-libs/libxslt ) >=app-portage/elt-patches-20170815 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-base/xcb-proto-1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] test? ( dev-libs/check[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) doc? ( app-doc/doxygen[dot] ) dev-libs/libxslt !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-base/xcb-proto-1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] elibc_Darwin? ( dev-libs/libpthread-stubs ) test? ( dev-libs/check[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=X C-language Bindings library
 EAPI=7
 HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb
@@ -12,4 +12,4 @@
 SLOT=0/1.12
 SRC_URI=https://www.x.org/releases/individual/lib/libxcb-1.14.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
-_md5_=0c26637344ea7221963ef37b37fe892b
+_md5_=c69cbff33a343ff960e029bc5817528d
diff --git a/metadata/md5-cache/x11-libs/libxkbfile-1.0.9-r2 b/metadata/md5-cache/x11-libs/libxkbfile-1.0.9-r2
deleted file mode 100644
index ac28fb7..0000000
--- a/metadata/md5-cache/x11-libs/libxkbfile-1.0.9-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-proto x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org xkbfile library
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=x11-base/xorg-proto x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libxkbfile-1.0.9.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	50dd640df6d0554c259daa81531ed3ee
-_md5_=18bf91395f4b1516d2c55824a7bb5481
diff --git a/metadata/md5-cache/x11-libs/libxkbfile-1.1.0 b/metadata/md5-cache/x11-libs/libxkbfile-1.1.0
new file mode 100644
index 0000000..2b020bd
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libxkbfile-1.1.0
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] x11-base/xorg-proto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=X.Org xkbfile library
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libxkbfile
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?]
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libxkbfile-1.1.0.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
+_md5_=723f0f0ed6e0ffa8e4ecc240b9633c92
diff --git a/metadata/md5-cache/x11-libs/libxshmfence-1.3-r1 b/metadata/md5-cache/x11-libs/libxshmfence-1.3-r1
deleted file mode 100644
index 8da3a64..0000000
--- a/metadata/md5-cache/x11-libs/libxshmfence-1.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-proto >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=Shared memory fences using futexes
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libxshmfence-1.3.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	50dd640df6d0554c259daa81531ed3ee
-_md5_=dde1764c43548db1043b1cb5bcad52f3
diff --git a/metadata/md5-cache/x11-libs/libxshmfence-1.3-r2 b/metadata/md5-cache/x11-libs/libxshmfence-1.3-r2
new file mode 100644
index 0000000..959965b
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libxshmfence-1.3-r2
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-base/xorg-proto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Shared memory fences using futexes
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libxshmfence
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs
+KEYWORDS=*
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libxshmfence-1.3.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
+_md5_=afc634bf9caa3b5e6afaa86968076377
diff --git a/metadata/md5-cache/x11-libs/pango-1.42.4-r2 b/metadata/md5-cache/x11-libs/pango-1.42.4-r2
index c40e2f7..7e01799 100644
--- a/metadata/md5-cache/x11-libs/pango-1.42.4-r2
+++ b/metadata/md5-cache/x11-libs/pango-1.42.4-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=media-libs/harfbuzz-1.4.2:=[glib(+),truetype(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=dev-libs/glib-2.50.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=media-libs/fontconfig-2.12.92:1.0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=dev-libs/fribidi-0.19.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) dev-util/glib-utils >=dev-util/gtk-doc-am-1.20 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] test? ( media-fonts/cantarell ) X? ( x11-base/xorg-proto ) !<=sys-devel/autoconf-2.63:2.5 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=media-libs/harfbuzz-1.4.2:=[glib(+),truetype(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=dev-libs/glib-2.50.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=media-libs/fontconfig-2.12.92:1.0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=dev-libs/fribidi-0.19.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) dev-util/glib-utils >=dev-util/gtk-doc-am-1.20 virtual/pkgconfig test? ( media-fonts/cantarell ) X? ( x11-base/xorg-proto ) !<=sys-devel/autoconf-2.63:2.5 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Internationalized text layout and rendering library
 EAPI=6
 HOMEPAGE=https://www.pango.org/
@@ -7,7 +7,8 @@
 KEYWORDS=*
 LICENSE=LGPL-2+ FTL
 RDEPEND=>=media-libs/harfbuzz-1.4.2:=[glib(+),truetype(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=dev-libs/glib-2.50.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=media-libs/fontconfig-2.12.92:1.0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=dev-libs/fribidi-0.19.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pango/1.42/pango-1.42.4.tar.xz https://dev.gentoo.org/~leio/distfiles/pango-1.42.4-patchset.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9a26f720809dce148c5d3dde96689bb6
+_md5_=cce0fb6c856b6f20fdedad16e420f402
diff --git a/metadata/md5-cache/x11-libs/pixman-0.32.4-r1 b/metadata/md5-cache/x11-libs/pixman-0.32.4-r1
deleted file mode 100644
index 5824fc9..0000000
--- a/metadata/md5-cache/x11-libs/pixman-0.32.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=Low-level pixel manipulation routines
-EAPI=4
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=altivec iwmmxt loongson2f mmxext neon sse2 ssse3 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20131008 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ) abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/pixman-0.32.4.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xorg-2	50dd640df6d0554c259daa81531ed3ee
-_md5_=40658a1e7bb099bd817334cd24841106
diff --git a/metadata/md5-cache/x11-libs/pixman-0.40.0 b/metadata/md5-cache/x11-libs/pixman-0.40.0
new file mode 100644
index 0000000..d0679ab
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/pixman-0.40.0
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=Low-level pixel manipulation routines
+EAPI=7
+HOMEPAGE=http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/
+IUSE=cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/pixman-0.40.0.tar.xz
+_eclasses_=meson	5ec14fdbc5446b8767e87e186e3b1a52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	1979aa0ff4d356d32507ca4650d9f37d	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=282b158b9754e9a87cedebc1932ad517
diff --git a/metadata/md5-cache/x11-libs/xtrans-1.3.5 b/metadata/md5-cache/x11-libs/xtrans-1.3.5
deleted file mode 100644
index 46c2d21..0000000
--- a/metadata/md5-cache/x11-libs/xtrans-1.3.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X.Org xtrans library
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=doc
-KEYWORDS=*
-LICENSE=MIT
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.3.5.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	50dd640df6d0554c259daa81531ed3ee
-_md5_=2ab97b7eec8bac3f3c5def1bab6b2d99
diff --git a/metadata/md5-cache/x11-libs/xtrans-1.4.0 b/metadata/md5-cache/x11-libs/xtrans-1.4.0
new file mode 100644
index 0000000..9005625
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/xtrans-1.4.0
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=X.Org xtrans library
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libxtrans
+IUSE=static-libs doc
+KEYWORDS=*
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/xtrans-1.4.0.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
+_md5_=bffa1da29db71fda9003ffb356a739fd
diff --git a/metadata/md5-cache/x11-misc/compose-tables-1.7.2 b/metadata/md5-cache/x11-misc/compose-tables-1.7.2
new file mode 100644
index 0000000..585079f
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/compose-tables-1.7.2
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-base/xorg-proto >=x11-libs/libxcb-1.11.1 x11-libs/xtrans !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=X.Org Compose Key tables from libX11
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/compose-tables
+IUSE=static-libs
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=!<x11-libs/libX11-1.7.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.7.2.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
+_md5_=ad6b3666b00c438947bc918120b5230d
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index dd4840a..dbd184f 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1 +1 @@
-DIST libidn2-2.0.4.tar.gz 2008524 BLAKE2B 7163e1eff498031c7433911533b34d993876b55d9b324aaef39c93db2cceee78dec4c8cfbf4d9dabd1dbbb03a8cbd65021f26a94758f57b32ef98dc869f744b6 SHA512 1e51bd4b8f8907531576291f1c2a8865d17429b4105418b4c98754eb982cd1cbb3adbeab4ec0c1c561d2dba11d876c7c09e5dc5b315c55a2c24986d7a2a3b4d2
+DIST libidn2-2.3.0.tar.gz 2164993 BLAKE2B 3c103831c39fa3fd0340c9c45f3f683483207ade9cadc8d85b046a698f75bbe5ce6829de69a5cb238404d243b7a39ef44d69ea4ea80c22b813eafbacae615a8b SHA512 a2bf6d2249948bce14fbbc802f8af1c9b427fc9bf64203a2f3d7239d8e6061d0a8e7970a23e8e5889110a654a321e0504c7a6d049bb501e7f6a23d42b50b6187
diff --git a/net-dns/libidn2/libidn2-2.0.4-r1.ebuild b/net-dns/libidn2/libidn2-2.0.4-r1.ebuild
deleted file mode 100644
index 89375e2..0000000
--- a/net-dns/libidn2/libidn2-2.0.4-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
-HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/jas/libidn2"
-SRC_URI="
-	mirror://gnu/libidn/${P}.tar.gz
-"
-
-LICENSE="GPL-2+ LGPL-3+"
-SLOT="0"
-KEYWORDS="*"
-IUSE="static-libs"
-
-RDEPEND="
-	dev-libs/libunistring[${MULTILIB_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-lang/perl
-	sys-apps/help2man
-"
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Darwin ar chokes when TMPDIR doesn't exist (as done for some
-		# reason in the Makefile)
-		sed -i -e '/^TMPDIR = /d' Makefile.in || die
-		export TMPDIR="${T}"
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
-		$(use_enable static-libs static) \
-		--disable-doc \
-		--disable-gtk-doc
-}
-
-multilib_src_install() {
-	default
-
-	prune_libtool_files
-}
diff --git a/net-dns/libidn2/libidn2-2.3.0.ebuild b/net-dns/libidn2/libidn2-2.3.0.ebuild
new file mode 100644
index 0000000..0d01fe1
--- /dev/null
+++ b/net-dns/libidn2/libidn2-2.3.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
+HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2"
+SRC_URI="
+	mirror://gnu/libidn/${P}.tar.gz
+"
+
+LICENSE="GPL-2+ LGPL-3+"
+SLOT="0"
+KEYWORDS="*"
+IUSE="static-libs"
+
+RDEPEND="
+	dev-libs/libunistring[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	sys-apps/help2man
+"
+S=${WORKDIR}/${P/a/}
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Darwin ar chokes when TMPDIR doesn't exist (as done for some
+		# reason in the Makefile)
+		sed -i -e '/^TMPDIR = /d' Makefile.in || die
+		export TMPDIR="${T}"
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
+		$(use_enable static-libs static) \
+		--disable-doc \
+		--disable-gcc-warnings \
+		--disable-gtk-doc
+}
+
+multilib_src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-dns/libidn2/metadata.xml b/net-dns/libidn2/metadata.xml
index 87360ed..a07f73b 100644
--- a/net-dns/libidn2/metadata.xml
+++ b/net-dns/libidn2/metadata.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-</maintainer>
-<upstream>
-<remote-id type="cpe">cpe:/a:libidn2_project:libidn2</remote-id>
-</upstream>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:libidn2_project:libidn2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild b/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
deleted file mode 100644
index 97a7ab8..0000000
--- a/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs autotools
-
-MY_PV="$(ver_rs 3 '-' )"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Controls Ethernet frame filtering on a Linux bridge, MAC NAT and brouting"
-HOMEPAGE="http://ebtables.sourceforge.net/"
-SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE="+perl static"
-
-BDEPEND=">=app-eselect/eselect-iptables-20200508"
-# The ebtables-save script is written in perl.
-RDEPEND="${BDEPEND}
-	perl? ( dev-lang/perl )
-	net-misc/ethertypes"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.11-makefile.patch"
-
-	# Enhance ebtables-save to take table names as parameters bug #189315
-	"${FILESDIR}/${PN}-2.0.11-ebt-save.patch"
-
-	# from upstream git
-	"${FILESDIR}/ebtables-2.0.11-remove-stray-atsign.patch"
-)
-
-pkg_setup() {
-	if use static; then
-		ewarn "You've chosen static build which is useful for embedded devices."
-		ewarn "It has no init script. Make sure that's really what you want."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# don't install perl scripts if USE=perl is disabled
-	if ! use perl; then
-		sed -e '/sbin_SCRIPTS/ d' -i Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--bindir="/bin" \
-		--sbindir="/sbin" \
-		--libdir=/$(get_libdir)/${PN} \
-		--sysconfdir="/usr/share/doc/${PF}" \
-		$(use_enable static)
-}
-
-src_compile() {
-	emake $(usex static 'static ebtables-legacy.8' '')
-}
-
-src_install() {
-	local -a DOCS=( ChangeLog THANKS )
-
-	if ! use static; then
-		emake DESTDIR="${D}" install
-		keepdir /var/lib/ebtables/
-		newinitd "${FILESDIR}"/ebtables.initd-r1 ebtables
-		newconfd "${FILESDIR}"/ebtables.confd-r1 ebtables
-
-		find "${D}" -name '*.la' -type f -delete || die
-	else
-		into /
-		newsbin static ebtables
-		insinto /etc
-		doins ethertypes
-	fi
-
-	newman ebtables-legacy.8 ebtables.8
-	einstalldocs
-	docompress -x /usr/share/doc/${PF}/ethertypes #724138
-}
-
-pkg_postinst() {
-	if ! eselect ebtables show &>/dev/null; then
-		elog "Current ebtables implementation is unset, setting to ebtables-legacy"
-		eselect ebtables set ebtables-legacy
-	fi
-
-	eselect ebtables show
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} ]] && has_version 'net-firewall/iptables[nftables]'; then
-		elog "Resetting ebtables symlinks to xtables-nft-multi before removal"
-		eselect ebtables set xtables-nft-multi
-	else
-		elog "Unsetting ebtables symlinks before removal"
-		eselect ebtables unset
-	fi
-}
diff --git a/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild b/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
index b73fd70..6f447b7 100644
--- a/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
-inherit toolchain-funcs autotools
+inherit autotools
 
 MY_PV="$(ver_rs 3 '-' )"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Controls Ethernet frame filtering on a Linux bridge, MAC NAT and brouting"
-HOMEPAGE="http://ebtables.sourceforge.net/"
-SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="https://ebtables.netfilter.org/"
+SRC_URI="http://ftp.netfilter.org/pub/${PN}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
@@ -44,11 +44,12 @@
 src_prepare() {
 	default
 
-	# don't install perl scripts if USE=perl is disabled
+	# Don't install perl scripts if USE=perl is disabled.
 	if ! use perl; then
-		sed -e '/sbin_SCRIPTS/ d' -i Makefile.am || die
+		sed -i -e '/^sbin_SCRIPTS/ d' Makefile.am || die
 	fi
 
+	# The bundled autotools are borked, so force a rebuild.
 	eautoreconf
 }
 
@@ -56,8 +57,7 @@
 	econf \
 		--bindir="/bin" \
 		--sbindir="/sbin" \
-		--libdir=/$(get_libdir)/${PN} \
-		--sysconfdir="/usr/share/doc/${PF}" \
+		--libdir="/$(get_libdir)/${PN}" \
 		$(use_enable static)
 }
 
@@ -70,13 +70,13 @@
 
 	if ! use static; then
 		emake DESTDIR="${D}" install
-		keepdir /var/lib/ebtables/
 		newinitd "${FILESDIR}"/ebtables.initd-r1 ebtables
 		newconfd "${FILESDIR}"/ebtables.confd-r1 ebtables
 
 		find "${D}" -name '*.la' -type f -delete || die
 
-		rm "${ED%/}"/etc/ethertypes || die
+		# The ethertypes package installs this for us.
+		rm "${ED}"/etc/ethertypes || die
 	else
 		into /
 		newsbin static ebtables
@@ -84,7 +84,6 @@
 
 	newman ebtables-legacy.8 ebtables.8
 	einstalldocs
-	docompress -x /usr/share/doc/${PF}/ethertypes #724138
 }
 
 pkg_postinst() {
diff --git a/net-firewall/ebtables/files/ebtables.confd-r1 b/net-firewall/ebtables/files/ebtables.confd-r1
index 645b26e..8e83c81 100644
--- a/net-firewall/ebtables/files/ebtables.confd-r1
+++ b/net-firewall/ebtables/files/ebtables.confd-r1
@@ -9,3 +9,11 @@
 
 # Save state on stopping ebtables
 SAVE_ON_STOP="yes"
+
+# If you need to log iptables messages as soon as iptables starts,
+# AND your logger does NOT depend on the network, then you may wish
+# to uncomment the next line.
+# If your logger depends on the network, and you uncomment this line
+# you will create an unresolvable circular dependency during startup.
+# After commenting or uncommenting this line, you must run 'rc-update -u'.
+#rc_use="logger"
diff --git a/net-firewall/ebtables/files/ebtables.initd-r1 b/net-firewall/ebtables/files/ebtables.initd-r1
index 6608760..bdc0987 100644
--- a/net-firewall/ebtables/files/ebtables.initd-r1
+++ b/net-firewall/ebtables/files/ebtables.initd-r1
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 extra_commands="save panic"
@@ -10,10 +10,10 @@
 
 depend() {
 	before net
-	use logger
 }
 
 ebtables_tables() {
+	local table
 	for table in filter nat broute; do
 		if ${ebtables_bin} -t ${table} -L > /dev/null 2>&1; then
 			printf '%s' "${table} "
@@ -80,8 +80,8 @@
 
 save() {
 	ebegin "Saving ebtables state"
-	touch "${ebtables_save}"
-	chmod 0600 "${ebtables_save}"
+	checkpath -d -m 0755 "${ebtables_save%/*}"
+	checkpath -f -m 0600 "${ebtables_save}"
 	${ebtables_bin}-save $(ebtables_tables) ${SAVE_RESTORE_OPTIONS} > "${ebtables_save}"
 	eend $?
 }
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 57fe6ac..94f3fc8 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1 +1 @@
-DIST gnutls-3.6.15.tar.xz 6081656 BLAKE2B 6c52419037e41e817087a2577a6b73969cf065453ecf88e2f87152f544a177e4ad0ef825ae9dab243312e0223a953ab28e532bd2dbf96cb9498618415bc7f654 SHA512 f757d1532198f44bcad7b73856ce6a05bab43f6fb77fcc81c59607f146202f73023d0796d3e1e7471709cf792c8ee7d436e19407e0601bc0bda2f21512b3b01c
+DIST gnutls-3.7.1.tar.xz 6038388 BLAKE2B 1d55eb441827c7148d63bcad37bf7bc62d539ee9bc7e14c2fe5ec1d0bdcadd75e2cbc98ba104523b24c8dfd9526b4595475a818d206971cc012fac509cd33a6f SHA512 0fe801f03676c3bd970387f94578c8be7ba6030904989e7d21dffdc726209bab44c8096fbcb6d51fed2de239537bd00df2338ee9c8d984a1c386826b91062a95
diff --git a/net-libs/gnutls/files/gnutls-3.7.0-ignore-duplicate-certificates.patch b/net-libs/gnutls/files/gnutls-3.7.0-ignore-duplicate-certificates.patch
new file mode 100644
index 0000000..b014381
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-3.7.0-ignore-duplicate-certificates.patch
@@ -0,0 +1,403 @@
+From 09b40be6e0e0a59ba4bd764067eb353241043a70 Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno@gnu.org>
+Date: Mon, 28 Dec 2020 12:14:13 +0100
+Subject: [PATCH] gnutls_x509_trust_list_verify_crt2: ignore duplicate
+ certificates
+
+The commit ebb19db9165fed30d73c83bab1b1b8740c132dfd caused a
+regression, where duplicate certificates in a certificate chain are no
+longer ignored but treated as a non-contiguous segment and that
+results in calling the issuer callback, or a verification failure.
+
+This adds a mechanism to record certificates already seen in the
+chain, and skip them while still allow the caller to inject missing
+certificates.
+
+Signed-off-by: Daiki Ueno <ueno@gnu.org>
+Co-authored-by: Andreas Metzler <ametzler@debian.org>
+---
+ lib/x509/common.c          |   8 ++
+ lib/x509/verify-high.c     | 157 +++++++++++++++++++++++++++++++------
+ tests/missingissuer.c      |   2 +
+ tests/test-chains-issuer.h | 101 +++++++++++++++++++++++-
+ 4 files changed, 245 insertions(+), 23 deletions(-)
+
+diff --git a/lib/x509/common.c b/lib/x509/common.c
+index 3301aaad0c..10c8db53c0 100644
+--- a/lib/x509/common.c
++++ b/lib/x509/common.c
+@@ -1758,6 +1758,14 @@ unsigned int _gnutls_sort_clist(gnutls_x509_crt_t *clist,
+ 	 * increasing DEFAULT_MAX_VERIFY_DEPTH.
+ 	 */
+ 	for (i = 0; i < clist_size; i++) {
++		/* Self-signed certificate found in the chain; skip it
++		 * as it should only appear in the trusted set.
++		 */
++		if (gnutls_x509_crt_check_issuer(clist[i], clist[i])) {
++			_gnutls_cert_log("self-signed cert found", clist[i]);
++			continue;
++		}
++
+ 		for (j = 1; j < clist_size; j++) {
+ 			if (i == j)
+ 				continue;
+diff --git a/lib/x509/verify-high.c b/lib/x509/verify-high.c
+index 588e7ee0dc..9a16e6b42a 100644
+--- a/lib/x509/verify-high.c
++++ b/lib/x509/verify-high.c
+@@ -67,6 +67,80 @@ struct gnutls_x509_trust_list_iter {
+ 
+ #define DEFAULT_SIZE 127
+ 
++struct cert_set_node_st {
++	gnutls_x509_crt_t *certs;
++	unsigned int size;
++};
++
++struct cert_set_st {
++	struct cert_set_node_st *node;
++	unsigned int size;
++};
++
++static int
++cert_set_init(struct cert_set_st *set, unsigned int size)
++{
++	memset(set, 0, sizeof(*set));
++
++	set->size = size;
++	set->node = gnutls_calloc(size, sizeof(*set->node));
++	if (!set->node) {
++		return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR);
++	}
++
++	return 0;
++}
++
++static void
++cert_set_deinit(struct cert_set_st *set)
++{
++	size_t i;
++
++	for (i = 0; i < set->size; i++) {
++		gnutls_free(set->node[i].certs);
++	}
++
++	gnutls_free(set->node);
++}
++
++static bool
++cert_set_contains(struct cert_set_st *set, const gnutls_x509_crt_t cert)
++{
++	size_t hash, i;
++
++	hash = hash_pjw_bare(cert->raw_dn.data, cert->raw_dn.size);
++	hash %= set->size;
++
++	for (i = 0; i < set->node[hash].size; i++) {
++		if (unlikely(gnutls_x509_crt_equals(set->node[hash].certs[i], cert))) {
++			return true;
++		}
++	}
++
++	return false;
++}
++
++static int
++cert_set_add(struct cert_set_st *set, const gnutls_x509_crt_t cert)
++{
++	size_t hash;
++
++	hash = hash_pjw_bare(cert->raw_dn.data, cert->raw_dn.size);
++	hash %= set->size;
++
++	set->node[hash].certs =
++		gnutls_realloc_fast(set->node[hash].certs,
++				    (set->node[hash].size + 1) *
++				    sizeof(*set->node[hash].certs));
++	if (!set->node[hash].certs) {
++		return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR);
++	}
++	set->node[hash].certs[set->node[hash].size] = cert;
++	set->node[hash].size++;
++
++	return 0;
++}
++
+ /**
+  * gnutls_x509_trust_list_init:
+  * @list: A pointer to the type to be initialized
+@@ -1328,6 +1402,7 @@ gnutls_x509_trust_list_verify_crt2(gnutls_x509_trust_list_t list,
+ 	unsigned have_set_name = 0;
+ 	unsigned saved_output;
+ 	gnutls_datum_t ip = {NULL, 0};
++	struct cert_set_st cert_set = { NULL, 0 };
+ 
+ 	if (cert_list == NULL || cert_list_size < 1)
+ 		return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
+@@ -1376,36 +1451,68 @@ gnutls_x509_trust_list_verify_crt2(gnutls_x509_trust_list_t list,
+ 	memcpy(sorted, cert_list, cert_list_size * sizeof(gnutls_x509_crt_t));
+ 	cert_list = sorted;
+ 
++	ret = cert_set_init(&cert_set, DEFAULT_MAX_VERIFY_DEPTH);
++	if (ret < 0) {
++		return ret;
++	}
++
+ 	for (i = 0; i < cert_list_size &&
+-		     cert_list_size <= DEFAULT_MAX_VERIFY_DEPTH; i++) {
+-		if (!(flags & GNUTLS_VERIFY_DO_NOT_ALLOW_UNSORTED_CHAIN)) {
+-			unsigned int sorted_size;
++		     cert_list_size <= DEFAULT_MAX_VERIFY_DEPTH; ) {
++		unsigned int sorted_size = 1;
++		unsigned int j;
++		gnutls_x509_crt_t issuer;
+ 
++		if (!(flags & GNUTLS_VERIFY_DO_NOT_ALLOW_UNSORTED_CHAIN)) {
+ 			sorted_size = _gnutls_sort_clist(&cert_list[i],
+ 							 cert_list_size - i);
+-			i += sorted_size - 1;
+ 		}
+ 
+-		if (i == cert_list_size - 1) {
+-			gnutls_x509_crt_t issuer;
+-
+-			/* If it is the last certificate and its issuer is
+-			 * known, don't need to run issuer callback. */
+-			if (_gnutls_trust_list_get_issuer(list,
+-							  cert_list[i],
+-							  &issuer,
+-							  0) == 0) {
++		/* Remove duplicates. Start with index 1, as the first element
++		 * may be re-checked after issuer retrieval. */
++		for (j = 1; j < sorted_size; j++) {
++			if (cert_set_contains(&cert_set, cert_list[i + j])) {
++				if (i + j < cert_list_size - 1) {
++					memmove(&cert_list[i + j],
++						&cert_list[i + j + 1],
++						sizeof(cert_list[i]));
++				}
++				cert_list_size--;
+ 				break;
+ 			}
+-		} else if (gnutls_x509_crt_check_issuer(cert_list[i],
+-							cert_list[i + 1])) {
+-			/* There is no gap between this and the next
+-			 * certificate. */
++		}
++		/* Found a duplicate, try again with the same index. */
++		if (j < sorted_size) {
++			continue;
++		}
++
++		/* Record the certificates seen. */
++		for (j = 0; j < sorted_size; j++, i++) {
++			ret = cert_set_add(&cert_set, cert_list[i]);
++			if (ret < 0) {
++				goto cleanup;
++			}
++		}
++
++		/* If the issuer of the certificate is known, no need
++		 * for further processing. */
++		if (_gnutls_trust_list_get_issuer(list,
++						  cert_list[i - 1],
++						  &issuer,
++						  0) == 0) {
++			cert_list_size = i;
++			break;
++		}
++
++		/* If there is no gap between this and the next certificate,
++		 * proceed with the next certificate. */
++		if (i < cert_list_size &&
++		    gnutls_x509_crt_check_issuer(cert_list[i - 1],
++						 cert_list[i])) {
+ 			continue;
+ 		}
+ 
+ 		ret = retrieve_issuers(list,
+-				       cert_list[i],
++				       cert_list[i - 1],
+ 				       &retrieved[retrieved_size],
+ 				       DEFAULT_MAX_VERIFY_DEPTH -
+ 				       MAX(retrieved_size,
+@@ -1413,15 +1520,20 @@ gnutls_x509_trust_list_verify_crt2(gnutls_x509_trust_list_t list,
+ 		if (ret < 0) {
+ 			break;
+ 		} else if (ret > 0) {
+-			memmove(&cert_list[i + 1 + ret],
+-				&cert_list[i + 1],
+-				(cert_list_size - i - 1) *
++			assert((unsigned int)ret <=
++			       DEFAULT_MAX_VERIFY_DEPTH - cert_list_size);
++			memmove(&cert_list[i + ret],
++				&cert_list[i],
++				(cert_list_size - i) *
+ 				sizeof(gnutls_x509_crt_t));
+-			memcpy(&cert_list[i + 1],
++			memcpy(&cert_list[i],
+ 			       &retrieved[retrieved_size],
+ 			       ret * sizeof(gnutls_x509_crt_t));
+ 			retrieved_size += ret;
+ 			cert_list_size += ret;
++
++			/* Start again from the end of the previous segment. */
++			i--;
+ 		}
+ 	}
+ 
+@@ -1581,6 +1693,7 @@ gnutls_x509_trust_list_verify_crt2(gnutls_x509_trust_list_t list,
+ 	for (i = 0; i < retrieved_size; i++) {
+ 		gnutls_x509_crt_deinit(retrieved[i]);
+ 	}
++	cert_set_deinit(&cert_set);
+ 	return ret;
+ }
+ 
+diff --git a/tests/missingissuer.c b/tests/missingissuer.c
+index f21e2b6b0c..226d095929 100644
+--- a/tests/missingissuer.c
++++ b/tests/missingissuer.c
+@@ -145,6 +145,8 @@ void doit(void)
+ 		printf("[%d]: Chain '%s'...\n", (int)i, chains[i].name);
+ 
+ 		for (j = 0; chains[i].chain[j]; j++) {
++			assert(j < MAX_CHAIN);
++
+ 			if (debug > 2)
+ 				printf("\tAdding certificate %d...", (int)j);
+ 
+diff --git a/tests/test-chains-issuer.h b/tests/test-chains-issuer.h
+index 543e2d71fb..bf1e65c956 100644
+--- a/tests/test-chains-issuer.h
++++ b/tests/test-chains-issuer.h
+@@ -24,7 +24,7 @@
+ #ifndef GNUTLS_TESTS_TEST_CHAINS_ISSUER_H
+ #define GNUTLS_TESTS_TEST_CHAINS_ISSUER_H
+ 
+-#define MAX_CHAIN 6
++#define MAX_CHAIN 15
+ 
+ #define SERVER_CERT "-----BEGIN CERTIFICATE-----\n"			\
+ 	"MIIDATCCAbmgAwIBAgIUQdvdegP8JFszFHLfV4+lrEdafzAwPQYJKoZIhvcNAQEK\n" \
+@@ -338,11 +338,102 @@ static const char *missing_middle_unrelated_extra_insert[] = {
+ 	NULL,
+ };
+ 
++static const char *missing_middle_single_duplicate[] = {
++	SERVER_CERT,
++	SERVER_CERT,
++	CA_CERT_5,
++	CA_CERT_5,
++	CA_CERT_4,
++	CA_CERT_4,
++	CA_CERT_2,
++	CA_CERT_2,
++	CA_CERT_1,
++	CA_CERT_1,
++	NULL,
++};
++
++static const char *missing_middle_multiple_duplicate[] = {
++	SERVER_CERT,
++	SERVER_CERT,
++	CA_CERT_5,
++	CA_CERT_5,
++	CA_CERT_4,
++	CA_CERT_4,
++	CA_CERT_1,
++	CA_CERT_1,
++	NULL,
++};
++
++static const char *missing_last_single_duplicate[] = {
++	SERVER_CERT,
++	SERVER_CERT,
++	CA_CERT_5,
++	CA_CERT_5,
++	CA_CERT_4,
++	CA_CERT_4,
++	CA_CERT_3,
++	CA_CERT_3,
++	CA_CERT_2,
++	CA_CERT_2,
++	NULL,
++};
++
++static const char *missing_last_multiple_duplicate[] = {
++	SERVER_CERT,
++	SERVER_CERT,
++	CA_CERT_5,
++	CA_CERT_5,
++	CA_CERT_4,
++	CA_CERT_4,
++	CA_CERT_3,
++	CA_CERT_3,
++	NULL,
++};
++
++static const char *missing_skip_single_duplicate[] = {
++	SERVER_CERT,
++	SERVER_CERT,
++	CA_CERT_5,
++	CA_CERT_5,
++	CA_CERT_3,
++	CA_CERT_3,
++	CA_CERT_1,
++	CA_CERT_1,
++	NULL,
++};
++
++static const char *missing_skip_multiple_duplicate[] = {
++	SERVER_CERT,
++	SERVER_CERT,
++	CA_CERT_5,
++	CA_CERT_5,
++	CA_CERT_3,
++	CA_CERT_3,
++	NULL,
++};
++
+ static const char *missing_ca[] = {
+ 	CA_CERT_0,
+ 	NULL,
+ };
+ 
++static const char *middle_single_duplicate_ca[] = {
++	SERVER_CERT,
++	CA_CERT_5,
++	CA_CERT_0,
++	CA_CERT_4,
++	CA_CERT_0,
++	CA_CERT_2,
++	CA_CERT_0,
++	CA_CERT_1,
++	NULL,
++};
++
++static const char *missing_middle_single_duplicate_ca_unrelated_insert[] = {
++	CA_CERT_0,
++	NULL,
++};
++
+ static struct chains {
+ 	const char *name;
+ 	const char **chain;
+@@ -377,6 +468,14 @@ static struct chains {
+ 	{ "skip multiple unsorted", missing_skip_multiple_unsorted, missing_skip_multiple_insert, missing_ca, 0, 0 },
+ 	{ "unrelated", missing_middle_single, missing_middle_unrelated_insert, missing_ca, 0, GNUTLS_CERT_INVALID | GNUTLS_CERT_SIGNER_NOT_FOUND },
+ 	{ "unrelated extra", missing_middle_single, missing_middle_unrelated_extra_insert, missing_ca, 0, 0 },
++	{ "middle single duplicate", missing_middle_single_duplicate, missing_middle_single_insert, missing_ca, 0, 0 },
++	{ "middle multiple duplicate", missing_middle_multiple_duplicate, missing_middle_multiple_insert, missing_ca, 0, 0 },
++	{ "last single duplicate", missing_last_single_duplicate, missing_last_single_insert, missing_ca, 0, 0 },
++	{ "last multiple duplicate", missing_last_multiple_duplicate, missing_last_multiple_insert, missing_ca, 0, 0 },
++	{ "skip single duplicate", missing_skip_single_duplicate, missing_skip_single_insert, missing_ca, 0, 0 },
++	{ "skip multiple duplicate", missing_skip_multiple_duplicate, missing_skip_multiple_insert, missing_ca, 0, 0 },
++	{ "middle single duplicate ca", middle_single_duplicate_ca, missing_middle_single_insert, missing_ca, 0, 0 },
++	{ "middle single duplicate ca - insert unrelated", middle_single_duplicate_ca, missing_middle_single_duplicate_ca_unrelated_insert, missing_ca, 0, GNUTLS_CERT_INVALID | GNUTLS_CERT_SIGNER_NOT_FOUND },
+ 	{ NULL, NULL, NULL, NULL },
+ };
+ 
+-- 
+GitLab
+
diff --git a/net-libs/gnutls/gnutls-3.6.15.ebuild b/net-libs/gnutls/gnutls-3.6.15.ebuild
deleted file mode 100644
index 1bf425f..0000000
--- a/net-libs/gnutls/gnutls-3.6.15.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
-
-LICENSE="GPL-3 LGPL-2.1+"
-SLOT="0/30" # libgnutls.so number
-KEYWORDS="*"
-IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
-
-REQUIRED_USE="
-	test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
-RESTRICT="!test? ( test )"
-
-# NOTICE: sys-devel/autogen is required at runtime as we
-# use system libopts
-RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
-	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-3.4.1:=[gmp,${MULTILIB_USEDEP}]
-	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
-	tools? ( sys-devel/autogen:= )
-	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
-	guile? ( >=dev-scheme/guile-2:=[networking] )
-	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? (
-		seccomp? ( sys-libs/libseccomp )
-	)"
-BDEPEND=">=virtual/pkgconfig-0-r1
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	tools? ( sys-devel/autogen )
-	valgrind? ( dev-util/valgrind )
-	test-full? (
-		app-crypt/dieharder
-		>=app-misc/datefudge-1.22
-		dev-libs/softhsm:2[-bindist]
-		net-dialup/ppp
-		net-misc/socat
-	)"
-
-DOCS=(
-	README.md
-	doc/certtool.cfg
-)
-
-HTML_DOCS=()
-
-#PATCHES=( "${FILESDIR}"/${PN}-3.6.15-skip-dtls-seccomp-tests.patch )
-
-pkg_setup() {
-	# bug#520818
-	export TZ=UTC
-
-	use doc && HTML_DOCS+=(
-		doc/gnutls.html
-	)
-}
-
-src_prepare() {
-	default
-
-	# force regeneration of autogen-ed files
-	local file
-	for file in $(grep -l AutoGen-ed src/*.c) ; do
-		rm src/$(basename ${file} .c).{c,h} || die
-	done
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-multilib_src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	local libconf=()
-
-	# TPM needs to be tested before being enabled
-	libconf+=( --without-tpm )
-
-	# hardware-accell is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	# Cygwin as does not understand these asm files at all
-	[[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	local myeconfargs=(
-		$(multilib_native_enable manpages)
-		$(multilib_native_use_enable doc gtk-doc)
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable guile)
-		$(multilib_native_use_enable seccomp seccomp-tests)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable test-full full-test-suite)
-		$(multilib_native_use_enable tools)
-		$(multilib_native_use_enable valgrind valgrind-tests)
-		$(use_enable cxx)
-		$(use_enable dane libdane)
-		$(use_enable nls)
-		$(use_enable openssl openssl-compatibility)
-		$(use_enable sslv2 ssl2-support)
-		$(use_enable sslv3 ssl3-support)
-		$(use_enable static-libs static)
-		$(use_enable tls-heartbeat heartbeat-support)
-		$(use_with idn)
-		$(use_with pkcs11 p11-kit)
-		--disable-rpath
-		--with-default-trust-store-file="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt"
-		--without-included-libtasn1
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-	ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-3.7.1.ebuild b/net-libs/gnutls/gnutls-3.7.1.ebuild
new file mode 100644
index 0000000..e8db6e9
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.7.1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols"
+HOMEPAGE="https://www.gnutls.org/"
+SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
+
+LICENSE="GPL-3 LGPL-2.1+"
+SLOT="0/30" # libgnutls.so number
+KEYWORDS="*"
+IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
+
+REQUIRED_USE="
+	test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
+RESTRICT="!test? ( test )"
+
+# NOTICE: sys-devel/autogen is required at runtime as we
+# use system libopts
+RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
+	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
+	>=dev-libs/nettle-3.6:=[gmp,${MULTILIB_USEDEP}]
+	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
+	tools? ( sys-devel/autogen:= )
+	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
+	guile? ( >=dev-scheme/guile-2:=[networking] )
+	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] )
+	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? (
+		seccomp? ( sys-libs/libseccomp )
+	)"
+BDEPEND=">=virtual/pkgconfig-0-r1
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )
+	tools? ( sys-devel/autogen )
+	valgrind? ( dev-util/valgrind )
+	test-full? (
+		app-crypt/dieharder
+		>=app-misc/datefudge-1.22
+		dev-libs/softhsm:2[-bindist]
+		net-dialup/ppp
+		net-misc/socat
+	)"
+
+DOCS=(
+	README.md
+	doc/certtool.cfg
+)
+
+HTML_DOCS=()
+
+pkg_setup() {
+	# bug#520818
+	export TZ=UTC
+
+	use doc && HTML_DOCS+=(
+		doc/gnutls.html
+	)
+}
+
+src_prepare() {
+	default
+
+	# force regeneration of autogen-ed files
+	local file
+	for file in $(grep -l AutoGen-ed src/*.c) ; do
+		rm src/$(basename ${file} .c).{c,h} || die
+	done
+
+	# don't try to use system certificate store on macOS, it is
+	# confusingly ignoring our ca-certificates and more importantly
+	# fails to compile in certain configurations
+	sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+}
+
+multilib_src_configure() {
+	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+	local libconf=()
+
+	# TPM needs to be tested before being enabled
+	libconf+=( --without-tpm )
+
+	# hardware-accell is disabled on OSX because the asm files force
+	#   GNU-stack (as doesn't support that) and when that's removed ld
+	#   complains about duplicate symbols
+	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+	# Cygwin as does not understand these asm files at all
+	[[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+	local myeconfargs=(
+		$(multilib_native_enable manpages)
+		$(multilib_native_use_enable doc gtk-doc)
+		$(multilib_native_use_enable doc)
+		$(multilib_native_use_enable guile)
+		$(multilib_native_use_enable seccomp seccomp-tests)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable test-full full-test-suite)
+		$(multilib_native_use_enable tools)
+		$(multilib_native_use_enable valgrind valgrind-tests)
+		$(use_enable cxx)
+		$(use_enable dane libdane)
+		$(use_enable nls)
+		$(use_enable openssl openssl-compatibility)
+		$(use_enable sslv2 ssl2-support)
+		$(use_enable sslv3 ssl3-support)
+		$(use_enable static-libs static)
+		$(use_enable tls-heartbeat heartbeat-support)
+		$(use_with idn)
+		$(use_with pkcs11 p11-kit)
+		--disable-rpath
+		--with-default-trust-store-file="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
+		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt"
+		--without-included-libtasn1
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+	ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}
diff --git a/net-libs/libnfsidmap/Manifest b/net-libs/libnfsidmap/Manifest
deleted file mode 100644
index f14e519..0000000
--- a/net-libs/libnfsidmap/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libnfsidmap-0.24.tar.gz 328720 RMD160 c1d61b31cc63a8c6c46709b1dfc4e94d22e0eaba SHA1 3ced887b642d33ecabdd751ec7c4fb536347fba1 SHA256 59501432e683336d7a290da13767e92afb5b86f42ea4254041225fe218e8dd47
diff --git a/net-libs/libnfsidmap/files/libnfsidmap-0.19-getgrouplist.patch b/net-libs/libnfsidmap/files/libnfsidmap-0.19-getgrouplist.patch
deleted file mode 100644
index c8cfeb9..0000000
--- a/net-libs/libnfsidmap/files/libnfsidmap-0.19-getgrouplist.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-http://bugs.gentoo.org/169909
-
---- libnfsidmap-0.19/configure.in
-+++ libnfsidmap-0.19/configure.in
-@@ -38,7 +38,7 @@
- 
- # Checks for library functions.
- AC_FUNC_MALLOC
--AC_CHECK_FUNCS([strchr strdup])
-+AC_CHECK_FUNCS([strchr strdup getgrouplist])
- 
- AC_CONFIG_FILES([Makefile])
- AC_OUTPUT(libnfsidmap.pc)
---- libnfsidmap-0.19/nss.c
-+++ libnfsidmap-0.19/nss.c
-@@ -49,6 +49,8 @@
- #include "cfg.h"
- #include <syslog.h>
- 
-+#include "getgrouplist.c"
-+
- /*
-  * NSS Translation Methods
-  *
---- libnfsidmap-0.19/getgrouplist.c
-+++ libnfsidmap-0.19/getgrouplist.c
-@@ -0,0 +1,85 @@
-+/*
-+ *  getgrouplist.c
-+ *
-+ *  if system does not provide the non-standard getgrouplist, we will emulate
-+ *  it via POSIX standard functions
-+ *
-+ * Copyright (c) 1991, 1993
-+ *	The Regents of the University of California.  All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 4. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+#include <sys/types.h>
-+#include <grp.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+#ifndef HAVE_GETGROUPLIST
-+static
-+int
-+getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt)
-+{
-+	const struct group *grp;
-+	int i, maxgroups, ngroups, ret;
-+
-+	ret = 0;
-+	ngroups = 0;
-+	maxgroups = *grpcnt;
-+	/*
-+	 * When installing primary group, duplicate it;
-+	 * the first element of groups is the effective gid
-+	 * and will be overwritten when a setgid file is executed.
-+	 */
-+	groups[ngroups++] = agroup;
-+	if (maxgroups > 1)
-+		groups[ngroups++] = agroup;
-+	/*
-+	 * Scan the group file to find additional groups.
-+	 */
-+	setgrent();
-+	while ((grp = getgrent()) != NULL) {
-+		for (i = 0; i < ngroups; i++) {
-+			if (grp->gr_gid == groups[i])
-+				goto skip;
-+		}
-+		for (i = 0; grp->gr_mem[i]; i++) {
-+			if (!strcmp(grp->gr_mem[i], uname)) {
-+				if (ngroups >= maxgroups) {
-+					ret = -1;
-+					break;
-+				}
-+				groups[ngroups++] = grp->gr_gid;
-+				break;
-+			}
-+		}
-+skip:
-+		;
-+	}
-+	endgrent();
-+	*grpcnt = ngroups;
-+	return (ret);
-+}
-+#endif
diff --git a/net-libs/libnfsidmap/files/libnfsidmap-0.21-headers.patch b/net-libs/libnfsidmap/files/libnfsidmap-0.21-headers.patch
deleted file mode 100644
index 6ef12d4..0000000
--- a/net-libs/libnfsidmap/files/libnfsidmap-0.21-headers.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-for toupper and such
-
---- a/nss.c
-+++ b/nss.c
-@@ -34,6 +34,7 @@
-  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
-+#include <ctype.h>
- #include <sys/types.h>
- #include <errno.h>
- #include <unistd.h>
---- a/libnfsidmap.c
-+++ b/libnfsidmap.c
-@@ -37,6 +37,7 @@
-  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
-+#include <ctype.h>
- #include <sys/types.h>
- #include <errno.h>
- #include <unistd.h>
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.24.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.24.ebuild
deleted file mode 100644
index bd376a4..0000000
--- a/net-libs/libnfsidmap/libnfsidmap-0.24.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnfsidmap/libnfsidmap-0.24.ebuild,v 1.7 2012/05/21 19:13:27 xarthisius Exp $
-
-EAPI="2"
-
-inherit autotools eutils
-
-DESCRIPTION="NFSv4 ID <-> name mapping library"
-HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/"
-SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="*"
-IUSE="ldap static-libs"
-
-DEPEND="ldap? ( net-nds/openldap )"
-RDEPEND="${DEPEND}
-	!<net-fs/nfs-utils-1.2.2
-	!net-fs/idmapd"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.19-getgrouplist.patch #169909
-	epatch "${FILESDIR}"/${PN}-0.21-headers.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static) \
-		$(use_enable ldap)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog NEWS README
-
-	insinto /etc
-	doins idmapd.conf || die
-
-	# remove useless files
-	rm -f "${D}"/usr/lib*/libnfsidmap/*.{a,la}
-	use static-libs || rm -f "${D}"/usr/lib*/*.la
-}
diff --git a/net-libs/libnfsidmap/metadata.xml b/net-libs/libnfsidmap/metadata.xml
deleted file mode 100644
index ca66751..0000000
--- a/net-libs/libnfsidmap/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>net-fs</herd>
-</pkgmetadata>
diff --git a/net-libs/libslirp/Manifest b/net-libs/libslirp/Manifest
new file mode 100644
index 0000000..b508e93
--- /dev/null
+++ b/net-libs/libslirp/Manifest
@@ -0,0 +1 @@
+DIST libslirp-4.3.1.tar.gz 127008 BLAKE2B de40980521a54367fda73b9a67a80159ff14e8ea073086d8df3b42028ffe778b62f0aabe2b3f0929e168c73c453a8eda3fe0bb866d22de5b0712775e9cece19f SHA512 fa38a5e508b00802538f8466b8b52fc4842d6f7f74caa399db1011c15bb37198678415147327a606e3f259fd5def9390012df1d4dc76e8869e9bb77ca6514005
diff --git a/net-libs/libslirp/OWNERS b/net-libs/libslirp/OWNERS
new file mode 100644
index 0000000..ea46789
--- /dev/null
+++ b/net-libs/libslirp/OWNERS
@@ -0,0 +1,2 @@
+# By default everyone may approve.
+*
diff --git a/net-libs/libslirp/files/libslirp-4.3.1-bug-756910-check-pkt_len.patch b/net-libs/libslirp/files/libslirp-4.3.1-bug-756910-check-pkt_len.patch
new file mode 100644
index 0000000..aef7f19
--- /dev/null
+++ b/net-libs/libslirp/files/libslirp-4.3.1-bug-756910-check-pkt_len.patch
@@ -0,0 +1,48 @@
+From: Prasad J Pandit <pjp@fedoraproject.org>
+Date: Thu, 26 Nov 2020 13:57:06 +0000
+Subject: [PATCH] slirp: check pkt_len before reading protocol header
+
+While processing ARP/NCSI packets in 'arp_input' or 'ncsi_input'
+routines, ensure that pkt_len is large enough to accommodate the
+respective protocol headers, lest it should do an OOB access.
+Add check to avoid it.
+
+Reported-by: Qiuhao Li @outlook.com;
+Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
+---
+ src/ncsi.c  | 4 ++++
+ src/slirp.c | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/src/ncsi.c b/src/ncsi.c
+index 3c1dfef..75dcc08 100644
+--- a/src/ncsi.c
++++ b/src/ncsi.c
+@@ -148,6 +148,10 @@ void ncsi_input(Slirp *slirp, const uint8_t *pkt, int pkt_len)
+     uint32_t checksum;
+     uint32_t *pchecksum;
+ 
++    if (pkt_len < ETH_HLEN + sizeof(struct ncsi_pkt_hdr)) {
++        return; /* packet too short */
++    }
++
+     memset(ncsi_reply, 0, sizeof(ncsi_reply));
+ 
+     memset(reh->h_dest, 0xff, ETH_ALEN);
+diff --git a/src/slirp.c b/src/slirp.c
+index 9bead0c..abb6f9a 100644
+--- a/src/slirp.c
++++ b/src/slirp.c
+@@ -860,6 +860,10 @@ static void arp_input(Slirp *slirp, const uint8_t *pkt, int pkt_len)
+         return;
+     }
+ 
++    if (pkt_len < ETH_HLEN + sizeof(struct slirp_arphdr)) {
++        return; /* packet too short */
++    }
++
+     ar_op = ntohs(ah->ar_op);
+     switch (ar_op) {
+     case ARPOP_REQUEST:
+-- 
+2.28.0
diff --git a/net-libs/libslirp/libslirp-4.3.1-r1.ebuild b/net-libs/libslirp/libslirp-4.3.1-r1.ebuild
new file mode 100644
index 0000000..fef0fb7
--- /dev/null
+++ b/net-libs/libslirp/libslirp-4.3.1-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+KEYWORDS="*"
+MY_P="${PN}-v${PV}"
+SRC_URI="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="A general purpose TCP-IP emulator used by virtual machine hypervisors to provide virtual networking services."
+HOMEPAGE="https://gitlab.freedesktop.org/slirp/libslirp"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="static-libs"
+
+RDEPEND="dev-libs/glib:="
+
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/libslirp-4.3.1-bug-756910-check-pkt_len.patch"
+)
+
+src_prepare() {
+	default
+	echo "${PV}" > .tarball-version || die
+	echo -e "#!${BASH}\necho -n \$(cat '${S}/.tarball-version')" > build-aux/git-version-gen || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+	)
+	meson_src_configure
+}
diff --git a/net-libs/libslirp/metadata.xml b/net-libs/libslirp/metadata.xml
new file mode 100644
index 0000000..8830eef
--- /dev/null
+++ b/net-libs/libslirp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<name>Zac Medico</name>
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">gitlab.freedesktop.org/slirp/libslirp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 199a2e0..025d4d2 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1 +1,2 @@
-DIST curl-7.74.0.tar.xz 2400972 BLAKE2B bef9e01493994afc933549a78b41065708aeaa9f6f5cdd1dbf2f43bbb03bbc97b17308b8bda5f11599c3cc0c6c77903e6fa6f1310ff874fad902a59566b51e8a SHA512 5d987f0b4d051c9e254f14d4e2a05f7cda9fb0f0ac7b3ca3664a25a51ee5ffe092ee072c0d9a613fcd3f34727d75bba14b70f5500cb110ca818591e071c3e6f4
+DIST curl-7.76.1.tar.xz 2427636 BLAKE2B 56452871fbd998f0c9a5af86b3853ed1dfc956c39380e5da472b4f382db45926ac3aa9e395ae7d2812aac0f0f29bee28343218810a169beb592c5224e0a4f018 SHA512 5fe85d2e776789aa8117c57fe7648e375b7fa92d5ead5d69855f19ca9a2624d77a1f9ab91766ecb72bbc17e82862248cd07e48917884d6fd856b93fb00d83e28
+DIST curl-7.77.0.tar.xz 2439336 BLAKE2B 433b3179dcf2c3363514b72bf9c54286873d8e5559b33e543ba8f3e7df25a619c5be13a8aacb9361c4464b646af4d1fb214d4de57a17f3de7e8f379777214d13 SHA512 aef92a0e3f8ce8491b258a9a1c4dcea3c07c29b139a1f68f08619caa0295cfde76335d2dfb9cdf434525daea7dd05d8acd22f203f5ccc7735bd317964ec1da76
diff --git a/net-misc/curl/curl-7.74.0-r2.ebuild b/net-misc/curl/curl-7.74.0-r2.ebuild
deleted file mode 100644
index 29280db..0000000
--- a/net-misc/curl/curl-7.74.0-r2.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools eutils prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
-
-LICENSE="curl"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="*"
-IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap libressl mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads winssl zstd"
-IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" nghttp3 quiche"
-IUSE+=" elibc_Winnt"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="!test? ( test )"
-
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	ssl? (
-		gnutls? (
-			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		mbedtls? (
-			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		openssl? (
-			!libressl? ( dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}] )
-		)
-		nss? (
-			dev-libs/nss:0[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-	)
-	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-	nghttp3? (
-		net-libs/nghttp3[${MULTILIB_USEDEP}]
-		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
-	)
-	quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
-	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-#	rtmp? (
-#		media-video/rtmpdump
-#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-#	)
-
-# ssl providers to be added:
-# fbopenssl  $(use_with spnego)
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-
-# c-ares must be disabled for threads
-# only one default ssl provider can be enabled
-REQUIRED_USE="
-	winssl? ( elibc_Winnt )
-	threads? ( !adns )
-	ssl? (
-		^^ (
-			curl_ssl_gnutls
-			curl_ssl_libressl
-			curl_ssl_mbedtls
-			curl_ssl_nss
-			curl_ssl_openssl
-			curl_ssl_winssl
-		)
-	)"
-
-DOCS=( CHANGES README docs/FEATURES.md docs/INTERNALS.md \
-	docs/FAQ docs/BUGS.md docs/CONTRIBUTE.md )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
-	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
-	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-	sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
-
-	eapply_user
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
-	local myconf=()
-
-	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	#myconf+=( --without-default-ssl-backend )
-	if use ssl ; then
-		if use gnutls || use curl_ssl_gnutls; then
-			einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls --with-nettle )
-		fi
-		if use mbedtls || use curl_ssl_mbedtls; then
-			einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		fi
-		if use nss || use curl_ssl_nss; then
-			einfo "SSL provided by nss"
-			myconf+=( --with-nss )
-		fi
-		if use openssl || use curl_ssl_openssl || use curl_ssl_libressl; then
-			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		fi
-		if use winssl || use curl_ssl_winssl; then
-			einfo "SSL provided by Windows"
-			myconf+=( --with-winssl )
-		fi
-
-		if use curl_ssl_gnutls; then
-			einfo "Default SSL provided by gnutls"
-			myconf+=( --with-default-ssl-backend=gnutls )
-		elif use curl_ssl_libressl; then
-			einfo "Default SSL provided by LibreSSL"
-			myconf+=( --with-default-ssl-backend=openssl )  # NOTE THE HACK HERE
-		elif use curl_ssl_mbedtls; then
-			einfo "Default SSL provided by mbedtls"
-			myconf+=( --with-default-ssl-backend=mbedtls )
-		elif use curl_ssl_nss; then
-			einfo "Default SSL provided by nss"
-			myconf+=( --with-default-ssl-backend=nss )
-		elif use curl_ssl_openssl; then
-			einfo "Default SSL provided by openssl"
-			myconf+=( --with-default-ssl-backend=openssl )
-		elif use curl_ssl_winssl; then
-			einfo "Default SSL provided by Windows"
-			myconf+=( --with-default-ssl-backend=winssl )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-		fi
-
-	else
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable alt-svc) \
-		--enable-crypto-auth \
-		--enable-dict \
-		--disable-ech \
-		--enable-file \
-		$(use_enable ftp) \
-		$(use_enable gopher) \
-		$(use_enable hsts) \
-		--enable-http \
-		$(use_enable imap) \
-		$(use_enable ldap) \
-		$(use_enable ldap ldaps) \
-		--disable-ntlm-wb \
-		$(use_enable pop3) \
-		--enable-rt  \
-		--enable-rtsp \
-		$(use_enable samba smb) \
-		$(use_with ssh libssh2) \
-		$(use_enable smtp) \
-		$(use_enable telnet) \
-		$(use_enable tftp) \
-		--enable-tls-srp \
-		$(use_enable adns ares) \
-		--enable-cookies \
-		--enable-dateparse \
-		--enable-dnsshuffle \
-		--enable-doh \
-		--enable-hidden-symbols \
-		--enable-http-auth \
-		$(use_enable ipv6) \
-		--enable-largefile \
-		--enable-manual \
-		--enable-mime \
-		--enable-netrc \
-		$(use_enable progress-meter) \
-		--enable-proxy \
-		--disable-sspi \
-		$(use_enable static-libs static) \
-		$(use_enable threads threaded-resolver) \
-		$(use_enable threads pthreads) \
-		--disable-versioned-symbols \
-		--without-amissl \
-		--without-bearssl \
-		--without-cyassl \
-		--without-darwinssl \
-		--without-fish-functions-dir \
-		$(use_with idn libidn2) \
-		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
-		$(use_with metalink libmetalink) \
-		$(use_with http2 nghttp2) \
-		--without-libpsl \
-		$(use_with nghttp3) \
-		$(use_with nghttp3 ngtcp2) \
-		$(use_with quiche) \
-		$(use_with rtmp librtmp) \
-		$(use_with brotli) \
-		--without-schannel \
-		--without-secure-transport \
-		--without-spnego \
-		--without-winidn \
-		--without-wolfssl \
-		--with-zlib \
-		$(use_with zstd) \
-		"${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# avoid building the client
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use quiche; then
-		libs+=( "-lquiche" )
-		priv+=( "quiche" )
-	fi
-	if use nghttp3; then
-		libs+=( "-lnghttp3" "-lngtcp2" )
-		priv+=( "libnghttp3" "-libtcp2" )
-	fi
-	if use ssl && use curl_ssl_openssl; then
-		libs+=( "-lssl" "-lcrypto" )
-		priv+=( "openssl" )
-	fi
-	grep -q Requires.private libcurl.pc && die "need to update ebuild"
-	libs=$(printf '|%s' "${libs[@]}")
-	sed -i -r \
-		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
-		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete
-	rm -rf "${ED}"/etc/
-}
diff --git a/net-misc/curl/curl-7.77.0.ebuild b/net-misc/curl/curl-7.77.0.ebuild
new file mode 100644
index 0000000..eefdca4
--- /dev/null
+++ b/net-misc/curl/curl-7.77.0.ebuild
@@ -0,0 +1,295 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
+
+LICENSE="curl"
+SLOT="0"
+KEYWORDS="*"
+IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd"
+IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" nghttp3 quiche"
+IUSE+=" elibc_Winnt"
+
+# c-ares must be disabled for threads
+# only one default ssl provider can be enabled
+REQUIRED_USE="
+	winssl? ( elibc_Winnt )
+	threads? ( !adns )
+	ssl? (
+		^^ (
+			curl_ssl_gnutls
+			curl_ssl_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+			curl_ssl_winssl
+		)
+	)"
+
+# lead to lots of false negatives, bug #285669
+RESTRICT="!test? ( test )"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	ssl? (
+		gnutls? (
+			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		mbedtls? (
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		openssl? (
+			dev-libs/openssl:0=[sslv3=,static-libs?,${MULTILIB_USEDEP}]
+		)
+		nss? (
+			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+	)
+	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+	nghttp3? (
+		net-libs/nghttp3[${MULTILIB_USEDEP}]
+		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
+	)
+	quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	"${FILESDIR}"/${PN}-respect-cflags-3.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+	sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
+
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+
+	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	#myconf+=( --without-default-ssl-backend )
+	if use ssl ; then
+		if use gnutls || use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls --with-nettle )
+		fi
+		if use mbedtls || use curl_ssl_mbedtls; then
+			einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		fi
+		if use nss || use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss )
+		fi
+		if use openssl || use curl_ssl_openssl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		fi
+		if use winssl || use curl_ssl_winssl; then
+			einfo "SSL provided by Windows"
+			myconf+=( --with-winssl )
+		fi
+
+		if use curl_ssl_gnutls; then
+			einfo "Default SSL provided by gnutls"
+			myconf+=( --with-default-ssl-backend=gnutls )
+		elif use curl_ssl_mbedtls; then
+			einfo "Default SSL provided by mbedtls"
+			myconf+=( --with-default-ssl-backend=mbedtls )
+		elif use curl_ssl_nss; then
+			einfo "Default SSL provided by nss"
+			myconf+=( --with-default-ssl-backend=nss )
+		elif use curl_ssl_openssl; then
+			einfo "Default SSL provided by openssl"
+			myconf+=( --with-default-ssl-backend=openssl )
+		elif use curl_ssl_winssl; then
+			einfo "Default SSL provided by Windows"
+			myconf+=( --with-default-ssl-backend=winssl )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+		fi
+
+	else
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+
+	myconf+=(
+		$(use_enable alt-svc)
+		--enable-crypto-auth
+		--enable-dict
+		--disable-ech
+		--enable-file
+		$(use_enable ftp)
+		$(use_enable gopher)
+		$(use_enable hsts)
+		--enable-http
+		$(use_enable imap)
+		$(use_enable ldap)
+		$(use_enable ldap ldaps)
+		--disable-ntlm-wb
+		$(use_enable pop3)
+		--enable-rt
+		--enable-rtsp
+		$(use_enable samba smb)
+		$(use_with ssh libssh2)
+		$(use_enable smtp)
+		$(use_enable telnet)
+		$(use_enable tftp)
+		--enable-tls-srp
+		$(use_enable adns ares)
+		--enable-cookies
+		--enable-dateparse
+		--enable-dnsshuffle
+		--enable-doh
+		--enable-hidden-symbols
+		--enable-http-auth
+		$(use_enable ipv6)
+		--enable-largefile
+		--enable-manual
+		--enable-mime
+		--enable-netrc
+		$(use_enable progress-meter)
+		--enable-proxy
+		--disable-sspi
+		$(use_enable static-libs static)
+		$(use_enable threads threaded-resolver)
+		$(use_enable threads pthreads)
+		--disable-versioned-symbols
+		--without-amissl
+		--without-bearssl
+		$(use_with brotli)
+		--without-cyassl
+		--without-darwinssl
+		--without-fish-functions-dir
+		$(use_with http2 nghttp2)
+		--without-hyper
+		$(use_with idn libidn2)
+		$(use_with kerberos gssapi "${EPREFIX}"/usr)
+		$(use_with metalink libmetalink)
+		--without-libgsasl
+		--without-libpsl
+		$(use_with nghttp3)
+		$(use_with nghttp3 ngtcp2)
+		$(use_with quiche)
+		$(use_with rtmp librtmp)
+		--without-rustls
+		--without-schannel
+		--without-secure-transport
+		--without-spnego
+		--without-winidn
+		--without-wolfssl
+		--with-zlib
+		$(use_with zstd)
+	)
+
+	ECONF_SOURCE="${S}" \
+	econf "${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use quiche; then
+		libs+=( "-lquiche" )
+		priv+=( "quiche" )
+	fi
+	if use nghttp3; then
+		libs+=( "-lnghttp3" "-lngtcp2" )
+		priv+=( "libnghttp3" "-libtcp2" )
+	fi
+	if use ssl && use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default_src_test
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm -rf "${ED}"/etc/ || die
+}
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index aeae03a..63231cb 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -26,6 +26,7 @@
 		<flag name="smtp">Enable Simple Mail Transfer Protocol support</flag>
 		<flag name="ssh">Enable SSH urls in curl using libssh2</flag>
 		<flag name="ssl">Enable crypto engine support (via openssl if USE='-gnutls -nss')</flag>
+		<flag name="sslv3">Support for the old/insecure SSLv3 protocol</flag>
 		<flag name="telnet">Enable Telnet protocol support</flag>
 		<flag name="tftp">Enable TFTP support</flag>
 		<flag name="winssl">Enable winssl ssl backend</flag>
diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
index bda0d86..465ad36 100644
--- a/net-misc/gsutil/Manifest
+++ b/net-misc/gsutil/Manifest
@@ -1 +1 @@
-DIST gsutil_4.47.tar.gz 3696516 BLAKE2B c3a5e132ffff7b0e2e46cac17b1bd820b1ead63bbca4b80f17227290f25d12cb46e38df4334ffc71d0261f4467c157ed50ac21b25b1c7a58ec4113758c64d75b SHA512 66d150d496789a89acc71238c7554244ad17a8896b26fd7d6ffb6e26ce14c8b2268633f4a48b8abd8aa25b36f2ef4bd15cdde02b37a9ef52843200b0449289bb
+DIST gsutil_4.60.tar.gz 4012900 BLAKE2B d3d1b57d5b0d42b1b454944efe8d62855b665d3772817c636568ef49c79ae2c566ef08c4c6e1bd3c9829471561865b64b3beec8d3911d6766748337aa1b1fc3e SHA512 18ab701cbb60513d66e8b96ced28cfe65dc0f210435fb5ffbcbfab3541ec7ed051db726e52239796d9579d0928953f610064279a3ee1e5b5c06cec963493804c
diff --git a/net-misc/gsutil/OWNERS b/net-misc/gsutil/OWNERS
new file mode 100644
index 0000000..d229735
--- /dev/null
+++ b/net-misc/gsutil/OWNERS
@@ -0,0 +1,2 @@
+# Used in the build to fetch files.
+include chromiumos/chromite:/OWNERS.build
diff --git a/net-misc/gsutil/files/gsutil-4.50-boto-tests.patch b/net-misc/gsutil/files/gsutil-4.50-boto-tests.patch
new file mode 100644
index 0000000..5a9b601
--- /dev/null
+++ b/net-misc/gsutil/files/gsutil-4.50-boto-tests.patch
@@ -0,0 +1,44 @@
+--- gsutil.orig/gslib/vendored/boto/tests/integration/s3/mock_storage_service.py	2020-04-10 13:26:12.000000000 -0700
++++ gsutil/gslib/vendored/boto/tests/integration/s3/mock_storage_service.py	2020-05-07 11:11:14.971631528 -0700
+@@ -30,13 +30,11 @@
+ import boto
+ import base64
+ import re
+-import six
+ from hashlib import md5
+
+ from boto.utils import compute_md5
+ from boto.utils import find_matching_headers
+ from boto.utils import merge_headers_by_name
+-from boto.utils import write_to_fd
+ from boto.s3.prefix import Prefix
+-from boto.compat import six
++import six
+
+@@ -90,14 +88,12 @@
+                              torrent=NOT_IMPL,
+                              version_id=NOT_IMPL,
+                              res_download_handler=NOT_IMPL):
+-        data = six.ensure_binary(self.data)
+-        write_to_fd(fp, data)
++        fp.write(six.ensure_str(self.data, errors='replace'))
+
+     def get_file(self, fp, headers=NOT_IMPL, cb=NOT_IMPL, num_cb=NOT_IMPL,
+                  torrent=NOT_IMPL, version_id=NOT_IMPL,
+                  override_num_retries=NOT_IMPL):
+-        data = six.ensure_binary(self.data)
+-        write_to_fd(fp, data)
++        fp.write(self.data)
+
+     def _handle_headers(self, headers):
+         if not headers:
+@@ -284,9 +280,6 @@
+         else:
+             return '<Subresource/>'
+
+-    def get_tags(self):
+-      return []
+-
+     def new_key(self, key_name=None):
+         mock_key = MockKey(self, key_name)
+         self.keys[key_name] = mock_key
diff --git a/net-misc/gsutil/files/gsutil-4.50-tests.patch b/net-misc/gsutil/files/gsutil-4.50-tests.patch
new file mode 100644
index 0000000..757f1f4
--- /dev/null
+++ b/net-misc/gsutil/files/gsutil-4.50-tests.patch
@@ -0,0 +1,57 @@
+diff --git a/gslib/boto_translation.py b/gslib/boto_translation.py
+index 0af2e663..7d2f549f 100644
+--- a/gslib/boto_translation.py
++++ b/gslib/boto_translation.py
+@@ -1457,7 +1457,8 @@ class BotoTranslation(CloudApi):
+         # TODO: Define tags-related methods on storage_uri objects. In the
+         # meantime, we invoke the underlying bucket's methods directly.
+         try:
+-          boto_tags = bucket_uri.get_bucket().get_tags()
++          bucket = bucket_uri.get_bucket()
++          boto_tags = bucket.get_tags() if hasattr(bucket, 'get_tags') else []
+           cloud_api_bucket.labels = (
+               LabelTranslation.BotoTagsToMessage(boto_tags))
+         except boto.exception.StorageResponseError as e:
+diff --git a/gslib/tests/test_naming.py b/gslib/tests/test_naming.py
+index d91cda04..6b44719f 100644
+--- a/gslib/tests/test_naming.py
++++ b/gslib/tests/test_naming.py
+@@ -36,6 +36,7 @@ from __future__ import unicode_literals
+ 
+ import gzip
+ import os
++import unittest 
+ 
+ import six
+ 
+@@ -504,6 +505,7 @@ class GsutilNamingTests(testcase.GsUtilUnitTestCase):
+     self.assertEqual(1, len(actual))
+     self.assertEqual('/obj', actual[0].root_object.name)
+ 
++  @unittest.skip('test appears to be flakey')
+   def testCopyingCompressedFileToBucket(self):
+     """Tests copying one file with compression to a bucket."""
+     src_file = self.CreateTempFile(contents=b'plaintext', file_name='f2.txt')
+diff --git a/gslib/tests/testcase/unit_testcase.py b/gslib/tests/testcase/unit_testcase.py
+index b25352b6..c958f670 100644
+--- a/gslib/tests/testcase/unit_testcase.py
++++ b/gslib/tests/testcase/unit_testcase.py
+@@ -27,7 +27,6 @@ import tempfile
+ import six
+ 
+ import boto
+-from boto.utils import get_utf8able_str
+ from gslib import project_id
+ from gslib import wildcard_iterator
+ from gslib.boto_translation import BotoTranslation
+@@ -157,8 +156,8 @@ class GsUtilUnitTestCase(base.GsUtilTestCase):
+         stderr = sys.stderr.buffer.read()
+     [six.ensure_text(string) for string in self.accumulated_stderr]
+     [six.ensure_text(string) for string in self.accumulated_stdout]
+-    stdout = six.ensure_text(get_utf8able_str(stdout))
+-    stderr = six.ensure_text(get_utf8able_str(stderr))
++    stdout = six.ensure_text(six.ensure_str(stdout))
++    stderr = six.ensure_text(six.ensure_str(stderr))
+     stdout += ''.join(self.accumulated_stdout)
+     stderr += ''.join(self.accumulated_stderr)
+     _AttemptToCloseSysFd(sys.stdout)
diff --git a/net-misc/gsutil/gsutil-4.47.ebuild b/net-misc/gsutil/gsutil-4.47.ebuild
deleted file mode 100644
index e866483..0000000
--- a/net-misc/gsutil/gsutil-4.47.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_6 )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="command line tool for interacting with cloud storage services"
-HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
-SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="*"
-IUSE="test"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}]
-	>=dev-python/boto-2.49.0[${PYTHON_USEDEP}]
-	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
-	>=dev-python/gcs-oauth2-boto-plugin-2.5[${PYTHON_USEDEP}]
-	>=dev-python/google-apitools-0.5.30[${PYTHON_USEDEP}]
-	>=dev-python/google-reauth-python-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.11.3[${PYTHON_USEDEP}]
-	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-4.1.3[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/gsutil-4.41-tests.patch"
-)
-
-S="${WORKDIR}/${PN}"
-
-DOCS=( README.md CHANGES.md )
-
-# needs to talk to Google to run tests
-RESTRICT="test"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# NB: We don't delete all of boto/ because the tests are imported by the
-	# production code.  The same reason we can't delete gslib/tests/.  We can
-	# delete the main boto library and use the system version though.
-	rm -r gslib/vendored/boto/boto || die
-
-	sed -i \
-		-e 's/mock==/mock>=/' \
-		-e 's/oauth2client==/oauth2client>=/' \
-		-e 's/SocksiPy-branch==/PySocks>=/' \
-		setup.py || die
-	# Sanity check we didn't miss any updates.
-	grep '==' setup.py && die "Need to update version requirements"
-
-	# For debugging purposes, temporarily uncomment this in order to
-	# show hidden tracebacks.
-	#sed -e 's/^  except OSError as e:$/&\n    raise/' \
-	#	-e 's/def _HandleUnknownFailure(e):/&\n  raise/' \
-	#	-i gslib/__main__.py || die
-
-	# create_bucket raised ResponseNotReady
-	sed -i \
-		-e 's/test_cp_unwritable_tracker_file/_&/' \
-		-e 's/test_cp_unwritable_tracker_file_download/_&/' \
-		gslib/tests/test_cp.py || die
-
-	sed -i -E -e 's/(executable_prefix =).*/\1 [sys.executable]/' \
-		gslib/commands/test.py || die
-
-	# IOError: close() called during concurrent operation on the same file object.
-	sed -i -e 's/sys.stderr.close()/#&/' \
-		gslib/tests/testcase/unit_testcase.py || die
-}
-
-python_test() {
-	BOTO_CONFIG=${FILESDIR}/dummy.boto \
-		${PYTHON} gslib/__main__.py test -u || die "tests failed"
-}
diff --git a/net-misc/gsutil/gsutil-4.60.ebuild b/net-misc/gsutil/gsutil-4.60.ebuild
new file mode 100644
index 0000000..e1458b8
--- /dev/null
+++ b/net-misc/gsutil/gsutil-4.60.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="command line tool for interacting with cloud storage services"
+HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
+SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="*"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}]
+	>=dev-python/boto-2.49.0[${PYTHON_USEDEP}]
+	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
+	>=dev-python/gcs-oauth2-boto-plugin-2.7[${PYTHON_USEDEP}]
+	>=dev-python/google-apitools-0.5.30[${PYTHON_USEDEP}]
+	>=dev-python/google-reauth-python-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.18[${PYTHON_USEDEP}]
+	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/gsutil-4.41-tests.patch"
+	"${FILESDIR}/gsutil-4.50-boto-tests.patch"
+	"${FILESDIR}/gsutil-4.50-tests.patch"
+)
+
+S="${WORKDIR}/${PN}"
+
+DOCS=( README.md CHANGES.md )
+
+# needs to talk to Google to run tests
+RESTRICT+=" test"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# NB: We don't delete all of boto/ because the tests are imported by the
+	# production code.  The same reason we can't delete gslib/tests/.  We can
+	# delete the main boto library and use the system version though.
+	rm -r gslib/vendored/boto/boto || die
+
+	# failes to compile with py3
+	rm gslib/vendored/boto/tests/mturk/cleanup_tests.py || die
+
+	sed -i \
+		-e 's/mock==/mock>=/' \
+		setup.py || die
+	# Sanity check we didn't miss any updates.
+	grep '==' setup.py && die "Need to update version requirements"
+
+	# For debugging purposes, temporarily uncomment this in order to
+	# show hidden tracebacks.
+	#sed -e 's/^  except OSError as e:$/&\n    raise/' \
+	#	-e 's/def _HandleUnknownFailure(e):/&\n  raise/' \
+	#	-i gslib/__main__.py || die
+
+	# create_bucket raised ResponseNotReady
+	sed -i \
+		-e 's/test_cp_unwritable_tracker_file/_&/' \
+		-e 's/test_cp_unwritable_tracker_file_download/_&/' \
+		gslib/tests/test_cp.py || die
+
+	sed -i -E -e 's/(executable_prefix =).*/\1 [sys.executable]/' \
+		gslib/commands/test.py || die
+
+	# IOError: close() called during concurrent operation on the same file object.
+	sed -i -e 's/sys.stderr.close()/#&/' \
+		gslib/tests/testcase/unit_testcase.py || die
+}
+
+python_compile() {
+	2to3 --write --nobackups --no-diffs -j "$(makeopts_jobs "${MAKEOPTS}" INF)" \
+		gslib/vendored/boto/tests || die "2to3 on boto tests failed"
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	BOTO_CONFIG="${FILESDIR}/dummy.boto" \
+		"${EPYTHON}" gslib/__main__.py test -u || die "tests failed with ${EPYTHON}"
+}
diff --git a/net-misc/openssh/files/openssh-8.1_p1-hpn-14.20-glue.patch b/net-misc/openssh/files/openssh-8.1_p1-hpn-14.20-glue.patch
new file mode 100644
index 0000000..90fa248
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.1_p1-hpn-14.20-glue.patch
@@ -0,0 +1,105 @@
+diff -ur a/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff b/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff
+--- a/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff	2020-02-04 14:55:30.408567718 -0800
++++ b/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff	2020-02-04 15:16:14.646567224 -0800
+@@ -409,18 +409,10 @@
+ index 817da43b..b2bcf78f 100644
+ --- a/packet.c
+ +++ b/packet.c
+-@@ -925,6 +925,24 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
++@@ -925,6 +925,16 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
+  	return 0;
+  }
+  
+-+/* this supports the forced rekeying required for the NONE cipher */
+-+int rekey_requested = 0;
+-+void
+-+packet_request_rekeying(void)
+-+{
+-+	rekey_requested = 1;
+-+}
+-+
+ +/* used to determine if pre or post auth when rekeying for aes-ctr
+ + * and none cipher switch */
+ +int
+@@ -434,20 +426,6 @@
+  #define MAX_PACKETS	(1U<<31)
+  static int
+  ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
+-@@ -951,6 +969,13 @@ ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
+- 	if (state->p_send.packets == 0 && state->p_read.packets == 0)
+- 		return 0;
+- 
+-+	/* used to force rekeying when called for by the none
+-+         * cipher switch methods -cjr */
+-+        if (rekey_requested == 1) {
+-+                rekey_requested = 0;
+-+                return 1;
+-+        }
+-+
+- 	/* Time-based rekeying */
+- 	if (state->rekey_interval != 0 &&
+- 	    (int64_t)state->rekey_time + state->rekey_interval <= monotime())
+ diff --git a/packet.h b/packet.h
+ index 8ccfd2e0..1ad9bc06 100644
+ --- a/packet.h
+@@ -476,9 +454,9 @@
+  /* Format of the configuration file:
+  
+ @@ -167,6 +168,8 @@ typedef enum {
+- 	oHashKnownHosts,
+  	oTunnel, oTunnelDevice,
+  	oLocalCommand, oPermitLocalCommand, oRemoteCommand,
++ 	oDisableMTAES,
+ +	oTcpRcvBufPoll, oTcpRcvBuf, oHPNDisabled, oHPNBufferSize,
+ +	oNoneEnabled, oNoneSwitch,
+  	oVisualHostKey,
+@@ -615,9 +593,9 @@
+  	int	ip_qos_bulk;		/* IP ToS/DSCP/class for bulk traffic */
+  	SyslogFacility log_facility;	/* Facility for system logging. */
+ @@ -112,7 +116,10 @@ typedef struct {
+- 
+  	int	enable_ssh_keysign;
+  	int64_t rekey_limit;
++ 	int     disable_multithreaded; /*disable multithreaded aes-ctr*/
+ +	int     none_switch;    /* Use none cipher */
+ +	int     none_enabled;   /* Allow none to be used */
+  	int	rekey_interval;
+@@ -700,9 +678,9 @@
+ +			options->hpn_buffer_size = CHAN_TCP_WINDOW_DEFAULT;
+ +	}
+ +
++ 	if (options->disable_multithreaded == -1)
++ 		options->disable_multithreaded = 0;
+  	if (options->ip_qos_interactive == -1)
+- 		options->ip_qos_interactive = IPTOS_DSCP_AF21;
+- 	if (options->ip_qos_bulk == -1)
+ @@ -486,6 +532,8 @@ typedef enum {
+  	sPasswordAuthentication, sKbdInteractiveAuthentication,
+  	sListenAddress, sAddressFamily,
+@@ -1079,11 +1057,11 @@
+  	xxx_host = host;
+  	xxx_hostaddr = hostaddr;
+  
+-@@ -422,6 +433,28 @@ ssh_userauth2(struct ssh *ssh, const char *local_user,
++@@ -422,7 +433,28 @@ ssh_userauth2(struct ssh *ssh, const char *local_user,
+  
+  	if (!authctxt.success)
+  		fatal("Authentication failed.");
+-+
++ 
+ +	/*
+ +	 * If the user wants to use the none cipher, do it post authentication
+ +	 * and only if the right conditions are met -- both of the NONE commands
+@@ -1105,9 +1083,9 @@
+ +		}
+ +	}
+ +
+- 	debug("Authentication succeeded (%s).", authctxt.method->name);
+- }
+- 
++ #ifdef WITH_OPENSSL
++ 	if (options.disable_multithreaded == 0) {
++ 		/* if we are using aes-ctr there can be issues in either a fork or sandbox
+ diff --git a/sshd.c b/sshd.c
+ index 11571c01..23a06022 100644
+ --- a/sshd.c
diff --git a/net-misc/openssh/files/openssh-8.1_p1-hpn-14.20-sctp-glue.patch b/net-misc/openssh/files/openssh-8.1_p1-hpn-14.20-sctp-glue.patch
new file mode 100644
index 0000000..3f5c7a4
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.1_p1-hpn-14.20-sctp-glue.patch
@@ -0,0 +1,19 @@
+diff -ur a/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff b/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff
+--- a/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff	2020-02-04 14:55:30.408567718 -0800
++++ b/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff	2020-02-04 16:36:51.394069720 -0800
+@@ -1191,15 +1191,3 @@
+  # Example of overriding settings on a per-user basis
+  #Match User anoncvs
+  #	X11Forwarding no
+-diff --git a/version.h b/version.h
+-index 6b3fadf8..ec1d2e27 100644
+---- a/version.h
+-+++ b/version.h
+-@@ -3,4 +3,6 @@
+- #define SSH_VERSION	"OpenSSH_8.1"
+- 
+- #define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+-+#define SSH_HPN         "-hpn14v20"
+-+#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
+-+ 
diff --git a/net-misc/openssh/files/openssh-8.1_p1-tests-2020.patch b/net-misc/openssh/files/openssh-8.1_p1-tests-2020.patch
new file mode 100644
index 0000000..505e34d
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.1_p1-tests-2020.patch
@@ -0,0 +1,26 @@
+diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh
+index 86ea6250..844adabc 100644
+--- a/regress/cert-hostkey.sh
++++ b/regress/cert-hostkey.sh
+@@ -252,7 +252,7 @@ test_one() {
+ test_one "user-certificate"	failure "-n $HOSTS"
+ test_one "empty principals"	success "-h"
+ test_one "wrong principals"	failure "-h -n foo"
+-test_one "cert not yet valid"	failure "-h -V20200101:20300101"
++test_one "cert not yet valid"	failure "-h -V20300101:20320101"
+ test_one "cert expired"		failure "-h -V19800101:19900101"
+ test_one "cert valid interval"	success "-h -V-1w:+2w"
+ test_one "cert has constraints"	failure "-h -Oforce-command=false"
+diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh
+index 38c14a69..5cd02fc3 100644
+--- a/regress/cert-userkey.sh
++++ b/regress/cert-userkey.sh
+@@ -338,7 +338,7 @@ test_one() {
+ test_one "correct principal"	success "-n ${USER}"
+ test_one "host-certificate"	failure "-n ${USER} -h"
+ test_one "wrong principals"	failure "-n foo"
+-test_one "cert not yet valid"	failure "-n ${USER} -V20200101:20300101"
++test_one "cert not yet valid"	failure "-n ${USER} -V20300101:20320101"
+ test_one "cert expired"		failure "-n ${USER} -V19800101:19900101"
+ test_one "cert valid interval"	success "-n ${USER} -V-1w:+2w"
+ test_one "wrong source-address"	failure "-n ${USER} -Osource-address=10.0.0.0/8"
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index d1dda9c..c1ee190 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1 +1 @@
-DIST rsync-3.1.3.tar.gz 905908 SHA256 55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0 SHA512 8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99 WHIRLPOOL 321d651aa2c61a81f0f647be5317174b6dcb0ebfbfd780d008b1784c0b8a4239d82c42da7be22d5fd66f2c61ab110a3b3e4f9f22b41065d5624348b36ba98474
+DIST rsync-3.2.3.tar.gz 1069784 BLAKE2B 085adb55d0d7e3d063fa198912fd09df67b63800a65baff5315ccb7dfc0e9d703eef30a7f2e72e3b271162c280abd9809b3f736704752c1663eed65ad8e0ac25 SHA512 48b68491f3ef644dbbbfcaec5ab90a1028593e02d50367ce161fd9d3d0bd0a3628bc57c5e5dec4be3a1d213f784f879b8a8fcdfd789ba0f99837cba16e1ae70e
diff --git a/net-misc/rsync/files/rsync-3.2.3-glibc-lchmod.patch b/net-misc/rsync/files/rsync-3.2.3-glibc-lchmod.patch
new file mode 100644
index 0000000..970d7af
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.2.3-glibc-lchmod.patch
@@ -0,0 +1,58 @@
+From 9dd62525f3b98d692e031f22c02be8f775966503 Mon Sep 17 00:00:00 2001
+From: Wayne Davison <wayne@opencoder.net>
+Date: Sun, 29 Nov 2020 09:33:54 -0800
+Subject: [PATCH] Work around glibc's lchmod() issue a better way.
+
+diff --git a/syscall.c b/syscall.c
+index b9c3b4ef..11d10e4a 100644
+--- a/syscall.c
++++ b/syscall.c
+@@ -227,27 +227,35 @@ int do_open(const char *pathname, int flags, mode_t mode)
+ #ifdef HAVE_CHMOD
+ int do_chmod(const char *path, mode_t mode)
+ {
++	static int switch_step = 0;
+ 	int code;
+ 	if (dry_run) return 0;
+ 	RETURN_ERROR_IF_RO_OR_LO;
++	switch (switch_step) {
+ #ifdef HAVE_LCHMOD
+-	code = lchmod(path, mode & CHMOD_BITS);
+-#else
+-	if (S_ISLNK(mode)) {
++#include "case_N.h"
++		if ((code = lchmod(path, mode & CHMOD_BITS)) == 0 || errno != ENOTSUP)
++			break;
++		switch_step++;
++#endif
++
++#include "case_N.h"
++		if (S_ISLNK(mode)) {
+ # if defined HAVE_SETATTRLIST
+-		struct attrlist attrList;
+-		uint32_t m = mode & CHMOD_BITS; /* manpage is wrong: not mode_t! */
++			struct attrlist attrList;
++			uint32_t m = mode & CHMOD_BITS; /* manpage is wrong: not mode_t! */
+ 
+-		memset(&attrList, 0, sizeof attrList);
+-		attrList.bitmapcount = ATTR_BIT_MAP_COUNT;
+-		attrList.commonattr = ATTR_CMN_ACCESSMASK;
+-		code = setattrlist(path, &attrList, &m, sizeof m, FSOPT_NOFOLLOW);
++			memset(&attrList, 0, sizeof attrList);
++			attrList.bitmapcount = ATTR_BIT_MAP_COUNT;
++			attrList.commonattr = ATTR_CMN_ACCESSMASK;
++			code = setattrlist(path, &attrList, &m, sizeof m, FSOPT_NOFOLLOW);
+ # else
+-		code = 1;
++			code = 1;
+ # endif
+-	} else
+-		code = chmod(path, mode & CHMOD_BITS); /* DISCOURAGED FUNCTION */
+-#endif /* !HAVE_LCHMOD */
++		} else
++			code = chmod(path, mode & CHMOD_BITS); /* DISCOURAGED FUNCTION */
++		break;
++	}
+ 	if (code != 0 && (preserve_perms || preserve_executability))
+ 		return code;
+ 	return 0;
diff --git a/net-misc/rsync/files/rsyncd.conf-3.0.9-r1 b/net-misc/rsync/files/rsyncd.conf-3.0.9-r1
index 20dcf3a..e3c55fd 100644
--- a/net-misc/rsync/files/rsyncd.conf-3.0.9-r1
+++ b/net-misc/rsync/files/rsyncd.conf-3.0.9-r1
@@ -10,6 +10,6 @@
 
 # Simple example for enabling your own local rsync server
 #[gentoo-portage]
-#	path = @GENTOO_PORTAGE_EPREFIX@/usr/portage
-#	comment = Gentoo Portage tree
+#	path = @GENTOO_PORTAGE_EPREFIX@/var/db/repos/gentoo
+#	comment = Gentoo ebuild repository
 #	exclude = /distfiles /packages
diff --git a/net-misc/rsync/files/rsyncd.service b/net-misc/rsync/files/rsyncd.service
deleted file mode 100644
index a2c1de0..0000000
--- a/net-misc/rsync/files/rsyncd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=rsync daemon
-After=networking.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/rsync --daemon --no-detach
-StandardOutput=syslog
-StandardError=syslog
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/rsync/metadata.xml b/net-misc/rsync/metadata.xml
index 148a18e..1f39f54 100644
--- a/net-misc/rsync/metadata.xml
+++ b/net-misc/rsync/metadata.xml
@@ -10,5 +10,7 @@
 	</upstream>
 	<use>
 		<flag name="stunnel">Provide helper scripts for using rsync via &gt;=net-misc/stunnel-4</flag>
+		<flag name="system-zlib">Use system zlib instead of bundled one. This is incompatible with older rsync releases!</flag>
+		<flag name="xxhash">Enable <pkg>dev-libs/xxhash</pkg> support for hashing</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/rsync/rsync-3.1.3.ebuild b/net-misc/rsync/rsync-3.1.3.ebuild
deleted file mode 100644
index 326e651..0000000
--- a/net-misc/rsync/rsync-3.1.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic prefix systemd
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="https://rsync.samba.org/"
-SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
-[[ "${PV}" = *_pre* ]] && SRC_URI="https://rsync.samba.org/ftp/rsync/src-previews/${P/_/}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ ${PV} = *_pre* ]] || \
-KEYWORDS="*"
-IUSE="acl examples iconv ipv6 static stunnel xattr"
-
-LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
-	xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
-	>=dev-libs/popt-1.5[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-
-S="${WORKDIR}/${P/_/}"
-
-src_configure() {
-	use static && append-ldflags -static
-	local myeconfargs=(
-		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
-		--without-included-popt
-		$(use_enable acl acl-support)
-		$(use_enable iconv)
-		$(use_enable ipv6)
-		$(use_enable xattr xattr-support)
-	)
-	econf "${myeconfargs[@]}"
-	touch proto.h-tstamp #421625
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
-	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
-
-	dodoc NEWS OLDNEWS README TODO tech_report.tex
-
-	insinto /etc
-	newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
-
-	# Install stunnel helpers
-	if use stunnel ; then
-		emake DESTDIR="${D}" install-ssl-client
-		emake DESTDIR="${D}" install-ssl-daemon
-	fi
-
-	# Install the useful contrib scripts
-	if use examples ; then
-		exeinto /usr/share/rsync
-		doexe support/*
-		rm -f "${ED%/}"/usr/share/rsync/{Makefile*,*.c}
-	fi
-
-	eprefixify "${ED%/}"/etc/{,xinetd.d}/rsyncd*
-
-	systemd_dounit "${FILESDIR}/rsyncd.service"
-}
-
-pkg_postinst() {
-	if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
-		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
-		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
-		ewarn "is a security risk which you should fix.  Please check your"
-		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
-	fi
-	if use stunnel ; then
-		einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
-		einfo
-		einfo "You maybe have to update the certificates configured in"
-		einfo "${EROOT}/etc/stunnel/rsync.conf"
-	fi
-}
diff --git a/net-misc/rsync/rsync-3.2.3-r3.ebuild b/net-misc/rsync/rsync-3.2.3-r3.ebuild
new file mode 100644
index 0000000..10d910c
--- /dev/null
+++ b/net-misc/rsync/rsync-3.2.3-r3.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit prefix systemd toolchain-funcs
+
+DESCRIPTION="File transfer program to keep remote files into sync"
+HOMEPAGE="https://rsync.samba.org/"
+if [[ "${PV}" == *9999 ]] ; then
+	PYTHON_COMPAT=( python3_{6,7,8} )
+	inherit autotools git-r3 python-any-r1
+	EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
+else
+	if [[ "${PV}" == *_pre* ]] ; then
+		SRC_DIR="src-previews"
+	else
+		SRC_DIR="src"
+		KEYWORDS="*"
+	fi
+	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
+	S="${WORKDIR}/${P/_/}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl examples iconv ipv6 libressl lz4 ssl stunnel system-zlib xattr xxhash zstd"
+
+RDEPEND="acl? ( virtual/acl )
+	lz4? ( app-arch/lz4 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	system-zlib? ( sys-libs/zlib )
+	xattr? ( kernel_linux? ( sys-apps/attr ) )
+	xxhash? ( dev-libs/xxhash )
+	zstd? ( >=app-arch/zstd-1.4 )
+	>=dev-libs/popt-1.5
+	iconv? ( virtual/libiconv )"
+DEPEND="${RDEPEND}"
+
+if [[ "${PV}" == *9999 ]] ; then
+	BDEPEND="${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+		')"
+fi
+
+# Only required for live ebuild
+python_check_deps() {
+	has_version "dev-python/commonmark[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/rsync-3.2.3-glibc-lchmod.patch"
+	)
+	default
+	if [[ "${PV}" == *9999 ]] ; then
+		eaclocal -I m4
+		eautoconf -o configure.sh
+		eautoheader && touch config.h.in
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
+		--without-included-popt
+		$(use_enable acl acl-support)
+		$(use_enable iconv)
+		$(use_enable ipv6)
+		$(use_enable lz4)
+		$(use_enable ssl openssl)
+		$(use_with !system-zlib included-zlib)
+		$(use_enable xattr xattr-support)
+		$(use_enable xxhash)
+		$(use_enable zstd)
+	)
+
+	if tc-is-cross-compiler; then
+		# configure check is broken when cross-compiling.
+		myeconfargs+=( --disable-simd )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
+	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
+
+	dodoc NEWS.md README.md TODO tech_report.tex
+
+	insinto /etc
+	newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
+
+	# Install stunnel helpers
+	if use stunnel ; then
+		emake DESTDIR="${D}" install-ssl-daemon
+	fi
+
+	# Install the useful contrib scripts
+	if use examples ; then
+		exeinto /usr/share/rsync
+		doexe support/*
+		rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
+	fi
+
+	eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
+
+	systemd_newunit "packaging/systemd/rsync.service" "rsyncd.service"
+}
+
+pkg_postinst() {
+	if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
+		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
+		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
+		ewarn "is a security risk which you should fix.  Please check your"
+		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
+	fi
+	if use stunnel ; then
+		einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
+		einfo
+		einfo "You maybe have to update the certificates configured in"
+		einfo "${EROOT}/etc/stunnel/rsync.conf"
+	fi
+	if use system-zlib ; then
+		ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
+		ewarn "using the --compress option."
+		ewarn
+		ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
+		ewarn "and the --compress option, add --new-compress (-zz)."
+		ewarn
+		ewarn "For syncing the portage tree, add:"
+		ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
+	fi
+}
diff --git a/net-misc/rsync/rsync-3.2.3-r4.ebuild b/net-misc/rsync/rsync-3.2.3-r4.ebuild
new file mode 120000
index 0000000..1be1ccb
--- /dev/null
+++ b/net-misc/rsync/rsync-3.2.3-r4.ebuild
@@ -0,0 +1 @@
+rsync-3.2.3-r3.ebuild
\ No newline at end of file
diff --git a/net-misc/vconfig/Manifest b/net-misc/vconfig/Manifest
deleted file mode 100644
index 7c94177..0000000
--- a/net-misc/vconfig/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST vlan.1.9.tar.gz 176135 SHA256 3b8f0a1bf0d3642764e5f646e1f3bbc8b1eeec474a77392d9aeb4868842b4cca
diff --git a/net-misc/vconfig/metadata.xml b/net-misc/vconfig/metadata.xml
deleted file mode 100644
index 712c2d2..0000000
--- a/net-misc/vconfig/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>base-system</herd>
-	<longdescription>
-		The vconfig program allows you to create and remove vlan-devices on a
-		vlan enabled kernel. Vlan-devices are virtual ethernet devices which
-		represents the virtual lans on the physical lan.
-	</longdescription>
-</pkgmetadata>
diff --git a/net-misc/vconfig/vconfig-1.9.ebuild b/net-misc/vconfig/vconfig-1.9.ebuild
deleted file mode 100644
index 97df680..0000000
--- a/net-misc/vconfig/vconfig-1.9.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vconfig/vconfig-1.9.ebuild,v 1.13 2009/09/23 19:47:33 patrick Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-MY_PN="vlan"
-S=${WORKDIR}/${MY_PN}
-
-DESCRIPTION="802.1Q vlan control utility"
-HOMEPAGE="http://www.candelatech.com/~greear/vlan.html"
-SRC_URI="http://www.candelatech.com/~greear/vlan/${MY_PN}.${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE="static"
-
-src_compile() {
-	use static && appened-ldflags -static
-	emake purge
-	emake CC="$(tc-getCC)" CCFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" STRIP="true" vconfig || die
-}
-
-src_install() {
-	into /
-	dosbin vconfig || die "dosbin error"
-
-	sed -e "s:/usr/local/bin/vconfig:/sbin/vconfig:g" -i vlan_test.pl
-	sed -e "s:/usr/local/bin/vconfig:/sbin/vconfig:g" -i vlan_test2.pl
-
-	doman vconfig.8 || die "doman error"
-	dohtml howto.html vlan.html || die "dohtml error"
-	dodoc CHANGELOG README vlan_test*.pl || die "dodoc error"
-}
-
-pkg_postinst() {
-	ewarn "MTU problems exist for many ethernet drivers."
-	ewarn "Reduce the MTU on the interface to 1496 to work around them."
-}
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 12dd61f..49fc44f 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,2 +1,2 @@
-DIST openldap-2.4.50.tgz 5712635 BLAKE2B 6a7d864a44c411b82cf703585c4a81954a02497e8510c84e29070dd120da0181e8425fd2b8bb7616e42e6e26d0f06db5ffdf50fb1cd97943d23f9914eb4f1260 SHA512 f528043ff9de36f7b65d8816c9a9c24f0ac400041b2969965178ee6eae62c92a11af33a0a883e4954e5fff98a0738a9f9aa2faf5b385d21974754e045aab31ae
+DIST openldap-2.4.57.tgz 5883912 BLAKE2B 439605e1bebcf34968f0a552aaade1b72b7671ae2a94a0b700a84f9f715acd162e7b8dadfdd3ffd5b0a785f9306b5f5033ab956cf0ffd26b66119a7110d0aa57 SHA512 b929bced0f5ba9a90e015a24b8037c8958fbb7282db272bd0cacf43b5f7540ab42159a3c4441148074340228bb5f07f93651c0dbb2affde961be156058f99ce5
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e
diff --git a/net-nds/openldap/OWNERS b/net-nds/openldap/OWNERS
new file mode 100644
index 0000000..a5571bf
--- /dev/null
+++ b/net-nds/openldap/OWNERS
@@ -0,0 +1,4 @@
+# openldap dependencies are generally gated by the ldap use flag. Global config
+# is USE=-ldap, but samba gets build with ldap enabled, so samba OWNERS
+# maintain the openldap package as well.
+include /net-fs/samba/OWNERS
diff --git a/net-nds/openldap/metadata.xml b/net-nds/openldap/metadata.xml
index 6cea2f2..38186cd 100644
--- a/net-nds/openldap/metadata.xml
+++ b/net-nds/openldap/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>ldap-bugs@gentoo.org</email>
 	</maintainer>
diff --git a/net-nds/openldap/openldap-2.4.50.ebuild b/net-nds/openldap/openldap-2.4.50.ebuild
deleted file mode 100644
index c7c6fde..0000000
--- a/net-nds/openldap/openldap-2.4.50.ebuild
+++ /dev/null
@@ -1,907 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools db-use flag-o-matic multilib-minimal preserve-libs ssl-cert toolchain-funcs user systemd
-
-BIS_PN=rfc2307bis.schema
-BIS_PV=20140524
-BIS_P="${BIS_PN}-${BIS_PV}"
-
-DESCRIPTION="LDAP suite of application and development tools"
-HOMEPAGE="https://www.OpenLDAP.org/"
-
-# upstream mirrors are mostly not working, using canonical URI
-SRC_URI="
-	https://openldap.org/software/download/OpenLDAP/openldap-release/${P}.tgz
-	http://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/${P}.tgz
-	http://repository.linagora.org/OpenLDAP/openldap-release/${P}.tgz
-	http://mirror.eu.oneandone.net/software/openldap/openldap-release/${P}.tgz
-	mirror://gentoo/${BIS_P}"
-
-LICENSE="OPENLDAP GPL-2"
-SLOT="0"
-KEYWORDS="*"
-
-IUSE_DAEMON="crypt samba tcpd experimental minimal"
-IUSE_BACKEND="+berkdb"
-IUSE_OVERLAY="overlays perl"
-IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux static-libs test"
-IUSE_CONTRIB="smbkrb5passwd kerberos kinit pbkdf2 sha2"
-IUSE_CONTRIB="${IUSE_CONTRIB} -cxx"
-IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="cxx? ( sasl )
-	pbkdf2? ( ssl )
-	test? ( berkdb )
-	?? ( test minimal )"
-
-# always list newer first
-# Do not add any AGPL-3 BDB here!
-# See bug 525110, comment 15.
-# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build.
-BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"
-BDB_PKGS=''
-for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
-
-# openssl is needed to generate lanman-passwords required by samba
-COMMON_DEPEND="
-	ssl? (
-		!gnutls? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-		)
-		gnutls? (
-			>=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}]
-			>=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	sasl? ( dev-libs/cyrus-sasl:= )
-	!minimal? (
-		sys-devel/libtool
-		sys-libs/e2fsprogs-libs
-		>=dev-db/lmdb-0.9.18:=
-		tcpd? ( sys-apps/tcp-wrappers )
-		odbc? ( !iodbc? ( dev-db/unixODBC )
-			iodbc? ( dev-db/libiodbc ) )
-		perl? ( dev-lang/perl:=[-build(-)] )
-		samba? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-		berkdb? (
-			<sys-libs/db-6.0:=
-			|| ( ${BDB_PKGS} )
-			)
-		smbkrb5passwd? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-			kerberos? ( app-crypt/heimdal )
-			)
-		kerberos? (
-			virtual/krb5
-			kinit? ( !app-crypt/heimdal )
-			)
-		cxx? ( dev-libs/cyrus-sasl:= )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	sys-apps/groff
-"
-RDEPEND="${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-ldap )
-"
-# for tracking versions
-OPENLDAP_VERSIONTAG=".version-tag"
-OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# USE=cxx
-	/usr/include/LDAPAsynConnection.h
-	/usr/include/LDAPAttrType.h
-	/usr/include/LDAPAttribute.h
-	/usr/include/LDAPAttributeList.h
-	/usr/include/LDAPConnection.h
-	/usr/include/LDAPConstraints.h
-	/usr/include/LDAPControl.h
-	/usr/include/LDAPControlSet.h
-	/usr/include/LDAPEntry.h
-	/usr/include/LDAPEntryList.h
-	/usr/include/LDAPException.h
-	/usr/include/LDAPExtResult.h
-	/usr/include/LDAPMessage.h
-	/usr/include/LDAPMessageQueue.h
-	/usr/include/LDAPModList.h
-	/usr/include/LDAPModification.h
-	/usr/include/LDAPObjClass.h
-	/usr/include/LDAPRebind.h
-	/usr/include/LDAPRebindAuth.h
-	/usr/include/LDAPReferenceList.h
-	/usr/include/LDAPResult.h
-	/usr/include/LDAPSaslBindResult.h
-	/usr/include/LDAPSchema.h
-	/usr/include/LDAPSearchReference.h
-	/usr/include/LDAPSearchResult.h
-	/usr/include/LDAPSearchResults.h
-	/usr/include/LDAPUrl.h
-	/usr/include/LDAPUrlList.h
-	/usr/include/LdifReader.h
-	/usr/include/LdifWriter.h
-	/usr/include/SaslInteraction.h
-	/usr/include/SaslInteractionHandler.h
-	/usr/include/StringList.h
-	/usr/include/TlsOptions.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.17-gcc44.patch
-
-	"${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch
-	"${FILESDIR}"/${PN}-2.4.15-ppolicy.patch
-
-	# bug #116045 - still present in 2.4.28
-	"${FILESDIR}"/${PN}-2.4.35-contrib-smbk5pwd.patch
-	# bug #408077 - samba4
-	"${FILESDIR}"/${PN}-2.4.35-contrib-samba4.patch
-
-	# bug #189817
-	"${FILESDIR}"/${PN}-2.4.11-libldap_r.patch
-
-	# bug #233633
-	"${FILESDIR}"/${PN}-2.4.45-fix-lmpasswd-gnutls-symbols.patch
-
-	# bug #281495
-	"${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch
-
-	# bug #294350
-	"${FILESDIR}"/${PN}-2.4.6-evolution-ntlm.patch
-
-	# unbreak /bin/sh -> dash
-	"${FILESDIR}"/${PN}-2.4.28-fix-dash.patch
-
-	# bug #420959
-	"${FILESDIR}"/${PN}-2.4.31-gcc47.patch
-
-	# unbundle lmdb
-	"${FILESDIR}"/${PN}-2.4.42-mdb-unbundle.patch
-
-	# bug #622464
-	"${FILESDIR}"/${PN}-2.4.47-libressl.patch
-
-	# fix some compiler warnings
-	"${FILESDIR}"/${PN}-2.4.47-warnings.patch
-)
-
-openldap_filecount() {
-	local dir="$1"
-	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
-}
-
-openldap_find_versiontags() {
-	# scan for all datadirs
-	local openldap_datadirs=()
-	if [[ -f "${EROOT}"/etc/openldap/slapd.conf ]]; then
-		openldap_datadirs=( $(awk '{if($1 == "directory") print $2 }' "${EROOT}"/etc/openldap/slapd.conf) )
-	fi
-	openldap_datadirs+=( ${OPENLDAP_DEFAULTDIR_VERSIONTAG} )
-
-	einfo
-	einfo "Scanning datadir(s) from slapd.conf and"
-	einfo "the default installdir for Versiontags"
-	einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)"
-	einfo
-
-	# scan datadirs if we have a version tag
-	openldap_found_tag=0
-	have_files=0
-	for each in ${openldap_datadirs[@]} ; do
-		CURRENT_TAGDIR="${ROOT}$(sed "s:\/::" <<< ${each})"
-		CURRENT_TAG="${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}"
-		if [[ -d "${CURRENT_TAGDIR}" ]] && [[ "${openldap_found_tag}" == 0 ]] ; then
-			einfo "- Checking ${each}..."
-			if [[ -r "${CURRENT_TAG}" ]] ; then
-				# yey, we have one :)
-				einfo "   Found Versiontag in ${each}"
-				source "${CURRENT_TAG}"
-				if [[ "${OLDPF}" == "" ]] ; then
-					eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}"
-					eerror "Please delete it"
-					eerror
-					die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}"
-				fi
-
-				OLD_MAJOR=$(ver_cut 2-3 ${OLDPF})
-
-				[[ "$(openldap_filecount ${CURRENT_TAGDIR})" -gt 0 ]] && have_files=1
-
-				# are we on the same branch?
-				if [[ "${OLD_MAJOR}" != "${PV:0:3}" ]] ; then
-					ewarn "   Versiontag doesn't match current major release!"
-					if [[ "${have_files}" == "1" ]] ; then
-						eerror "   Versiontag says other major and you (probably) have datafiles!"
-						echo
-						openldap_upgrade_howto
-					else
-						einfo "   No real problem, seems there's no database."
-					fi
-				else
-					einfo "   Versiontag is fine here :)"
-				fi
-			else
-				einfo "   Non-tagged dir ${each}"
-				[[ "$(openldap_filecount ${each})" -gt 0 ]] && have_files=1
-				if [[ "${have_files}" == "1" ]] ; then
-					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
-					echo
-
-					eerror
-					eerror "Your OpenLDAP Installation has a non tagged datadir that"
-					eerror "possibly contains a database at ${CURRENT_TAGDIR}"
-					eerror
-					eerror "Please export data if any entered and empty or remove"
-					eerror "the directory, installation has been stopped so you"
-					eerror "can take required action"
-					eerror
-					eerror "For a HOWTO on exporting the data, see instructions in the ebuild"
-					eerror
-					openldap_upgrade_howto
-					die "Please move the datadir ${CURRENT_TAGDIR} away"
-				fi
-			fi
-			einfo
-		fi
-	done
-	[[ "${have_files}" == "1" ]] && einfo "DB files present" || einfo "No DB files present"
-
-	# Now we must check for the major version of sys-libs/db linked against.
-	SLAPD_PATH="${EROOT}/usr/$(get_libdir)/openldap/slapd"
-	if [[ "${have_files}" == "1" ]] && [[ -f "${SLAPD_PATH}" ]]; then
-		OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \
-			| awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')"
-		if use berkdb; then
-			# find which one would be used
-			for bdb_slot in ${BDB_SLOTS} ; do
-				NEWVER="$(db_findver "=sys-libs/db-${bdb_slot}*")"
-				[[ -n "${NEWVER}" ]] && break
-			done
-		fi
-		local fail=0
-		if [[ -z "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
-			:
-			# Nothing wrong here.
-		elif [[ -z "${OLDVER}" ]] && [[ -n "${NEWVER}" ]]; then
-			eerror "	Your existing version of OpenLDAP was not built against"
-			eerror "	any version of sys-libs/db, but the new one will build"
-			eerror "	against	${NEWVER} and your database may be inaccessible."
-			echo
-			fail=1
-		elif [[ -n "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
-			eerror "	Your existing version of OpenLDAP was built against"
-			eerror "	sys-libs/db:${OLDVER}, but the new one will not be"
-			eerror "	built against any version and your database may be"
-			eerror "	inaccessible."
-			echo
-			fail=1
-		elif [[ "${OLDVER}" != "${NEWVER}" ]]; then
-			eerror "	Your existing version of OpenLDAP was built against"
-			eerror "	sys-libs/db:${OLDVER}, but the new one will build against"
-			eerror "	${NEWVER} and your database would be inaccessible."
-			echo
-			fail=1
-		fi
-		[[ "${fail}" == "1" ]] && openldap_upgrade_howto
-	fi
-
-	echo
-	einfo
-	einfo "All datadirs are fine, proceeding with merge now..."
-	einfo
-}
-
-openldap_upgrade_howto() {
-	local d l i
-	eerror
-	eerror "A (possible old) installation of OpenLDAP was detected,"
-	eerror "installation will not proceed for now."
-	eerror
-	eerror "As major version upgrades can corrupt your database,"
-	eerror "you need to dump your database and re-create it afterwards."
-	eerror
-	eerror "Additionally, rebuilding against different major versions of the"
-	eerror "sys-libs/db libraries will cause your database to be inaccessible."
-	eerror ""
-	d="$(date -u +%s)"
-	l="/root/ldapdump.${d}"
-	i="${l}.raw"
-	eerror " 1. /etc/init.d/slapd stop"
-	eerror " 2. slapcat -l ${i}"
-	eerror " 3. egrep -v '^(entry|context)CSN:' <${i} >${l}"
-	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
-	eerror " 5. emerge --update \=net-nds/${PF}"
-	eerror " 6. etc-update, and ensure that you apply the changes"
-	eerror " 7. slapadd -l ${l}"
-	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
-	eerror " 9. /etc/init.d/slapd start"
-	eerror "10. check that your data is intact."
-	eerror "11. set up the new replication system."
-	eerror
-	if [[ "${FORCE_UPGRADE}" != "1" ]]; then
-		die "You need to upgrade your database first"
-	else
-		eerror "You have the magical FORCE_UPGRADE=1 in place."
-		eerror "Don't say you weren't warned about data loss."
-	fi
-}
-
-pkg_setup() {
-	if ! use sasl && use cxx ; then
-		die "To build the ldapc++ library you must emerge openldap with sasl support"
-	fi
-	# Bug #322787
-	if use minimal && ! has_version "net-nds/openldap" ; then
-		einfo "No datadir scan needed, openldap not installed"
-	elif use minimal && has_version 'net-nds/openldap[minimal]' ; then
-		einfo "Skipping scan for previous datadirs as requested by minimal useflag"
-	else
-		openldap_find_versiontags
-	fi
-
-	# The user/group are only used for running daemons which are
-	# disabled in minimal builds, so elide the accounts too.
-	if ! use minimal ; then
-		enewgroup ldap 439
-		enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap
-	fi
-}
-
-src_prepare() {
-	# ensure correct SLAPI path by default
-	sed -e 's,\(#define LDAPI_SOCK\).*,\1 "'"${EPREFIX}"'/var/run/openldap/slapd.sock",' \
-		-i include/ldap_defaults.h || die
-
-	default
-	rm -r libraries/liblmdb || die
-
-	pushd build &>/dev/null || die "pushd build"
-	einfo "Making sure upstream build strip does not do stripping too early"
-	sed -i.orig \
-		-e '/^STRIP/s,-s,,g' \
-		top.mk || die "Failed to block stripping"
-	popd &>/dev/null || die
-
-	# wrong assumption that /bin/sh is /bin/bash
-	sed \
-		-e 's|/bin/sh|/bin/bash|g' \
-		-i tests/scripts/* || die "sed failed"
-
-	AT_NOEAUTOMAKE=yes eautoreconf
-}
-
-build_contrib_module() {
-	# <dir> <sources> <outputname>
-	pushd "${S}/contrib/slapd-modules/$1" &>/dev/null || die "pushd contrib/slapd-modules/$1"
-	einfo "Compiling contrib-module: $3"
-	# Make sure it's uppercase
-	local define_name="$(LC_ALL=C tr '[:lower:]' '[:upper:]' <<< "SLAPD_OVER_${1}")"
-	"${lt}" --mode=compile --tag=CC \
-		"${CC}" \
-		-D${define_name}=SLAPD_MOD_DYNAMIC \
-		-I"${BUILD_DIR}"/include \
-		-I../../../include -I../../../servers/slapd ${CFLAGS} \
-		-o ${2%.c}.lo -c $2 || die "compiling $3 failed"
-	einfo "Linking contrib-module: $3"
-	"${lt}" --mode=link --tag=CC \
-		"${CC}" -module \
-		${CFLAGS} \
-		${LDFLAGS} \
-		-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
-		-o $3.la ${2%.c}.lo || die "linking $3 failed"
-	popd &>/dev/null || die
-}
-
-src_configure() {
-	# Bug 408001
-	use elibc_FreeBSD && append-cppflags -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync
-
-	# connectionless ldap per bug #342439
-	append-cppflags -DLDAP_CONNECTIONLESS
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	use debug && myconf+=( $(use_enable debug) )
-
-	# ICU exists only in the configure, nowhere in the codebase, bug #510858
-	export ac_cv_header_unicode_utypes_h=no ol_cv_lib_icu=no
-
-	if ! use minimal && multilib_is_native_abi; then
-		local CPPFLAGS=${CPPFLAGS}
-
-		# re-enable serverside overlay chains per bug #296567
-		# see ldap docs chaper 12.3.1 for details
-		myconf+=( --enable-ldap )
-
-		# backends
-		myconf+=( --enable-slapd )
-		if use berkdb ; then
-			einfo "Using Berkeley DB for local backend"
-			myconf+=( --enable-bdb --enable-hdb )
-			DBINCLUDE=$(db_includedir ${BDB_SLOTS})
-			einfo "Using ${DBINCLUDE} for sys-libs/db version"
-			# We need to include the slotted db.h dir for FreeBSD
-			append-cppflags -I${DBINCLUDE}
-		else
-			myconf+=( --disable-bdb --disable-hdb )
-		fi
-		for backend in dnssrv ldap mdb meta monitor null passwd relay shell sock; do
-			myconf+=( --enable-${backend}=mod )
-		done
-
-		myconf+=( $(use_enable perl perl mod) )
-
-		myconf+=( $(use_enable odbc sql mod) )
-		if use odbc ; then
-			local odbc_lib="unixodbc"
-			if use iodbc ; then
-				odbc_lib="iodbc"
-				append-cppflags -I"${EPREFIX}"/usr/include/iodbc
-			fi
-			myconf+=( --with-odbc=${odbc_lib} )
-		fi
-
-		# slapd options
-		myconf+=(
-			$(use_enable crypt)
-			--disable-slp
-			$(use_enable samba lmpasswd)
-			$(use_enable syslog)
-		)
-		if use experimental ; then
-			myconf+=(
-				--enable-dynacl
-				--enable-aci=mod
-			)
-		fi
-		for option in aci cleartext modules rewrite rlookups slapi; do
-			myconf+=( --enable-${option} )
-		done
-
-		# slapd overlay options
-		# Compile-in the syncprov, the others as module
-		myconf+=( --enable-syncprov=yes )
-		use overlays && myconf+=( --enable-overlays=mod )
-
-	else
-		myconf+=(
-			--disable-backends
-			--disable-slapd
-			--disable-bdb
-			--disable-hdb
-			--disable-mdb
-			--disable-overlays
-			--disable-syslog
-		)
-	fi
-
-	# basic functionality stuff
-	myconf+=(
-		$(use_enable ipv6)
-		$(multilib_native_use_with sasl cyrus-sasl)
-		$(multilib_native_use_enable sasl spasswd)
-		$(use_enable tcpd wrappers)
-	)
-
-	# Some cross-compiling tests don't pan out well.
-	tc-is-cross-compiler && myconf+=(
-		--with-yielding-select=yes
-	)
-
-	local ssl_lib="no"
-	if use ssl || ( ! use minimal && use samba ) ; then
-		ssl_lib="openssl"
-		use gnutls && ssl_lib="gnutls"
-	fi
-
-	myconf+=( --with-tls=${ssl_lib} )
-
-	for basicflag in dynamic local proctitle shared; do
-		myconf+=( --enable-${basicflag} )
-	done
-
-	tc-export AR CC CXX
-	CONFIG_SHELL="/bin/bash" \
-	ECONF_SOURCE="${S}" \
-	STRIP=/bin/true \
-	econf \
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	emake depend
-}
-
-src_configure_cxx() {
-	# This needs the libraries built by the first build run.
-	# So we have to run it AFTER the main build, not just after the main
-	# configure.
-	local myconf_ldapcpp=(
-		--with-ldap-includes="${S}"/include
-	)
-
-	mkdir -p "${BUILD_DIR}"/contrib/ldapc++ || die
-	pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
-
-	local LDFLAGS=${LDFLAGS} CPPFLAGS=${CPPFLAGS}
-	append-ldflags -L"${BUILD_DIR}"/libraries/liblber/.libs \
-		-L"${BUILD_DIR}"/libraries/libldap/.libs
-	append-cppflags -I"${BUILD_DIR}"/include
-	ECONF_SOURCE=${S}/contrib/ldapc++ \
-	econf "${myconf_ldapcpp[@]}" \
-		CC="${CC}" \
-		CXX="${CXX}"
-	popd &>/dev/null || die
-}
-
-multilib_src_compile() {
-	tc-export AR CC CXX
-	emake CC="${CC}" AR="${AR}" SHELL="${EPREFIX}"/bin/bash
-	local lt="${BUILD_DIR}/libtool"
-	export echo="echo"
-
-	if ! use minimal && multilib_is_native_abi ; then
-		if use cxx ; then
-			einfo "Building contrib library: ldapc++"
-			src_configure_cxx
-			pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
-			emake CC="${CC}" CXX="${CXX}"
-			popd &>/dev/null || die
-		fi
-
-		if use smbkrb5passwd ; then
-			einfo "Building contrib-module: smbk5pwd"
-			pushd "${S}/contrib/slapd-modules/smbk5pwd" &>/dev/null || die "pushd contrib/slapd-modules/smbk5pwd"
-
-			MY_DEFS="-DDO_SHADOW"
-			if use samba ; then
-				MY_DEFS="${MY_DEFS} -DDO_SAMBA"
-				MY_KRB5_INC=""
-			fi
-			if use kerberos ; then
-				MY_DEFS="${MY_DEFS} -DDO_KRB5"
-				MY_KRB5_INC="$(krb5-config --cflags)"
-			fi
-
-			emake \
-				DEFS="${MY_DEFS}" \
-				KRB5_INC="${MY_KRB5_INC}" \
-				LDAP_BUILD="${BUILD_DIR}" \
-				CC="${CC}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
-			popd &>/dev/null || die
-		fi
-
-		if use overlays ; then
-			einfo "Building contrib-module: samba4"
-			pushd "${S}/contrib/slapd-modules/samba4" &>/dev/null || die "pushd contrib/slapd-modules/samba4"
-
-			emake \
-				LDAP_BUILD="${BUILD_DIR}" \
-				CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap"
-			popd &>/dev/null || die
-		fi
-
-		if use kerberos ; then
-			if use kinit ; then
-				build_contrib_module "kinit" "kinit.c" "kinit"
-			fi
-			pushd "${S}/contrib/slapd-modules/passwd" &>/dev/null || die "pushd contrib/slapd-modules/passwd"
-			einfo "Compiling contrib-module: pw-kerberos"
-			"${lt}" --mode=compile --tag=CC \
-				"${CC}" \
-				-I"${BUILD_DIR}"/include \
-				-I../../../include \
-				${CFLAGS} \
-				$(krb5-config --cflags) \
-				-DHAVE_KRB5 \
-				-o kerberos.lo \
-				-c kerberos.c || die "compiling pw-kerberos failed"
-			einfo "Linking contrib-module: pw-kerberos"
-			"${lt}" --mode=link --tag=CC \
-				"${CC}" -module \
-				${CFLAGS} \
-				${LDFLAGS} \
-				-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
-				-o pw-kerberos.la \
-				kerberos.lo || die "linking pw-kerberos failed"
-			popd &>/dev/null || die
-		fi
-
-		if use pbkdf2; then
-			pushd "${S}/contrib/slapd-modules/passwd/pbkdf2" &>/dev/null || die "pushd contrib/slapd-modules/passwd/pbkdf2"
-			einfo "Compiling contrib-module: pw-pbkdf2"
-			"${lt}" --mode=compile --tag=CC \
-				"${CC}" \
-				-I"${BUILD_DIR}"/include \
-				-I../../../../include \
-				${CFLAGS} \
-				-o pbkdf2.lo \
-				-c pw-pbkdf2.c || die "compiling pw-pbkdf2 failed"
-			einfo "Linking contrib-module: pw-pbkdf2"
-			"${lt}" --mode=link --tag=CC \
-				"${CC}" -module \
-				${CFLAGS} \
-				${LDFLAGS} \
-				-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
-				-o pw-pbkdf2.la \
-				pbkdf2.lo || die "linking pw-pbkdf2 failed"
-			popd &>/dev/null || die
-		fi
-
-		if use sha2 ; then
-			pushd "${S}/contrib/slapd-modules/passwd/sha2" &>/dev/null || die "pushd contrib/slapd-modules/passwd/sha2"
-			einfo "Compiling contrib-module: pw-sha2"
-			"${lt}" --mode=compile --tag=CC \
-				"${CC}" \
-				-I"${BUILD_DIR}"/include \
-				-I../../../../include \
-				${CFLAGS} \
-				-o sha2.lo \
-				-c sha2.c || die "compiling pw-sha2 failed"
-			"${lt}" --mode=compile --tag=CC \
-				"${CC}" \
-				-I"${BUILD_DIR}"/include \
-				-I../../../../include \
-				${CFLAGS} \
-				-o slapd-sha2.lo \
-				-c slapd-sha2.c || die "compiling pw-sha2 failed"
-			einfo "Linking contrib-module: pw-sha2"
-			"${lt}" --mode=link --tag=CC \
-				"${CC}" -module \
-				${CFLAGS} \
-				${LDFLAGS} \
-				-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
-				-o pw-sha2.la \
-				sha2.lo slapd-sha2.lo || die "linking pw-sha2 failed"
-			popd &>/dev/null || die
-		fi
-
-		# We could build pw-radius if GNURadius would install radlib.h
-		pushd "${S}/contrib/slapd-modules/passwd" &>/dev/null || die "pushd contrib/slapd-modules/passwd"
-		einfo "Compiling contrib-module: pw-netscape"
-		"${lt}" --mode=compile --tag=CC \
-			"${CC}" \
-			-I"${BUILD_DIR}"/include \
-			-I../../../include \
-			${CFLAGS} \
-			-o netscape.lo \
-			-c netscape.c || die "compiling pw-netscape failed"
-		einfo "Linking contrib-module: pw-netscape"
-		"${lt}" --mode=link --tag=CC \
-			"${CC}" -module \
-			${CFLAGS} \
-			${LDFLAGS} \
-			-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
-			-o pw-netscape.la \
-			netscape.lo || die "linking pw-netscape failed"
-
-		#build_contrib_module "acl" "posixgroup.c" "posixGroup" # example code only
-		#build_contrib_module "acl" "gssacl.c" "gss" # example code only, also needs kerberos
-		build_contrib_module "addpartial" "addpartial-overlay.c" "addpartial-overlay"
-		build_contrib_module "allop" "allop.c" "overlay-allop"
-		build_contrib_module "allowed" "allowed.c" "allowed"
-		build_contrib_module "autogroup" "autogroup.c" "autogroup"
-		build_contrib_module "cloak" "cloak.c" "cloak"
-		# build_contrib_module "comp_match" "comp_match.c" "comp_match" # really complex, adds new external deps, questionable demand
-		build_contrib_module "denyop" "denyop.c" "denyop-overlay"
-		build_contrib_module "dsaschema" "dsaschema.c" "dsaschema-plugin"
-		build_contrib_module "dupent" "dupent.c" "dupent"
-		build_contrib_module "lastbind" "lastbind.c" "lastbind"
-		# lastmod may not play well with other overlays
-		build_contrib_module "lastmod" "lastmod.c" "lastmod"
-		build_contrib_module "noopsrch" "noopsrch.c" "noopsrch"
-		#build_contrib_module "nops" "nops.c" "nops-overlay" https://bugs.gentoo.org/641576
-		#build_contrib_module "nssov" "nssov.c" "nssov-overlay" RESO:LATER
-		build_contrib_module "trace" "trace.c" "trace"
-		popd &>/dev/null || die
-		# build slapi-plugins
-		pushd "${S}/contrib/slapi-plugins/addrdnvalues" &>/dev/null || die "pushd contrib/slapi-plugins/addrdnvalues"
-		einfo "Building contrib-module: addrdnvalues plugin"
-		"${CC}" -shared \
-			-I"${BUILD_DIR}"/include \
-			-I../../../include \
-			${CFLAGS} \
-			-fPIC \
-			${LDFLAGS} \
-			-o libaddrdnvalues-plugin.so \
-			addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed"
-		popd &>/dev/null || die
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		cd tests || die
-		emake tests
-	fi
-}
-
-multilib_src_install() {
-	local lt="${BUILD_DIR}/libtool"
-	emake DESTDIR="${D}" SHELL="${EPREFIX}"/bin/bash install
-
-	if ! use minimal && multilib_is_native_abi; then
-		# openldap modules go here
-		# TODO: write some code to populate slapd.conf with moduleload statements
-		keepdir /usr/$(get_libdir)/openldap/openldap/
-
-		# initial data storage dir
-		keepdir /var/lib/openldap-data
-		use prefix || fowners ldap:ldap /var/lib/openldap-data
-		fperms 0700 /var/lib/openldap-data
-
-		echo "OLDPF='${PF}'" > "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-		echo "# do NOT delete this. it is used"	>> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-		echo "# to track versions for upgrading." >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-
-		# use our config
-		rm "${ED}"/etc/openldap/slapd.conf
-		insinto /etc/openldap
-		newins "${FILESDIR}"/${PN}-2.4.40-slapd-conf slapd.conf
-		configfile="${ED}"/etc/openldap/slapd.conf
-
-		# populate with built backends
-		ebegin "populate config with built backends"
-		for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do
-			einfo "Adding $(basename ${x})"
-			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die
-		done
-		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}"
-		use prefix || fowners root:ldap /etc/openldap/slapd.conf
-		fperms 0640 /etc/openldap/slapd.conf
-		cp "${configfile}" "${configfile}".default || die
-		eend
-
-		# install our own init scripts and systemd unit files
-		einfo "Install init scripts"
-		sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-initd-2.4.40-r2 > "${T}"/slapd || die
-		doinitd "${T}"/slapd
-		newconfd "${FILESDIR}"/slapd-confd-2.4.28-r1 slapd
-
-		einfo "Install systemd service"
-		sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd.service > "${T}"/slapd.service || die
-		systemd_dounit "${T}"/slapd.service
-		systemd_install_serviced "${FILESDIR}"/slapd.service.conf
-		systemd_newtmpfilesd "${FILESDIR}"/slapd.tmpfilesd slapd.conf
-
-		# If built without SLP, we don't need to be before avahi
-			sed -i \
-				-e '/before/{s/avahi-daemon//g}' \
-				"${ED}"/etc/init.d/slapd \
-				|| die
-
-		if use cxx ; then
-			einfo "Install the ldapc++ library"
-			cd "${BUILD_DIR}/contrib/ldapc++" || die
-			emake DESTDIR="${D}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
-			cd "${S}"/contrib/ldapc++ || die
-			newdoc README ldapc++-README
-		fi
-
-		if use smbkrb5passwd ; then
-			einfo "Install the smbk5pwd module"
-			cd "${S}/contrib/slapd-modules/smbk5pwd" || die
-			emake DESTDIR="${D}" \
-				LDAP_BUILD="${BUILD_DIR}" \
-				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
-			newdoc README smbk5pwd-README
-		fi
-
-		if use overlays ; then
-			einfo "Install the samba4 module"
-			cd "${S}/contrib/slapd-modules/samba4" || die
-			emake DESTDIR="${D}" \
-				LDAP_BUILD="${BUILD_DIR}" \
-				libexecdir="/usr/$(get_libdir)/openldap" install
-			newdoc README samba4-README
-		fi
-
-		einfo "Installing contrib modules"
-		cd "${S}/contrib/slapd-modules" || die
-		for l in */*.la */*/*.la; do
-			[[ -e ${l} ]] || continue
-			"${lt}" --mode=install cp ${l} \
-				"${ED}"/usr/$(get_libdir)/openldap/openldap || \
-				die "installing ${l} failed"
-		done
-
-		dodoc "${FILESDIR}"/DB_CONFIG.fast.example
-		docinto contrib
-		doman */*.5
-		#newdoc acl/README*
-		newdoc addpartial/README addpartial-README
-		newdoc allop/README allop-README
-		newdoc allowed/README  allowed-README
-		newdoc autogroup/README autogroup-README
-		newdoc dsaschema/README dsaschema-README
-		newdoc passwd/README passwd-README
-		cd "${S}/contrib/slapi-plugins" || die
-		insinto /usr/$(get_libdir)/openldap/openldap
-		doins  */*.so
-		docinto contrib
-		newdoc addrdnvalues/README addrdnvalues-README
-
-		insinto /etc/openldap/schema
-		newins "${DISTDIR}"/${BIS_P} ${BIS_PN}
-
-		docinto back-sock ; dodoc "${S}"/servers/slapd/back-sock/searchexample*
-		docinto back-shell ; dodoc "${S}"/servers/slapd/back-shell/searchexample*
-		docinto back-perl ; dodoc "${S}"/servers/slapd/back-perl/SampleLDAP.pm
-
-		dosbin "${S}"/contrib/slapd-tools/statslog
-		newdoc "${S}"/contrib/slapd-tools/README README.statslog
-	fi
-
-	if ! use static-libs ; then
-		find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README
-	docinto rfc ; dodoc doc/rfc/*.txt
-}
-
-pkg_preinst() {
-	# keep old libs if any
-	preserve_old_lib /usr/$(get_libdir)/{liblber,libldap_r,liblber}-2.3$(get_libname 0)
-	# bug 440470, only display the getting started help there was no openldap before,
-	# or we are going to a non-minimal build
-	! has_version net-nds/openldap || has_version 'net-nds/openldap[minimal]'
-	OPENLDAP_PRINT_MESSAGES=$((! $?))
-}
-
-pkg_postinst() {
-	if ! use minimal ; then
-		# You cannot build SSL certificates during src_install that will make
-		# binary packages containing your SSL key, which is both a security risk
-		# and a misconfiguration if multiple machines use the same key and cert.
-		if use ssl; then
-			install_cert /etc/openldap/ssl/ldap
-			use prefix || chown ldap:ldap "${EROOT}"/etc/openldap/ssl/ldap.*
-			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-			ewarn "add 'TLS_REQCERT allow' if you want to use them."
-		fi
-
-		if use prefix; then
-			# Warn about prefix issues with slapd
-			eerror "slapd might NOT be usable on Prefix systems as it requires root privileges"
-			eerror "to start up, and requires that certain files directories be owned by"
-			eerror "ldap:ldap.  As Prefix does not support changing ownership of files and"
-			eerror "directories, you will have to manually fix this yourself."
-		fi
-
-		# These lines force the permissions of various content to be correct
-		if [[ -d "${EROOT}"/var/run/openldap ]]; then
-			use prefix || { chown ldap:ldap "${EROOT}"/var/run/openldap || die; }
-			chmod 0755 "${EROOT}"/var/run/openldap || die
-		fi
-		use prefix || chown root:ldap "${EROOT}"/etc/openldap/slapd.conf{,.default}
-		chmod 0640 "${EROOT}"/etc/openldap/slapd.conf{,.default} || die
-		use prefix || chown ldap:ldap "${EROOT}"/var/lib/openldap-data
-	fi
-
-	if has_version 'net-nds/openldap[-minimal]' && ((${OPENLDAP_PRINT_MESSAGES})); then
-		elog "Getting started using OpenLDAP? There is some documentation available:"
-		elog "Gentoo Guide to OpenLDAP Authentication"
-		elog "(https://wiki.gentoo.org/wiki/Centralized_authentication_using_OpenLDAP)"
-		elog "---"
-		elog "An example file for tuning BDB backends with openldap is"
-		elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/"
-	fi
-
-	preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3$(get_libname 0)
-}
diff --git a/net-nds/openldap/openldap-2.4.57.ebuild b/net-nds/openldap/openldap-2.4.57.ebuild
new file mode 100644
index 0000000..77fa1b2
--- /dev/null
+++ b/net-nds/openldap/openldap-2.4.57.ebuild
@@ -0,0 +1,912 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools db-use flag-o-matic multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd
+
+BIS_PN=rfc2307bis.schema
+BIS_PV=20140524
+BIS_P="${BIS_PN}-${BIS_PV}"
+
+DESCRIPTION="LDAP suite of application and development tools"
+HOMEPAGE="https://www.OpenLDAP.org/"
+
+# upstream mirrors are mostly not working, using canonical URI
+SRC_URI="
+	https://openldap.org/software/download/OpenLDAP/openldap-release/${P}.tgz
+	http://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/${P}.tgz
+	http://repository.linagora.org/OpenLDAP/openldap-release/${P}.tgz
+	http://mirror.eu.oneandone.net/software/openldap/openldap-release/${P}.tgz
+	mirror://gentoo/${BIS_P}"
+
+LICENSE="OPENLDAP GPL-2"
+SLOT="0"
+KEYWORDS="*"
+
+IUSE_DAEMON="crypt samba tcpd experimental minimal"
+IUSE_BACKEND="+berkdb"
+IUSE_OVERLAY="overlays perl"
+IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux static-libs test"
+IUSE_CONTRIB="smbkrb5passwd kerberos kinit pbkdf2 sha2"
+IUSE_CONTRIB="${IUSE_CONTRIB} -cxx"
+IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="cxx? ( sasl )
+	pbkdf2? ( ssl )
+	test? ( berkdb )
+	?? ( test minimal )"
+
+# always list newer first
+# Do not add any AGPL-3 BDB here!
+# See bug 525110, comment 15.
+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build.
+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"
+BDB_PKGS=''
+for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
+
+# openssl is needed to generate lanman-passwords required by samba
+COMMON_DEPEND="
+	ssl? (
+		!gnutls? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+		)
+		gnutls? (
+			>=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}]
+			>=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	sasl? ( dev-libs/cyrus-sasl:= )
+	!minimal? (
+		dev-libs/libltdl
+		sys-libs/e2fsprogs-libs
+		>=dev-db/lmdb-0.9.18:=
+		tcpd? ( sys-apps/tcp-wrappers )
+		odbc? ( !iodbc? ( dev-db/unixODBC )
+			iodbc? ( dev-db/libiodbc ) )
+		perl? ( dev-lang/perl:=[-build(-)] )
+		samba? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+		berkdb? (
+			<sys-libs/db-6.0:=
+			|| ( ${BDB_PKGS} )
+			)
+		smbkrb5passwd? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+			kerberos? ( app-crypt/heimdal )
+			)
+		kerberos? (
+			virtual/krb5
+			kinit? ( !app-crypt/heimdal )
+			)
+		cxx? ( dev-libs/cyrus-sasl:= )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	sys-apps/groff
+"
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-ldap )
+"
+
+# The user/group are only used for running daemons which are
+# disabled in minimal builds, so elide the accounts too.
+# for tracking versions
+
+BDEPEND="!minimal? (
+		acct-group/ldap
+		acct-user/ldap
+)
+"
+
+OPENLDAP_VERSIONTAG=".version-tag"
+OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# USE=cxx
+	/usr/include/LDAPAsynConnection.h
+	/usr/include/LDAPAttrType.h
+	/usr/include/LDAPAttribute.h
+	/usr/include/LDAPAttributeList.h
+	/usr/include/LDAPConnection.h
+	/usr/include/LDAPConstraints.h
+	/usr/include/LDAPControl.h
+	/usr/include/LDAPControlSet.h
+	/usr/include/LDAPEntry.h
+	/usr/include/LDAPEntryList.h
+	/usr/include/LDAPException.h
+	/usr/include/LDAPExtResult.h
+	/usr/include/LDAPMessage.h
+	/usr/include/LDAPMessageQueue.h
+	/usr/include/LDAPModList.h
+	/usr/include/LDAPModification.h
+	/usr/include/LDAPObjClass.h
+	/usr/include/LDAPRebind.h
+	/usr/include/LDAPRebindAuth.h
+	/usr/include/LDAPReferenceList.h
+	/usr/include/LDAPResult.h
+	/usr/include/LDAPSaslBindResult.h
+	/usr/include/LDAPSchema.h
+	/usr/include/LDAPSearchReference.h
+	/usr/include/LDAPSearchResult.h
+	/usr/include/LDAPSearchResults.h
+	/usr/include/LDAPUrl.h
+	/usr/include/LDAPUrlList.h
+	/usr/include/LdifReader.h
+	/usr/include/LdifWriter.h
+	/usr/include/SaslInteraction.h
+	/usr/include/SaslInteractionHandler.h
+	/usr/include/StringList.h
+	/usr/include/TlsOptions.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.17-gcc44.patch
+
+	"${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch
+	"${FILESDIR}"/${PN}-2.4.15-ppolicy.patch
+
+	# bug #116045 - still present in 2.4.28
+	"${FILESDIR}"/${PN}-2.4.35-contrib-smbk5pwd.patch
+	# bug #408077 - samba4
+	"${FILESDIR}"/${PN}-2.4.35-contrib-samba4.patch
+
+	# bug #189817
+	"${FILESDIR}"/${PN}-2.4.11-libldap_r.patch
+
+	# bug #233633
+	"${FILESDIR}"/${PN}-2.4.45-fix-lmpasswd-gnutls-symbols.patch
+
+	# bug #281495
+	"${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch
+
+	# bug #294350
+	"${FILESDIR}"/${PN}-2.4.6-evolution-ntlm.patch
+
+	# unbreak /bin/sh -> dash
+	"${FILESDIR}"/${PN}-2.4.28-fix-dash.patch
+
+	# bug #420959
+	"${FILESDIR}"/${PN}-2.4.31-gcc47.patch
+
+	# unbundle lmdb
+	"${FILESDIR}"/${PN}-2.4.42-mdb-unbundle.patch
+
+	# bug #622464
+	"${FILESDIR}"/${PN}-2.4.47-libressl.patch
+
+	# fix some compiler warnings
+	"${FILESDIR}"/${PN}-2.4.47-warnings.patch
+)
+
+openldap_filecount() {
+	local dir="$1"
+	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
+}
+
+openldap_find_versiontags() {
+	# scan for all datadirs
+	local openldap_datadirs=()
+	if [[ -f "${EROOT}"/etc/openldap/slapd.conf ]]; then
+		openldap_datadirs=( $(awk '{if($1 == "directory") print $2 }' "${EROOT}"/etc/openldap/slapd.conf) )
+	fi
+	openldap_datadirs+=( ${OPENLDAP_DEFAULTDIR_VERSIONTAG} )
+
+	einfo
+	einfo "Scanning datadir(s) from slapd.conf and"
+	einfo "the default installdir for Versiontags"
+	einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)"
+	einfo
+
+	# scan datadirs if we have a version tag
+	openldap_found_tag=0
+	have_files=0
+	for each in ${openldap_datadirs[@]} ; do
+		CURRENT_TAGDIR="${ROOT}$(sed "s:\/::" <<< ${each})"
+		CURRENT_TAG="${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}"
+		if [[ -d "${CURRENT_TAGDIR}" ]] && [[ "${openldap_found_tag}" == 0 ]] ; then
+			einfo "- Checking ${each}..."
+			if [[ -r "${CURRENT_TAG}" ]] ; then
+				# yey, we have one :)
+				einfo "   Found Versiontag in ${each}"
+				source "${CURRENT_TAG}"
+				if [[ "${OLDPF}" == "" ]] ; then
+					eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}"
+					eerror "Please delete it"
+					eerror
+					die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}"
+				fi
+
+				OLD_MAJOR=$(ver_cut 2-3 ${OLDPF})
+
+				[[ "$(openldap_filecount ${CURRENT_TAGDIR})" -gt 0 ]] && have_files=1
+
+				# are we on the same branch?
+				if [[ "${OLD_MAJOR}" != "${PV:0:3}" ]] ; then
+					ewarn "   Versiontag doesn't match current major release!"
+					if [[ "${have_files}" == "1" ]] ; then
+						eerror "   Versiontag says other major and you (probably) have datafiles!"
+						echo
+						openldap_upgrade_howto
+					else
+						einfo "   No real problem, seems there's no database."
+					fi
+				else
+					einfo "   Versiontag is fine here :)"
+				fi
+			else
+				einfo "   Non-tagged dir ${each}"
+				[[ "$(openldap_filecount ${each})" -gt 0 ]] && have_files=1
+				if [[ "${have_files}" == "1" ]] ; then
+					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
+					echo
+
+					eerror
+					eerror "Your OpenLDAP Installation has a non tagged datadir that"
+					eerror "possibly contains a database at ${CURRENT_TAGDIR}"
+					eerror
+					eerror "Please export data if any entered and empty or remove"
+					eerror "the directory, installation has been stopped so you"
+					eerror "can take required action"
+					eerror
+					eerror "For a HOWTO on exporting the data, see instructions in the ebuild"
+					eerror
+					openldap_upgrade_howto
+					die "Please move the datadir ${CURRENT_TAGDIR} away"
+				fi
+			fi
+			einfo
+		fi
+	done
+	[[ "${have_files}" == "1" ]] && einfo "DB files present" || einfo "No DB files present"
+
+	# Now we must check for the major version of sys-libs/db linked against.
+	SLAPD_PATH="${EROOT}/usr/$(get_libdir)/openldap/slapd"
+	if [[ "${have_files}" == "1" ]] && [[ -f "${SLAPD_PATH}" ]]; then
+		OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \
+			| awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')"
+		if use berkdb; then
+			# find which one would be used
+			for bdb_slot in ${BDB_SLOTS} ; do
+				NEWVER="$(db_findver "=sys-libs/db-${bdb_slot}*")"
+				[[ -n "${NEWVER}" ]] && break
+			done
+		fi
+		local fail=0
+		if [[ -z "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
+			:
+			# Nothing wrong here.
+		elif [[ -z "${OLDVER}" ]] && [[ -n "${NEWVER}" ]]; then
+			eerror "	Your existing version of OpenLDAP was not built against"
+			eerror "	any version of sys-libs/db, but the new one will build"
+			eerror "	against	${NEWVER} and your database may be inaccessible."
+			echo
+			fail=1
+		elif [[ -n "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
+			eerror "	Your existing version of OpenLDAP was built against"
+			eerror "	sys-libs/db:${OLDVER}, but the new one will not be"
+			eerror "	built against any version and your database may be"
+			eerror "	inaccessible."
+			echo
+			fail=1
+		elif [[ "${OLDVER}" != "${NEWVER}" ]]; then
+			eerror "	Your existing version of OpenLDAP was built against"
+			eerror "	sys-libs/db:${OLDVER}, but the new one will build against"
+			eerror "	${NEWVER} and your database would be inaccessible."
+			echo
+			fail=1
+		fi
+		[[ "${fail}" == "1" ]] && openldap_upgrade_howto
+	fi
+
+	echo
+	einfo
+	einfo "All datadirs are fine, proceeding with merge now..."
+	einfo
+}
+
+openldap_upgrade_howto() {
+	local d l i
+	eerror
+	eerror "A (possible old) installation of OpenLDAP was detected,"
+	eerror "installation will not proceed for now."
+	eerror
+	eerror "As major version upgrades can corrupt your database,"
+	eerror "you need to dump your database and re-create it afterwards."
+	eerror
+	eerror "Additionally, rebuilding against different major versions of the"
+	eerror "sys-libs/db libraries will cause your database to be inaccessible."
+	eerror ""
+	d="$(date -u +%s)"
+	l="/root/ldapdump.${d}"
+	i="${l}.raw"
+	eerror " 1. /etc/init.d/slapd stop"
+	eerror " 2. slapcat -l ${i}"
+	eerror " 3. egrep -v '^(entry|context)CSN:' <${i} >${l}"
+	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
+	eerror " 5. emerge --update \=net-nds/${PF}"
+	eerror " 6. etc-update, and ensure that you apply the changes"
+	eerror " 7. slapadd -l ${l}"
+	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
+	eerror " 9. /etc/init.d/slapd start"
+	eerror "10. check that your data is intact."
+	eerror "11. set up the new replication system."
+	eerror
+	if [[ "${FORCE_UPGRADE}" != "1" ]]; then
+		die "You need to upgrade your database first"
+	else
+		eerror "You have the magical FORCE_UPGRADE=1 in place."
+		eerror "Don't say you weren't warned about data loss."
+	fi
+}
+
+pkg_setup() {
+	if ! use sasl && use cxx ; then
+		die "To build the ldapc++ library you must emerge openldap with sasl support"
+	fi
+	# Bug #322787
+	if use minimal && ! has_version "net-nds/openldap" ; then
+		einfo "No datadir scan needed, openldap not installed"
+	elif use minimal && has_version 'net-nds/openldap[minimal]' ; then
+		einfo "Skipping scan for previous datadirs as requested by minimal useflag"
+	else
+		openldap_find_versiontags
+	fi
+}
+
+src_prepare() {
+	# ensure correct SLAPI path by default
+	sed -e 's,\(#define LDAPI_SOCK\).*,\1 "'"${EPREFIX}"'/var/run/openldap/slapd.sock",' \
+		-i include/ldap_defaults.h || die
+
+	default
+	rm -r libraries/liblmdb || die
+
+	pushd build &>/dev/null || die "pushd build"
+	einfo "Making sure upstream build strip does not do stripping too early"
+	sed -i.orig \
+		-e '/^STRIP/s,-s,,g' \
+		top.mk || die "Failed to block stripping"
+	popd &>/dev/null || die
+
+	# wrong assumption that /bin/sh is /bin/bash
+	sed \
+		-e 's|/bin/sh|/bin/bash|g' \
+		-i tests/scripts/* || die "sed failed"
+
+	# Required for autoconf-2.70 #765043
+	sed 's@^AM_INIT_AUTOMAKE.*@AC_PROG_MAKE_SET@' -i configure.in || die
+	AT_NOEAUTOMAKE=yes eautoreconf
+}
+
+build_contrib_module() {
+	# <dir> <sources> <outputname>
+	pushd "${S}/contrib/slapd-modules/$1" &>/dev/null || die "pushd contrib/slapd-modules/$1"
+	einfo "Compiling contrib-module: $3"
+	# Make sure it's uppercase
+	local define_name="$(LC_ALL=C tr '[:lower:]' '[:upper:]' <<< "SLAPD_OVER_${1}")"
+	"${lt}" --mode=compile --tag=CC \
+		"${CC}" \
+		-D${define_name}=SLAPD_MOD_DYNAMIC \
+		-I"${BUILD_DIR}"/include \
+		-I../../../include -I../../../servers/slapd ${CFLAGS} \
+		-o ${2%.c}.lo -c $2 || die "compiling $3 failed"
+	einfo "Linking contrib-module: $3"
+	"${lt}" --mode=link --tag=CC \
+		"${CC}" -module \
+		${CFLAGS} \
+		${LDFLAGS} \
+		-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+		-o $3.la ${2%.c}.lo || die "linking $3 failed"
+	popd &>/dev/null || die
+}
+
+src_configure() {
+	# Bug 408001
+	use elibc_FreeBSD && append-cppflags -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync
+
+	# connectionless ldap per bug #342439
+	append-cppflags -DLDAP_CONNECTIONLESS
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	use debug && myconf+=( $(use_enable debug) )
+
+	# ICU exists only in the configure, nowhere in the codebase, bug #510858
+	export ac_cv_header_unicode_utypes_h=no ol_cv_lib_icu=no
+
+	if ! use minimal && multilib_is_native_abi; then
+		local CPPFLAGS=${CPPFLAGS}
+
+		# re-enable serverside overlay chains per bug #296567
+		# see ldap docs chaper 12.3.1 for details
+		myconf+=( --enable-ldap )
+
+		# backends
+		myconf+=( --enable-slapd )
+		if use berkdb ; then
+			einfo "Using Berkeley DB for local backend"
+			myconf+=( --enable-bdb --enable-hdb )
+			DBINCLUDE=$(db_includedir ${BDB_SLOTS})
+			einfo "Using ${DBINCLUDE} for sys-libs/db version"
+			# We need to include the slotted db.h dir for FreeBSD
+			append-cppflags -I${DBINCLUDE}
+		else
+			myconf+=( --disable-bdb --disable-hdb )
+		fi
+		for backend in dnssrv ldap mdb meta monitor null passwd relay shell sock; do
+			myconf+=( --enable-${backend}=mod )
+		done
+
+		myconf+=( $(use_enable perl perl mod) )
+
+		myconf+=( $(use_enable odbc sql mod) )
+		if use odbc ; then
+			local odbc_lib="unixodbc"
+			if use iodbc ; then
+				odbc_lib="iodbc"
+				append-cppflags -I"${EPREFIX}"/usr/include/iodbc
+			fi
+			myconf+=( --with-odbc=${odbc_lib} )
+		fi
+
+		# slapd options
+		myconf+=(
+			$(use_enable crypt)
+			--disable-slp
+			$(use_enable samba lmpasswd)
+			$(use_enable syslog)
+		)
+		if use experimental ; then
+			myconf+=(
+				--enable-dynacl
+				--enable-aci=mod
+			)
+		fi
+		for option in aci cleartext modules rewrite rlookups slapi; do
+			myconf+=( --enable-${option} )
+		done
+
+		# slapd overlay options
+		# Compile-in the syncprov, the others as module
+		myconf+=( --enable-syncprov=yes )
+		use overlays && myconf+=( --enable-overlays=mod )
+
+	else
+		myconf+=(
+			--disable-backends
+			--disable-slapd
+			--disable-bdb
+			--disable-hdb
+			--disable-mdb
+			--disable-overlays
+			--disable-syslog
+		)
+	fi
+
+	# basic functionality stuff
+	myconf+=(
+		$(use_enable ipv6)
+		$(multilib_native_use_with sasl cyrus-sasl)
+		$(multilib_native_use_enable sasl spasswd)
+		$(use_enable tcpd wrappers)
+	)
+
+	# Some cross-compiling tests don't pan out well.
+	tc-is-cross-compiler && myconf+=(
+		--with-yielding-select=yes
+	)
+
+	local ssl_lib="no"
+	if use ssl || ( ! use minimal && use samba ) ; then
+		ssl_lib="openssl"
+		use gnutls && ssl_lib="gnutls"
+	fi
+
+	myconf+=( --with-tls=${ssl_lib} )
+
+	for basicflag in dynamic local proctitle shared; do
+		myconf+=( --enable-${basicflag} )
+	done
+
+	tc-export AR CC CXX
+	CONFIG_SHELL="/bin/sh" \
+	ECONF_SOURCE="${S}" \
+	STRIP=/bin/true \
+	econf \
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	emake depend
+}
+
+src_configure_cxx() {
+	# This needs the libraries built by the first build run.
+	# So we have to run it AFTER the main build, not just after the main
+	# configure.
+	local myconf_ldapcpp=(
+		--with-ldap-includes="${S}"/include
+	)
+
+	mkdir -p "${BUILD_DIR}"/contrib/ldapc++ || die
+	pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
+
+	local LDFLAGS=${LDFLAGS} CPPFLAGS=${CPPFLAGS}
+	append-ldflags -L"${BUILD_DIR}"/libraries/liblber/.libs \
+		-L"${BUILD_DIR}"/libraries/libldap/.libs
+	append-cppflags -I"${BUILD_DIR}"/include
+	ECONF_SOURCE=${S}/contrib/ldapc++ \
+	econf "${myconf_ldapcpp[@]}" \
+		CC="${CC}" \
+		CXX="${CXX}"
+	popd &>/dev/null || die
+}
+
+multilib_src_compile() {
+	tc-export AR CC CXX
+	emake CC="${CC}" AR="${AR}" SHELL="${EPREFIX}"/bin/sh
+	local lt="${BUILD_DIR}/libtool"
+	export echo="echo"
+
+	if ! use minimal && multilib_is_native_abi ; then
+		if use cxx ; then
+			einfo "Building contrib library: ldapc++"
+			src_configure_cxx
+			pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
+			emake CC="${CC}" CXX="${CXX}"
+			popd &>/dev/null || die
+		fi
+
+		if use smbkrb5passwd ; then
+			einfo "Building contrib-module: smbk5pwd"
+			pushd "${S}/contrib/slapd-modules/smbk5pwd" &>/dev/null || die "pushd contrib/slapd-modules/smbk5pwd"
+
+			MY_DEFS="-DDO_SHADOW"
+			if use samba ; then
+				MY_DEFS="${MY_DEFS} -DDO_SAMBA"
+				MY_KRB5_INC=""
+			fi
+			if use kerberos ; then
+				MY_DEFS="${MY_DEFS} -DDO_KRB5"
+				MY_KRB5_INC="$(krb5-config --cflags)"
+			fi
+
+			emake \
+				DEFS="${MY_DEFS}" \
+				KRB5_INC="${MY_KRB5_INC}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				CC="${CC}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
+			popd &>/dev/null || die
+		fi
+
+		if use overlays ; then
+			einfo "Building contrib-module: samba4"
+			pushd "${S}/contrib/slapd-modules/samba4" &>/dev/null || die "pushd contrib/slapd-modules/samba4"
+
+			emake \
+				LDAP_BUILD="${BUILD_DIR}" \
+				CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap"
+			popd &>/dev/null || die
+		fi
+
+		if use kerberos ; then
+			if use kinit ; then
+				build_contrib_module "kinit" "kinit.c" "kinit"
+			fi
+			pushd "${S}/contrib/slapd-modules/passwd" &>/dev/null || die "pushd contrib/slapd-modules/passwd"
+			einfo "Compiling contrib-module: pw-kerberos"
+			"${lt}" --mode=compile --tag=CC \
+				"${CC}" \
+				-I"${BUILD_DIR}"/include \
+				-I../../../include \
+				${CFLAGS} \
+				$(krb5-config --cflags) \
+				-DHAVE_KRB5 \
+				-o kerberos.lo \
+				-c kerberos.c || die "compiling pw-kerberos failed"
+			einfo "Linking contrib-module: pw-kerberos"
+			"${lt}" --mode=link --tag=CC \
+				"${CC}" -module \
+				${CFLAGS} \
+				${LDFLAGS} \
+				-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+				-o pw-kerberos.la \
+				kerberos.lo || die "linking pw-kerberos failed"
+			popd &>/dev/null || die
+		fi
+
+		if use pbkdf2; then
+			pushd "${S}/contrib/slapd-modules/passwd/pbkdf2" &>/dev/null || die "pushd contrib/slapd-modules/passwd/pbkdf2"
+			einfo "Compiling contrib-module: pw-pbkdf2"
+			"${lt}" --mode=compile --tag=CC \
+				"${CC}" \
+				-I"${BUILD_DIR}"/include \
+				-I../../../../include \
+				${CFLAGS} \
+				-o pbkdf2.lo \
+				-c pw-pbkdf2.c || die "compiling pw-pbkdf2 failed"
+			einfo "Linking contrib-module: pw-pbkdf2"
+			"${lt}" --mode=link --tag=CC \
+				"${CC}" -module \
+				${CFLAGS} \
+				${LDFLAGS} \
+				-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+				-o pw-pbkdf2.la \
+				pbkdf2.lo || die "linking pw-pbkdf2 failed"
+			popd &>/dev/null || die
+		fi
+
+		if use sha2 ; then
+			pushd "${S}/contrib/slapd-modules/passwd/sha2" &>/dev/null || die "pushd contrib/slapd-modules/passwd/sha2"
+			einfo "Compiling contrib-module: pw-sha2"
+			"${lt}" --mode=compile --tag=CC \
+				"${CC}" \
+				-I"${BUILD_DIR}"/include \
+				-I../../../../include \
+				${CFLAGS} \
+				-o sha2.lo \
+				-c sha2.c || die "compiling pw-sha2 failed"
+			"${lt}" --mode=compile --tag=CC \
+				"${CC}" \
+				-I"${BUILD_DIR}"/include \
+				-I../../../../include \
+				${CFLAGS} \
+				-o slapd-sha2.lo \
+				-c slapd-sha2.c || die "compiling pw-sha2 failed"
+			einfo "Linking contrib-module: pw-sha2"
+			"${lt}" --mode=link --tag=CC \
+				"${CC}" -module \
+				${CFLAGS} \
+				${LDFLAGS} \
+				-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+				-o pw-sha2.la \
+				sha2.lo slapd-sha2.lo || die "linking pw-sha2 failed"
+			popd &>/dev/null || die
+		fi
+
+		# We could build pw-radius if GNURadius would install radlib.h
+		pushd "${S}/contrib/slapd-modules/passwd" &>/dev/null || die "pushd contrib/slapd-modules/passwd"
+		einfo "Compiling contrib-module: pw-netscape"
+		"${lt}" --mode=compile --tag=CC \
+			"${CC}" \
+			-I"${BUILD_DIR}"/include \
+			-I../../../include \
+			${CFLAGS} \
+			-o netscape.lo \
+			-c netscape.c || die "compiling pw-netscape failed"
+		einfo "Linking contrib-module: pw-netscape"
+		"${lt}" --mode=link --tag=CC \
+			"${CC}" -module \
+			${CFLAGS} \
+			${LDFLAGS} \
+			-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+			-o pw-netscape.la \
+			netscape.lo || die "linking pw-netscape failed"
+
+		#build_contrib_module "acl" "posixgroup.c" "posixGroup" # example code only
+		#build_contrib_module "acl" "gssacl.c" "gss" # example code only, also needs kerberos
+		build_contrib_module "addpartial" "addpartial-overlay.c" "addpartial-overlay"
+		build_contrib_module "allop" "allop.c" "overlay-allop"
+		build_contrib_module "allowed" "allowed.c" "allowed"
+		build_contrib_module "autogroup" "autogroup.c" "autogroup"
+		build_contrib_module "cloak" "cloak.c" "cloak"
+		# build_contrib_module "comp_match" "comp_match.c" "comp_match" # really complex, adds new external deps, questionable demand
+		build_contrib_module "denyop" "denyop.c" "denyop-overlay"
+		build_contrib_module "dsaschema" "dsaschema.c" "dsaschema-plugin"
+		build_contrib_module "dupent" "dupent.c" "dupent"
+		build_contrib_module "lastbind" "lastbind.c" "lastbind"
+		# lastmod may not play well with other overlays
+		build_contrib_module "lastmod" "lastmod.c" "lastmod"
+		build_contrib_module "noopsrch" "noopsrch.c" "noopsrch"
+		#build_contrib_module "nops" "nops.c" "nops-overlay" https://bugs.gentoo.org/641576
+		#build_contrib_module "nssov" "nssov.c" "nssov-overlay" RESO:LATER
+		build_contrib_module "trace" "trace.c" "trace"
+		popd &>/dev/null || die
+		# build slapi-plugins
+		pushd "${S}/contrib/slapi-plugins/addrdnvalues" &>/dev/null || die "pushd contrib/slapi-plugins/addrdnvalues"
+		einfo "Building contrib-module: addrdnvalues plugin"
+		"${CC}" -shared \
+			-I"${BUILD_DIR}"/include \
+			-I../../../include \
+			${CFLAGS} \
+			-fPIC \
+			${LDFLAGS} \
+			-o libaddrdnvalues-plugin.so \
+			addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed"
+		popd &>/dev/null || die
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		cd tests || die
+		emake tests
+	fi
+}
+
+multilib_src_install() {
+	local lt="${BUILD_DIR}/libtool"
+	emake DESTDIR="${D}" SHELL="${EPREFIX}"/bin/sh install
+
+	if ! use minimal && multilib_is_native_abi; then
+		# openldap modules go here
+		# TODO: write some code to populate slapd.conf with moduleload statements
+		keepdir /usr/$(get_libdir)/openldap/openldap/
+
+		# initial data storage dir
+		keepdir /var/lib/openldap-data
+		use prefix || fowners ldap:ldap /var/lib/openldap-data
+		fperms 0700 /var/lib/openldap-data
+
+		echo "OLDPF='${PF}'" > "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+		echo "# do NOT delete this. it is used"	>> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+		echo "# to track versions for upgrading." >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+
+		# use our config
+		rm "${ED}"/etc/openldap/slapd.conf
+		insinto /etc/openldap
+		newins "${FILESDIR}"/${PN}-2.4.40-slapd-conf slapd.conf
+		configfile="${ED}"/etc/openldap/slapd.conf
+
+		# populate with built backends
+		ebegin "populate config with built backends"
+		for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do
+			einfo "Adding $(basename ${x})"
+			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die
+		done
+		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}"
+		use prefix || fowners root:ldap /etc/openldap/slapd.conf
+		fperms 0640 /etc/openldap/slapd.conf
+		cp "${configfile}" "${configfile}".default || die
+		eend
+
+		# install our own init scripts and systemd unit files
+		einfo "Install init scripts"
+		sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-initd-2.4.40-r2 > "${T}"/slapd || die
+		doinitd "${T}"/slapd
+		newconfd "${FILESDIR}"/slapd-confd-2.4.28-r1 slapd
+
+		einfo "Install systemd service"
+		sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd.service > "${T}"/slapd.service || die
+		systemd_dounit "${T}"/slapd.service
+		systemd_install_serviced "${FILESDIR}"/slapd.service.conf
+		systemd_newtmpfilesd "${FILESDIR}"/slapd.tmpfilesd slapd.conf
+
+		# If built without SLP, we don't need to be before avahi
+			sed -i \
+				-e '/before/{s/avahi-daemon//g}' \
+				"${ED}"/etc/init.d/slapd \
+				|| die
+
+		if use cxx ; then
+			einfo "Install the ldapc++ library"
+			cd "${BUILD_DIR}/contrib/ldapc++" || die
+			emake DESTDIR="${D}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
+			cd "${S}"/contrib/ldapc++ || die
+			newdoc README ldapc++-README
+		fi
+
+		if use smbkrb5passwd ; then
+			einfo "Install the smbk5pwd module"
+			cd "${S}/contrib/slapd-modules/smbk5pwd" || die
+			emake DESTDIR="${D}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
+			newdoc README smbk5pwd-README
+		fi
+
+		if use overlays ; then
+			einfo "Install the samba4 module"
+			cd "${S}/contrib/slapd-modules/samba4" || die
+			emake DESTDIR="${D}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				libexecdir="/usr/$(get_libdir)/openldap" install
+			newdoc README samba4-README
+		fi
+
+		einfo "Installing contrib modules"
+		cd "${S}/contrib/slapd-modules" || die
+		for l in */*.la */*/*.la; do
+			[[ -e ${l} ]] || continue
+			"${lt}" --mode=install cp ${l} \
+				"${ED}"/usr/$(get_libdir)/openldap/openldap || \
+				die "installing ${l} failed"
+		done
+
+		dodoc "${FILESDIR}"/DB_CONFIG.fast.example
+		docinto contrib
+		doman */*.5
+		#newdoc acl/README*
+		newdoc addpartial/README addpartial-README
+		newdoc allop/README allop-README
+		newdoc allowed/README  allowed-README
+		newdoc autogroup/README autogroup-README
+		newdoc dsaschema/README dsaschema-README
+		newdoc passwd/README passwd-README
+		cd "${S}/contrib/slapi-plugins" || die
+		insinto /usr/$(get_libdir)/openldap/openldap
+		doins  */*.so
+		docinto contrib
+		newdoc addrdnvalues/README addrdnvalues-README
+
+		insinto /etc/openldap/schema
+		newins "${DISTDIR}"/${BIS_P} ${BIS_PN}
+
+		docinto back-sock ; dodoc "${S}"/servers/slapd/back-sock/searchexample*
+		docinto back-shell ; dodoc "${S}"/servers/slapd/back-shell/searchexample*
+		docinto back-perl ; dodoc "${S}"/servers/slapd/back-perl/SampleLDAP.pm
+
+		dosbin "${S}"/contrib/slapd-tools/statslog
+		newdoc "${S}"/contrib/slapd-tools/README README.statslog
+	fi
+
+	if ! use static-libs ; then
+		find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README
+	docinto rfc ; dodoc doc/rfc/*.txt
+}
+
+pkg_preinst() {
+	# keep old libs if any
+	preserve_old_lib /usr/$(get_libdir)/{liblber,libldap_r,liblber}-2.3$(get_libname 0)
+	# bug 440470, only display the getting started help there was no openldap before,
+	# or we are going to a non-minimal build
+	! has_version net-nds/openldap || has_version 'net-nds/openldap[minimal]'
+	OPENLDAP_PRINT_MESSAGES=$((! $?))
+}
+
+pkg_postinst() {
+	if ! use minimal ; then
+		# You cannot build SSL certificates during src_install that will make
+		# binary packages containing your SSL key, which is both a security risk
+		# and a misconfiguration if multiple machines use the same key and cert.
+		if use ssl; then
+			install_cert /etc/openldap/ssl/ldap
+			use prefix || chown ldap:ldap "${EROOT}"/etc/openldap/ssl/ldap.*
+			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+			ewarn "add 'TLS_REQCERT allow' if you want to use them."
+		fi
+
+		if use prefix; then
+			# Warn about prefix issues with slapd
+			eerror "slapd might NOT be usable on Prefix systems as it requires root privileges"
+			eerror "to start up, and requires that certain files directories be owned by"
+			eerror "ldap:ldap.  As Prefix does not support changing ownership of files and"
+			eerror "directories, you will have to manually fix this yourself."
+		fi
+
+		# These lines force the permissions of various content to be correct
+		if [[ -d "${EROOT}"/var/run/openldap ]]; then
+			use prefix || { chown ldap:ldap "${EROOT}"/var/run/openldap || die; }
+			chmod 0755 "${EROOT}"/var/run/openldap || die
+		fi
+		use prefix || chown root:ldap "${EROOT}"/etc/openldap/slapd.conf{,.default}
+		chmod 0640 "${EROOT}"/etc/openldap/slapd.conf{,.default} || die
+		use prefix || chown ldap:ldap "${EROOT}"/var/lib/openldap-data
+	fi
+
+	if has_version 'net-nds/openldap[-minimal]' && ((${OPENLDAP_PRINT_MESSAGES})); then
+		elog "Getting started using OpenLDAP? There is some documentation available:"
+		elog "Gentoo Guide to OpenLDAP Authentication"
+		elog "(https://wiki.gentoo.org/wiki/Centralized_authentication_using_OpenLDAP)"
+		elog "---"
+		elog "An example file for tuning BDB backends with openldap is"
+		elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/"
+	fi
+
+	preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3$(get_libname 0)
+}
diff --git a/net-vpn/wireguard-tools/Manifest b/net-vpn/wireguard-tools/Manifest
new file mode 100644
index 0000000..e07c2e7
--- /dev/null
+++ b/net-vpn/wireguard-tools/Manifest
@@ -0,0 +1 @@
+DIST wireguard-tools-1.0.20200319.tar.xz 92324 BLAKE2B 9f514748708ef6a5b7f5b043c9054c954d17bb77de7a354b5a9a4e63cfb5f441237e98b16b288426441a7e709e1874d396cf67b04b38bb0ebbe7822bb32ada57 SHA512 d5bcd153f9b10f184b9a1bf9a81f33a9713ab4863ab5aa190eac60e92919756c8fecbb0d3cfb83bae20ac78fc43fdd7168f37294cdd7c5ee21f2a1b2db5fdf41
diff --git a/net-vpn/wireguard-tools/OWNERS b/net-vpn/wireguard-tools/OWNERS
new file mode 100644
index 0000000..b830d86
--- /dev/null
+++ b/net-vpn/wireguard-tools/OWNERS
@@ -0,0 +1 @@
+include chromiumos/platform2:/patchpanel/OWNERS
diff --git a/net-vpn/wireguard-tools/metadata.xml b/net-vpn/wireguard-tools/metadata.xml
new file mode 100644
index 0000000..652da2d
--- /dev/null
+++ b/net-vpn/wireguard-tools/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+		<name>Jason A. Donenfeld</name>
+	</maintainer>
+	<use>
+		<flag name="wg-quick">Install the wg-quick(8) helper tool. Most users want to use this.</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-vpn/wireguard-tools/wireguard-tools-1.0.20200319.ebuild b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200319.ebuild
new file mode 100644
index 0000000..4492e91
--- /dev/null
+++ b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200319.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info bash-completion-r1 systemd toolchain-funcs
+
+DESCRIPTION="Required tools for WireGuard, such as wg(8) and wg-quick(8)"
+HOMEPAGE="https://www.wireguard.com/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.zx2c4.com/wireguard-tools"
+	KEYWORDS="~*"
+else
+	SRC_URI="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${PV}.tar.xz"
+	KEYWORDS="*"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="*"
+IUSE="+wg-quick"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND=""
+RDEPEND="${DEPEND}
+	wg-quick? (
+		|| ( net-firewall/nftables net-firewall/iptables )
+		net-dns/openresolv
+	)
+	!<virtual/wireguard-1
+"
+
+wg_quick_optional_config_nob() {
+	CONFIG_CHECK="$CONFIG_CHECK ~$1"
+	declare -g ERROR_$1="CONFIG_$1: This option is required for automatic routing of default routes inside of wg-quick(8), though it is not required for general WireGuard usage."
+}
+
+pkg_setup() {
+	use wg-quick || return 0
+	wg_quick_optional_config_nob IP_ADVANCED_ROUTER
+	wg_quick_optional_config_nob IP_MULTIPLE_TABLES
+	wg_quick_optional_config_nob IPV6_MULTIPLE_TABLES
+	if has_version net-firewall/nftables; then
+		wg_quick_optional_config_nob NF_TABLES
+		wg_quick_optional_config_nob NF_TABLES_IPV4
+		wg_quick_optional_config_nob NF_TABLES_IPV6
+		wg_quick_optional_config_nob NFT_CT
+		wg_quick_optional_config_nob NFT_FIB
+		wg_quick_optional_config_nob NFT_FIB_IPV4
+		wg_quick_optional_config_nob NFT_FIB_IPV6
+		wg_quick_optional_config_nob NF_CONNTRACK_MARK
+	elif has_version net-firewall/iptables; then
+		wg_quick_optional_config_nob NETFILTER_XTABLES
+		wg_quick_optional_config_nob NETFILTER_XT_MARK
+		wg_quick_optional_config_nob NETFILTER_XT_CONNMARK
+		wg_quick_optional_config_nob NETFILTER_XT_MATCH_COMMENT
+		wg_quick_optional_config_nob IP6_NF_RAW
+		wg_quick_optional_config_nob IP_NF_RAW
+		wg_quick_optional_config_nob IP6_NF_FILTER
+		wg_quick_optional_config_nob IP_NF_FILTER
+	fi
+	linux-info_pkg_setup
+}
+
+src_compile() {
+	emake RUNSTATEDIR="${EPREFIX}/run" -C src CC="$(tc-getCC)" LD="$(tc-getLD)"
+}
+
+src_install() {
+	dodoc README.md
+	dodoc -r contrib
+	emake \
+		WITH_BASHCOMPLETION=yes \
+		WITH_SYSTEMDUNITS=yes \
+		WITH_WGQUICK=$(usex wg-quick) \
+		DESTDIR="${D}" \
+		BASHCOMPDIR="$(get_bashcompdir)" \
+		SYSTEMDUNITDIR="$(systemd_get_systemunitdir)" \
+		PREFIX="${EPREFIX}/usr" \
+		-C src install
+}
+
+pkg_postinst() {
+	einfo
+	einfo "After installing WireGuard, if you'd like to try sending some packets through"
+	einfo "WireGuard, you may use, for testing purposes only, the insecure client.sh"
+	einfo "test example script:"
+	einfo
+	einfo "  \$ bzcat ${ROOT}/usr/share/doc/${PF}/contrib/ncat-client-server/client.sh.bz2 | sudo bash -"
+	einfo
+	einfo "This will automatically setup interface wg0, through a very insecure transport"
+	einfo "that is only suitable for demonstration purposes. You can then try loading the"
+	einfo "hidden website or sending pings:"
+	einfo
+	einfo "  \$ chromium http://192.168.4.1"
+	einfo "  \$ ping 192.168.4.1"
+	einfo
+	einfo "More info on getting started can be found at: https://www.wireguard.com/quickstart/"
+	einfo
+}
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
deleted file mode 100644
index 83256c4..0000000
--- a/profiles/base/make.defaults
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.110 2014/01/18 01:02:47 vapier Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
-
-# Profile IUSE injection (applies only to ebuilds which use EAPI 5 or later)
-IUSE_IMPLICIT="prefix"
-USE_EXPAND_UNPREFIXED="ARCH"
-USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND"
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa hppa-hpux ia64 ia64-hpux ia64-linux m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos ppc-openbsd s390 sh sparc sparc64-freebsd sparc64-solaris sparc-fbsd sparc-solaris x64-freebsd x64-macos x64-openbsd x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-openbsd x86-solaris x86-winnt"
-USE_EXPAND_VALUES_ELIBC="AIX Cygwin Darwin FreeBSD glibc HPUX Interix mintlib musl NetBSD OpenBSD SunOS uclibc Winnt"
-USE_EXPAND_VALUES_KERNEL="AIX Cygwin Darwin FreeBSD freemint HPUX Interix linux NetBSD OpenBSD SunOS Winnt"
-USE_EXPAND_VALUES_USERLAND="BSD GNU"
-
-# Env vars to expand into USE vars.  Modifying this requires prior
-# discussion on gentoo-dev@gentoo.org.
-USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CROSSCOMPILE_OPTS CURL_SSL DRACUT_MODULES DVB_CARDS ELIBC ENLIGHTENMENT_MODULES FCDSL_CARDS FFTOOLS FOO2ZJS_DEVICES FRITZCAPI_CARDS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL LCD_DEVICES LIBREOFFICE_EXTENSIONS LINGUAS LIRC_DEVICES MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS"
-
-# USE_EXPAND variables whose contents are not shown in package manager
-# output. Changes need discussion on gentoo-dev.
-USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ABI_MIPS ABI_PPC ABI_S390 ABI_X86"
-
-CONFIG_PROTECT="/etc"
-CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf"
-
-# Variables that are set exclusively by the profile
-# and not by user configuration files.
-PROFILE_ONLY_VARIABLES="ARCH ELIBC IUSE_IMPLICIT KERNEL USERLAND USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ARCH USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL USE_EXPAND_VALUES_USERLAND"
-
-# 'Sane' defaults
-ELIBC="glibc"
-KERNEL="linux"
-USERLAND="GNU"
-INPUT_DEVICES="keyboard mouse"
-
-# Tomáš Chvátal <scarabeus@gentoo.org> (23 Mar 2013)
-# By default enable libreoffice implementation only.
-OFFICE_IMPLEMENTATION="libreoffice"
-
-# Tomáš Chvátal <scarabeus@gentoo.org> (12 Aug 2011)
-# By default do not build any grub platform and let it guess.
-GRUB_PLATFORMS=""
-
-# Tomáš Chvátal <scarabeus@gentoo.org> (05 May 2013)
-# By default enable all extensions with no dependencies
-LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer"
-
-# Tomáš Chvátal <scarabeus@gentoo.org> (15 May 2011)
-# Andreas K. Hüttel <dilfridge@gentoo.org> (19 Aug 2011, 25 Mar 2012)
-# By default build all koffice / calligra features.
-CALLIGRA_FEATURES="kexi words flow plan sheets stage tables krita karbon braindump author"
-
-# Pacho Ramos <pacho@gentoo.org> (14 Feb 2010)
-# Enable 'ptp2' by default as it is available for most cameras.
-CAMERAS="ptp2"
-
-# Ole Markus With <olemarkus@gentoo.org> (09 Oct 2010)
-# Default PHP targets (should always be latest stable version)
-PHP_TARGETS="php5-5"
-
-# Andreas K. Huettel <dilfridge@gentoo.org> (28 Sep 2010)
-# Small default list of enabled plugins for collectd
-COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog"
-
-# Tomáš Chvátal <scarabeus@gentoo.org> (26 Oct 2010)
-# By default enable all protocols for average GPS user
-GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip tripmate tnt ublox ubx"
-
-# Benedikt Böhm <hollow@gentoo.org> (27 Nov 2007)
-# Sane defaults for built-in apache modules
-# Patrick Lauer <patrick@gentoo.org> (12 Oct 2012)
-# extend for apache 2.4
-APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias"
-
-# Peter Volkov <pva@gentoo.org> (29 Apr 2010)
-# Set some defaults or package will fail to build (Check mconfig in package sources)
-XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account"
-
-# Robert Buchholz <rbu@gentoo.org> (17 Jan 2006)
-# Some common lcd devices
-LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text"
-
-# 2006/10/17 - Daniel Drake <dsd@gentoo.org>
-# cracklib is becoming optional in shadow (and removed from system) as of
-# today. However, cracklib is very standard across the Linux world so we
-# enable it by default.
-#
-# Diego Pettenò <flameeyes@gentoo.org> (14 Jul 2007)
-# Moved to base/ profile from default-linux/ so that it also applies to
-# embedded and hardened profiles.
-USE="cracklib"
-
-# Miroslav Šulc <fordfrog@gentoo.org> (19 Nov 2008)
-# Netbeans modules/clusters
-NETBEANS="apisupport cnd groovy gsf harness ide identity j2ee java mobility nb php profiler soa visualweb webcommon websvccommon xml"
-
-# 2009/09/21 Robin H. Johnson <robbat2@gentoo.org>
-# http://archives.gentoo.org/gentoo-dev/msg_dc705dc2c1a45e18a85aa62e8fb17009.xml
-# Build kernel modules from linux-mod by default:
-USE="${USE} modules"
-
-# Alex Legler <a3li@gentoo.org> (30 Nov 2009)
-# Default Ruby build targets
-RUBY_TARGETS="ruby19 ruby18"
-
-# Samuli Suominen <ssuominen@gentoo.org> (03 Dec 2009)
-# Enable USE cxx by default so base-system and toolchain pkgs can start using USE cxx
-# instead of USE nocxx.
-# http://archives.gentoo.org/gentoo-dev/msg_a181cd0d36600067b599f4b996c6989f.xml
-USE="${USE} cxx"
-
-# Tiziano Müller <dev-zero@gentoo.org> (24 Jan 2010)
-# We usually don't want python to (re)write .py[co] files during phase runs
-# since it could cause sandbox violations
-PYTHONDONTWRITEBYTECODE="1"
-
-# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
-# Add default USE value for bootstrap and rename it from STAGE1_USE to BOOTSTRAP_USE
-# Add in expanded PYTHON_TARGETS or stage1 builds break because of USE="-* ${BOOTSTRAP_USE}"
-# This MUST be kept in sync with the PYTHON_TARGETS below
-BOOTSTRAP_USE="cxx unicode python_targets_python3_3 python_targets_python2_7"
-
-# Mike Gilbert <floppym@gentoo.org> (15 May 2012)
-# Default target(s) for python-r1.eclass
-PYTHON_TARGETS="python2_7 python3_3"
-PYTHON_SINGLE_TARGET="python2_7"
-
-# Michał Górny <mgorny@gentoo.org> (10 Aug 2013)
-# Moved from portage's make.globals.
-# 1) do not uninstall kernel modules and therefore allow replacing them,
-# 2) allow replacing unowned compiled Python modules (python-r1 migration),
-# 3) allow replacing unowned dropin.cache files (twisted-r1 migration).
-COLLISION_IGNORE="/lib/modules/* *.py[co] *\$py.class */dropin.cache"
-UNINSTALL_IGNORE="/lib/modules/*"
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (23 Aug 2013)
-# Make emerge messages default to English as per Council decision
-LC_MESSAGES=C
diff --git a/profiles/base/package.use b/profiles/base/package.use
deleted file mode 100644
index f3a0ec3..0000000
--- a/profiles/base/package.use
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use,v 1.30 2013/09/12 13:37:39 flameeyes Exp $
-
-# Hans de Graaff <graaff@gentoo.org> (3 Sep 2013)
-# Enable ruby20 on the core ruby packages so we don't
-# need to include ruby20 in RUBY_TARGETS right now.
-# bug 483254
->=dev-ruby/rubygems-2.0.3 ruby_targets_ruby20
->=dev-ruby/rake-0.9.6 ruby_targets_ruby20
->=dev-ruby/json-1.8.0 ruby_targets_ruby20
->=dev-ruby/racc-1.4.9 ruby_targets_ruby20
->=dev-ruby/rdoc-4.0.1-r1 ruby_targets_ruby20
-
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (27 Jul 2012)
-# Modular X: Build the Xorg X server by default
-x11-base/xorg-server xorg
-
-# Diego Elio Pettenò <flameeyes@gentoo.org> (11 Apr 2011)
-# Disable ldap support by default in sudo, as it seem to lack
-# developers maintaining that particular support and is, thus, vastly
-# untested.
-app-admin/sudo -ldap
-
-# Doug Goldstein <cardoe@gentoo.org> (30 Aug 2010)
-# bug #332077 - Disable xcb backend by default for cairo-1.10. Its not
-# really prime time ready prior to cairo-1.10
-<x11-libs/cairo-1.10 -xcb
-
-# Zac Medico <zmedico@gentoo.org> (04 Dec 2009)
-# Bug #295615 - Disable cxx by default, in order to avoid a die
-# in pkg_setup with default USE settings (cxx requires sasl).
-net-nds/openldap -cxx
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
deleted file mode 100644
index 81ce026..0000000
--- a/profiles/base/package.use.force
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.force,v 1.44 2013/12/26 09:34:00 graaff Exp $
-
-# Michał Gorny <mgorny@gentoo.org> (26 Feb 2013)
-# Meta-packages which use multilib ebuilds always install development
-# headers. The flag is there to satisfy deps only.
->=app-emulation/emul-linux-x86-xlibs-20130224-r1 development
-
-# Zac Medico <zmedico@gentoo.org> (4 Dec 2012)
-# Force app-shells/bash[readline] in stage1 builds, so that compgen is
-# available for sys-apps/portage (see bug #445576).
-app-shells/bash readline
-
-# Michał Górny <mgorny@gentoo.org> (14 Oct 2012)
-# Force-enable all PYTHON_TARGETS for python-exec to avoid using private
-# API. Please remember to keep it in sync with python_targets.desc.
-dev-lang/python-exec python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_jython2_5 python_targets_jython2_7 python_targets_pypy2_0
-dev-python/python-exec python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_jython2_5 python_targets_jython2_7 python_targets_pypy2_0
-
-# Samuli Suominen <ssuominen@gentoo.org> (23 Jan 2012)
-# Forcing enabled while waiting for eselect-notify-send wrt #379941
-x11-libs/libnotify symlink
-
-# Zac Medico <zmedico@gentoo.org> (20 Oct 2010)
-# Force ipc USE flag since it should remain enabled unless
-# it is found to be incompatible with a specific profile
-# or environment. When enabled, it fixes bug #278895,
-# bug #315615, and makes subshell die support more robust
-# (so that repoman's ebuild.nesteddie check is irrelevant).
-sys-apps/portage ipc
-
-# Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-# Python should use wide Unicode implementation by default.
-# Switching of "wide-unicode" USE flag changes ABI of Python
-# and requires reinstallation of many Python modules.
-dev-lang/python wide-unicode
-
-# Peter Alfredsen <loki_val@gentoo.org> (11 Apr 2009)
-# Forcing w.r.t. bug 265336. When unicode use-flag is
-# turned off, ABI is broken without a .so bump.
-dev-libs/libpcre unicode
-
-# Diego E. Pettenò <flameeyes@gentoo.org> (14 Jan 2010)
-# List of packages working on a single (non-default) Ruby
-# implementation that cannot, thus, be turned off.
-dev-ruby/bitescript ruby_targets_jruby
-dev-ruby/duby ruby_targets_jruby
-dev-ruby/jruby-debug-base ruby_targets_jruby
-dev-ruby/jruby-openssl ruby_targets_jruby
-=dev-ruby/test-unit-1* ruby_targets_ruby19
-
-# Diego E. Pettenò <flameeyes@gentoo.org> (14 Jan 2010)
-# Multi-version Ruby virtuals for sanity
-~virtual/ruby-ssl-0 ruby_targets_ruby18
-~virtual/ruby-ssl-1 ruby_targets_ruby19
-~virtual/ruby-ssl-2 ruby_targets_jruby
-~virtual/ruby-ssl-3 ruby_targets_ruby20
-~virtual/ruby-ssl-4 ruby_targets_ruby21
-~virtual/ruby-rdoc-0 ruby_targets_ruby18
-~virtual/ruby-rdoc-1 ruby_targets_ruby19
-~virtual/ruby-rdoc-2 ruby_targets_jruby
-~virtual/ruby-rdoc-3 ruby_targets_ruby20
-~virtual/ruby-rdoc-4 ruby_targets_ruby21
-~virtual/ruby-threads-0 ruby_targets_ruby18
-~virtual/ruby-threads-1 ruby_targets_ruby19
-~virtual/ruby-threads-2 ruby_targets_jruby
-~virtual/ruby-threads-3 ruby_targets_ree18
-~virtual/ruby-threads-4 ruby_targets_ruby20
-~virtual/ruby-threads-5 ruby_targets_ruby21
-~virtual/rubygems-1 ruby_targets_ruby18
-~virtual/rubygems-2 ruby_targets_jruby
-~virtual/rubygems-3 ruby_targets_ree18
-~virtual/rubygems-4 ruby_targets_ruby19
-~virtual/rubygems-5 ruby_targets_rbx
-~virtual/rubygems-6 ruby_targets_ruby20
-~virtual/rubygems-7 ruby_targets_ruby21
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
deleted file mode 100644
index ac645d4..0000000
--- a/profiles/base/package.use.mask
+++ /dev/null
@@ -1,611 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.540 2014/01/13 17:31:25 polynomial-c Exp $
-
-# This file requires >=portage-2.1.1
-# New entries go on top.
-#
-
-# Andreas K. Huettel <dilfridge@gentoo.org> (4 Jan 2014)
-# Mask until dependencies are keyworded (bug 497068)
-dev-vcs/git mediawiki
-
-# Sergey Popov <pinkbyte@gentoo.org> (27 Dec 2013)
-# Mask because Boost.Context library does not work on most of arches
-dev-libs/boost context
-
-# Lars Wendler <polynomial-c@gentoo.org> (26 Dec 2013)
-# Masked until upstream has fixed support with >=polarssl-1.3.0
-# (see upstream bug https://github.com/fatbob313/umurmur/issues/24)
-# and affected versions are removed from the tree.
-<media-sound/umurmur-0.2.14 polarssl
-
-# Gilles Dartiguelongue <eva@gentoo.org> (25 Dec 2013)
-# gjs: tests fail and support for it was purely and simply removed in master/1.9
-# python2_6: unit tests fail for this abi, must report usptream
->=dev-libs/libpeas-1.9 gjs python_targets_python2_6
-
-# Gilles Dartiguelongue <eva@gentoo.org> (23 Dec 2013)
-# Gstreamer support fails to build due to libtool shortcomings when using
-# an intermediate library as a dependency of another libtool target dependency.
-# Since this is new and unused yet, keep it masked for now and check
-# with upstream if there is something that can be done to fix the issue.
-media-libs/cogl gstreamer
-
-# Rick Farina <zerochaos@gentoo.org> (20 Dec 2013)
-# masked pending rake 10 availability
-net-analyzer/metasploit development test
-
-# Johannes Huber <johu@gentoo.org> (18 Dec 2013)
-# net-libs/libotr-4.0.0 is masked. Please remove the use mask if package mask
-# is lifted.
->=kde-base/kopete-4.12.0 otr
-
-# Alexandre Rostovtsev <tetromino@gentoo.org> (15 Dec 2013)
-# pulseaudio patchset breaks too often on live wine ebuild
-=app-emulation/wine-9999 pulseaudio
-
-# Pawel Hajdan jr <phajdan.jr@gentoo.org> (13 Nov 2013)
-# Depends on masked dev-lang/v8
-dev-db/drizzle v8
-
-# Andrey Grozin <grozin@gentoo.org> (12 Nov 2013)
-# berkdb support works only for sys-libs/db-6.0 which is masked
-sci-physics/reduze berkdb
-
-# Michał Górny <mgorny@gentoo.org> (10 Nov 2013)
-# (on behalf of python@)
-# USE=sandbox is not done properly in Gentoo and results in crippled
-# PyPy install that is not usable for non-sandbox clients (and there are
-# no real sandbox clients right now). Masked until the flag is
-# re-implemented or dropped. For more details, bug #429372.
-dev-python/pypy sandbox
-
-# Julian Ospald <hasufell@gentoo.org> (27 Oct 2013)
-# luajit is in ~arch, prepare for minetest stabilization
-games-action/minetest luajit
-
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (13 Oct 2013)
-# Masked for security bug #472280, CVE 2013-1872
-<=media-libs/mesa-9.0.3 video_cards_intel video_cards_i965
-
-# Tom Wijsman <TomWij@gentoo.org> (15 Sep 2013)
-# Mask JCE functionality of diablo-jdk because it depends on masked sun-jce-bin,
-# this needs to be revisited to either be dropped from the Portage tree or to
-# use the new way of doing JCE as part of a revision or version bump.
-dev-java/diablo-jdk jce
-
-# Tom Wijsman <TomWij@gentoo.org> (7 Sep 2013)
-# Dependency (www-servers/mongrel) currently only
-# works with Ruby 1.8; so, masking Ruby 1.9 USE flag
-# until Ruby 1.9 support is added to mongrel.
-net-proxy/swiftiply ruby_targets_ruby19
-
-# Jeff Horelick <jdhore@gentoo.org> (1 Sep 2013)
-# Dependency (media-libs/libsidplayfp) only keyworded
-# on x86 and amd64. Will unmask there.
->=media-plugins/audacious-plugins-3.4 sid
-
-# Julian Ospald <hasufell@gentoo.org> (31 Aug 2013)
-# Randomly breaks consumers at runtime. Do not report
-# gentoo bugs.
-media-libs/libsdl2 custom-cflags
-
-# Mike Gilbert <floppym@gentoo.org> (23 Aug 2013)
-# Requires hard-masked ffmpeg.
->=www-client/chromium-30 system-ffmpeg
-
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013)
-# Causes build to fail, issue is being discussed with upstream
->=www-plugins/gnash-0.8.10_p20130822 openvg
-
-# Tim Harder <radhermit@gentoo.org> (13 Aug 2013)
-# Related deps dev-lang/luajit and dev-scheme/racket are not keyworded by most arches.
-app-editors/vim luajit racket
-app-editors/gvim luajit racket
-
-# Alexis Ballier <aballier@gentoo.org> (11 Aug 2013)
-# Multilib migrated version for binary compatibility.
-# Those useflags have deps that are not migrated yet.
-=media-video/ffmpeg-0.10* libass frei0r gnutls rtmp vaapi sdl openssl
-
-# Kacper Kowalik <xarthisius@gentoo.org> (09 Aug 2013)
-# Doesn't work on most profiles. Easier to mask here and 
-# unmask in particular profiles
-sys-apps/hwloc cuda gl opencl
-
-# Samuli Suominen <ssuominen@gentoo.org> (07 Aug 2013)
-# There is no support for recent app-pda/libimobiledevice wrt bug #471920
-# Upstream removed entire support in future release:
-# http://code.google.com/p/clementine-player/source/detail?r=3d434f1c881890dd77fea6d0e3de3afc86971196
-# Remove this entry once <=media-sound/clementine-1.1.1 has left the building
-media-sound/clementine ios
-<media-sound/clementine-1.2.0 ipod
-
-# Ben de Groot <yngwin@gentoo.org> (07 Aug 2013)
-# Newer lightdm doesn't work with current razorqt-lightdm-greeter, bug 479734
->=x11-misc/lightdm-1.5.0 razor
-
-# Andreas K. Huettel <dilfridge@gentoo.org> (21 Jul 2013)
-# designer is pulled in by kdelibs, designer[phonon] blocks kdelibs...
-# Lots of reports on difficulties. Acked by kensington for qt team
-dev-qt/designer phonon
-
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (13 Jul 2013)
-# GL/GLES support in cairo is mutually exclusive, bug #428770.
-x11-libs/cairo gles2
-dev-libs/weston gles2 rpi
-
-# Alexis Ballier <aballier@gentoo.org> (03 Jul 2013)
-# The idea behind using libunwind there is to avoid needing to link to libgcc_s
-# and have a C++ stack without gcc with libcxx.
-# However, in any case, clang links its binaries to libgcc_s, hence at the
-# moment there is not much point in enabling this.
-sys-libs/libcxxrt libunwind
-
-# Michael Weber <xmw@gentoo.org>  (19 Jun 2013)
-# Not fit for production
-=www-client/netsurf-3.0* fbcon pdf-writer gstreamer
-
-# Anthony G. Basile <blueness@gentoo.org> (18 Jun 2013)
-# Only work on amd64/x86
-net-libs/cyassl aes-ni
-
-# Sergey Popov <pinkbyte@gentoo.org> (08 Jun 2013)
-# mask because requires unstable depends not ready for the stabilization
-app-leechcraft/leechcraft-meta unstable
-
-# Robin H. Johnson <robbat2@gentoo.org> (02 Jun 2013)
-# PBXT is no longer supported by upstream, and fails testcases.
->=dev-db/mysql-5.5 pbxt
->=dev-db/mariadb-5.5 pbxt
-# overlay -- no inline comments wrt bug #472292, ssuominen (04 Jun 2013)
->=dev-db/mysql-cluster-5.5 pbxt
->=dev-db/mariadb-galera-5.5 pbxt
->=dev-db/percona-server-5.5 pbxt
->=dev-db/google-mysql-5.5 pbxt
-
-# XFCE <xfce@gentoo.org> (01 Jun 2013)
-# Masked temporarily while waiting for >=net-libs/webkit-gtk-2 unmasking from
-# profiles/package.mask
->=www-client/midori-0.5.2 webkit2
-
-# Kacper Kowalik <xarthisius@gentoo.org> (19 May 2013)
-# Fails to build, haven't had time to debug
-app-doc/doxygen sqlite
-
-# Alexis Ballier <aballier@gentoo.org> (08 May 2013)
-# On behalf of Pavel Sanda <ps@twin.jikos.cz>
-# Lyx is currently not working with subversion 1.7 and needs 1.6.
-app-office/lyx subversion
-
-# Christian Faulhammer <fauli@gentoo.org> (08 May 2013)
-# Will not build successfully yet
-mail-client/claws-mail gtk3
-
-# Bernard Cafarelli <voyageur@gentoo.org> (04 Apr 2013)
-# Broken for now (segmentation fault on play)
-gnustep-apps/cynthiune flac
-
-# Richard Freeman <rich0@gentoo.org> (24 Mar 2013)
-# Dependency is masked for buffer overflows for now
-app-text/yagf cuneiform
-
-# Michael Weber <xmw@gentoo.org> (23 Mar 2013)
-# Does not build.
-=media-libs/oyranos-0.9.4* fltk
-
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (19 Mar 2013)
-# Depends on special llvm-3.2 branch from tstellar
-=media-libs/mesa-9.1* r600-llvm-compiler video_cards_radeonsi
-
-# Christoph Junghans <ottxor@gentoo.org> (10 Mar 2013)
-# log4cxx has known memory leaking issues wrt bug #287697,
-# unmask when log4cxx is fixed and stable.
-media-sound/google-musicmanager log
-
-# Tom Wijsman <TomWij@gentoo.org> (10 Mar 2013)
-# Experimental, masked until it compiles and works.
-media-libs/avidemux-core system-ffmpeg
-
-# Pawel Hajdan jr <phajdan.jr@gentoo.org> (07 Mar 2013)
-# Experimental, breaks WebSQL. Please report sites broken
-# by enabling this flag.
-www-client/chromium system-sqlite
-
-# Justin Lecher <jlec@gentoo.org> (21 Feb 2013)
-# cuda only works on x86 and amd64
-sci-libs/cholmod cuda
-sci-libs/flann cuda
-
-# Agostino Sarubbo <ago@gentoo.org< (21 Feb 2013)
-# Mask vpx because requires new libvpx and is not ready to go to stable
->=media-plugins/gst-plugins-meta-1.0 vpx
-
-# Julian Ospald <hasufell@gentoo.org> (20 Feb 2013)
-# Unsupported and experimental.
-net-misc/teamviewer system-wine
-
-# Alexis Ballier <aballier@gentoo.org> (15 Feb 2013)
-# Needs a huge patch to build against recent releases of FFmpeg/libav.
-# Mask it until upstream fixes it. Bug #417869
-media-sound/audacity ffmpeg
-
-# Julian Ospald <hasufell@gentoo.org> (10 Feb 2013)
-# This flag is experimental and breaks googleearth
-# in numerous ways. Unsupportable.
->=sci-geosciences/googleearth-7.0.2.8415-r2 system-qt
-
-# Alexandre Rostovtsev <tetromino@gentoo.org> (30 Dec 2012)
-# sys-apps/biosdevname is keyworded only for amd64/x86
-# systemd keyworded only for amd64/arm/x86
-sys-kernel/dracut dracut_modules_biosdevname dracut_modules_systemd
-
-# Alexandre Rostovtsev <tetromino@gentoo.org> (30 Dec 2012)
-# chromium and mono are keyworded only on a few arches
-gnome-extra/zeitgeist-datasources chromium tomboy
-
-# Alexandre Rostovtsev <tetromino@gentoo.org> (27 Dec 2012)
-# Incompatible with evolution-data-server-3.6, blocks upgrade to gnome-3.6
-# See bug #436460 and http://git.gnome.org/browse/tracker/log/?h=evo-new-api
-app-misc/tracker eds
-
-# Christoph Jungans <ottxor@gentoo.org> (26 Dec 2012)
-# cuda/openmm/mkl only works on x86/amd64
-sci-chemistry/gromacs cuda mkl openmm
-
-# Zac Medico <zmedico@gentoo.org> (13 Jun 2012)
-# Mask USE=pypy2_0 for sys-apps/portage, since pypy has limited KEYWORDS.
-sys-apps/portage pypy2_0
-
-# Jory A. Pratt <anarchy@gentoo.org> (15 Dec 2012)
-# PGO is known to be busted with most configurations
-www-client/firefox pgo
-
-# Sergey Popov <pinkbyte@gentoo.org> (26 Nov 2012)
-# PDF docs building failed with sandbox violation
-media-libs/opencolorio pdf
-
-# Diego Elio Pettenò <flameeyes@gentoo.org> (3 Nov 2012)
-# Requires net-dns/unbound which is not keyworded by most arches
-net-libs/gnutls dane
-
-# Alexis Ballier <aballier@gentoo.org> (1 Nov 2012)
-# dev-ml/ocamlduce requires ocaml-3 and there has been no upstream release to
-# support ocaml-4. Mask useflags requiring it so that we can mask ocamlduce and
-# unmask ocaml-4.
-dev-ml/tyxml ocamlduce
-www-servers/ocsigen ocamlduce
-dev-ml/eliom ocamlduce
-
-# GNOME <gnome@gentoo.org> (02 Oct 2012)
-# Mask USE="udisks" and use USE="gdu" as the default for <gnome-base/gvfs-1.14;
-# older gvfs releases have problems with recent stable udisks:2 (bug #463792)
-<gnome-base/gvfs-1.14 udisks
-
-# Pawel Hajdan jr <phajdan.jr@gentoo.org> (28 Sep 2012)
-# Causes problems with old NVidia drivers, bug #413637.
-<www-client/chromium-32.0.1700.19 tcmalloc
-
-# Diego Elio Pettenò (27 Aug 2012)
-# The libpci access is only used for linux.
-net-analyzer/net-snmp pci
-
-# Diego Elio Pettenò (20 Aug 2012)
-# The prevent-removal USE flag is only implemented for Linux.
-sys-auth/pam_mktemp prevent-removal
-
-# Ben de Groot <yngwin@gentoo.org> (30 Jul 2012)
-# fontconfig-infinality dependency not yet keyworded on most arches
-media-libs/freetype infinality
-
-# Ralph Sennhauser <sera@gentoo.org> (18 Jul 2012)
-# Requires masked eclipse-sdk.
-dev-lang/icc eclipse
-dev-lang/idb eclipse
-
-# Michael Weber<xmw@gentoo.org>  (18 Jun 2012)
-# Not fit for production
-=www-client/netsurf-2.9 pdf-writer javascript gstreamer
-
-# Diego Elio Pettenò <flameeyes@gentoo.org> (16 Jul 2012)
-# Stop glibc/uclibc from using iconv in blender
-media-gfx/blender iconv
-
-# Rick Farina <zerochaos@gentoo.org> (05 July 2012)
-# cuda is available on x86/amd64 only
-app-crypt/johntheripper cuda
-
-# Mike Gilbert <floppym@gentoo.org> (29 Jun 2012)
-# sys-fs/zfs is not available everywhere.
-sys-boot/grub libzfs
-
-# Andreas K. Huettel <dilfridge@gentoo.org> (03 Jun 2012)
-# needs libpqxx-3* which is not in the tree anymore
-app-office/calligra postgres
-
-# Michael Weber<xmw@gentoo.org>  (02 Jun 2012)
-# Not fit for production (bug 404403, comment #5)
-dev-db/firebird client
-
-# Andreas K. Huettel <dilfridge@gentoo.org> (25 Mai 2012)
-# Requires icc which does not emerge (distfile unavailable)
-media-libs/opencv ipp
-
-# Alexandre Rostovtsev <tetromino@gentoo.org> (10 May 2012)
-# This entry can be removed by anyone after gnome-panel-3.* is stabilized
-# Mask to allow stabilization (bug #414983)
-=app-misc/gnote-0.8.2 applet
-
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (02 May 2012)
-# Causes crashes and build failures, not needed by any package, bug #412177
-x11-libs/cairo qt4
-
-# Alexandre Rostovtsev <tetromino@gentoo.org> (12 Apr 2012)
-# Temporary mask-in-base, unmask-in-arch for dev-python/mako keywording for
-# gobject-introspection[doctool], bug #411761
-dev-libs/gobject-introspection doctool
-
-# Michał Górny <mgorny@gentoo.org> (11 Apr 2012)
-# JIT compilation in libzpaq generates code for x86/amd64.
-app-arch/libzpaq jit
-
-# Alexis Ballier <aballier@gentoo.org> (8 Apr 2012)
-# mask x264-encoder[ffmpegsource] on all versions but latest one
-# ffmpegsource which is pulled in is only ~arch and not ready to be
-# stabilised ( bug #410341 ). x264 needs to be stabilied for bug #401069
-<media-video/x264-encoder-0.0.20120327 ffmpegsource
-
-# Arun Raghavan <ford_prefect@gentoo.org> (28 Mar 2012)
-# webrtc-audio-processing is only supported on x86/amd64. Possibly arm can be
-# added.
-# Arun Raghavan <ford_prefect@gentoo.org> (24 May 2012)
-# Mask xen USE flag by default, unmask on x86/amd64 where it is supported.
-media-sound/pulseaudio webrtc-aec xen
-
-# Alexandre Rostovtsev <tetromino@gentoo.org> (27 Mar 2012)
-# Requires libxkbcommon from the x11 overlay
-<dev-cpp/gtkmm-3.7 wayland
-<x11-libs/gtk+-3.7 egl wayland
-
-# Tim Harder <radhermit@gentoo.org> (22 Mar 2012)
-# Masked since skype isn't stable
-net-im/bitlbee skype
-
-# Samuli Suominen <ssuominen@gentoo.org> (20 Mar 2012)
-# This is for udev-acl. Unmasked in default/linux/package.use.mask.
-sys-auth/consolekit acl
-
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (25 Feb 2012)
-# directfb build issues, bug #405817.
-www-plugins/gnash directfb
-
-# Justin Lecher <jlec@gentoo.org> (13. Feb 2012)
-# Is broken somehow, upstream informed
->=sci-chemistry/pymol-1.5.0.1 vmd
-
-# Bernard Cafarelli <voyageur@gentoo.org> (08 Feb 2012)
-# libobjc2/clang experimental support
->=gnustep-base/gnustep-make-2.6.2 libobjc2
-
-# Christoph Junghans <ottxor@gentoo.org> (04 Feb 2012)
-# mips only use flags
->=sci-libs/fftw-3 paired-single zbus
-
-# Samuli Suominen <ssuominen@gentoo.org> (10 Jan 2012)
-# This is required only for Linux, so mask it here and unmask in
-# default/linux/package.use.mask. Bug 354923.
-app-arch/libarchive e2fsprogs
-
-# Alexandre Rostovtsev <tetromino@gentoo.org> (09 Jan 2012)
-# jsc JIT compilation is supported only on amd64/arm/x86 and their prefixes, so
-# it's masked here and unmasked in individual profiles (bug #396313).
-net-libs/webkit-gtk jit
-www-client/epiphany jit
-
-# Mike Frysinger <vapier@gentoo.org> (06 Dec 2011)
-# No one should be mucking with libssp unless they really know what they're
-# doing.  Force extra work on the smart peeps to protect the not-so-smart.
-sys-devel/gcc libssp
-
-# Samuli Suominen <ssuominen@gentoo.org> (06 Dec 2011)
-# NuppelVideo is available on x86 only
-media-video/transcode nuv pic
-
-# Davide Pesavento <pesa@gentoo.org> (30 Nov 2011)
-# JavaScriptCore JIT is supported only on amd64/arm/x86, so
-# mask USE="jit" here and unmask it in the relevant arch profiles.
-dev-qt/qtscript jit
-dev-qt/qtwebkit jit
-
-# Samuli Suominen <ssuominen@gentoo.org> (25 Nov 2011)
-# Expose USE="suid" for USE="svga" only for x86 users,
-# see arch/x86/package.use.mask
-www-client/links suid
-
-# Kacper Kowalik <xarthisius@gentoo.org> (09 Nov 2011)
-# pathdb works only as a SIGSEGV generator, mask until upstream
-# fixes it bug #385683
-dev-lang/path64 debugger
-
-# Alexandre Rostovtsev <tetromino@gentoo.org> (31 Oct 2011)
-# Let's not suddenly enable clutter on stable evolution versions
-<mail-client/evolution-3 clutter
-
-# Samuli Suominen <ssuominen@gentoo.org> (16 Oct 2011)
-# Mask libbluray support here, and enable it per arch instead
-gnome-base/gvfs bluray
-
-# Pawel Hajdan jr <phajdan.jr@gentoo.org> (12 Oct 2011)
-# Upstream support before 27.x not ready:
-# http://code.google.com/p/chromium/issues/detail?id=32757
-<www-client/chromium-27.0.1448.0 pulseaudio
-
-# Nirbheek Chauhan <nirbheek@gentoo.org> (17 Sep 2011)
-# Systemtap is not keyworded on anything except amd64/x86
-# Temporarily mask instead of dropping keywords, bug 384647
-dev-libs/glib systemtap
-
-# Nirbheek Chauhan <nirbheek@gentoo.org> (16 Aug 2011)
-# Mask introspection on ebuilds that went stable before it was unmasked.
-# As these ebuilds are cleaned from the tree, the masks can be removed.
-<app-crypt/seahorse-2.32.0-r1 introspection
-<media-libs/babl-0.1.4-r1 introspection
-<www-client/epiphany-3 introspection
-
-# Robin H. Johnson <robbat2@gentoo.org> (10 Jul 2011)
-# PPS should work on all arches, but only keyworded on amd64/x86
->=net-misc/ntp-4.2.6_p3-r1 parse-clocks
-
-# Andrey Grozin <grozin@gentoo.org> (29 Mar 2011)
-# dev-lang/swig-2.0.2 with -octave generated .cpp files
-# incompatible with >=sci-mathematics/octave-3.4.0
-sci-libs/mathgl octave
-
-# Luca Barbato <lu_zero@gentoo.org> (28 Mar 2011)
-# Mask mplayer2 arch specific flags
-media-video/mplayer2 bluray
-
-# Diego E. Pettenò <flameeyes@gentoo.org> (27 Mar 2011)
-#
-# Mask pdnsd's Linux-specific USE flags.
-net-dns/pdnsd isdn urandom
-
-# Gilles Dartiguelongue <eva@gentoo.org> (26 Mar 2011)
-# Mask due to unsatisfied dependencies
-# applet is required for the search panel applet
->=app-misc/tracker-0.10 applet
-
-# Raúl Porcel <armin76@gentoo.org> (13 Feb 2011)
-# Masked until devs know how to use repoman
-<media-video/mplayer-9999 bluray
-
-# Robin H. Johnson <robbat2@gentoo.org> (28 Nov 2010)
-# bug 344885: USE=debug causes compile to fail presently.
-=dev-db/mysql-5.1.51* debug
-=dev-db/mysql-5.1.52* debug
-=dev-db/mysql-5.1.53* debug
-
-# Justin Lecher <jlec@gentoo.org> (17 Nov 2010)
-# Upstream didn't release patches for aria yet
->=sci-chemistry/cns-1.3 aria
-
-# Tomáš Chvátal <scarabeus@gentoo.org> (8 Sep 2010)
-# drm don't even build here so mask everywhere expect live.
-# openvg require openvg-1.1 implemenatation so mask until there is some
-<x11-libs/cairo-9999 drm
-<x11-libs/cairo-1.12 openvg
-
-# Alex Legler <a3li@gentoo.org> (1 Sep 2010)
-# This feature is marked as experimental by upstream.
-dev-lang/ruby-enterprise fastthreading
-
-# Nirbheek Chauhan <nirbheek@gentoo.org> (26 Jun 2010)
-# Inter-process communication doesn't work on anything except x86/amd64/arm
-# due to lack of atomic ops, bug 325185
-www-client/firefox ipc
-
-# Tomas Touceda <chiiph@gentoo.org> (13 Apr 2010)
-# Masked because libsvm module is broken with this release on every arch.
-dev-lisp/clisp svm
-
-# Tomáš Chvátal <scarabeus@gentoo.org> (4 Apr 2010)
-# Masked because tools pulled in are not supported on most archs.
-sys-power/pm-utils video_cards_intel video_cards_radeon
-
-# Diego E. Pettenò <flameeyes@gmail.com> (18 Jan 2010)
-# Don't use system-wide mode unless you *really* know what you're doing.
-# Keep it masked here so that I don't need to manage two versions every time.
-media-sound/pulseaudio system-wide
-
-# Jeremy Olexa <darkside@gentoo.org> (10 Jan 2010)
-# Upsteam doesn't support ioctl backend and neither does Gentoo. ioctl USE flag
-# will eventually be removed unless the backend is re-written by upstream. bug
-# 299674
->net-misc/wicd-1.6.2.2 ioctl
-
-# Tomáš Chvátal <scarabeus@gentoo.org> (6 Jan 2010)
-# Still not really functional, upstream requires not building it.
-x11-libs/cairo gallium
-
-# Alexey Shvetsov <alexxy@gentoo.org> (3 Dec 2009)
-# Mask very experimental mpi use flag dfor gamess
-sci-chemistry/gamess mpi
-
-# Mounir Lamouri <volkmar@gentoo.org> (07 Nov 2009)
-# Mask cuda for k3d. Works only on amd64/x86. Bug 267264
-media-gfx/k3d cuda
-
-# Gilles Dartiguelongue <eva@gentoo.org> (01 Nov 2009)
-# Broken on so many setups it is just insane.
-# 0.7 is API/ABI incompatible but is the way to go.
-# Masking to lower maintainance headache, bug #291501.
-media-video/totem tracker
-
-# Tomáš Chvátal <scarabeus@gentoo.org> (27 Oct 2009)
-# Broken on so many setups it is just insane.
-# Unmask if you really know what you are doing.
-<sys-apps/groff-1.20.1-r2 linguas_ja
-
-# Samuli Suominen <ssuominen@gentoo.org> (09 Oct 2009)
-# log4cxx has known memory leaking issues wrt bug #287697,
-# unmask when log4cxx is fixed and stable.
-app-misc/strigi log
-
-# Jean-Noël Rivasseau <elvanor@gentoo.org> (23 Sep 2009)
-# X use flag only for amd64/x86, bug 285951.
-media-gfx/iscan X
-
-# Tomáš Chvátal <scarabeus@gentoo.org> (10 Sep 2009)
-# quakeforge has video_cards_tdfx enabled only for x86
-games-fps/quakeforge video_cards_tdfx
-
-# Tomas Chvatal <scarabeus@gentoo.org> (31 Jan 2009)
-# mask cuda for boinc. Works only on amd64 and x86
-sci-misc/boinc cuda
-
-# Robert Buchholz <rbu@gentoo.org> (16 Aug 2008)
-# TLS needs dev-libs/cryptlib, which is x86 only
-dev-python/kaa-base tls
-
-# Serkan Kaba <serkan@gentoo.org> (20 Jul 2008)
-# Java is not supported in most of the arches enchant is keyworded
-app-text/enchant zemberek
-
-# Peter Alfredsen <loki_val@gentoo.org> (25 Jun 2008)
-# Php module fails to build due to newer autotools.
->=media-libs/ming-0.4.0_beta5 php
-
-dev-java/sun-jdk nsplugin
-dev-java/sun-jre-bin nsplugin
-dev-java/ibm-jdk-bin nsplugin
-dev-java/ibm-jre-bin nsplugin
-
-# These are for BSD only
-net-proxy/squid ipf-transparent pf-transparent
-app-admin/sshguard ipfilter
-
-# Linking against libnfsidmap requires libs in /usr #149472
-sys-apps/acl nfs
-
-# Christian Faulhammer <opfer@gentoo.org> (14 Jan 2008)
-# only works on x86, where this will be unmasked
-dev-java/ibm-jdk-bin alsa
-dev-java/ibm-jre-bin alsa
-
-# Raúl Porcel <armin76@gentoo.org> (09 Nov 2008)
-# CPU opts: This needs amd64, x86 and ppc on some of them
-# dvdnav: hard masked dependency
-media-video/mplayer cpudetection custom-cpuopts bindist
-
-# Alexis Ballier <aballier@gentoo.org> <16 Feb 2011>
-# Win32 specific useflags for vlc. Can be used for cross-compiling.
-media-video/vlc direct2d directx dshow dxva2 waveout wingdi
-# Mac OSX / iPhone OS specific useflags
-media-video/vlc audioqueue ios-vout macosx macosx-audio macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit macosx-vout
-# media-library does not build
-media-video/vlc media-library
-
-# Alexis Ballier <aballier@gentoo.org> <28 Apr 2011>
-# Requires ~arch libcelt and keywording
-<media-video/ffmpeg-2.0 celt
diff --git a/profiles/base/package.use.mask.example b/profiles/base/package.use.mask.example
deleted file mode 100644
index 3c37315..0000000
--- a/profiles/base/package.use.mask.example
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask.example,v 1.2 2009/07/31 11:16:52 ssuominen Exp $
-
-# This file requires >=portage-2.1.1
-# It's named example so portage doesn't open it and it doesn't do anything yet.
-# The syntax is similar to /etc/portage/package.use
-
-###
-### Examples!
-###
-### Masking
-
-# sys-devel/gcc hardened # mask hardened USE flag for sys-devel/gcc
-
-
-### Unmasking
-# sys-devel/gcc -hardened # unmask hardened USE flag for sys-devel/gcc
-
-# DO NOT DO
-# -sys-devel/gcc hardened 
-
-# This wrong example is here because someone did it (he blamed his copy
-# and pasting program).
-
diff --git a/profiles/base/packages b/profiles/base/packages
deleted file mode 100644
index 13593ad..0000000
--- a/profiles/base/packages
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/packages,v 1.65 2013/08/27 07:10:20 ulm Exp $
-
-# Gentoo Base Profile
-
-# NOTE: THIS IS THE BASE PROFILE FOR *ANY* GENTOO BASED OPERATING SYSTEM.
-# NO MODIFICATIONS MAY BE MADE TO THIS FILE WITHOUT PRIOR DISCUSSION.  IF
-# YOU ARE CREATING A NEW PROFILE, YOU SIMPLY NEED TO INHERIT THIS BASE
-# PROFILE IN YOUR PROFILE DIRECTORY'S "parent" FILE.
-
-
-# OK, you're staring at this file and you have no idea what these stars are
-# for.  Here's the scoop.  An initial "*" marks a package that is part of
-# the official BASE system profile.  If there is a "*" then `emerge system`
-# will use the line in its calculations of what should be installed for the
-# base profile.  Lines without a "*" prefix will be ignored for profile
-# system calculations.
-
-# Please note that this file is rarely used as a package inclusion mask
-# file, because it affects EVERY SINGLE gentoo profile.   As can be seen,
-# we've limited the inclusion mask to a version of portage which supports
-# cascaded profiles, but apart from that, there should be no version
-# specific information in here. This file serves as a high level description
-# of the minimum set of packages needed for any Gentoo based system.
-
-*>=sys-apps/baselayout-2
-*app-arch/bzip2
-*app-arch/gzip
-*app-arch/tar
-*app-arch/xz-utils
-*app-shells/bash
-#*dev-lang/perl
-#*dev-lang/python
-*net-misc/iputils
-*net-misc/rsync
-*net-misc/wget
-*sys-apps/coreutils
-#*sys-apps/debianutils
-*sys-apps/diffutils
-*sys-apps/file
-*sys-apps/findutils
-*sys-apps/gawk
-*sys-apps/grep
-*sys-apps/kbd
-# temporary bugfix for #398295
-*sys-apps/less
-# stopgap solution for functions.sh #373219
-*sys-apps/openrc
-#*>=sys-apps/portage-2.0.51.22
-*sys-process/procps
-*sys-process/psmisc
-*sys-apps/sed
-*sys-apps/texinfo
-*sys-apps/which
-#*sys-devel/autoconf
-#*sys-devel/automake
-*sys-devel/binutils
-#*sys-devel/bison
-#*sys-devel/flex
-*sys-devel/gcc
-*sys-devel/gnuconfig
-#*sys-devel/libtool
-#*sys-devel/m4
-*sys-devel/make
-*>=sys-devel/patch-2.6.1
-*sys-fs/e2fsprogs
-*virtual/dev-manager
-*virtual/editor
-*virtual/libc
-*virtual/man
-*virtual/modutils
-*virtual/os-headers
-*virtual/package-manager
-*virtual/pager
-*virtual/service-manager
-*virtual/shadow
-*virtual/ssh
diff --git a/profiles/base/profile.bashrc b/profiles/base/profile.bashrc
deleted file mode 100644
index 6cc7c18..0000000
--- a/profiles/base/profile.bashrc
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2006-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/profile.bashrc,v 1.7 2011/06/12 10:10:10 ferringb Exp $
-
-if ! declare -F elog >/dev/null ; then
-	elog() {
-		einfo "$@"
-	}
-fi
diff --git a/profiles/base/use.force b/profiles/base/use.force
deleted file mode 100644
index df19ac4..0000000
--- a/profiles/base/use.force
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.force,v 1.3 2009/07/31 16:42:56 ssuominen Exp $
-
-# Force the GNU/Linux ELIBC, KERNEL, and USERLAND
-# flags that apply to the majority of profiles.
-elibc_glibc
-kernel_linux
-userland_GNU
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
deleted file mode 100644
index dc45582..0000000
--- a/profiles/base/use.mask
+++ /dev/null
@@ -1,365 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.184 2014/01/16 00:12:06 redlizard Exp $
-
-# masking here and unmasking in default/linux/
-kmod
-
-# not ready for primetime
-packagekit
-
-# masking here, and unmasking in arch/x86/use.mask
-vidix
-
-# Mask as long its not available everywhere
-zeitgeist
-
-# vdpau is currently only available with binary nvidia-drivers, thus amd64/x86*
-vdpau
-
-# Infiniband stuff should generaly work on all arches but keyworded only on amd64/x86
-infiniband
-
-# These ABIs are in constant change and currently only available for SVN snapshots
-php_targets_php5-2
-#php_targets_php5-4
-
-# Its deps are not mature enough yet
-ayatana
-
-# Only available on x86
-fdftk
-
-# These need libieee1284 which is amd64/x86 only.
-sane_backends_canon_pp
-sane_backends_hpsj5s
-sane_backends_mustek_pp
-sane_backends_qcam
-
-# Gluon still don't have release.
-gluon
-
-# profile specific USE flags
-# Don't put hardened in here.
-selinux
-uclibc
-multilib
-
-# amd64/x86 arch specific USE flags
-kqemu
-3dnow
-3dnowext
-lilo
-mmx
-mmxext
-sse
-sse2
-sse3
-sse4
-sse4a
-sse4_1
-sse4_2
-ssse3
-avx
-avx128fma
-avx256
-fma4
-svga
-nvram
-
-# ppc arch specific USE flags
-altivec
-pbbuttonsd
-ppcsha1
-
-# mips arch specific USE flags
-n32
-n64
-fixed-point
-loongson2f
-mips32r2
-mipsdspr1
-mipsdspr2
-mipsfpu
-
-# ppc64 arch specific USE flags
-ibm
-ps3
-
-# sparc arch specific USE flags
-vis
-ultra1
-
-# arm arch specific USE flags
-armvfp
-armv5te
-armv6
-armv6t2
-iwmmxt
-neon
-
-# nVidia XvMC requires nvidia-drivers/nvidia-legacy-drivers
-nvidia
-
-# dev-db/oracle-instantclient-basic is only available on x86
-oci8-instant-client
-oracle
-
-# net-libs/osptoolkit is only available on x86 (used by asterisk, bug 115798)
-osp
-
-# yellownet is only avaible as a binary blob (bug 149970)
-yellownet
-
-# not keyworded on non-x86 systems
-video_cards_geode
-video_cards_xgi
-video_cards_voodoo
-
-# not needed on non-sparc systems
-video_cards_sunbw2
-video_cards_suncg14
-video_cards_suncg3
-video_cards_suncg6
-video_cards_sunffb
-video_cards_sunleo
-video_cards_suntcx
-
-# not needed on non-mips systems
-video_cards_newport
-video_cards_impact
-
-# not needed on non-x86, non-amd64 systems
-input_devices_virtualbox
-input_devices_vmmouse
-video_cards_nvidia
-video_cards_fglrx
-video_cards_via
-video_cards_vmware
-video_cards_virtualbox
-
-# not needed on non-arm systems
-video_cards_exynos
-video_cards_freedreno
-video_cards_omap
-video_cards_omapfb
-
-# linux-only drivers
-video_cards_qxl
-
-# not needed on non-x86, non-amd64, non-ppc systems
-input_devices_synaptics
-input_devices_wacom
-
-# psyco only works on x86
-psyco
-
-# Mask ELIBC, KERNEL, and USERLAND flags that apply to specific profiles.
-userland_BSD
-
-elibc_AIX
-elibc_Darwin
-elibc_DragonFly
-elibc_FreeBSD
-elibc_HPUX
-elibc_Interix
-elibc_mintlib
-elibc_musl
-elibc_NetBSD
-elibc_OpenBSD
-elibc_SunOS
-elibc_uclibc
-
-kernel_AIX
-kernel_Darwin
-kernel_FreeBSD
-kernel_freemint
-kernel_HPUX
-kernel_Interix
-kernel_NetBSD
-kernel_OpenBSD
-kernel_SunOS
-
-# Diego Pettenò <flameeyes@gentoo.org> (6 Dec 2006)
-# Mask specific Apple drivers
-alsa_cards_aoa
-alsa_cards_aoa-fabric-layout
-alsa_cards_aoa-onyx
-alsa_cards_aoa-soundbus
-alsa_cards_aoa-soundbus-i2s
-alsa_cards_aoa-tas
-alsa_cards_aoa-toonie
-alsa_cards_powermac
-# Mask specific Sun drivers
-alsa_cards_sun-amd7930
-alsa_cards_sun-cs4231
-alsa_cards_sun-dbri
-# Mask specific ARM drivers
-alsa_cards_pxa2xx-i2sound
-alsa_cards_pxa2xx-soc
-alsa_cards_pxa2xx-soc-corgi
-alsa_cards_pxa2xx-soc-poodle
-alsa_cards_pxa2xx-soc-spitz
-alsa_cards_pxa2xx-soc-tosa
-alsa_cards_sa11xx-uda1341ts
-alsa_cards_armaaci
-alsa_cards_at91-soc
-alsa_cards_at91-soc-eti-b1-wm8731
-# Mask specific HPPA drivers
-alsa_cards_harmony
-# Mask specific MIPS drivers
-alsa_cards_au1x00
-
-# Diego Pettenò <flameeyes@gentoo.org> (29 Dec 2006)
-# Adobe FDF toolkit is x86 only.
-fdftk
-
-# Diego Pettenò <flameeyes@gentoo.org> (30 Dec 2006)
-# These are specific of Mac OS X
-aqua
-coreaudio
-
-# Diego Pettenò <flameeyes@gentoo.org> (4 Jan 2007)
-# Mask the flags for PHP that are available only on x86
-sybase-ct
-ingres
-birdstep
-adabas
-filepro
-pfpro
-informix
-empress
-empress-bcs
-sybase
-frontbase
-dbmaker
-esoob
-solid
-# Shared with amd64
-oci8
-oracle7
-firebird
-db2
-
-# Robert Buchholz <rbu@gentoo.org> (03 Jun 2007)
-# Only works on x86 or amd64
-lcd_devices_svga
-lcd_devices_luise
-
-# Joseph Jezak <josejx@gentoo.org> (11 Mar 2007)
-# Only for x86 and amd64 (in pbbuttonsd)
-macbook
-
-# George Shapovalov <george@gentoo.org> (8 Apr 2007)
-# Ada is supported only on x86, amd64 and ppc at present
-ada
-
-# lvm2 clustered use flags (moved from default-linux)
-gulm
-
-# tcc is x86 only
-tcc
-
-# Diego Pettenò <flameeyes@gentoo.org> (15 Nov 2007)
-# pam_console was masked for removal for security issue.
-# mask the flag too.
-pam_console
-
-# Jeremy Olexa <darkside@gentoo.org>
-# The prefix USE flags should never be used on non prefix profiles
-prefix
-prefix-guest
-
-# Diego E. Pettenò <flameeyes@gentoo.org> (6 Dec 2009)
-#  on behalf of QA Team
-# Removal of pvm is scheduled for Februrary 4.
-pvm
-
-# Alex Legler <a3li@gentoo.org> (7 Dec 2009)
-# JRuby, REE18, and Rubinius are whitelisted on supported arches
-ruby_targets_jruby
-ruby_targets_ree18
-ruby_targets_rbx
-
-# Diego E. Pettenò <flameeyes@gentoo.org> (19 Oct 2010)
-# masking flags that only apply to FreeBSD
-kqueue
-
-# Samuli Suominen <ssuominen@gentoo.org> (03 Oct 2011)
-# RealMagic Hollywood+/Creative DXR3 support
-# Still using obsolete V4L1 wrt bug 350211
-# If fixed, should be unmasked in amd64/x86/ppc32 use.mask
-dxr3
-
-# Ralph Sennhauser <sera@gentoo.org> (31 Jul 2012)
-# Unmask in arch specific profiles when jython implementaton is available.
-python_targets_jython2_5
-python_targets_jython2_7
-python_targets_jython3_1
-python_single_target_jython2_5
-python_single_target_jython2_7
-python_single_target_jython3_1
-
-# Diego Elio Pettenò <flameeyes@gentoo.org> (18 Aug 2012)
-# Prelude is being masked for removal
-prelude
-
-# Diego Elio Pettenò <flameeyes@gentoo.org> (21 Aug 2012)
-# IPMI is only implemented for x86, amd64 and ia64
-ipmi
-
-# Diego Elio Pettenò <flameeyes@gentoo.org> (27 Aug 2012)
-# netlink is a Linux-specific interface
-netlink
-
-# Alexandre Rostovtsev <tetromino@gentoo.org> (09 Dec 2012)
-# dev-lang/orc is useful only for some specific arches (amd64/x86/arm/...)
-orc
-
-# Mike Gilbert <floppym@gentoo.org> (02 Jan 2013)
-# PyPy is unkeyworded on most arches. If you are running amd64 or x86,
-# please switch to one of the testing 13.0 profiles to get it.
-python_targets_pypy2_0
-python_single_target_pypy2_0
-
-# Michał Górny <mgorny@gentoo.org> (26 Jan 2013)
-# Mask the multilib flags globally. Unmasked in specific arches.
-abi_x86_32
-abi_x86_64
-abi_x86_x32
-# Matt Turner <mattst88@gentoo.org> (29 Jul 2013)
-abi_mips_o32
-abi_mips_n32
-abi_mips_n64
-abi_ppc_32
-abi_ppc_64
-abi_s390_32
-abi_s390_64
-
-# Zac Medico <zmedico@gentoo.org> (21 Mar 2013)
-# Python 3.4 pre-releases not available in main tree yet.
-python_targets_python3_4
-
-# Andrey Grozin <grozin@gentoo.org> (1 May 2013)
-# gcl is masked, cmucl only available on x86, clozurecl on x86 and amd64
-gcl
-cmucl
-clozurecl
-
-# Michał Górny <mgorny@gentoo.org> (4 May 2013)
-# Mask systemd flag globally, unmasked on arches on which systemd
-# is keyworded.
-systemd
-
-# Michael Palimaka <kensington@gentoo.org> (1 May 2013)
-# Mask until Qt 5 is in portage. (The flag is here already
-# to permit the neccessary package preparation.)
-qt5
-
-# Pacho Ramos <pacho@gentoo.org> (28 Sep 2013)
-# This USE flag is available after long dicussion in
-# http://www.gossamer-threads.com/lists/gentoo/dev/276077
-# to let some prople not able to run systemd to skip the dep (#480336).
-# Enabling this you will get a fully unsupported Gnome setup that
-# could suffer unexpected problem, don't expect support for it then.
-openrc-force
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/make.defaults b/profiles/default/bsd/fbsd/amd64/9.1/clang/make.defaults
deleted file mode 100644
index 2929302..0000000
--- a/profiles/default/bsd/fbsd/amd64/9.1/clang/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/make.defaults,v 1.1 2013/06/19 20:13:50 aballier Exp $
-
-CFLAGS="-O2 -pipe"
-CXXFLAGS="-stdlib=libc++ ${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.force b/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.force
deleted file mode 100644
index 97067e9..0000000
--- a/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.force
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.force,v 1.5 2013/07/27 23:27:39 aballier Exp $
-
-# Force building libc++ over libcxxrt.
-sys-libs/libcxx libcxxrt
-
-# Force static libs and multilib on the C++ stack.
-sys-libs/libcxxrt static-libs abi_x86_32
-sys-libs/libcxx static-libs abi_x86_32
-
-# Force openssl on curl since cmakes needs it and is in @system because of
-# libcxx on this profile. Mask the other ssl providers.
-net-misc/curl ssl curl_ssl_openssl
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask b/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask
deleted file mode 100644
index 171daab..0000000
--- a/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask,v 1.4 2013/06/19 13:00:27 aballier Exp $
-
-# Build libcxxrt over libgcc_s since that is what clang defaults to.
-sys-libs/libcxxrt libunwind
-
-# Needs to be fixed: cxx useflag enables plugins and gold. 
-# gold fails to build with clang:
-# https://bugs.gentoo.org/show_bug.cgi?id=427344
-# http://llvm.org/bugs/show_bug.cgi?id=12299
-sys-devel/binutils cxx
-
-# Force openssl on curl since cmakes needs it and is in @system because of
-# libcxx on this profile. Mask the other ssl providers.
-net-misc/curl curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss curl_ssl_polarssl
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/packages b/profiles/default/bsd/fbsd/amd64/9.1/clang/packages
deleted file mode 100644
index ceaaa60..0000000
--- a/profiles/default/bsd/fbsd/amd64/9.1/clang/packages
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/packages,v 1.2 2013/05/25 22:04:45 aballier Exp $
-
-# Don't remove gcc from here: clang uses it for crt{begin,end}*.o and its c++
-# stack.
-
-*sys-devel/llvm
-*sys-devel/clang
-*sys-libs/libcxx
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/packages.build b/profiles/default/bsd/fbsd/amd64/9.1/clang/packages.build
deleted file mode 100644
index af06e61..0000000
--- a/profiles/default/bsd/fbsd/amd64/9.1/clang/packages.build
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/packages.build,v 1.4 2013/05/25 22:04:45 aballier Exp $
-
-# This file describes the packages needed to build a stage 1 based on this
-# profile.  Packages in this file are built in order.
-
-# Please do not move perl before baselayout doing so will break lib -> lib64
-# symlinks on systems that use them.
-
-app-arch/bzip2
-app-arch/gzip
-dev-libs/openssl
-app-arch/libarchive
-app-shells/bash
-net-misc/rsync
-net-misc/wget
-sys-devel/autoconf
-sys-devel/automake
-sys-devel/libtool
-sys-apps/openrc
-sys-apps/baselayout
-sys-apps/diffutils
-sys-apps/file
-sys-apps/findutils
-sys-apps/gawk
-sys-apps/grep
-sys-apps/less
-sys-apps/portage
-sys-apps/sed
-sys-devel/binutils
-sys-devel/bison
-sys-devel/flex
-sys-devel/gcc
-dev-libs/libiconv
-sys-devel/gettext
-sys-devel/gnuconfig
-sys-devel/make
-sys-devel/patch
-virtual/editor
-virtual/libc
-virtual/os-headers
-sys-freebsd/freebsd-mk-defs
-sys-freebsd/freebsd-lib
-sys-freebsd/freebsd-libexec
-sys-freebsd/freebsd-bin
-sys-freebsd/freebsd-sbin
-sys-freebsd/freebsd-ubin
-sys-freebsd/freebsd-usbin
-sys-freebsd/freebsd-contrib
-sys-devel/llvm
-sys-devel/clang
-sys-libs/libcxx
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/parent b/profiles/default/bsd/fbsd/amd64/9.1/clang/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/default/bsd/fbsd/amd64/9.1/clang/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/profile.bashrc b/profiles/default/bsd/fbsd/amd64/9.1/clang/profile.bashrc
deleted file mode 100644
index af919bc..0000000
--- a/profiles/default/bsd/fbsd/amd64/9.1/clang/profile.bashrc
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/profile.bashrc,v 1.2 2013/05/25 22:04:45 aballier Exp $
-
-# Check if clang/clang++ exist before setting them so that we can more easily
-# switch to this profile and build stages.
-type -P clang > /dev/null && export CC=clang
-type -P clang++ > /dev/null && [ -f /usr/lib/libc++.so ] && export CXX="clang++ -stdlib=libc++"
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/make.defaults b/profiles/default/bsd/fbsd/amd64/9.1/make.defaults
deleted file mode 100644
index 640042c..0000000
--- a/profiles/default/bsd/fbsd/amd64/9.1/make.defaults
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/make.defaults,v 1.1 2012/08/07 20:52:35 aballier Exp $
-
-CHOST="x86_64-gentoo-freebsd9.1"
-CHOST_amd64_fbsd="x86_64-gentoo-freebsd9.1"
-CHOST_x86_fbsd="i686-gentoo-freebsd9.1"
-
-# Diego Pettenò <flameeyes@gentoo.org> (2 Dec 2006)
-# Turn this on by default as we don't have Java 1.4 and 1.5 at all
-USE="java6"
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/parent b/profiles/default/bsd/fbsd/amd64/9.1/parent
deleted file mode 100644
index ec4bdf7..0000000
--- a/profiles/default/bsd/fbsd/amd64/9.1/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../releases/freebsd-9.1/
diff --git a/profiles/default/bsd/fbsd/amd64/9.2/clang/make.defaults b/profiles/default/bsd/fbsd/amd64/9.2/clang/make.defaults
deleted file mode 100644
index 8ab5e08..0000000
--- a/profiles/default/bsd/fbsd/amd64/9.2/clang/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.2/clang/make.defaults,v 1.1 2013/08/09 14:11:22 aballier Exp $
-
-CFLAGS="-O2 -pipe"
-CXXFLAGS="-stdlib=libc++ ${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
diff --git a/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.force b/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.force
deleted file mode 100644
index e13759f..0000000
--- a/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.force
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.force,v 1.2 2013/08/10 02:33:31 aballier Exp $
-
-# Force building libc++ over libcxxrt.
-sys-libs/libcxx libcxxrt
-
-# Force static libs and multilib on the C++ stack.
-sys-libs/libcxxrt static-libs abi_x86_32
-sys-libs/libcxx static-libs abi_x86_32
-
-# Force openssl on curl since cmakes needs it and is in @system because of
-# libcxx on this profile. Mask the other ssl providers.
-net-misc/curl ssl curl_ssl_openssl
-
-# We obviously need clang
-sys-devel/llvm clang
diff --git a/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.mask b/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.mask
deleted file mode 100644
index b8d04ba..0000000
--- a/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.mask
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.mask,v 1.1 2013/08/09 14:11:22 aballier Exp $
-
-# Build libcxxrt over libgcc_s since that is what clang defaults to.
-sys-libs/libcxxrt libunwind
-
-# Needs to be fixed: cxx useflag enables plugins and gold. 
-# gold fails to build with clang:
-# https://bugs.gentoo.org/show_bug.cgi?id=427344
-# http://llvm.org/bugs/show_bug.cgi?id=12299
-sys-devel/binutils cxx
-
-# Force openssl on curl since cmakes needs it and is in @system because of
-# libcxx on this profile. Mask the other ssl providers.
-net-misc/curl curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss curl_ssl_polarssl
diff --git a/profiles/default/bsd/fbsd/amd64/9.2/clang/packages b/profiles/default/bsd/fbsd/amd64/9.2/clang/packages
deleted file mode 100644
index f1297a8..0000000
--- a/profiles/default/bsd/fbsd/amd64/9.2/clang/packages
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.2/clang/packages,v 1.1 2013/08/09 14:11:22 aballier Exp $
-
-# Don't remove gcc from here: clang uses it for crt{begin,end}*.o and its c++
-# stack.
-
-*sys-devel/llvm
-*sys-devel/clang
-*sys-libs/libcxx
diff --git a/profiles/default/bsd/fbsd/amd64/9.2/clang/packages.build b/profiles/default/bsd/fbsd/amd64/9.2/clang/packages.build
deleted file mode 100644
index 6bcd8c5..0000000
--- a/profiles/default/bsd/fbsd/amd64/9.2/clang/packages.build
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.2/clang/packages.build,v 1.1 2013/08/09 14:11:22 aballier Exp $
-
-# This file describes the packages needed to build a stage 1 based on this
-# profile.  Packages in this file are built in order.
-
-# Please do not move perl before baselayout doing so will break lib -> lib64
-# symlinks on systems that use them.
-
-app-arch/bzip2
-app-arch/gzip
-dev-libs/openssl
-app-arch/libarchive
-app-shells/bash
-net-misc/rsync
-net-misc/wget
-sys-devel/autoconf
-sys-devel/automake
-sys-devel/libtool
-sys-apps/openrc
-sys-apps/baselayout
-sys-apps/diffutils
-sys-apps/file
-sys-apps/findutils
-sys-apps/gawk
-sys-apps/grep
-sys-apps/less
-sys-apps/portage
-sys-apps/sed
-sys-devel/binutils
-sys-devel/bison
-sys-devel/flex
-sys-devel/gcc
-dev-libs/libiconv
-sys-devel/gettext
-sys-devel/gnuconfig
-sys-devel/make
-sys-devel/patch
-virtual/editor
-virtual/libc
-virtual/os-headers
-sys-freebsd/freebsd-mk-defs
-sys-freebsd/freebsd-lib
-sys-freebsd/freebsd-libexec
-sys-freebsd/freebsd-bin
-sys-freebsd/freebsd-sbin
-sys-freebsd/freebsd-ubin
-sys-freebsd/freebsd-usbin
-sys-freebsd/freebsd-contrib
-sys-devel/llvm
-sys-devel/clang
-sys-libs/libcxx
diff --git a/profiles/default/bsd/fbsd/amd64/9.2/clang/parent b/profiles/default/bsd/fbsd/amd64/9.2/clang/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/default/bsd/fbsd/amd64/9.2/clang/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/bsd/fbsd/amd64/9.2/clang/profile.bashrc b/profiles/default/bsd/fbsd/amd64/9.2/clang/profile.bashrc
deleted file mode 100644
index c9964e9..0000000
--- a/profiles/default/bsd/fbsd/amd64/9.2/clang/profile.bashrc
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.2/clang/profile.bashrc,v 1.1 2013/08/09 14:11:22 aballier Exp $
-
-# Check if clang/clang++ exist before setting them so that we can more easily
-# switch to this profile and build stages.
-type -P clang > /dev/null && export CC=clang
-type -P clang++ > /dev/null && [ -f /usr/lib/libc++.so ] && export CXX="clang++ -stdlib=libc++"
diff --git a/profiles/default/bsd/fbsd/amd64/9.2/make.defaults b/profiles/default/bsd/fbsd/amd64/9.2/make.defaults
deleted file mode 100644
index 8c8009f..0000000
--- a/profiles/default/bsd/fbsd/amd64/9.2/make.defaults
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.2/make.defaults,v 1.1 2013/08/09 14:11:22 aballier Exp $
-
-CHOST="x86_64-gentoo-freebsd9.2"
-CHOST_amd64_fbsd="x86_64-gentoo-freebsd9.2"
-CHOST_x86_fbsd="i686-gentoo-freebsd9.2"
-
-# Diego Pettenò <flameeyes@gentoo.org> (2 Dec 2006)
-# Turn this on by default as we don't have Java 1.4 and 1.5 at all
-USE="java6"
diff --git a/profiles/default/bsd/fbsd/amd64/9.2/parent b/profiles/default/bsd/fbsd/amd64/9.2/parent
deleted file mode 100644
index 20a7ce8..0000000
--- a/profiles/default/bsd/fbsd/amd64/9.2/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../releases/freebsd-9.2/
diff --git a/profiles/default/bsd/fbsd/amd64/parent b/profiles/default/bsd/fbsd/amd64/parent
deleted file mode 100644
index 5fbdc94..0000000
--- a/profiles/default/bsd/fbsd/amd64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../arch/amd64-fbsd
diff --git a/profiles/default/bsd/fbsd/make.defaults b/profiles/default/bsd/fbsd/make.defaults
deleted file mode 100644
index 10c4a80..0000000
--- a/profiles/default/bsd/fbsd/make.defaults
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/make.defaults,v 1.15 2013/02/08 15:43:17 aballier Exp $
-
-# Last building sandbox breaks gfind, bug #374425
-FEATURES="-sandbox"
-
-USERLAND="BSD"
-KERNEL="FreeBSD"
-ELIBC="FreeBSD"
-
-MAKE="gmake"
-
-USE="berkdb crypt iconv ipv6 ncurses nls oss pam pcre readline ssl tcpd zlib"
-
-# 2006/03/07 - Donnie Berkholz <dberkholz@gentoo.org>
-# Modular X: Support direct rendering by default
-USE="${USE} dri"
-
-# 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
-# Defaults for video drivers
-VIDEO_CARDS="dummy fbdev vmware"
-
-# Let virtual/mta pick ssmtp[mta] for stage1 builds.
-# https://bugs.gentoo.org/show_bug.cgi?id=408587
-# python2: let portage pulls in python-2 so that we get it as default
-# interpreter in stage1's and add it to make.default so that it is rebuilt in
-# stage 3 and when updating.
-BOOTSTRAP_USE="${BOOTSTRAP_USE} mta python2"
-USE="${USE} python2"
diff --git a/profiles/default/bsd/fbsd/package.use b/profiles/default/bsd/fbsd/package.use
deleted file mode 100644
index c324055..0000000
--- a/profiles/default/bsd/fbsd/package.use
+++ /dev/null
@@ -1,12 +0,0 @@
-# Default USE flags for specific packages
-
-# Diego Pettenò <flameeyes@gentoo.org> (06 March 2008)
-# pam_racklib requires sys-libs/pam, disable it by default (it is
-# masked anyway).
-# pam_passwdqc is used by default on FreeBSD, enable it by default
-# even on Gentoo/FreeBSD.
-sys-auth/pambase -cracklib passwdqc
-
-# Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> (13 Feb 2011)
-# Disable deprecated bsddb module of Python 2 by default.
-=dev-lang/python-2* -berkdb
diff --git a/profiles/default/bsd/fbsd/package.use.force b/profiles/default/bsd/fbsd/package.use.force
deleted file mode 100644
index 6ff27bd..0000000
--- a/profiles/default/bsd/fbsd/package.use.force
+++ /dev/null
@@ -1,3 +0,0 @@
-# Naohiro Aota <naota@gentoo.org> (08 Nov 2011)
-# Always enable hardened not to depend glibc
-app-emulation/wine hardened
diff --git a/profiles/default/bsd/fbsd/package.use.mask b/profiles/default/bsd/fbsd/package.use.mask
deleted file mode 100644
index d442d8c..0000000
--- a/profiles/default/bsd/fbsd/package.use.mask
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/package.use.mask,v 1.36 2013/08/27 22:07:31 aballier Exp $
-
-# As per UberLord's requests
-sys-apps/openrc pam
-
-# Jim Ramsay <lack@gentoo.org> (7 Sep 2007)
-# app-admin/gkrellm may pull in hddtemp, which is not yet available here
-app-admin/gkrellm hddtemp
-
-# Somehow, check's tests are broken..
-dev-libs/confuse test
-dev-util/checkstyle test
-
-# Dillo won't run on FreeBSD
-# PDA masked until we can do some testing on it
-mail-client/claws-mail dillo pda
-
-# Original spell plugin uses ispell that requires
-# miscfiles.. that in turn does not work
-net-irc/rbot spell
-
-# Diego Pettenò <flameeyes@gentoo.org> (18 Jan 2007)
-# Vixie-Cron uses pam useflag for pam_limits.so that is provided
-# by Linux-PAM we don't use for now.
-sys-process/vixie-cron pam
-
-x11-misc/xscreensaver new-login
-
-# net-wireless/aircrack-ng - wireless capture tools not needed.
-net-wireless/aircrack-ng wifi
-
-# Gilles Dartiguelongue <eva@gentoo.org> (22 Oct 2007)
-# GNU attr isn't supported
-dev-libs/glib xattr
-gnome-base/gnome-vfs acl
-# https://bugs.gentoo.org/show_bug.cgi?id=435474
-sys-devel/patch xattr
-# https://bugs.gentoo.org/show_bug.cgi?id=432410
-app-arch/tar xattr
-
-# Diego Pettenò <flameeyes@gentoo.org> (21 Feb 2008)
-# pam_cracklib is only provided by Linux-PAM which is not usable on
-# Gentoo/FreeBSD.
-# Javier Villavicencio <the_paya@gentoo.org> (31 Jul 2008)
-# pam_ssh deps on Linux-PAM.
-# Diego Pettenò <flameeyes@gentoo.org> (1 Aug 2008)
-# sha512 is only supported by Linux-PAM's pam_unix for now
-sys-auth/pambase cracklib pam_ssh sha512
-
-# Alexis Ballier <aballier@gentoo.org> (31 Jan 2009)
-# app-misc/tracker should work but needs some code fixups and it uses the fdatasync system call
-# that we do not have (bug #257052)
-# Mask it for now
-gnome-base/nautilus tracker
-media-video/totem tracker
-
-# Naohiro Aota <naota@gentoo.org> (04 Aug 2011)
-# ads require krb5, which is maksed on FreeBSD
-# cluster require ctdb, which doesn't support FreeBSD
-net-fs/samba ads cluster
-
-# Naohiro Aota <naota@gentoo.org> (08 Nov 2011)
-# capi require Linux features
-# hardened require prelink which depends on glibc
-app-emulation/wine capi
-
-# Naohiro Aota <naota@gentoo.org> (24 Nov 2011)
-# Masked because kerberos is masked
-net-dns/bind gssapi
-
-# Naohiro Aota <naota@gentoo.org> (13 Dec 2011)
-# Masked because sun-j2me-bin does not support BSD
-dev-java/proguard j2me
-
-# Naohiro Aota <naota@gentoo.org> (20 Feb 2012)
-# Upstream does not support FreeBSD wifi nor crashreporter
-www-client/firefox wifi
-
-# Naohiro Aota <naota@gentoo.org> (03 Oct 2012)
-# Mask gbm, udev is not supported on FreeBSD.
-media-libs/mesa gbm
-
-# Naohiro Aota <naota@gentoo.org> (06 Oct 2012)
-# Mask rpm, app-arch/rpm needs elfutils
-net-analyzer/net-snmp rpm
-
-# Naohiro Aota <naota@gentoo.org> (09 Oct 2012)
-# Mask dmpai, sys-apps/dmapi cannot build on BSD
-net-fs/samba dmapi
-
-# Naohiro Aota <naota@gentoo.org> (15 Oct 2012)
-# Mask numa on sys-apps/hwloc. numactl not available on FreeBSD
-sys-apps/hwloc numa
diff --git a/profiles/default/bsd/fbsd/packages b/profiles/default/bsd/fbsd/packages
deleted file mode 100644
index 14628dc..0000000
--- a/profiles/default/bsd/fbsd/packages
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/packages,v 1.3 2012/07/25 12:34:40 ryao Exp $
-
-# This files contains a small list of packages that define a 
-# minimal FreeBSD system. DO NOT change this without contacting
-# <bsd@gentoo.org>
-#
-*sys-freebsd/freebsd-mk-defs
-*sys-freebsd/freebsd-lib
-*sys-freebsd/freebsd-libexec
-*sys-freebsd/freebsd-bin
-*sys-freebsd/freebsd-sbin
-*sys-freebsd/freebsd-ubin
-*sys-freebsd/freebsd-usbin
-*sys-freebsd/freebsd-share
-*sys-freebsd/freebsd-contrib
-
-*sys-devel/gettext
-*dev-libs/libiconv
-
-*app-arch/libarchive
-
-*sys-libs/timezone-data
-
-*sys-process/pidof-bsd
diff --git a/profiles/default/bsd/fbsd/packages.build b/profiles/default/bsd/fbsd/packages.build
deleted file mode 100644
index 21ec990..0000000
--- a/profiles/default/bsd/fbsd/packages.build
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/packages.build,v 1.10 2013/05/25 20:32:33 aballier Exp $
-
-# This file describes the packages needed to build a stage 1 based on this
-# profile.  Packages in this file are built in order.
-
-# Please do not move perl before baselayout doing so will break lib -> lib64
-# symlinks on systems that use them.
-
-app-arch/bzip2
-app-arch/gzip
-dev-libs/openssl
-app-arch/libarchive
-app-shells/bash
-net-misc/rsync
-net-misc/wget
-sys-devel/autoconf
-sys-devel/automake
-sys-devel/libtool
-sys-apps/openrc
-sys-apps/baselayout
-sys-apps/diffutils
-sys-apps/file
-sys-apps/findutils
-sys-apps/gawk
-sys-apps/grep
-sys-apps/less
-sys-apps/sed
-sys-devel/binutils
-sys-devel/bison
-sys-devel/flex
-sys-devel/gcc
-dev-libs/libiconv
-sys-devel/gettext
-sys-devel/gnuconfig
-sys-devel/make
-sys-devel/patch
-virtual/editor
-virtual/libc
-virtual/os-headers
-virtual/package-manager
-sys-freebsd/freebsd-mk-defs
-sys-freebsd/freebsd-lib
-sys-freebsd/freebsd-libexec
-sys-freebsd/freebsd-bin
-sys-freebsd/freebsd-sbin
-sys-freebsd/freebsd-ubin
-sys-freebsd/freebsd-usbin
-sys-freebsd/freebsd-contrib
diff --git a/profiles/default/bsd/fbsd/parent b/profiles/default/bsd/fbsd/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/default/bsd/fbsd/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/bsd/fbsd/profile.bashrc b/profiles/default/bsd/fbsd/profile.bashrc
deleted file mode 100644
index c2cbd0a..0000000
--- a/profiles/default/bsd/fbsd/profile.bashrc
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/profile.bashrc,v 1.12 2012/05/29 13:42:41 aballier Exp $
-
-alias make=gmake
-alias patch=gpatch
-alias sed=gsed
-alias awk=gawk
-# findutils stuff
-type -P gfind > /dev/null && alias find=gfind
-type -P gxargs > /dev/null && alias xargs=gxargs
-
-# Attempt to point the default SHELL used by configure scripts to bash.
-# while most should work with BSD's bourne just fine, the extra scripts
-# used by some applications (specially test scripts) use way too many bashisms.
-# Alexis Ballier <29 May 2012>: Disable this, we should rather fix bugs and it
-# seems to confuse libtool a couple of packages (dev-libs/libtar, net-dns/hesiod)
-# export CONFIG_SHELL="/bin/bash"
-
-# Hack to avoid every package that uses libiconv/gettext
-# install a charset.alias that will collide with libiconv's one
-# See bugs 169678, 195148 and 256129.
-# Also the discussion on
-# http://archives.gentoo.org/gentoo-dev/msg_8cb1805411f37b4eb168a3e680e531f3.xml
-bsd-post_src_install()
-{
-	if [ "${PN}" != "libiconv" -a -e "${D}"/usr/lib*/charset.alias ] ; then
-		rm -f "${D}"/usr/lib*/charset.alias
-	fi
-}
-
-# These are because of
-# http://archives.gentoo.org/gentoo-dev/msg_529a0806ed2cf841a467940a57e2d588.xml
-# The profile-* ones are meant to be used in etc/portage/profile.bashrc by user
-# until there is the registration mechanism.
-profile-post_src_install() { bsd-post_src_install ; }
-        post_src_install() { bsd-post_src_install ; }
-
-
-# Another hack to fix old versions of install-sh (automake) where a non-gnu
-# mkdir is not considered thread-safe (make install errors with -j > 1)
-bsd-patch_install-sh() {
-	# Do nothing if we don't have patch installed:
-	if [[ -z $(type -P gpatch) ]]; then
-		return 0
-	fi
-
-        # Do nothing if $S does not exist
-        [ -d "${S}" ] || return 0
-
-	local EPDIR="${ECLASSDIR}/ELT-patches/install-sh"
-	local EPATCHES="${EPDIR}/1.5.6 ${EPDIR}/1.5.4 ${EPDIR}/1.5"
-	local ret=0
-	cd "${S}"
-	for file in $(find . -name "install-sh" -print); do
-		if [[ -n $(egrep "scriptversion=2005|scriptversion=2004" ${file}) ]]; then
-			einfo "Automatically patching parallel-make unfriendly install-sh."
-			# Stolen from libtool.eclass
-			for mypatch in ${EPATCHES}; do
-				if gpatch -p0 --dry-run "${file}" "${mypatch}" &> "${T}/patch_install-sh.log"; then
-					gpatch -p0 -g0 --no-backup-if-mismatch "${file}" "${mypatch}" \
-						&> "${T}/patch_install-sh.log"
-					ret=$?
-					break
-				else
-					ret=1
-				fi
-			done
-			if [[ ret -eq 0 ]]; then
-				einfo "Patch applied successfully on \"${file}\"."
-			else
-				ewarn "Unable to apply install-sh patch. "
-				ewarn "If you experience errors during install phase, try with MAKEOPTS=\"-j1\""
-			fi
-		fi
-	done
-}
-
-# It should be run after everything has been unpacked/patched, some developers
-# do patch this little bastard from time to time.
-# So do it after unpack() for EAPI=0|1 and after prepare() for everything else.
-if [[ -n $EAPI ]] ; then
-	case "$EAPI" in
-		0|1)
-			profile-post_src_unpack() { bsd-patch_install-sh ; }
-			post_src_unpack() { bsd-patch_install-sh ; }
-			;;
-		*)
-			profile_post_src_prepare() { bsd-patch_install-sh ; }
-			post_src_prepare() { bsd-patch_install-sh ; }
-			;;
-	esac
-fi
diff --git a/profiles/default/bsd/fbsd/sparc/8.2/make.defaults b/profiles/default/bsd/fbsd/sparc/8.2/make.defaults
deleted file mode 100644
index 41d23bf..0000000
--- a/profiles/default/bsd/fbsd/sparc/8.2/make.defaults
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/sparc/8.2/make.defaults,v 1.1 2011/07/06 05:56:06 aballier Exp $
-
-CHOST="sparc64-gentoo-freebsd8.2"
diff --git a/profiles/default/bsd/fbsd/sparc/8.2/parent b/profiles/default/bsd/fbsd/sparc/8.2/parent
deleted file mode 100644
index d91b99a..0000000
--- a/profiles/default/bsd/fbsd/sparc/8.2/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../releases/freebsd-8.2/
diff --git a/profiles/default/bsd/fbsd/sparc/parent b/profiles/default/bsd/fbsd/sparc/parent
deleted file mode 100644
index 134cc7a..0000000
--- a/profiles/default/bsd/fbsd/sparc/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../arch/sparc-fbsd
diff --git a/profiles/default/bsd/fbsd/use.force b/profiles/default/bsd/fbsd/use.force
deleted file mode 100644
index d221d0e..0000000
--- a/profiles/default/bsd/fbsd/use.force
+++ /dev/null
@@ -1,5 +0,0 @@
-java5
-
-# Force freebsd-specific variables
-elibc_FreeBSD
-kernel_FreeBSD
diff --git a/profiles/default/bsd/fbsd/use.mask b/profiles/default/bsd/fbsd/use.mask
deleted file mode 100644
index f517b9c..0000000
--- a/profiles/default/bsd/fbsd/use.mask
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/use.mask,v 1.8 2012/10/28 22:41:53 naota Exp $
-
-# Espeak does not run on bsd
-espeak
-
-# Someone who knows kerberos is needed to make sure that this works
-kerberos
-krb4
-
-# fftw requires sinl and cosl function, not present in FreeBSD
-fftw
-
-# we have hardened.
--hardened
-
-# Unmask freebsd-specific variables
--elibc_FreeBSD
--kernel_FreeBSD
-
-# This does not build on FreeBSD, unless anybody wants to fix it, use opie
-skey
-
-# To be tested
-snmp
-pcsc-lite
-
-# we don't have custom patched cdparanoia for fbsd anymore
-cdparanoia
-
-# wayland is not targetting BSDs
-wayland
-
-# Recent sys-auth/polkit cannot be built on FreeBSD
-policykit
diff --git a/profiles/default/bsd/fbsd/x86/9.1/make.defaults b/profiles/default/bsd/fbsd/x86/9.1/make.defaults
deleted file mode 100644
index ee43dab..0000000
--- a/profiles/default/bsd/fbsd/x86/9.1/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/x86/9.1/make.defaults,v 1.1 2012/08/07 20:52:35 aballier Exp $
-
-CHOST="i486-gentoo-freebsd9.1"
-
-# Diego Pettenò <flameeyes@gentoo.org> (2 Dec 2006)
-# Turn this on by default as we don't have Java 1.4 and 1.5 at all
-USE="java6"
diff --git a/profiles/default/bsd/fbsd/x86/9.1/parent b/profiles/default/bsd/fbsd/x86/9.1/parent
deleted file mode 100644
index ec4bdf7..0000000
--- a/profiles/default/bsd/fbsd/x86/9.1/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../releases/freebsd-9.1/
diff --git a/profiles/default/bsd/fbsd/x86/9.2/make.defaults b/profiles/default/bsd/fbsd/x86/9.2/make.defaults
deleted file mode 100644
index 4a225ae..0000000
--- a/profiles/default/bsd/fbsd/x86/9.2/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/x86/9.2/make.defaults,v 1.1 2013/08/09 14:12:40 aballier Exp $
-
-CHOST="i486-gentoo-freebsd9.2"
-
-# Diego Pettenò <flameeyes@gentoo.org> (2 Dec 2006)
-# Turn this on by default as we don't have Java 1.4 and 1.5 at all
-USE="java6"
diff --git a/profiles/default/bsd/fbsd/x86/9.2/parent b/profiles/default/bsd/fbsd/x86/9.2/parent
deleted file mode 100644
index 20a7ce8..0000000
--- a/profiles/default/bsd/fbsd/x86/9.2/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../releases/freebsd-9.2/
diff --git a/profiles/default/bsd/fbsd/x86/parent b/profiles/default/bsd/fbsd/x86/parent
deleted file mode 100644
index 2b1ea63..0000000
--- a/profiles/default/bsd/fbsd/x86/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../arch/x86-fbsd
diff --git a/profiles/default/bsd/make.defaults b/profiles/default/bsd/make.defaults
deleted file mode 100644
index ecdd49f..0000000
--- a/profiles/default/bsd/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/make.defaults,v 1.1 2012/07/05 16:23:28 ryao Exp $
-
-# Mask systemd files until upstream supports *BSD
-INSTALL_MASK="/usr/lib/systemd"
diff --git a/profiles/default/bsd/package.use.force b/profiles/default/bsd/package.use.force
deleted file mode 100644
index 596e1d1..0000000
--- a/profiles/default/bsd/package.use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Peter Weller <welp@gentoo.org> (10 March 2007)
-# lprng deps on a p.masked package, force xarchiver to use cups
-xfce-base/xfprint cups
-
-# Javier Villavicencio <the_paya@gentoo.org> (22 Jan 2009)
-# Otherwise useless tar.
-app-arch/libarchive bzip2 zlib lzma
diff --git a/profiles/default/bsd/package.use.mask b/profiles/default/bsd/package.use.mask
deleted file mode 100644
index 841d2a1..0000000
--- a/profiles/default/bsd/package.use.mask
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/package.use.mask,v 1.41 2013/10/14 04:53:56 naota Exp $
-
-
-# Naohiro Aota <naota@gentoo.org> (14 Oct 2013)
-# libcap-ng is for Linux only
-net-analyzer/tcpdump drop-root
-
-# Richard Yao <ryao@gentoo.org> (09 Nov 2012)
-# pm-utils is Linux-specific
-kde-base/powerdevil pm-utils
-
-# Diego Elio Pettenò <flameeyes@gentoo.org> (16 Jul 2012)
-# Allow using iconv in blender
-media-gfx/blender -iconv
-
-# Sebastian Pipping <sping@gentoo.org> (22 Feb 2011)
-# No dev-util/source-highlight or media-sound/lilypond here, yet (bug #356069, bug #344289)
-app-text/asciidoc test highlight
-
-app-misc/mc pam
-
-# See http://bugzilla.gnome.org/show_bug.cgi?id=370847 for why we disable pam
-gnome-extra/gnome-screensaver pam
-
-# Requires Linux-only packages
-app-accessibility/gok usb
-
-# iproute2 - linux only
-net-misc/openvpn iproute2
-
-app-admin/sshguard -ipfilter
-media-video/ffmpeg ieee1394 iec61883
-net-libs/c-client pam
-net-proxy/squid -ipf-transparent -pf-transparent
-sys-apps/baselayout pam
-sys-apps/coreutils acl
-sys-apps/help2man nls
-
-# NetworkManager is Linux-only, Zephyr requires kerberos
-net-im/pidgin networkmanager zephyr
-
-media-video/totem bluetooth
-
-# Alexis Ballier <aballier@gentoo.org> (18 Jul 2008)
-# Requires a linux only library,  bug #226085
-dev-lang/erlang sctp
-
-# Alexis Ballier <aballier@gentoo.org> (8 Aug 2008)
-# Linux only useflags for vlc
-media-video/vlc dc1394 ieee1394 fbosd
-
-# Alexis Ballier <aballier@gentoo.org> (8 Aug 2008)
-# Depends on torque which is a linux only thing
-# lksctp-tools is linux only too
-sys-cluster/openmpi openmpi_rm_pbs openmpi_fabrics_sctp
-
-# Alexis Ballier <aballier@gentoo.org> (25 Sep 2008)
-# elf -> dev-libs/elfutils is too tight to the gnu libc
-# rpm could be masked but we have rpm 5 keyworded even if it's still masked.
-net-analyzer/net-snmp elf
-
-# Alexis Ballier <aballier@gentoo.org> (4 Oct 2008)
-# clisp doesn't build out of the box but can be fixed, xindy's way of building
-# its clisp module is confused by gmake vs bsdmake, mask it until we can
-# properly keyword xindy.
-app-text/texlive xindy
-
-# Alexis Ballier <aballier@gentoo.org> (28 Nov 2008)
-# Requires bluez-libs which is linux only
-net-libs/libpcap bluetooth
-gnome-base/gvfs bluetooth
-
-# Alexis Ballier <aballier@gentoo.org> (22 Jan 2009)
-# Requires gpm
-www-client/links livecd
-
-# Needs bluez and wicd which are linux only
-kde-base/solid bluetooth wicd
-
-# Needs DirectFB which is linux only
-media-libs/xine-lib fusion
-
-# needs udev
-kde-base/kdelibs udisks upower
-media-libs/mesa gbm
-x11-base/xorg-drivers video_cards_radeonsi
-x11-drivers/xf86-video-ati glamor
-x11-drivers/xf86-video-intel glamor
-
-# connman is Linux only
-dev-qt/qtbearer connman
-
-# udisks is linux only (for now?)
-gnome-base/gvfs udisks
-
-# joystick and video_cards_tdfx useflag are linux only #477750
-media-video/mplayer joystick video_cards_tdfx
-
-# linux only
-media-libs/opencv ieee1394 cuda
-
-# depends on networkmanager
-app-misc/geoclue skyhook
diff --git a/profiles/default/bsd/packages b/profiles/default/bsd/packages
deleted file mode 100644
index 2702d6e..0000000
--- a/profiles/default/bsd/packages
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/packages,v 1.9 2012/03/12 09:13:37 phajdan.jr Exp $
-
--*virtual/dev-manager
--*sys-fs/e2fsprogs
--*sys-process/procps
--*sys-process/psmisc
--*virtual/shadow
--*sys-apps/which
--*virtual/modutils
--*sys-apps/kbd
-#-*sys-apps/findutils
-#-*sys-apps/debianutils
--*sys-apps/coreutils
--*net-misc/iputils
--*app-arch/tar
diff --git a/profiles/default/bsd/parent b/profiles/default/bsd/parent
deleted file mode 100644
index 985c694..0000000
--- a/profiles/default/bsd/parent
+++ /dev/null
@@ -1 +0,0 @@
-../../base
diff --git a/profiles/default/bsd/profile.bashrc b/profiles/default/bsd/profile.bashrc
deleted file mode 100644
index 6e1f856..0000000
--- a/profiles/default/bsd/profile.bashrc
+++ /dev/null
@@ -1,14 +0,0 @@
-if [[ ${EBUILD_PHASE} == compile ]] && [ -d "${S}" ] ; then
-	if grep -q "Assume that mode_t is passed compatibly" ${S} -r --include openat.c; then
-		eerror "The source code contains a faulty openat.c unit from gnulib."
-		eerror "Please report this on Gentoo Bugzilla in Gentoo/Alt product for component FreeBSD."
-		eerror "http://bugs.gentoo.org/enter_bug.cgi?product=Gentoo%2FAlt&component=FreeBSD&op_sys=FreeBSD"
-		die "Broken openat.c gnulib unit."
-	fi
-        if grep -q "\\<test .*==" "${S}" -r --include configure; then
-                eerror "Found a non POSIX test construction in a configure script"
-                eerror "The configure checks of this package may not function properly"
-                eerror "Please report this on Gentoo Bugzilla in Gentoo/Alt product for component FreeBSD."
-                eerror "http://bugs.gentoo.org/enter_bug.cgi?product=Gentoo%2FAlt&component=FreeBSD&op_sys=FreeBSD"
-        fi
-fi
diff --git a/profiles/default/bsd/use.force b/profiles/default/bsd/use.force
deleted file mode 100644
index 8602cb4..0000000
--- a/profiles/default/bsd/use.force
+++ /dev/null
@@ -1 +0,0 @@
-userland_BSD
diff --git a/profiles/default/bsd/use.mask b/profiles/default/bsd/use.mask
deleted file mode 100644
index 640055c..0000000
--- a/profiles/default/bsd/use.mask
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/use.mask,v 1.26 2013/05/19 16:28:01 aballier Exp $
-
-# Mart Raudsepp <leio@gentoo.org>
-# net-misc/networkmanager not keyworded
-networkmanager
-
-# ulm told me to do it!
-m17n-lib
-
-# Linux-dependant flags
-selinux
-nptl
-alsa
-v4l
-libv4l
-fbcon
-directfb
-gpm
-lirc
-multilib
-lm_sensors
-caps
-filecaps
-vidix
-madwifi
-3dfx
-nvidia
-xvmc
-xfs
-udev
-systemd
-inotify
-aio
-
-# This usually refers just to linux-dvb
-dvb
-
-# Hardened doesn't work on Gentoo/*BSD for now
-hardened
-pax_kernel
-
-# This requires a kernel module that's Linux specific right now
-ifp
-
-# This requires a usb-eject command
-ipod
-
-# Mask extraneous elibc/kernel combinations
--userland_BSD
-elibc_glibc
-kernel_linux
-userland_GNU
-
-# mask linux touch screen access lib.
-tslib
-
-# Mask Xorg-modular drivers that are Linux-specific
-input_devices_aiptek
-input_devices_evdev
-input_devices_tslib
-input_devices_linuxwacom
-input_devices_synaptics
-input_devices_ur98
-input_devices_vmmouse
-video_cards_newport
-video_cards_sisusb
-video_cards_v4l
-video_cards_vmware
-video_cards_nvidia
-video_cards_nouveau
-
-# Linux only sane backends
-sane_backends_qcam
-
-# Diego E. Pettenò <flameeyes@gentoo.org> (19 oct 2010)
-# unmasking flags that only apply to FreeBSD
--kqueue
diff --git a/profiles/default/linux/alpha/10.0/deprecated b/profiles/default/linux/alpha/10.0/deprecated
deleted file mode 100644
index b75ed27..0000000
--- a/profiles/default/linux/alpha/10.0/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/alpha/13.0
diff --git a/profiles/default/linux/alpha/10.0/desktop/deprecated b/profiles/default/linux/alpha/10.0/desktop/deprecated
deleted file mode 100644
index c355192..0000000
--- a/profiles/default/linux/alpha/10.0/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/alpha/13.0/desktop
diff --git a/profiles/default/linux/alpha/10.0/desktop/eapi b/profiles/default/linux/alpha/10.0/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/alpha/10.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/alpha/10.0/desktop/gnome/deprecated b/profiles/default/linux/alpha/10.0/desktop/gnome/deprecated
deleted file mode 100644
index e3e89de..0000000
--- a/profiles/default/linux/alpha/10.0/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/alpha/13.0/desktop/gnome
diff --git a/profiles/default/linux/alpha/10.0/desktop/gnome/eapi b/profiles/default/linux/alpha/10.0/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/alpha/10.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/alpha/10.0/desktop/gnome/parent b/profiles/default/linux/alpha/10.0/desktop/gnome/parent
deleted file mode 100644
index 6589a0e..0000000
--- a/profiles/default/linux/alpha/10.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/alpha/10.0/desktop/kde/deprecated b/profiles/default/linux/alpha/10.0/desktop/kde/deprecated
deleted file mode 100644
index 6b164ee..0000000
--- a/profiles/default/linux/alpha/10.0/desktop/kde/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/alpha/13.0/desktop/kde
diff --git a/profiles/default/linux/alpha/10.0/desktop/kde/eapi b/profiles/default/linux/alpha/10.0/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/alpha/10.0/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/alpha/10.0/desktop/kde/parent b/profiles/default/linux/alpha/10.0/desktop/kde/parent
deleted file mode 100644
index b4d42bb..0000000
--- a/profiles/default/linux/alpha/10.0/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/alpha/10.0/desktop/parent b/profiles/default/linux/alpha/10.0/desktop/parent
deleted file mode 100644
index ad6c5e1..0000000
--- a/profiles/default/linux/alpha/10.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/alpha/10.0/developer/deprecated b/profiles/default/linux/alpha/10.0/developer/deprecated
deleted file mode 100644
index f5a3ba8..0000000
--- a/profiles/default/linux/alpha/10.0/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/alpha/13.0/developer
diff --git a/profiles/default/linux/alpha/10.0/developer/eapi b/profiles/default/linux/alpha/10.0/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/alpha/10.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/alpha/10.0/developer/parent b/profiles/default/linux/alpha/10.0/developer/parent
deleted file mode 100644
index 4c89374..0000000
--- a/profiles/default/linux/alpha/10.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/alpha/10.0/eapi b/profiles/default/linux/alpha/10.0/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/alpha/10.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/alpha/10.0/parent b/profiles/default/linux/alpha/10.0/parent
deleted file mode 100644
index 605d043..0000000
--- a/profiles/default/linux/alpha/10.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/10.0
diff --git a/profiles/default/linux/alpha/10.0/server/deprecated b/profiles/default/linux/alpha/10.0/server/deprecated
deleted file mode 100644
index b75ed27..0000000
--- a/profiles/default/linux/alpha/10.0/server/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/alpha/13.0
diff --git a/profiles/default/linux/alpha/10.0/server/eapi b/profiles/default/linux/alpha/10.0/server/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/alpha/10.0/server/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/alpha/10.0/server/parent b/profiles/default/linux/alpha/10.0/server/parent
deleted file mode 100644
index c399016..0000000
--- a/profiles/default/linux/alpha/10.0/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/server
diff --git a/profiles/default/linux/alpha/10.0/use.mask b/profiles/default/linux/alpha/10.0/use.mask
deleted file mode 100644
index 795d4aa..0000000
--- a/profiles/default/linux/alpha/10.0/use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Anthony G. Basile <blueness@gentoo.org> (15 Apr 2012)
-# Pulls in net-libs/axtls or net-libs/polarssl which are
-# not keyworded for arch
-curl_ssl_axtls
-curl_ssl_cyassl
-curl_ssl_polarssl
diff --git a/profiles/default/linux/alpha/13.0/desktop/eapi b/profiles/default/linux/alpha/13.0/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/alpha/13.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/alpha/13.0/desktop/gnome/eapi b/profiles/default/linux/alpha/13.0/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/alpha/13.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/alpha/13.0/desktop/gnome/parent b/profiles/default/linux/alpha/13.0/desktop/gnome/parent
deleted file mode 100644
index 6589a0e..0000000
--- a/profiles/default/linux/alpha/13.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/parent
deleted file mode 100644
index 44f88d3..0000000
--- a/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/systemd
diff --git a/profiles/default/linux/alpha/13.0/desktop/kde/eapi b/profiles/default/linux/alpha/13.0/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/alpha/13.0/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/alpha/13.0/desktop/kde/parent b/profiles/default/linux/alpha/13.0/desktop/kde/parent
deleted file mode 100644
index b4d42bb..0000000
--- a/profiles/default/linux/alpha/13.0/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/alpha/13.0/desktop/kde/systemd/parent b/profiles/default/linux/alpha/13.0/desktop/kde/systemd/parent
deleted file mode 100644
index 44f88d3..0000000
--- a/profiles/default/linux/alpha/13.0/desktop/kde/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/systemd
diff --git a/profiles/default/linux/alpha/13.0/desktop/parent b/profiles/default/linux/alpha/13.0/desktop/parent
deleted file mode 100644
index ad6c5e1..0000000
--- a/profiles/default/linux/alpha/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/alpha/13.0/developer/eapi b/profiles/default/linux/alpha/13.0/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/alpha/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/alpha/13.0/developer/parent b/profiles/default/linux/alpha/13.0/developer/parent
deleted file mode 100644
index 4c89374..0000000
--- a/profiles/default/linux/alpha/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/alpha/13.0/eapi b/profiles/default/linux/alpha/13.0/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/alpha/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/alpha/13.0/parent b/profiles/default/linux/alpha/13.0/parent
deleted file mode 100644
index 7c03775..0000000
--- a/profiles/default/linux/alpha/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/13.0
diff --git a/profiles/default/linux/alpha/13.0/use.mask b/profiles/default/linux/alpha/13.0/use.mask
deleted file mode 100644
index 795d4aa..0000000
--- a/profiles/default/linux/alpha/13.0/use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Anthony G. Basile <blueness@gentoo.org> (15 Apr 2012)
-# Pulls in net-libs/axtls or net-libs/polarssl which are
-# not keyworded for arch
-curl_ssl_axtls
-curl_ssl_cyassl
-curl_ssl_polarssl
diff --git a/profiles/default/linux/alpha/parent b/profiles/default/linux/alpha/parent
deleted file mode 100644
index a6de9b1..0000000
--- a/profiles/default/linux/alpha/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../base
-..
-../../../arch/alpha
diff --git a/profiles/default/linux/amd64/10.0/deprecated b/profiles/default/linux/amd64/10.0/deprecated
deleted file mode 100644
index 647b9e6..0000000
--- a/profiles/default/linux/amd64/10.0/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/13.0
diff --git a/profiles/default/linux/amd64/10.0/desktop/deprecated b/profiles/default/linux/amd64/10.0/desktop/deprecated
deleted file mode 100644
index d084b59..0000000
--- a/profiles/default/linux/amd64/10.0/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/13.0/desktop
diff --git a/profiles/default/linux/amd64/10.0/desktop/eapi b/profiles/default/linux/amd64/10.0/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/amd64/10.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/amd64/10.0/desktop/gnome/deprecated b/profiles/default/linux/amd64/10.0/desktop/gnome/deprecated
deleted file mode 100644
index c20619b..0000000
--- a/profiles/default/linux/amd64/10.0/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/13.0/desktop/gnome
diff --git a/profiles/default/linux/amd64/10.0/desktop/gnome/eapi b/profiles/default/linux/amd64/10.0/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/amd64/10.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/amd64/10.0/desktop/gnome/parent b/profiles/default/linux/amd64/10.0/desktop/gnome/parent
deleted file mode 100644
index 6589a0e..0000000
--- a/profiles/default/linux/amd64/10.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/amd64/10.0/desktop/kde/deprecated b/profiles/default/linux/amd64/10.0/desktop/kde/deprecated
deleted file mode 100644
index 7ba1652..0000000
--- a/profiles/default/linux/amd64/10.0/desktop/kde/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/13.0/desktop/kde
diff --git a/profiles/default/linux/amd64/10.0/desktop/kde/eapi b/profiles/default/linux/amd64/10.0/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/amd64/10.0/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/amd64/10.0/desktop/kde/parent b/profiles/default/linux/amd64/10.0/desktop/kde/parent
deleted file mode 100644
index b4d42bb..0000000
--- a/profiles/default/linux/amd64/10.0/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/amd64/10.0/desktop/parent b/profiles/default/linux/amd64/10.0/desktop/parent
deleted file mode 100644
index ad6c5e1..0000000
--- a/profiles/default/linux/amd64/10.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/amd64/10.0/developer/deprecated b/profiles/default/linux/amd64/10.0/developer/deprecated
deleted file mode 100644
index 2511f9c..0000000
--- a/profiles/default/linux/amd64/10.0/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/13.0/developer
diff --git a/profiles/default/linux/amd64/10.0/developer/eapi b/profiles/default/linux/amd64/10.0/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/amd64/10.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/amd64/10.0/developer/make.defaults b/profiles/default/linux/amd64/10.0/developer/make.defaults
deleted file mode 100644
index c76eb45..0000000
--- a/profiles/default/linux/amd64/10.0/developer/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2004-2010 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/amd64/10.0/developer/make.defaults,v 1.1 2010/08/14 19:43:18 hwoarang Exp $
-
-# Adding -Wl,--hash-style=gnu to default LDFLAGS for linux/amd64 dev profile
-# This will help developers track packages, that don't respect LDFLAGS, down
-# more effectively
-LDFLAGS="-Wl,--hash-style=gnu ${LDFLAGS}"
diff --git a/profiles/default/linux/amd64/10.0/developer/parent b/profiles/default/linux/amd64/10.0/developer/parent
deleted file mode 100644
index 4c89374..0000000
--- a/profiles/default/linux/amd64/10.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/amd64/10.0/eapi b/profiles/default/linux/amd64/10.0/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/amd64/10.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/amd64/10.0/no-multilib/deprecated b/profiles/default/linux/amd64/10.0/no-multilib/deprecated
deleted file mode 100644
index 5e7e1ee..0000000
--- a/profiles/default/linux/amd64/10.0/no-multilib/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/13.0/no-multilib
diff --git a/profiles/default/linux/amd64/10.0/no-multilib/eapi b/profiles/default/linux/amd64/10.0/no-multilib/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/amd64/10.0/no-multilib/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/amd64/10.0/no-multilib/parent b/profiles/default/linux/amd64/10.0/no-multilib/parent
deleted file mode 100644
index 521b28a..0000000
--- a/profiles/default/linux/amd64/10.0/no-multilib/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-..
-../../../../../arch/amd64/no-multilib
-../../../../../features/64bit-native
diff --git a/profiles/default/linux/amd64/10.0/parent b/profiles/default/linux/amd64/10.0/parent
deleted file mode 100644
index 605d043..0000000
--- a/profiles/default/linux/amd64/10.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/10.0
diff --git a/profiles/default/linux/amd64/10.0/selinux/deprecated b/profiles/default/linux/amd64/10.0/selinux/deprecated
deleted file mode 100644
index 07308f9..0000000
--- a/profiles/default/linux/amd64/10.0/selinux/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/13.0/selinux
diff --git a/profiles/default/linux/amd64/10.0/selinux/eapi b/profiles/default/linux/amd64/10.0/selinux/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/amd64/10.0/selinux/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/amd64/10.0/selinux/parent b/profiles/default/linux/amd64/10.0/selinux/parent
deleted file mode 100644
index 933e679..0000000
--- a/profiles/default/linux/amd64/10.0/selinux/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../features/selinux
diff --git a/profiles/default/linux/amd64/10.0/server/deprecated b/profiles/default/linux/amd64/10.0/server/deprecated
deleted file mode 100644
index 647b9e6..0000000
--- a/profiles/default/linux/amd64/10.0/server/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/13.0
diff --git a/profiles/default/linux/amd64/10.0/server/eapi b/profiles/default/linux/amd64/10.0/server/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/amd64/10.0/server/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/amd64/10.0/server/parent b/profiles/default/linux/amd64/10.0/server/parent
deleted file mode 100644
index c399016..0000000
--- a/profiles/default/linux/amd64/10.0/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/server
diff --git a/profiles/default/linux/amd64/10.0/x32/deprecated b/profiles/default/linux/amd64/10.0/x32/deprecated
deleted file mode 100644
index 7f6fe26..0000000
--- a/profiles/default/linux/amd64/10.0/x32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/13.0/x32
diff --git a/profiles/default/linux/amd64/10.0/x32/eapi b/profiles/default/linux/amd64/10.0/x32/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/amd64/10.0/x32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/amd64/10.0/x32/make.defaults b/profiles/default/linux/amd64/10.0/x32/make.defaults
deleted file mode 100644
index b17da92..0000000
--- a/profiles/default/linux/amd64/10.0/x32/make.defaults
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/amd64/10.0/x32/make.defaults,v 1.1 2012/09/07 00:37:28 vapier Exp $
-
-CHOST="x86_64-pc-linux-gnux32"
diff --git a/profiles/default/linux/amd64/10.0/x32/parent b/profiles/default/linux/amd64/10.0/x32/parent
deleted file mode 100644
index cf0023c..0000000
--- a/profiles/default/linux/amd64/10.0/x32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/amd64/x32
diff --git a/profiles/default/linux/amd64/13.0/desktop/eapi b/profiles/default/linux/amd64/13.0/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/amd64/13.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/amd64/13.0/desktop/gnome/eapi b/profiles/default/linux/amd64/13.0/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/amd64/13.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/amd64/13.0/desktop/gnome/parent b/profiles/default/linux/amd64/13.0/desktop/gnome/parent
deleted file mode 100644
index 6589a0e..0000000
--- a/profiles/default/linux/amd64/13.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/amd64/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/amd64/13.0/desktop/gnome/systemd/parent
deleted file mode 100644
index 44f88d3..0000000
--- a/profiles/default/linux/amd64/13.0/desktop/gnome/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/systemd
diff --git a/profiles/default/linux/amd64/13.0/desktop/kde/eapi b/profiles/default/linux/amd64/13.0/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/amd64/13.0/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/amd64/13.0/desktop/kde/parent b/profiles/default/linux/amd64/13.0/desktop/kde/parent
deleted file mode 100644
index b4d42bb..0000000
--- a/profiles/default/linux/amd64/13.0/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/amd64/13.0/desktop/kde/systemd/parent b/profiles/default/linux/amd64/13.0/desktop/kde/systemd/parent
deleted file mode 100644
index 44f88d3..0000000
--- a/profiles/default/linux/amd64/13.0/desktop/kde/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/systemd
diff --git a/profiles/default/linux/amd64/13.0/desktop/parent b/profiles/default/linux/amd64/13.0/desktop/parent
deleted file mode 100644
index ad6c5e1..0000000
--- a/profiles/default/linux/amd64/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/amd64/13.0/developer/eapi b/profiles/default/linux/amd64/13.0/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/amd64/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/amd64/13.0/developer/make.defaults b/profiles/default/linux/amd64/13.0/developer/make.defaults
deleted file mode 100644
index d7e0515..0000000
--- a/profiles/default/linux/amd64/13.0/developer/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/amd64/13.0/developer/make.defaults,v 1.1 2013/01/15 23:08:00 dilfridge Exp $
-
-# Adding -Wl,--hash-style=gnu to default LDFLAGS for linux/amd64 dev profile
-# This will help developers track packages, that don't respect LDFLAGS, down
-# more effectively
-LDFLAGS="-Wl,--hash-style=gnu ${LDFLAGS}"
diff --git a/profiles/default/linux/amd64/13.0/developer/parent b/profiles/default/linux/amd64/13.0/developer/parent
deleted file mode 100644
index 4c89374..0000000
--- a/profiles/default/linux/amd64/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/amd64/13.0/eapi b/profiles/default/linux/amd64/13.0/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/default/linux/amd64/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/amd64/13.0/no-multilib/eapi b/profiles/default/linux/amd64/13.0/no-multilib/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/amd64/13.0/no-multilib/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/amd64/13.0/no-multilib/parent b/profiles/default/linux/amd64/13.0/no-multilib/parent
deleted file mode 100644
index 521b28a..0000000
--- a/profiles/default/linux/amd64/13.0/no-multilib/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-..
-../../../../../arch/amd64/no-multilib
-../../../../../features/64bit-native
diff --git a/profiles/default/linux/amd64/13.0/package.use.stable.mask b/profiles/default/linux/amd64/13.0/package.use.stable.mask
deleted file mode 100644
index 761255e..0000000
--- a/profiles/default/linux/amd64/13.0/package.use.stable.mask
+++ /dev/null
@@ -1,413 +0,0 @@
-# Michał Górny <mgorny@gentoo.org> (16 Nov 2013)
-# Don't apply stable masks to python-exec since we're forcing every
-# impl there anyway. Please keep this in sync with use.stable.mask.
-dev-lang/python-exec -python_targets_pypy2_0
-dev-lang/python-exec -python_single_target_pypy2_0
-dev-python/python-exec -python_targets_pypy2_0
-dev-python/python-exec -python_single_target_pypy2_0
-
-# Ian Stakenvicius <axs@gentoo.org> (20 Sep 2013)
-# on behalf of gx86-multilib project <multilib@gentoo.org>
-# Mask abi_x86_32 on stable until emul-* packages are made
-# fully redundant and end-user experience in resolving
-# flag changes and blockages is generally smooth.
-# Please keep in sync with hardened/linux/amd64.
-app-admin/fam abi_x86_32
-app-admin/gamin abi_x86_32
-app-arch/bzip2 abi_x86_32
-app-arch/xz-utils abi_x86_32
-app-crypt/mit-krb5 abi_x86_32
-app-emulation/emul-linux-x86-baselibs abi_x86_32
-app-emulation/emul-linux-x86-compat abi_x86_32
-app-emulation/emul-linux-x86-cpplibs abi_x86_32
-app-emulation/emul-linux-x86-db abi_x86_32
-app-emulation/emul-linux-x86-glibc-errno-compat abi_x86_32
-app-emulation/emul-linux-x86-gstplugins abi_x86_32
-app-emulation/emul-linux-x86-gtklibs abi_x86_32
-app-emulation/emul-linux-x86-gtkmmlibs abi_x86_32
-app-emulation/emul-linux-x86-java abi_x86_32
-app-emulation/emul-linux-x86-jna abi_x86_32
-app-emulation/emul-linux-x86-medialibs abi_x86_32
-app-emulation/emul-linux-x86-motif abi_x86_32
-app-emulation/emul-linux-x86-opengl abi_x86_32
-app-emulation/emul-linux-x86-qtlibs abi_x86_32
-app-emulation/emul-linux-x86-sdl abi_x86_32
-app-emulation/emul-linux-x86-soundlibs abi_x86_32
-app-emulation/emul-linux-x86-xlibs abi_x86_32
-app-misc/lirc abi_x86_32
-app-text/libpaper abi_x86_32
-dev-cpp/atkmm abi_x86_32
-dev-cpp/cairomm abi_x86_32
-dev-cpp/glibmm abi_x86_32
-dev-cpp/gtest abi_x86_32
-dev-cpp/gtkmm abi_x86_32
-dev-cpp/libglademm abi_x86_32
-dev-cpp/pangomm abi_x86_32
-dev-db/myodbc abi_x86_32
-dev-db/mysql abi_x86_32
-dev-db/sqlite abi_x86_32
-dev-db/unixODBC abi_x86_32
-dev-games/physfs abi_x86_32
-dev-java/jna abi_x86_32
-dev-lang/orc abi_x86_32
-dev-lang/perl abi_x86_32
-dev-lang/python abi_x86_32
-dev-libs/angelscript abi_x86_32
-dev-libs/atk abi_x86_32
-dev-libs/boost abi_x86_32
-dev-libs/dbus-glib abi_x86_32
-dev-libs/ding-libs abi_x86_32
-dev-libs/DirectFB abi_x86_32
-dev-libs/elfutils abi_x86_32
-dev-libs/expat abi_x86_32
-dev-libs/fribidi abi_x86_32
-dev-libs/glib abi_x86_32
-dev-libs/gmp abi_x86_32
-dev-libs/json-c abi_x86_32
-dev-libs/libcdio abi_x86_32
-dev-libs/libconfig abi_x86_32
-dev-libs/libcss abi_x86_32
-dev-libs/libedit abi_x86_32
-dev-libs/libelf abi_x86_32
-dev-libs/libffi abi_x86_32
-dev-libs/libgamin abi_x86_32
-dev-libs/libgcrypt abi_x86_32
-dev-libs/libgpg-error abi_x86_32
-dev-libs/libiconv abi_x86_32
-dev-libs/libIDL abi_x86_32
-dev-libs/libnl abi_x86_32
-dev-libs/libnsfb abi_x86_32
-dev-libs/liboil abi_x86_32
-dev-libs/libparserutils abi_x86_32
-dev-libs/libpcre abi_x86_32
-dev-libs/libpthread-stubs abi_x86_32
-dev-libs/libRocket abi_x86_32
-dev-libs/libsigc++ abi_x86_32
-dev-libs/libtasn1 abi_x86_32
-dev-libs/libusb abi_x86_32
-dev-libs/libusbx abi_x86_32
-dev-libs/libusb-compat abi_x86_32
-dev-libs/libwapcaplet abi_x86_32
-dev-libs/libxml2 abi_x86_32
-dev-libs/libxslt abi_x86_32
-dev-libs/lzo abi_x86_32
-dev-libs/nettle abi_x86_32
-dev-libs/nsgenbind abi_x86_32
-dev-libs/nspr abi_x86_32
-dev-libs/nss abi_x86_32
-dev-libs/openssl abi_x86_32
-dev-libs/re2 abi_x86_32
-dev-libs/udis86 abi_x86_32
-dev-libs/yajl abi_x86_32
-gnome-base/gconf abi_x86_32
-gnome-base/gnome-vfs abi_x86_32
-gnome-base/libglade abi_x86_32
-gnome-base/orbit abi_x86_32
-media-gfx/sane-backends abi_x86_32
-media-libs/a52dec abi_x86_32
-media-libs/allegro abi_x86_32
-media-libs/alsa-lib abi_x86_32
-media-libs/alsa-oss abi_x86_32
-media-libs/audiofile abi_x86_32
-media-libs/celt abi_x86_32
-media-libs/dumb abi_x86_32
-media-libs/faac abi_x86_32
-media-libs/faad2 abi_x86_32
-media-libs/fdk-aac abi_x86_32
-media-libs/flac abi_x86_32
-media-libs/fontconfig abi_x86_32
-media-libs/freealut abi_x86_32
-media-libs/freeglut abi_x86_32
-media-libs/freetype abi_x86_32
-media-libs/game-music-emu abi_x86_32
-media-libs/gavl abi_x86_32
-media-libs/giflib abi_x86_32
-media-libs/glew abi_x86_32
-media-libs/glu abi_x86_32
-media-libs/gst-plugins-bad abi_x86_32
-media-libs/gst-plugins-base abi_x86_32
-media-libs/gst-plugins-good abi_x86_32
-media-libs/gst-plugins-ugly abi_x86_32
-media-libs/gstreamer abi_x86_32
-media-libs/ilmbase abi_x86_32
-media-libs/imlib abi_x86_32
-media-libs/jbigkit abi_x86_32
-media-libs/jpeg abi_x86_32
-media-libs/ladspa-sdk abi_x86_32
-media-libs/lcms abi_x86_32
-media-libs/libaacplus abi_x86_32
-media-libs/libao abi_x86_32
-media-libs/libart_lgpl abi_x86_32
-media-libs/libcddb abi_x86_32
-media-libs/libcuefile abi_x86_32
-media-libs/libdc1394 abi_x86_32
-media-libs/libdca abi_x86_32
-media-libs/libdv abi_x86_32
-media-libs/libdvdnav abi_x86_32
-media-libs/libdvdread abi_x86_32
-media-libs/libexif abi_x86_32
-media-libs/libfame abi_x86_32
-media-libs/libgii abi_x86_32
-media-libs/libgphoto2 abi_x86_32
-media-libs/libid3tag abi_x86_32
-media-libs/libiec61883 abi_x86_32
-media-libs/libjpeg-turbo abi_x86_32
-media-libs/libmad abi_x86_32
-media-libs/libmikmod abi_x86_32
-media-libs/libmimic abi_x86_32
-media-libs/libmms abi_x86_32
-media-libs/libmng abi_x86_32
-media-libs/libmodplug abi_x86_32
-media-libs/libmpeg2 abi_x86_32
-media-libs/libnsbmp abi_x86_32
-media-libs/libnsgif abi_x86_32
-media-libs/libofa abi_x86_32
-media-libs/libogg abi_x86_32
-media-libs/libpng abi_x86_32
-media-libs/libreplaygain abi_x86_32
-media-libs/librosprite abi_x86_32
-media-libs/libsamplerate abi_x86_32
-media-libs/libsdl abi_x86_32
-media-libs/libshout abi_x86_32
-media-libs/libsidplay abi_x86_32
-media-libs/libsndfile abi_x86_32
-media-libs/libsvgtiny abi_x86_32
-media-libs/libtheora abi_x86_32
-media-libs/libv4l abi_x86_32
-media-libs/libvisual abi_x86_32
-media-libs/libvorbis abi_x86_32
-media-libs/libvpx abi_x86_32
-media-libs/libwebp abi_x86_32
-media-libs/libXcm abi_x86_32
-media-libs/mesa abi_x86_32
-media-libs/nas abi_x86_32
-media-libs/openal abi_x86_32
-media-libs/opencore-amr abi_x86_32
-media-libs/openexr abi_x86_32
-media-libs/openjpeg abi_x86_32
-media-libs/opus abi_x86_32
-media-libs/oyranos abi_x86_32
-media-libs/phonon abi_x86_32
-media-libs/portaudio abi_x86_32
-media-libs/schroedinger abi_x86_32
-media-libs/sdl-image abi_x86_32
-media-libs/sdl-mixer abi_x86_32
-media-libs/sdl-net abi_x86_32
-media-libs/sdl-sound abi_x86_32
-media-libs/sdl-ttf abi_x86_32
-media-libs/smpeg abi_x86_32
-media-libs/soxr abi_x86_32
-media-libs/speex abi_x86_32
-media-libs/taglib abi_x86_32
-media-libs/tiff abi_x86_32
-media-libs/vo-aacenc abi_x86_32
-media-libs/vo-amrwbenc abi_x86_32
-media-libs/webrtc-audio-processing abi_x86_32
-media-libs/x264 abi_x86_32
-media-libs/xvid abi_x86_32
-media-plugins/alsaequal abi_x86_32
-media-plugins/alsa-plugins abi_x86_32
-media-plugins/caps-plugins abi_x86_32
-media-plugins/gst-plugins-a52dec abi_x86_32
-media-plugins/gst-plugins-alsa abi_x86_32
-media-plugins/gst-plugins-annodex abi_x86_32
-media-plugins/gst-plugins-cdio abi_x86_32
-media-plugins/gst-plugins-cdparanoia abi_x86_32
-media-plugins/gst-plugins-dts abi_x86_32
-media-plugins/gst-plugins-dv abi_x86_32
-media-plugins/gst-plugins-dvb abi_x86_32
-media-plugins/gst-plugins-dvdread abi_x86_32
-media-plugins/gst-plugins-faac abi_x86_32
-media-plugins/gst-plugins-faad abi_x86_32
-media-plugins/gst-plugins-ffmpeg abi_x86_32
-media-plugins/gst-plugins-flac abi_x86_32
-media-plugins/gst-plugins-gconf abi_x86_32
-media-plugins/gst-plugins-gio abi_x86_32
-media-plugins/gst-plugins-gnomevfs abi_x86_32
-media-plugins/gst-plugins-jpeg abi_x86_32
-media-plugins/gst-plugins-ladspa abi_x86_32
-media-plugins/gst-plugins-lame abi_x86_32
-media-plugins/gst-plugins-libmms abi_x86_32
-media-plugins/gst-plugins-libpng abi_x86_32
-media-plugins/gst-plugins-libvisual abi_x86_32
-media-plugins/gst-plugins-mad abi_x86_32
-media-plugins/gst-plugins-meta abi_x86_32
-media-plugins/gst-plugins-mimic abi_x86_32
-media-plugins/gst-plugins-modplug abi_x86_32
-media-plugins/gst-plugins-mpeg2dec abi_x86_32
-media-plugins/gst-plugins-mplex abi_x86_32
-media-plugins/gst-plugins-musepack abi_x86_32
-media-plugins/gst-plugins-neon abi_x86_32
-media-plugins/gst-plugins-ofa abi_x86_32
-media-plugins/gst-plugins-ogg abi_x86_32
-media-plugins/gst-plugins-oss abi_x86_32
-media-plugins/gst-plugins-pango abi_x86_32
-media-plugins/gst-plugins-pulse abi_x86_32
-media-plugins/gst-plugins-raw1394 abi_x86_32
-media-plugins/gst-plugins-resindvd abi_x86_32
-media-plugins/gst-plugins-shout2 abi_x86_32
-media-plugins/gst-plugins-sidplay abi_x86_32
-media-plugins/gst-plugins-soup abi_x86_32
-media-plugins/gst-plugins-speex abi_x86_32
-media-plugins/gst-plugins-taglib abi_x86_32
-media-plugins/gst-plugins-theora abi_x86_32
-media-plugins/gst-plugins-twolame abi_x86_32
-media-plugins/gst-plugins-v4l2 abi_x86_32
-media-plugins/gst-plugins-vorbis abi_x86_32
-media-plugins/gst-plugins-vp8 abi_x86_32
-media-plugins/gst-plugins-wavpack abi_x86_32
-media-plugins/gst-plugins-x abi_x86_32
-media-plugins/gst-plugins-x264 abi_x86_32
-media-plugins/gst-plugins-ximagesrc abi_x86_32
-media-plugins/gst-plugins-xvid abi_x86_32
-media-plugins/gst-plugins-xvideo abi_x86_32
-media-plugins/swh-plugins abi_x86_32
-media-sound/cdparanoia abi_x86_32
-media-sound/gsm abi_x86_32
-media-sound/jack-audio-connection-kit abi_x86_32
-media-sound/lame abi_x86_32
-media-sound/mpg123 abi_x86_32
-media-sound/musepack-tools abi_x86_32
-media-sound/pulseaudio abi_x86_32
-media-sound/twolame abi_x86_32
-media-sound/wavpack abi_x86_32
-media-video/dirac abi_x86_32
-media-video/ffmpeg abi_x86_32
-media-video/mjpegtools abi_x86_32
-media-video/vcdimager abi_x86_32
-net-dialup/capi4k-utils abi_x86_32
-net-dns/libidn abi_x86_32
-net-libs/gnutls abi_x86_32
-net-libs/libdom abi_x86_32
-net-libs/libgssglue abi_x86_32
-net-libs/libhubbub abi_x86_32
-net-libs/libsoup abi_x86_32
-net-libs/libtirpc abi_x86_32
-net-libs/nacl abi_x86_32
-net-libs/neon abi_x86_32
-net-misc/curl abi_x86_32
-net-nds/openldap abi_x86_32
-net-print/cups abi_x86_32
-net-wireless/bluez abi_x86_32
-sci-libs/djbfft abi_x86_32
-sci-libs/fftw abi_x86_32
-sys-apps/acl abi_x86_32
-sys-apps/attr abi_x86_32
-sys-apps/dbus abi_x86_32
-sys-apps/file abi_x86_32
-sys-apps/keyutils abi_x86_32
-sys-apps/pciutils abi_x86_32
-sys-apps/systemd abi_x86_32
-sys-apps/tcp-wrappers abi_x86_32
-sys-apps/util-linux abi_x86_32
-sys-auth/nss_ldap abi_x86_32
-sys-auth/nss-mdns abi_x86_32
-sys-auth/openpam abi_x86_32
-sys-auth/pam_ldap abi_x86_32
-sys-devel/binutils abi_x86_32
-sys-devel/clang abi_x86_32
-sys-devel/gettext abi_x86_32
-sys-devel/libperl abi_x86_32
-sys-devel/libtool abi_x86_32
-sys-devel/llvm abi_x86_32
-sys-freebsd/freebsd-lib abi_x86_32
-sys-freebsd/freebsd-libexec abi_x86_32
-sys-freebsd/freebsd-ubin abi_x86_32
-sys-fs/e2fsprogs abi_x86_32
-sys-fs/eudev abi_x86_32
-sys-fs/udev abi_x86_32
-sys-libs/cracklib abi_x86_32
-sys-libs/db abi_x86_32
-sys-libs/e2fsprogs-libs abi_x86_32
-sys-libs/gdbm abi_x86_32
-sys-libs/gpm abi_x86_32
-sys-libs/libavc1394 abi_x86_32
-sys-libs/lib-compat abi_x86_32
-sys-libs/libcxx abi_x86_32
-sys-libs/libcxxrt abi_x86_32
-sys-libs/libieee1284 abi_x86_32
-sys-libs/libraw1394 abi_x86_32
-sys-libs/libsepol abi_x86_32
-sys-libs/libstdc++-v3 abi_x86_32
-sys-libs/ncurses abi_x86_32
-sys-libs/pam abi_x86_32
-sys-libs/pwdb abi_x86_32
-sys-libs/readline abi_x86_32
-sys-libs/slang abi_x86_32
-sys-libs/talloc abi_x86_32
-sys-libs/zlib abi_x86_32
-virtual/fam abi_x86_32
-virtual/glu abi_x86_32
-virtual/jpeg abi_x86_32
-virtual/libffi abi_x86_32
-virtual/libiconv abi_x86_32
-virtual/libusb abi_x86_32
-virtual/opengl abi_x86_32
-virtual/udev abi_x86_32
-x11-libs/cairo abi_x86_32
-x11-libs/gdk-pixbuf abi_x86_32
-x11-libs/gtk+ abi_x86_32
-x11-libs/libdrm abi_x86_32
-x11-libs/libICE abi_x86_32
-x11-libs/libnotify abi_x86_32
-x11-libs/libpciaccess abi_x86_32
-x11-libs/libSM abi_x86_32
-x11-libs/libvdpau abi_x86_32
-x11-libs/libX11 abi_x86_32
-x11-libs/libXau abi_x86_32
-x11-libs/libXaw abi_x86_32
-x11-libs/libxcb abi_x86_32
-x11-libs/libXcomposite abi_x86_32
-x11-libs/libXcursor abi_x86_32
-x11-libs/libXdamage abi_x86_32
-x11-libs/libXdmcp abi_x86_32
-x11-libs/libXext abi_x86_32
-x11-libs/libXfixes abi_x86_32
-x11-libs/libXft abi_x86_32
-x11-libs/libXi abi_x86_32
-x11-libs/libXinerama abi_x86_32
-x11-libs/libXmu abi_x86_32
-x11-libs/libXp abi_x86_32
-x11-libs/libXpm abi_x86_32
-x11-libs/libXrandr abi_x86_32
-x11-libs/libXrender abi_x86_32
-x11-libs/libXScrnSaver abi_x86_32
-x11-libs/libXt abi_x86_32
-x11-libs/libXtst abi_x86_32
-x11-libs/libXv abi_x86_32
-x11-libs/libXvMC abi_x86_32
-x11-libs/libXxf86dga abi_x86_32
-x11-libs/libXxf86vm abi_x86_32
-x11-libs/motif abi_x86_32
-x11-libs/pango abi_x86_32
-x11-libs/pixman abi_x86_32
-x11-libs/qt-core abi_x86_32
-x11-libs/qt-dbus abi_x86_32
-x11-libs/qt-gui abi_x86_32
-x11-libs/qt-opengl abi_x86_32
-x11-libs/qt-script abi_x86_32
-x11-libs/qt-sql abi_x86_32
-x11-libs/qt-svg abi_x86_32
-x11-libs/qt-webkit abi_x86_32
-x11-libs/qt-xmlpatterns abi_x86_32
-x11-proto/compositeproto abi_x86_32
-x11-proto/damageproto abi_x86_32
-x11-proto/fixesproto abi_x86_32
-x11-proto/inputproto abi_x86_32
-x11-proto/kbproto abi_x86_32
-x11-proto/printproto abi_x86_32
-x11-proto/randrproto abi_x86_32
-x11-proto/recordproto abi_x86_32
-x11-proto/renderproto abi_x86_32
-x11-proto/scrnsaverproto abi_x86_32
-x11-proto/videoproto abi_x86_32
-x11-proto/xcb-proto abi_x86_32
-x11-proto/xextproto abi_x86_32
-x11-proto/xf86bigfontproto abi_x86_32
-x11-proto/xf86dgaproto abi_x86_32
-x11-proto/xf86vidmodeproto abi_x86_32
-x11-proto/xineramaproto abi_x86_32
-x11-proto/xproto abi_x86_32
-x11-themes/gtk-engines abi_x86_32
-x11-themes/gtk-engines-murrine abi_x86_32
-x11-themes/gtk-engines-xfce abi_x86_32
diff --git a/profiles/default/linux/amd64/13.0/parent b/profiles/default/linux/amd64/13.0/parent
deleted file mode 100644
index 7c03775..0000000
--- a/profiles/default/linux/amd64/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/13.0
diff --git a/profiles/default/linux/amd64/13.0/selinux/eapi b/profiles/default/linux/amd64/13.0/selinux/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/amd64/13.0/selinux/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/amd64/13.0/selinux/parent b/profiles/default/linux/amd64/13.0/selinux/parent
deleted file mode 100644
index 933e679..0000000
--- a/profiles/default/linux/amd64/13.0/selinux/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../features/selinux
diff --git a/profiles/default/linux/amd64/13.0/use.mask b/profiles/default/linux/amd64/13.0/use.mask
deleted file mode 100644
index 6af1398..0000000
--- a/profiles/default/linux/amd64/13.0/use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/amd64/13.0/use.mask,v 1.2 2013/08/07 22:11:07 mgorny Exp $
-
-# Michał Górny <mgorny@gentoo.org> (19 Jan 2013)
-# PyPy is keyworded on this arch.
--python_targets_pypy2_0
--python_single_target_pypy2_0
diff --git a/profiles/default/linux/amd64/13.0/use.stable.mask b/profiles/default/linux/amd64/13.0/use.stable.mask
deleted file mode 100644
index bd4ca1c..0000000
--- a/profiles/default/linux/amd64/13.0/use.stable.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/amd64/13.0/use.stable.mask,v 1.2 2013/08/07 22:11:07 mgorny Exp $
-
-# Michał Górny <mgorny@gentoo.org> (19 Jan 2013)
-# PyPy is unstable on this arch.
-python_targets_pypy2_0
-python_single_target_pypy2_0
diff --git a/profiles/default/linux/amd64/13.0/x32/eapi b/profiles/default/linux/amd64/13.0/x32/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/amd64/13.0/x32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/amd64/13.0/x32/make.defaults b/profiles/default/linux/amd64/13.0/x32/make.defaults
deleted file mode 100644
index ba7d253..0000000
--- a/profiles/default/linux/amd64/13.0/x32/make.defaults
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/amd64/13.0/x32/make.defaults,v 1.1 2013/01/15 23:08:00 dilfridge Exp $
-
-CHOST="x86_64-pc-linux-gnux32"
diff --git a/profiles/default/linux/amd64/13.0/x32/parent b/profiles/default/linux/amd64/13.0/x32/parent
deleted file mode 100644
index cf0023c..0000000
--- a/profiles/default/linux/amd64/13.0/x32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/amd64/x32
diff --git a/profiles/default/linux/amd64/dev/32bit-userland/README b/profiles/default/linux/amd64/dev/32bit-userland/README
deleted file mode 100644
index edcab26..0000000
--- a/profiles/default/linux/amd64/dev/32bit-userland/README
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/amd64/dev/32bit-userland/README,v 1.1 2009/10/03 16:00:24 ssuominen Exp $
-
-IMPORTANT
-=========
-
-Here's how to use this profile. Any other use will probably break your installation, so you better follow it closely.
-
-1. Download the latest amd64 stage2 tarball
-2. Unpack it to your chroot location and do all the bind mounts
-3. Chroot in
-4. run `find /usr/lib64 /lib64 -exec touch {} \;'
-5. remove the "CHOST=" line from /etc/make.conf
-6. change the /etc/make.profile link to this profile
-7. run `emerge -e world'
-
-Dependencies might not always be quite correct. Don't use this profile for anything else then creating emul-libs.
diff --git a/profiles/default/linux/amd64/dev/32bit-userland/make.defaults b/profiles/default/linux/amd64/dev/32bit-userland/make.defaults
deleted file mode 100644
index 98b1cdc..0000000
--- a/profiles/default/linux/amd64/dev/32bit-userland/make.defaults
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/amd64/dev/32bit-userland/make.defaults,v 1.1 2009/10/03 16:00:24 ssuominen Exp $
-
-DEFAULT_ABI="x86"
-ABI="x86"
-
-CHOST="i686-pc-linux-gnu"
-
-FEATURES="collision-protect multilib-strict"
-
-CFLAGS_x86="-m32 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"
-LDFLAGS_x86="-m elf_i386 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"
diff --git a/profiles/default/linux/amd64/dev/32bit-userland/parent b/profiles/default/linux/amd64/dev/32bit-userland/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/default/linux/amd64/dev/32bit-userland/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/linux/amd64/dev/parent b/profiles/default/linux/amd64/dev/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/default/linux/amd64/dev/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/linux/amd64/parent b/profiles/default/linux/amd64/parent
deleted file mode 100644
index 158dd88..0000000
--- a/profiles/default/linux/amd64/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../base
-..
-../../../arch/amd64
diff --git a/profiles/default/linux/arm/10.0/armv4/deprecated b/profiles/default/linux/arm/10.0/armv4/deprecated
deleted file mode 100644
index 977c931..0000000
--- a/profiles/default/linux/arm/10.0/armv4/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv4
diff --git a/profiles/default/linux/arm/10.0/armv4/desktop/deprecated b/profiles/default/linux/arm/10.0/armv4/desktop/deprecated
deleted file mode 100644
index 775c79f..0000000
--- a/profiles/default/linux/arm/10.0/armv4/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv4/desktop
diff --git a/profiles/default/linux/arm/10.0/armv4/desktop/eapi b/profiles/default/linux/arm/10.0/armv4/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv4/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv4/desktop/gnome/deprecated b/profiles/default/linux/arm/10.0/armv4/desktop/gnome/deprecated
deleted file mode 100644
index 9656139..0000000
--- a/profiles/default/linux/arm/10.0/armv4/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-linux/arm/13.0/armv4/desktop/gnome
diff --git a/profiles/default/linux/arm/10.0/armv4/desktop/gnome/eapi b/profiles/default/linux/arm/10.0/armv4/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv4/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv4/desktop/gnome/parent b/profiles/default/linux/arm/10.0/armv4/desktop/gnome/parent
deleted file mode 100644
index 9e06c45..0000000
--- a/profiles/default/linux/arm/10.0/armv4/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/arm/10.0/armv4/desktop/kde/deprecated b/profiles/default/linux/arm/10.0/armv4/desktop/kde/deprecated
deleted file mode 100644
index 1d55cdc..0000000
--- a/profiles/default/linux/arm/10.0/armv4/desktop/kde/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv4/desktop/kde
diff --git a/profiles/default/linux/arm/10.0/armv4/desktop/kde/eapi b/profiles/default/linux/arm/10.0/armv4/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv4/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv4/desktop/kde/parent b/profiles/default/linux/arm/10.0/armv4/desktop/kde/parent
deleted file mode 100644
index f8a0399..0000000
--- a/profiles/default/linux/arm/10.0/armv4/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/arm/10.0/armv4/desktop/parent b/profiles/default/linux/arm/10.0/armv4/desktop/parent
deleted file mode 100644
index db8ce08..0000000
--- a/profiles/default/linux/arm/10.0/armv4/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/arm/10.0/armv4/developer/deprecated b/profiles/default/linux/arm/10.0/armv4/developer/deprecated
deleted file mode 100644
index ceee398..0000000
--- a/profiles/default/linux/arm/10.0/armv4/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv4/developer
diff --git a/profiles/default/linux/arm/10.0/armv4/developer/eapi b/profiles/default/linux/arm/10.0/armv4/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv4/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv4/developer/parent b/profiles/default/linux/arm/10.0/armv4/developer/parent
deleted file mode 100644
index 5c8258a..0000000
--- a/profiles/default/linux/arm/10.0/armv4/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/arm/10.0/armv4/eapi b/profiles/default/linux/arm/10.0/armv4/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv4/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv4/parent b/profiles/default/linux/arm/10.0/armv4/parent
deleted file mode 100644
index b614216..0000000
--- a/profiles/default/linux/arm/10.0/armv4/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/arm/armv4/
diff --git a/profiles/default/linux/arm/10.0/armv4/server/deprecated b/profiles/default/linux/arm/10.0/armv4/server/deprecated
deleted file mode 100644
index 977c931..0000000
--- a/profiles/default/linux/arm/10.0/armv4/server/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv4
diff --git a/profiles/default/linux/arm/10.0/armv4/server/eapi b/profiles/default/linux/arm/10.0/armv4/server/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv4/server/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv4/server/parent b/profiles/default/linux/arm/10.0/armv4/server/parent
deleted file mode 100644
index 2e085a6..0000000
--- a/profiles/default/linux/arm/10.0/armv4/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/server
diff --git a/profiles/default/linux/arm/10.0/armv4t/deprecated b/profiles/default/linux/arm/10.0/armv4t/deprecated
deleted file mode 100644
index 14964d3..0000000
--- a/profiles/default/linux/arm/10.0/armv4t/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv4t
diff --git a/profiles/default/linux/arm/10.0/armv4t/desktop/deprecated b/profiles/default/linux/arm/10.0/armv4t/desktop/deprecated
deleted file mode 100644
index ade5e03..0000000
--- a/profiles/default/linux/arm/10.0/armv4t/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv4t/desktop
diff --git a/profiles/default/linux/arm/10.0/armv4t/desktop/eapi b/profiles/default/linux/arm/10.0/armv4t/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv4t/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv4t/desktop/gnome/deprecated b/profiles/default/linux/arm/10.0/armv4t/desktop/gnome/deprecated
deleted file mode 100644
index cd57033..0000000
--- a/profiles/default/linux/arm/10.0/armv4t/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv4t/desktop/gnome
diff --git a/profiles/default/linux/arm/10.0/armv4t/desktop/gnome/eapi b/profiles/default/linux/arm/10.0/armv4t/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv4t/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv4t/desktop/gnome/parent b/profiles/default/linux/arm/10.0/armv4t/desktop/gnome/parent
deleted file mode 100644
index 9e06c45..0000000
--- a/profiles/default/linux/arm/10.0/armv4t/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/arm/10.0/armv4t/desktop/kde/deprecated b/profiles/default/linux/arm/10.0/armv4t/desktop/kde/deprecated
deleted file mode 100644
index 12cf5d8..0000000
--- a/profiles/default/linux/arm/10.0/armv4t/desktop/kde/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv4t/desktop/kde
diff --git a/profiles/default/linux/arm/10.0/armv4t/desktop/kde/eapi b/profiles/default/linux/arm/10.0/armv4t/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv4t/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv4t/desktop/kde/parent b/profiles/default/linux/arm/10.0/armv4t/desktop/kde/parent
deleted file mode 100644
index f8a0399..0000000
--- a/profiles/default/linux/arm/10.0/armv4t/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/arm/10.0/armv4t/desktop/parent b/profiles/default/linux/arm/10.0/armv4t/desktop/parent
deleted file mode 100644
index db8ce08..0000000
--- a/profiles/default/linux/arm/10.0/armv4t/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/arm/10.0/armv4t/developer/deprecated b/profiles/default/linux/arm/10.0/armv4t/developer/deprecated
deleted file mode 100644
index 28fe8c2..0000000
--- a/profiles/default/linux/arm/10.0/armv4t/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv4t/developer
diff --git a/profiles/default/linux/arm/10.0/armv4t/developer/eapi b/profiles/default/linux/arm/10.0/armv4t/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv4t/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv4t/developer/parent b/profiles/default/linux/arm/10.0/armv4t/developer/parent
deleted file mode 100644
index 5c8258a..0000000
--- a/profiles/default/linux/arm/10.0/armv4t/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/arm/10.0/armv4t/eapi b/profiles/default/linux/arm/10.0/armv4t/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv4t/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv4t/parent b/profiles/default/linux/arm/10.0/armv4t/parent
deleted file mode 100644
index 94db639..0000000
--- a/profiles/default/linux/arm/10.0/armv4t/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/arm/armv4t/
diff --git a/profiles/default/linux/arm/10.0/armv4t/server/deprecated b/profiles/default/linux/arm/10.0/armv4t/server/deprecated
deleted file mode 100644
index 14964d3..0000000
--- a/profiles/default/linux/arm/10.0/armv4t/server/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv4t
diff --git a/profiles/default/linux/arm/10.0/armv4t/server/eapi b/profiles/default/linux/arm/10.0/armv4t/server/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv4t/server/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv4t/server/parent b/profiles/default/linux/arm/10.0/armv4t/server/parent
deleted file mode 100644
index 2e085a6..0000000
--- a/profiles/default/linux/arm/10.0/armv4t/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/server
diff --git a/profiles/default/linux/arm/10.0/armv5te/deprecated b/profiles/default/linux/arm/10.0/armv5te/deprecated
deleted file mode 100644
index 311dc47..0000000
--- a/profiles/default/linux/arm/10.0/armv5te/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv5te
diff --git a/profiles/default/linux/arm/10.0/armv5te/desktop/deprecated b/profiles/default/linux/arm/10.0/armv5te/desktop/deprecated
deleted file mode 100644
index 376d70f..0000000
--- a/profiles/default/linux/arm/10.0/armv5te/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv5te/desktop
diff --git a/profiles/default/linux/arm/10.0/armv5te/desktop/eapi b/profiles/default/linux/arm/10.0/armv5te/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv5te/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv5te/desktop/gnome/deprecated b/profiles/default/linux/arm/10.0/armv5te/desktop/gnome/deprecated
deleted file mode 100644
index 1e4d377..0000000
--- a/profiles/default/linux/arm/10.0/armv5te/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv5te/desktop/gnome
diff --git a/profiles/default/linux/arm/10.0/armv5te/desktop/gnome/eapi b/profiles/default/linux/arm/10.0/armv5te/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv5te/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv5te/desktop/gnome/parent b/profiles/default/linux/arm/10.0/armv5te/desktop/gnome/parent
deleted file mode 100644
index 9e06c45..0000000
--- a/profiles/default/linux/arm/10.0/armv5te/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/arm/10.0/armv5te/desktop/kde/deprecated b/profiles/default/linux/arm/10.0/armv5te/desktop/kde/deprecated
deleted file mode 100644
index 8dab21b..0000000
--- a/profiles/default/linux/arm/10.0/armv5te/desktop/kde/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv5te/desktop/kde
diff --git a/profiles/default/linux/arm/10.0/armv5te/desktop/kde/eapi b/profiles/default/linux/arm/10.0/armv5te/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv5te/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv5te/desktop/kde/parent b/profiles/default/linux/arm/10.0/armv5te/desktop/kde/parent
deleted file mode 100644
index f8a0399..0000000
--- a/profiles/default/linux/arm/10.0/armv5te/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/arm/10.0/armv5te/desktop/parent b/profiles/default/linux/arm/10.0/armv5te/desktop/parent
deleted file mode 100644
index db8ce08..0000000
--- a/profiles/default/linux/arm/10.0/armv5te/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/arm/10.0/armv5te/developer/deprecated b/profiles/default/linux/arm/10.0/armv5te/developer/deprecated
deleted file mode 100644
index ebf78d8..0000000
--- a/profiles/default/linux/arm/10.0/armv5te/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv5te/developer
diff --git a/profiles/default/linux/arm/10.0/armv5te/developer/eapi b/profiles/default/linux/arm/10.0/armv5te/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv5te/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv5te/developer/parent b/profiles/default/linux/arm/10.0/armv5te/developer/parent
deleted file mode 100644
index 5c8258a..0000000
--- a/profiles/default/linux/arm/10.0/armv5te/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/arm/10.0/armv5te/eapi b/profiles/default/linux/arm/10.0/armv5te/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv5te/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv5te/parent b/profiles/default/linux/arm/10.0/armv5te/parent
deleted file mode 100644
index c7af285..0000000
--- a/profiles/default/linux/arm/10.0/armv5te/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/arm/armv5te/
diff --git a/profiles/default/linux/arm/10.0/armv5te/server/deprecated b/profiles/default/linux/arm/10.0/armv5te/server/deprecated
deleted file mode 100644
index 311dc47..0000000
--- a/profiles/default/linux/arm/10.0/armv5te/server/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv5te
diff --git a/profiles/default/linux/arm/10.0/armv5te/server/eapi b/profiles/default/linux/arm/10.0/armv5te/server/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv5te/server/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv5te/server/parent b/profiles/default/linux/arm/10.0/armv5te/server/parent
deleted file mode 100644
index 2e085a6..0000000
--- a/profiles/default/linux/arm/10.0/armv5te/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/server
diff --git a/profiles/default/linux/arm/10.0/armv6j/deprecated b/profiles/default/linux/arm/10.0/armv6j/deprecated
deleted file mode 100644
index 9ec63f8..0000000
--- a/profiles/default/linux/arm/10.0/armv6j/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv6j
diff --git a/profiles/default/linux/arm/10.0/armv6j/desktop/deprecated b/profiles/default/linux/arm/10.0/armv6j/desktop/deprecated
deleted file mode 100644
index fc5a542..0000000
--- a/profiles/default/linux/arm/10.0/armv6j/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv6j/desktop
diff --git a/profiles/default/linux/arm/10.0/armv6j/desktop/eapi b/profiles/default/linux/arm/10.0/armv6j/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv6j/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv6j/desktop/gnome/deprecated b/profiles/default/linux/arm/10.0/armv6j/desktop/gnome/deprecated
deleted file mode 100644
index ab6403e..0000000
--- a/profiles/default/linux/arm/10.0/armv6j/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv6j/desktop/gnome
diff --git a/profiles/default/linux/arm/10.0/armv6j/desktop/gnome/eapi b/profiles/default/linux/arm/10.0/armv6j/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv6j/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv6j/desktop/gnome/parent b/profiles/default/linux/arm/10.0/armv6j/desktop/gnome/parent
deleted file mode 100644
index 9e06c45..0000000
--- a/profiles/default/linux/arm/10.0/armv6j/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/arm/10.0/armv6j/desktop/kde/deprecated b/profiles/default/linux/arm/10.0/armv6j/desktop/kde/deprecated
deleted file mode 100644
index 4afba63..0000000
--- a/profiles/default/linux/arm/10.0/armv6j/desktop/kde/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv6j/desktop/kde
diff --git a/profiles/default/linux/arm/10.0/armv6j/desktop/kde/eapi b/profiles/default/linux/arm/10.0/armv6j/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv6j/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv6j/desktop/kde/parent b/profiles/default/linux/arm/10.0/armv6j/desktop/kde/parent
deleted file mode 100644
index f8a0399..0000000
--- a/profiles/default/linux/arm/10.0/armv6j/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/arm/10.0/armv6j/desktop/parent b/profiles/default/linux/arm/10.0/armv6j/desktop/parent
deleted file mode 100644
index db8ce08..0000000
--- a/profiles/default/linux/arm/10.0/armv6j/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/arm/10.0/armv6j/developer/deprecated b/profiles/default/linux/arm/10.0/armv6j/developer/deprecated
deleted file mode 100644
index d886992..0000000
--- a/profiles/default/linux/arm/10.0/armv6j/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv6j/developer
diff --git a/profiles/default/linux/arm/10.0/armv6j/developer/eapi b/profiles/default/linux/arm/10.0/armv6j/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv6j/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv6j/developer/parent b/profiles/default/linux/arm/10.0/armv6j/developer/parent
deleted file mode 100644
index 5c8258a..0000000
--- a/profiles/default/linux/arm/10.0/armv6j/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/arm/10.0/armv6j/eapi b/profiles/default/linux/arm/10.0/armv6j/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv6j/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv6j/parent b/profiles/default/linux/arm/10.0/armv6j/parent
deleted file mode 100644
index c0ffd32..0000000
--- a/profiles/default/linux/arm/10.0/armv6j/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/arm/armv6j/
diff --git a/profiles/default/linux/arm/10.0/armv6j/server/deprecated b/profiles/default/linux/arm/10.0/armv6j/server/deprecated
deleted file mode 100644
index 9ec63f8..0000000
--- a/profiles/default/linux/arm/10.0/armv6j/server/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv6j
diff --git a/profiles/default/linux/arm/10.0/armv6j/server/eapi b/profiles/default/linux/arm/10.0/armv6j/server/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv6j/server/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv6j/server/parent b/profiles/default/linux/arm/10.0/armv6j/server/parent
deleted file mode 100644
index 2e085a6..0000000
--- a/profiles/default/linux/arm/10.0/armv6j/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/server
diff --git a/profiles/default/linux/arm/10.0/armv7a/deprecated b/profiles/default/linux/arm/10.0/armv7a/deprecated
deleted file mode 100644
index c11c04d..0000000
--- a/profiles/default/linux/arm/10.0/armv7a/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv7a
diff --git a/profiles/default/linux/arm/10.0/armv7a/desktop/deprecated b/profiles/default/linux/arm/10.0/armv7a/desktop/deprecated
deleted file mode 100644
index 795e84d..0000000
--- a/profiles/default/linux/arm/10.0/armv7a/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv7a/desktop
diff --git a/profiles/default/linux/arm/10.0/armv7a/desktop/eapi b/profiles/default/linux/arm/10.0/armv7a/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv7a/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv7a/desktop/gnome/deprecated b/profiles/default/linux/arm/10.0/armv7a/desktop/gnome/deprecated
deleted file mode 100644
index 3491897..0000000
--- a/profiles/default/linux/arm/10.0/armv7a/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv7a/desktop/gnome
diff --git a/profiles/default/linux/arm/10.0/armv7a/desktop/gnome/eapi b/profiles/default/linux/arm/10.0/armv7a/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv7a/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv7a/desktop/gnome/parent b/profiles/default/linux/arm/10.0/armv7a/desktop/gnome/parent
deleted file mode 100644
index 9e06c45..0000000
--- a/profiles/default/linux/arm/10.0/armv7a/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/arm/10.0/armv7a/desktop/kde/deprecated b/profiles/default/linux/arm/10.0/armv7a/desktop/kde/deprecated
deleted file mode 100644
index 6be7875..0000000
--- a/profiles/default/linux/arm/10.0/armv7a/desktop/kde/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv7a/desktop/kde
diff --git a/profiles/default/linux/arm/10.0/armv7a/desktop/kde/eapi b/profiles/default/linux/arm/10.0/armv7a/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv7a/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv7a/desktop/kde/parent b/profiles/default/linux/arm/10.0/armv7a/desktop/kde/parent
deleted file mode 100644
index f8a0399..0000000
--- a/profiles/default/linux/arm/10.0/armv7a/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/arm/10.0/armv7a/desktop/parent b/profiles/default/linux/arm/10.0/armv7a/desktop/parent
deleted file mode 100644
index db8ce08..0000000
--- a/profiles/default/linux/arm/10.0/armv7a/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/arm/10.0/armv7a/developer/deprecated b/profiles/default/linux/arm/10.0/armv7a/developer/deprecated
deleted file mode 100644
index a1dcc23..0000000
--- a/profiles/default/linux/arm/10.0/armv7a/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv7a/developer
diff --git a/profiles/default/linux/arm/10.0/armv7a/developer/eapi b/profiles/default/linux/arm/10.0/armv7a/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv7a/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv7a/developer/parent b/profiles/default/linux/arm/10.0/armv7a/developer/parent
deleted file mode 100644
index 5c8258a..0000000
--- a/profiles/default/linux/arm/10.0/armv7a/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/arm/10.0/armv7a/eapi b/profiles/default/linux/arm/10.0/armv7a/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv7a/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv7a/parent b/profiles/default/linux/arm/10.0/armv7a/parent
deleted file mode 100644
index 39d8921..0000000
--- a/profiles/default/linux/arm/10.0/armv7a/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/arm/armv7a/
diff --git a/profiles/default/linux/arm/10.0/armv7a/server/deprecated b/profiles/default/linux/arm/10.0/armv7a/server/deprecated
deleted file mode 100644
index c11c04d..0000000
--- a/profiles/default/linux/arm/10.0/armv7a/server/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/armv7a
diff --git a/profiles/default/linux/arm/10.0/armv7a/server/eapi b/profiles/default/linux/arm/10.0/armv7a/server/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/armv7a/server/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/armv7a/server/parent b/profiles/default/linux/arm/10.0/armv7a/server/parent
deleted file mode 100644
index 2e085a6..0000000
--- a/profiles/default/linux/arm/10.0/armv7a/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/server
diff --git a/profiles/default/linux/arm/10.0/deprecated b/profiles/default/linux/arm/10.0/deprecated
deleted file mode 100644
index 74de624..0000000
--- a/profiles/default/linux/arm/10.0/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0
diff --git a/profiles/default/linux/arm/10.0/desktop/deprecated b/profiles/default/linux/arm/10.0/desktop/deprecated
deleted file mode 100644
index 4a4f617..0000000
--- a/profiles/default/linux/arm/10.0/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/desktop
diff --git a/profiles/default/linux/arm/10.0/desktop/eapi b/profiles/default/linux/arm/10.0/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/desktop/gnome/deprecated b/profiles/default/linux/arm/10.0/desktop/gnome/deprecated
deleted file mode 100644
index 1a7b5cc..0000000
--- a/profiles/default/linux/arm/10.0/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/desktop/gnome
diff --git a/profiles/default/linux/arm/10.0/desktop/gnome/eapi b/profiles/default/linux/arm/10.0/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/desktop/gnome/parent b/profiles/default/linux/arm/10.0/desktop/gnome/parent
deleted file mode 100644
index 6589a0e..0000000
--- a/profiles/default/linux/arm/10.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/arm/10.0/desktop/kde/deprecated b/profiles/default/linux/arm/10.0/desktop/kde/deprecated
deleted file mode 100644
index 60b5139..0000000
--- a/profiles/default/linux/arm/10.0/desktop/kde/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/desktop/kde
diff --git a/profiles/default/linux/arm/10.0/desktop/kde/eapi b/profiles/default/linux/arm/10.0/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/desktop/kde/parent b/profiles/default/linux/arm/10.0/desktop/kde/parent
deleted file mode 100644
index b4d42bb..0000000
--- a/profiles/default/linux/arm/10.0/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/arm/10.0/desktop/parent b/profiles/default/linux/arm/10.0/desktop/parent
deleted file mode 100644
index ad6c5e1..0000000
--- a/profiles/default/linux/arm/10.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/arm/10.0/developer/deprecated b/profiles/default/linux/arm/10.0/developer/deprecated
deleted file mode 100644
index 4ee81f0..0000000
--- a/profiles/default/linux/arm/10.0/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0/developer
diff --git a/profiles/default/linux/arm/10.0/developer/eapi b/profiles/default/linux/arm/10.0/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/developer/parent b/profiles/default/linux/arm/10.0/developer/parent
deleted file mode 100644
index 4c89374..0000000
--- a/profiles/default/linux/arm/10.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/arm/10.0/eapi b/profiles/default/linux/arm/10.0/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/parent b/profiles/default/linux/arm/10.0/parent
deleted file mode 100644
index 605d043..0000000
--- a/profiles/default/linux/arm/10.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/10.0
diff --git a/profiles/default/linux/arm/10.0/server/deprecated b/profiles/default/linux/arm/10.0/server/deprecated
deleted file mode 100644
index 74de624..0000000
--- a/profiles/default/linux/arm/10.0/server/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/13.0
diff --git a/profiles/default/linux/arm/10.0/server/eapi b/profiles/default/linux/arm/10.0/server/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/10.0/server/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/10.0/server/parent b/profiles/default/linux/arm/10.0/server/parent
deleted file mode 100644
index c399016..0000000
--- a/profiles/default/linux/arm/10.0/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/server
diff --git a/profiles/default/linux/arm/13.0/armv4/desktop/eapi b/profiles/default/linux/arm/13.0/armv4/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/armv4/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/armv4/desktop/gnome/eapi b/profiles/default/linux/arm/13.0/armv4/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/armv4/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/armv4/desktop/gnome/parent b/profiles/default/linux/arm/13.0/armv4/desktop/gnome/parent
deleted file mode 100644
index 9e06c45..0000000
--- a/profiles/default/linux/arm/13.0/armv4/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/arm/13.0/armv4/desktop/kde/eapi b/profiles/default/linux/arm/13.0/armv4/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/armv4/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/armv4/desktop/kde/parent b/profiles/default/linux/arm/13.0/armv4/desktop/kde/parent
deleted file mode 100644
index f8a0399..0000000
--- a/profiles/default/linux/arm/13.0/armv4/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/arm/13.0/armv4/desktop/parent b/profiles/default/linux/arm/13.0/armv4/desktop/parent
deleted file mode 100644
index db8ce08..0000000
--- a/profiles/default/linux/arm/13.0/armv4/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/arm/13.0/armv4/developer/eapi b/profiles/default/linux/arm/13.0/armv4/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/armv4/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/armv4/developer/parent b/profiles/default/linux/arm/13.0/armv4/developer/parent
deleted file mode 100644
index 5c8258a..0000000
--- a/profiles/default/linux/arm/13.0/armv4/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/arm/13.0/armv4/eapi b/profiles/default/linux/arm/13.0/armv4/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/armv4/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/armv4/parent b/profiles/default/linux/arm/13.0/armv4/parent
deleted file mode 100644
index b614216..0000000
--- a/profiles/default/linux/arm/13.0/armv4/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/arm/armv4/
diff --git a/profiles/default/linux/arm/13.0/armv4t/desktop/eapi b/profiles/default/linux/arm/13.0/armv4t/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/armv4t/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/armv4t/desktop/gnome/eapi b/profiles/default/linux/arm/13.0/armv4t/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/armv4t/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/armv4t/desktop/gnome/parent b/profiles/default/linux/arm/13.0/armv4t/desktop/gnome/parent
deleted file mode 100644
index 9e06c45..0000000
--- a/profiles/default/linux/arm/13.0/armv4t/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/arm/13.0/armv4t/desktop/kde/eapi b/profiles/default/linux/arm/13.0/armv4t/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/armv4t/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/armv4t/desktop/kde/parent b/profiles/default/linux/arm/13.0/armv4t/desktop/kde/parent
deleted file mode 100644
index f8a0399..0000000
--- a/profiles/default/linux/arm/13.0/armv4t/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/arm/13.0/armv4t/desktop/parent b/profiles/default/linux/arm/13.0/armv4t/desktop/parent
deleted file mode 100644
index db8ce08..0000000
--- a/profiles/default/linux/arm/13.0/armv4t/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/arm/13.0/armv4t/developer/eapi b/profiles/default/linux/arm/13.0/armv4t/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/armv4t/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/armv4t/developer/parent b/profiles/default/linux/arm/13.0/armv4t/developer/parent
deleted file mode 100644
index 5c8258a..0000000
--- a/profiles/default/linux/arm/13.0/armv4t/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/arm/13.0/armv4t/eapi b/profiles/default/linux/arm/13.0/armv4t/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/armv4t/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/armv4t/parent b/profiles/default/linux/arm/13.0/armv4t/parent
deleted file mode 100644
index 94db639..0000000
--- a/profiles/default/linux/arm/13.0/armv4t/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/arm/armv4t/
diff --git a/profiles/default/linux/arm/13.0/armv5te/desktop/eapi b/profiles/default/linux/arm/13.0/armv5te/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/armv5te/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/armv5te/desktop/gnome/eapi b/profiles/default/linux/arm/13.0/armv5te/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/armv5te/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/armv5te/desktop/gnome/parent b/profiles/default/linux/arm/13.0/armv5te/desktop/gnome/parent
deleted file mode 100644
index 9e06c45..0000000
--- a/profiles/default/linux/arm/13.0/armv5te/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/arm/13.0/armv5te/desktop/kde/eapi b/profiles/default/linux/arm/13.0/armv5te/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/armv5te/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/armv5te/desktop/kde/parent b/profiles/default/linux/arm/13.0/armv5te/desktop/kde/parent
deleted file mode 100644
index f8a0399..0000000
--- a/profiles/default/linux/arm/13.0/armv5te/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/arm/13.0/armv5te/desktop/parent b/profiles/default/linux/arm/13.0/armv5te/desktop/parent
deleted file mode 100644
index db8ce08..0000000
--- a/profiles/default/linux/arm/13.0/armv5te/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/arm/13.0/armv5te/developer/eapi b/profiles/default/linux/arm/13.0/armv5te/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/armv5te/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/armv5te/developer/parent b/profiles/default/linux/arm/13.0/armv5te/developer/parent
deleted file mode 100644
index 5c8258a..0000000
--- a/profiles/default/linux/arm/13.0/armv5te/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/arm/13.0/armv5te/eapi b/profiles/default/linux/arm/13.0/armv5te/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/armv5te/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/armv5te/parent b/profiles/default/linux/arm/13.0/armv5te/parent
deleted file mode 100644
index c7af285..0000000
--- a/profiles/default/linux/arm/13.0/armv5te/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/arm/armv5te/
diff --git a/profiles/default/linux/arm/13.0/armv6j/desktop/eapi b/profiles/default/linux/arm/13.0/armv6j/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/armv6j/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/armv6j/desktop/gnome/eapi b/profiles/default/linux/arm/13.0/armv6j/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/armv6j/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/armv6j/desktop/gnome/parent b/profiles/default/linux/arm/13.0/armv6j/desktop/gnome/parent
deleted file mode 100644
index 9e06c45..0000000
--- a/profiles/default/linux/arm/13.0/armv6j/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/arm/13.0/armv6j/desktop/kde/eapi b/profiles/default/linux/arm/13.0/armv6j/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/armv6j/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/armv6j/desktop/kde/parent b/profiles/default/linux/arm/13.0/armv6j/desktop/kde/parent
deleted file mode 100644
index f8a0399..0000000
--- a/profiles/default/linux/arm/13.0/armv6j/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/arm/13.0/armv6j/desktop/parent b/profiles/default/linux/arm/13.0/armv6j/desktop/parent
deleted file mode 100644
index db8ce08..0000000
--- a/profiles/default/linux/arm/13.0/armv6j/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/arm/13.0/armv6j/developer/eapi b/profiles/default/linux/arm/13.0/armv6j/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/armv6j/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/armv6j/developer/parent b/profiles/default/linux/arm/13.0/armv6j/developer/parent
deleted file mode 100644
index 5c8258a..0000000
--- a/profiles/default/linux/arm/13.0/armv6j/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/arm/13.0/armv6j/eapi b/profiles/default/linux/arm/13.0/armv6j/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/armv6j/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/armv6j/parent b/profiles/default/linux/arm/13.0/armv6j/parent
deleted file mode 100644
index c0ffd32..0000000
--- a/profiles/default/linux/arm/13.0/armv6j/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/arm/armv6j/
diff --git a/profiles/default/linux/arm/13.0/armv7a/desktop/eapi b/profiles/default/linux/arm/13.0/armv7a/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/armv7a/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/armv7a/desktop/gnome/eapi b/profiles/default/linux/arm/13.0/armv7a/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/armv7a/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/armv7a/desktop/gnome/parent b/profiles/default/linux/arm/13.0/armv7a/desktop/gnome/parent
deleted file mode 100644
index 9e06c45..0000000
--- a/profiles/default/linux/arm/13.0/armv7a/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/arm/13.0/armv7a/desktop/kde/eapi b/profiles/default/linux/arm/13.0/armv7a/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/armv7a/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/armv7a/desktop/kde/parent b/profiles/default/linux/arm/13.0/armv7a/desktop/kde/parent
deleted file mode 100644
index f8a0399..0000000
--- a/profiles/default/linux/arm/13.0/armv7a/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/arm/13.0/armv7a/desktop/parent b/profiles/default/linux/arm/13.0/armv7a/desktop/parent
deleted file mode 100644
index db8ce08..0000000
--- a/profiles/default/linux/arm/13.0/armv7a/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/arm/13.0/armv7a/developer/eapi b/profiles/default/linux/arm/13.0/armv7a/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/armv7a/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/armv7a/developer/parent b/profiles/default/linux/arm/13.0/armv7a/developer/parent
deleted file mode 100644
index 5c8258a..0000000
--- a/profiles/default/linux/arm/13.0/armv7a/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/arm/13.0/armv7a/eapi b/profiles/default/linux/arm/13.0/armv7a/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/armv7a/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/armv7a/parent b/profiles/default/linux/arm/13.0/armv7a/parent
deleted file mode 100644
index 39d8921..0000000
--- a/profiles/default/linux/arm/13.0/armv7a/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/arm/armv7a/
diff --git a/profiles/default/linux/arm/13.0/desktop/eapi b/profiles/default/linux/arm/13.0/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/desktop/gnome/eapi b/profiles/default/linux/arm/13.0/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/desktop/gnome/parent b/profiles/default/linux/arm/13.0/desktop/gnome/parent
deleted file mode 100644
index 6589a0e..0000000
--- a/profiles/default/linux/arm/13.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/arm/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/arm/13.0/desktop/gnome/systemd/parent
deleted file mode 100644
index 44f88d3..0000000
--- a/profiles/default/linux/arm/13.0/desktop/gnome/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/systemd
diff --git a/profiles/default/linux/arm/13.0/desktop/kde/eapi b/profiles/default/linux/arm/13.0/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/desktop/kde/parent b/profiles/default/linux/arm/13.0/desktop/kde/parent
deleted file mode 100644
index b4d42bb..0000000
--- a/profiles/default/linux/arm/13.0/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/arm/13.0/desktop/kde/systemd/parent b/profiles/default/linux/arm/13.0/desktop/kde/systemd/parent
deleted file mode 100644
index 44f88d3..0000000
--- a/profiles/default/linux/arm/13.0/desktop/kde/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/systemd
diff --git a/profiles/default/linux/arm/13.0/desktop/parent b/profiles/default/linux/arm/13.0/desktop/parent
deleted file mode 100644
index ad6c5e1..0000000
--- a/profiles/default/linux/arm/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/arm/13.0/developer/eapi b/profiles/default/linux/arm/13.0/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/developer/parent b/profiles/default/linux/arm/13.0/developer/parent
deleted file mode 100644
index 4c89374..0000000
--- a/profiles/default/linux/arm/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/arm/13.0/eapi b/profiles/default/linux/arm/13.0/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm/13.0/parent b/profiles/default/linux/arm/13.0/parent
deleted file mode 100644
index 7c03775..0000000
--- a/profiles/default/linux/arm/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/13.0
diff --git a/profiles/default/linux/arm/parent b/profiles/default/linux/arm/parent
deleted file mode 100644
index cf8b79e..0000000
--- a/profiles/default/linux/arm/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../base
-..
-../../../arch/arm
diff --git a/profiles/default/linux/arm64/13.0/desktop/eapi b/profiles/default/linux/arm64/13.0/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm64/13.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm64/13.0/desktop/parent b/profiles/default/linux/arm64/13.0/desktop/parent
deleted file mode 100644
index ad6c5e1..0000000
--- a/profiles/default/linux/arm64/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/arm64/13.0/developer/eapi b/profiles/default/linux/arm64/13.0/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/arm64/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/arm64/13.0/developer/parent b/profiles/default/linux/arm64/13.0/developer/parent
deleted file mode 100644
index 4c89374..0000000
--- a/profiles/default/linux/arm64/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/arm64/13.0/eapi b/profiles/default/linux/arm64/13.0/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/default/linux/arm64/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm64/13.0/parent b/profiles/default/linux/arm64/13.0/parent
deleted file mode 100644
index 7c03775..0000000
--- a/profiles/default/linux/arm64/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/13.0
diff --git a/profiles/default/linux/arm64/13.0/use.stable.mask b/profiles/default/linux/arm64/13.0/use.stable.mask
deleted file mode 100644
index dee1936..0000000
--- a/profiles/default/linux/arm64/13.0/use.stable.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/arm64/13.0/use.stable.mask,v 1.1 2014/01/14 20:47:47 vapier Exp $
-
-# Markus Meier <maekke@gentoo.org> (26 Dec 2013)
-# Unmask dev-lang/python-3.3* targets, bug #474128
--python_targets_python3_3
--python_single_target_python3_3
diff --git a/profiles/default/linux/arm64/parent b/profiles/default/linux/arm64/parent
deleted file mode 100644
index 63b5baf..0000000
--- a/profiles/default/linux/arm64/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../base
-..
-../../../arch/arm64
diff --git a/profiles/default/linux/hppa/10.0/deprecated b/profiles/default/linux/hppa/10.0/deprecated
deleted file mode 100644
index cff72dd..0000000
--- a/profiles/default/linux/hppa/10.0/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/hppa/13.0
diff --git a/profiles/default/linux/hppa/10.0/desktop/deprecated b/profiles/default/linux/hppa/10.0/desktop/deprecated
deleted file mode 100644
index c0202b0..0000000
--- a/profiles/default/linux/hppa/10.0/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/hppa/13.0/desktop
diff --git a/profiles/default/linux/hppa/10.0/desktop/eapi b/profiles/default/linux/hppa/10.0/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/hppa/10.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/hppa/10.0/desktop/parent b/profiles/default/linux/hppa/10.0/desktop/parent
deleted file mode 100644
index ad6c5e1..0000000
--- a/profiles/default/linux/hppa/10.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/hppa/10.0/developer/deprecated b/profiles/default/linux/hppa/10.0/developer/deprecated
deleted file mode 100644
index bce3155..0000000
--- a/profiles/default/linux/hppa/10.0/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/hppa/13.0/developer
diff --git a/profiles/default/linux/hppa/10.0/developer/eapi b/profiles/default/linux/hppa/10.0/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/hppa/10.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/hppa/10.0/developer/parent b/profiles/default/linux/hppa/10.0/developer/parent
deleted file mode 100644
index 4c89374..0000000
--- a/profiles/default/linux/hppa/10.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/hppa/10.0/eapi b/profiles/default/linux/hppa/10.0/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/hppa/10.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/hppa/10.0/parent b/profiles/default/linux/hppa/10.0/parent
deleted file mode 100644
index 605d043..0000000
--- a/profiles/default/linux/hppa/10.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/10.0
diff --git a/profiles/default/linux/hppa/10.0/server/deprecated b/profiles/default/linux/hppa/10.0/server/deprecated
deleted file mode 100644
index cff72dd..0000000
--- a/profiles/default/linux/hppa/10.0/server/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/hppa/13.0
diff --git a/profiles/default/linux/hppa/10.0/server/eapi b/profiles/default/linux/hppa/10.0/server/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/hppa/10.0/server/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/hppa/10.0/server/parent b/profiles/default/linux/hppa/10.0/server/parent
deleted file mode 100644
index c399016..0000000
--- a/profiles/default/linux/hppa/10.0/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/server
diff --git a/profiles/default/linux/hppa/13.0/desktop/eapi b/profiles/default/linux/hppa/13.0/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/hppa/13.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/hppa/13.0/desktop/parent b/profiles/default/linux/hppa/13.0/desktop/parent
deleted file mode 100644
index ad6c5e1..0000000
--- a/profiles/default/linux/hppa/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/hppa/13.0/developer/eapi b/profiles/default/linux/hppa/13.0/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/hppa/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/hppa/13.0/developer/parent b/profiles/default/linux/hppa/13.0/developer/parent
deleted file mode 100644
index 4c89374..0000000
--- a/profiles/default/linux/hppa/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/hppa/13.0/eapi b/profiles/default/linux/hppa/13.0/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/hppa/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/hppa/13.0/parent b/profiles/default/linux/hppa/13.0/parent
deleted file mode 100644
index 7c03775..0000000
--- a/profiles/default/linux/hppa/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/13.0
diff --git a/profiles/default/linux/hppa/package.use.mask b/profiles/default/linux/hppa/package.use.mask
deleted file mode 100644
index 0b25e73..0000000
--- a/profiles/default/linux/hppa/package.use.mask
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/hppa/package.use.mask,v 1.14 2013/10/14 18:32:06 jer Exp $
-
-# DON'T TOUCH THIS FILE. Instead, file a bug and assign it to <hppa@gentoo.org>.
-
-# Jeroen Roovers <jer@gentoo.org> (1 Sep 2011)
-# No hardware support for NUMA (bug #381313)
-sys-apps/hwloc numa
-
-# Jeroen Roovers <jer@gentoo.org> (15 Aug 2008)
-# HPPA still isn't supported with anything but -O0.
-www-client/firefox custom-optimization
-
-# Jeroen Roovers <jer@gentoo.org> (18 Jul 2008)
-# Mask precompiled headers (pch) USE flag for dev-qt/qt* (bug #223775).
-dev-qt/qt3support pch
-dev-qt/qtbearer pch
-dev-qt/qtcore pch
-dev-qt/qtdbus pch
-dev-qt/qtdemo pch
-dev-qt/qtgui pch
-dev-qt/qthelp pch 
-dev-qt/qtopengl pch
-dev-qt/qtphonon pch
-dev-qt/qtscript pch
-dev-qt/qtsql pch
-dev-qt/qtsvg pch
-dev-qt/qttest pch
-dev-qt/qtwebkit pch
-dev-qt/qtxmlpatterns pch
-
-# DON'T TOUCH THIS FILE. Instead, file a bug and assign it to <hppa@gentoo.org>.
diff --git a/profiles/default/linux/hppa/parent b/profiles/default/linux/hppa/parent
deleted file mode 100644
index aed3077..0000000
--- a/profiles/default/linux/hppa/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../base
-..
-../../../arch/hppa
diff --git a/profiles/default/linux/ia64/10.0/deprecated b/profiles/default/linux/ia64/10.0/deprecated
deleted file mode 100644
index 40f7b21..0000000
--- a/profiles/default/linux/ia64/10.0/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/ia64/13.0
diff --git a/profiles/default/linux/ia64/10.0/desktop/deprecated b/profiles/default/linux/ia64/10.0/desktop/deprecated
deleted file mode 100644
index c5cc17c..0000000
--- a/profiles/default/linux/ia64/10.0/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/ia64/13.0/desktop
diff --git a/profiles/default/linux/ia64/10.0/desktop/eapi b/profiles/default/linux/ia64/10.0/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/ia64/10.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/ia64/10.0/desktop/gnome/deprecated b/profiles/default/linux/ia64/10.0/desktop/gnome/deprecated
deleted file mode 100644
index bcdd271..0000000
--- a/profiles/default/linux/ia64/10.0/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/ia64/13.0/desktop/gnome
diff --git a/profiles/default/linux/ia64/10.0/desktop/gnome/eapi b/profiles/default/linux/ia64/10.0/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/ia64/10.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/ia64/10.0/desktop/gnome/parent b/profiles/default/linux/ia64/10.0/desktop/gnome/parent
deleted file mode 100644
index 6589a0e..0000000
--- a/profiles/default/linux/ia64/10.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/ia64/10.0/desktop/kde/deprecated b/profiles/default/linux/ia64/10.0/desktop/kde/deprecated
deleted file mode 100644
index 3180c58..0000000
--- a/profiles/default/linux/ia64/10.0/desktop/kde/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/ia64/13.0/desktop/kde
diff --git a/profiles/default/linux/ia64/10.0/desktop/kde/eapi b/profiles/default/linux/ia64/10.0/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/ia64/10.0/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/ia64/10.0/desktop/kde/parent b/profiles/default/linux/ia64/10.0/desktop/kde/parent
deleted file mode 100644
index b4d42bb..0000000
--- a/profiles/default/linux/ia64/10.0/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/ia64/10.0/desktop/parent b/profiles/default/linux/ia64/10.0/desktop/parent
deleted file mode 100644
index ad6c5e1..0000000
--- a/profiles/default/linux/ia64/10.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/ia64/10.0/developer/deprecated b/profiles/default/linux/ia64/10.0/developer/deprecated
deleted file mode 100644
index 5790c7a..0000000
--- a/profiles/default/linux/ia64/10.0/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/ia64/13.0/developer
diff --git a/profiles/default/linux/ia64/10.0/developer/eapi b/profiles/default/linux/ia64/10.0/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/ia64/10.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/ia64/10.0/developer/parent b/profiles/default/linux/ia64/10.0/developer/parent
deleted file mode 100644
index 4c89374..0000000
--- a/profiles/default/linux/ia64/10.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/ia64/10.0/eapi b/profiles/default/linux/ia64/10.0/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/ia64/10.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/ia64/10.0/parent b/profiles/default/linux/ia64/10.0/parent
deleted file mode 100644
index 605d043..0000000
--- a/profiles/default/linux/ia64/10.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/10.0
diff --git a/profiles/default/linux/ia64/10.0/server/deprecated b/profiles/default/linux/ia64/10.0/server/deprecated
deleted file mode 100644
index 40f7b21..0000000
--- a/profiles/default/linux/ia64/10.0/server/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/ia64/13.0
diff --git a/profiles/default/linux/ia64/10.0/server/eapi b/profiles/default/linux/ia64/10.0/server/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/ia64/10.0/server/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/ia64/10.0/server/parent b/profiles/default/linux/ia64/10.0/server/parent
deleted file mode 100644
index c399016..0000000
--- a/profiles/default/linux/ia64/10.0/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/server
diff --git a/profiles/default/linux/ia64/10.0/use.mask b/profiles/default/linux/ia64/10.0/use.mask
deleted file mode 100644
index 795d4aa..0000000
--- a/profiles/default/linux/ia64/10.0/use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Anthony G. Basile <blueness@gentoo.org> (15 Apr 2012)
-# Pulls in net-libs/axtls or net-libs/polarssl which are
-# not keyworded for arch
-curl_ssl_axtls
-curl_ssl_cyassl
-curl_ssl_polarssl
diff --git a/profiles/default/linux/ia64/13.0/desktop/eapi b/profiles/default/linux/ia64/13.0/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/ia64/13.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/ia64/13.0/desktop/gnome/eapi b/profiles/default/linux/ia64/13.0/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/ia64/13.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/ia64/13.0/desktop/gnome/parent b/profiles/default/linux/ia64/13.0/desktop/gnome/parent
deleted file mode 100644
index 6589a0e..0000000
--- a/profiles/default/linux/ia64/13.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/ia64/13.0/desktop/kde/eapi b/profiles/default/linux/ia64/13.0/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/ia64/13.0/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/ia64/13.0/desktop/kde/parent b/profiles/default/linux/ia64/13.0/desktop/kde/parent
deleted file mode 100644
index b4d42bb..0000000
--- a/profiles/default/linux/ia64/13.0/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/ia64/13.0/desktop/parent b/profiles/default/linux/ia64/13.0/desktop/parent
deleted file mode 100644
index ad6c5e1..0000000
--- a/profiles/default/linux/ia64/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/ia64/13.0/developer/eapi b/profiles/default/linux/ia64/13.0/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/ia64/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/ia64/13.0/developer/parent b/profiles/default/linux/ia64/13.0/developer/parent
deleted file mode 100644
index 4c89374..0000000
--- a/profiles/default/linux/ia64/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/ia64/13.0/eapi b/profiles/default/linux/ia64/13.0/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/ia64/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/ia64/13.0/parent b/profiles/default/linux/ia64/13.0/parent
deleted file mode 100644
index 7c03775..0000000
--- a/profiles/default/linux/ia64/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/13.0
diff --git a/profiles/default/linux/ia64/13.0/use.mask b/profiles/default/linux/ia64/13.0/use.mask
deleted file mode 100644
index 795d4aa..0000000
--- a/profiles/default/linux/ia64/13.0/use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Anthony G. Basile <blueness@gentoo.org> (15 Apr 2012)
-# Pulls in net-libs/axtls or net-libs/polarssl which are
-# not keyworded for arch
-curl_ssl_axtls
-curl_ssl_cyassl
-curl_ssl_polarssl
diff --git a/profiles/default/linux/ia64/parent b/profiles/default/linux/ia64/parent
deleted file mode 100644
index 10d6c4b..0000000
--- a/profiles/default/linux/ia64/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../base
-..
-../../../arch/ia64
diff --git a/profiles/default/linux/m68k/10.0/deprecated b/profiles/default/linux/m68k/10.0/deprecated
deleted file mode 100644
index 95d48a5..0000000
--- a/profiles/default/linux/m68k/10.0/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/m68k/13.0
diff --git a/profiles/default/linux/m68k/10.0/desktop/deprecated b/profiles/default/linux/m68k/10.0/desktop/deprecated
deleted file mode 100644
index 35cb81c..0000000
--- a/profiles/default/linux/m68k/10.0/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/m68k/13.0/desktop
diff --git a/profiles/default/linux/m68k/10.0/desktop/eapi b/profiles/default/linux/m68k/10.0/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/m68k/10.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/m68k/10.0/desktop/gnome/deprecated b/profiles/default/linux/m68k/10.0/desktop/gnome/deprecated
deleted file mode 100644
index 3ad6843..0000000
--- a/profiles/default/linux/m68k/10.0/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/m68k/13.0/desktop/gnome
diff --git a/profiles/default/linux/m68k/10.0/desktop/gnome/eapi b/profiles/default/linux/m68k/10.0/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/m68k/10.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/m68k/10.0/desktop/gnome/parent b/profiles/default/linux/m68k/10.0/desktop/gnome/parent
deleted file mode 100644
index 6589a0e..0000000
--- a/profiles/default/linux/m68k/10.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/m68k/10.0/desktop/kde/deprecated b/profiles/default/linux/m68k/10.0/desktop/kde/deprecated
deleted file mode 100644
index a52eba0..0000000
--- a/profiles/default/linux/m68k/10.0/desktop/kde/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/m68k/13.0/desktop/kde
diff --git a/profiles/default/linux/m68k/10.0/desktop/kde/eapi b/profiles/default/linux/m68k/10.0/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/m68k/10.0/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/m68k/10.0/desktop/kde/parent b/profiles/default/linux/m68k/10.0/desktop/kde/parent
deleted file mode 100644
index b4d42bb..0000000
--- a/profiles/default/linux/m68k/10.0/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/m68k/10.0/desktop/parent b/profiles/default/linux/m68k/10.0/desktop/parent
deleted file mode 100644
index ad6c5e1..0000000
--- a/profiles/default/linux/m68k/10.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/m68k/10.0/developer/deprecated b/profiles/default/linux/m68k/10.0/developer/deprecated
deleted file mode 100644
index bd58599..0000000
--- a/profiles/default/linux/m68k/10.0/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/m68k/13.0/developer
diff --git a/profiles/default/linux/m68k/10.0/developer/eapi b/profiles/default/linux/m68k/10.0/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/m68k/10.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/m68k/10.0/developer/parent b/profiles/default/linux/m68k/10.0/developer/parent
deleted file mode 100644
index 4c89374..0000000
--- a/profiles/default/linux/m68k/10.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/m68k/10.0/eapi b/profiles/default/linux/m68k/10.0/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/m68k/10.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/m68k/10.0/parent b/profiles/default/linux/m68k/10.0/parent
deleted file mode 100644
index 605d043..0000000
--- a/profiles/default/linux/m68k/10.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/10.0
diff --git a/profiles/default/linux/m68k/10.0/server/deprecated b/profiles/default/linux/m68k/10.0/server/deprecated
deleted file mode 100644
index 95d48a5..0000000
--- a/profiles/default/linux/m68k/10.0/server/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/m68k/13.0
diff --git a/profiles/default/linux/m68k/10.0/server/eapi b/profiles/default/linux/m68k/10.0/server/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/m68k/10.0/server/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/m68k/10.0/server/parent b/profiles/default/linux/m68k/10.0/server/parent
deleted file mode 100644
index c399016..0000000
--- a/profiles/default/linux/m68k/10.0/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/server
diff --git a/profiles/default/linux/m68k/13.0/desktop/eapi b/profiles/default/linux/m68k/13.0/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/m68k/13.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/m68k/13.0/desktop/gnome/eapi b/profiles/default/linux/m68k/13.0/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/m68k/13.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/m68k/13.0/desktop/gnome/parent b/profiles/default/linux/m68k/13.0/desktop/gnome/parent
deleted file mode 100644
index 6589a0e..0000000
--- a/profiles/default/linux/m68k/13.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/m68k/13.0/desktop/kde/eapi b/profiles/default/linux/m68k/13.0/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/m68k/13.0/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/m68k/13.0/desktop/kde/parent b/profiles/default/linux/m68k/13.0/desktop/kde/parent
deleted file mode 100644
index b4d42bb..0000000
--- a/profiles/default/linux/m68k/13.0/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/m68k/13.0/desktop/parent b/profiles/default/linux/m68k/13.0/desktop/parent
deleted file mode 100644
index ad6c5e1..0000000
--- a/profiles/default/linux/m68k/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/m68k/13.0/developer/eapi b/profiles/default/linux/m68k/13.0/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/m68k/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/m68k/13.0/developer/parent b/profiles/default/linux/m68k/13.0/developer/parent
deleted file mode 100644
index 4c89374..0000000
--- a/profiles/default/linux/m68k/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/m68k/13.0/eapi b/profiles/default/linux/m68k/13.0/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/m68k/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/m68k/13.0/parent b/profiles/default/linux/m68k/13.0/parent
deleted file mode 100644
index 7c03775..0000000
--- a/profiles/default/linux/m68k/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/13.0
diff --git a/profiles/default/linux/m68k/parent b/profiles/default/linux/m68k/parent
deleted file mode 100644
index 8514412..0000000
--- a/profiles/default/linux/m68k/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../base
-..
-../../../arch/m68k
diff --git a/profiles/default/linux/make.defaults b/profiles/default/linux/make.defaults
deleted file mode 100644
index 676b097..0000000
--- a/profiles/default/linux/make.defaults
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/make.defaults,v 1.19 2013/01/21 09:26:05 dilfridge Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
-#
-# Please avoid enabling things by default in here if possible. Understand any 
-# implications with core packages.  For example, if "java" is in USE and db 
-# has a conditional dependency on java (which it does,) then a JDK will be 
-# pulled in during *emerge system*!
-
-
-# Default starting set of USE flags for all default/linux profiles.
-USE="berkdb crypt ipv6 ncurses nls pam readline ssl tcpd zlib"
-
-# make sure toolchain has sane defaults <tooclhain@gentoo.org>
-USE="${USE} mudflap fortran openmp"
-
-# 2010/10/21 - Ole Markus With <olemarkus@gentoo.org>
-# These USE flags were originally inserted here because of PHP
-# and were later removed by me. Reinserting the USE flags again because they are
-# global USE flags that may be expected to be set by other packages.
-USE="${USE} cli pcre session"
-
-# 2006/03/07 - Donnie Berkholz <dberkholz@gentoo.org>
-# Modular X: Support direct rendering by default
-# 2013/01/21 - Andreas K. Huettel <dilfridge@gentoo.org>
-# Re-added following discussion with chithead
-USE="${USE} dri"
-
-# 2006/10/28 - Luca Barbato <lu_zero@gentoo.org>
-# on glibc system you cannot turn it off
-USE="${USE} iconv"
-
-# 2006/06/30 - Donnie Berkholz <dberkholz@gentoo.org>
-# Sane defaults for input drivers
-INPUT_DEVICES="keyboard mouse evdev"
-
-# 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
-# Lowest common denominator defaults for video drivers,
-# except hppa, which lacks v4l so removes it in the hppa profile
-VIDEO_CARDS="dummy fbdev v4l"
-
-# 2008/07/09 - Doug Goldstein <cardoe@gentoo.org>
-# Adding LDFLAGS="-Wl,-O1 for all Linux profiles by default
-# after discussion on the gentoo-dev ML. As we bang out a clear
-# direction with how LDFLAGS will be set by default, this entry
-# may move.
-# 2010/07/12 - Samuli Suominen <ssuominen@gentoo.org>
-# Note that adding LDFLAGS="-Wl,-O1 ${LDFLAGS}" breaks dev-util/boost-build
-# because of whitespace.
-LDFLAGS="-Wl,-O1 -Wl,--as-needed"
-
-# 2009/09/21 Robin H. Johnson <robbat2@gentoo.org>
-# http://archives.gentoo.org/gentoo-dev/msg_dc705dc2c1a45e18a85aa62e8fb17009.xml
-# Build kernel modules from linux-mod by default:
-USE="${USE} modules"
diff --git a/profiles/default/linux/mips/10.0/deprecated b/profiles/default/linux/mips/10.0/deprecated
deleted file mode 100644
index 3bf431c..0000000
--- a/profiles/default/linux/mips/10.0/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0
diff --git a/profiles/default/linux/mips/10.0/desktop/eapi b/profiles/default/linux/mips/10.0/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/mips/10.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/mips/10.0/desktop/parent b/profiles/default/linux/mips/10.0/desktop/parent
deleted file mode 100644
index ad6c5e1..0000000
--- a/profiles/default/linux/mips/10.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/mips/10.0/developer/eapi b/profiles/default/linux/mips/10.0/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/mips/10.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/mips/10.0/developer/parent b/profiles/default/linux/mips/10.0/developer/parent
deleted file mode 100644
index 4c89374..0000000
--- a/profiles/default/linux/mips/10.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/mips/10.0/eapi b/profiles/default/linux/mips/10.0/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/mips/10.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/mips/10.0/mipsel/deprecated b/profiles/default/linux/mips/10.0/mipsel/deprecated
deleted file mode 100644
index c64e1ec..0000000
--- a/profiles/default/linux/mips/10.0/mipsel/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/mipsel
diff --git a/profiles/default/linux/mips/10.0/mipsel/desktop/parent b/profiles/default/linux/mips/10.0/mipsel/desktop/parent
deleted file mode 100644
index db8ce08..0000000
--- a/profiles/default/linux/mips/10.0/mipsel/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/mips/10.0/mipsel/developer/parent b/profiles/default/linux/mips/10.0/mipsel/developer/parent
deleted file mode 100644
index 5c8258a..0000000
--- a/profiles/default/linux/mips/10.0/mipsel/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/mips/10.0/mipsel/multilib/deprecated b/profiles/default/linux/mips/10.0/mipsel/multilib/deprecated
deleted file mode 100644
index 5720139..0000000
--- a/profiles/default/linux/mips/10.0/mipsel/multilib/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/mipsel/multilib
diff --git a/profiles/default/linux/mips/10.0/mipsel/multilib/n32/deprecated b/profiles/default/linux/mips/10.0/mipsel/multilib/n32/deprecated
deleted file mode 100644
index 671dcba..0000000
--- a/profiles/default/linux/mips/10.0/mipsel/multilib/n32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/mipsel/multilib/n32
diff --git a/profiles/default/linux/mips/10.0/mipsel/multilib/n32/parent b/profiles/default/linux/mips/10.0/mipsel/multilib/n32/parent
deleted file mode 100644
index b2a2317..0000000
--- a/profiles/default/linux/mips/10.0/mipsel/multilib/n32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../..
-../../../../../../../arch/mips/mipsel/mips64el/multilib/n32
diff --git a/profiles/default/linux/mips/10.0/mipsel/multilib/n64/deprecated b/profiles/default/linux/mips/10.0/mipsel/multilib/n64/deprecated
deleted file mode 100644
index 5a01e78..0000000
--- a/profiles/default/linux/mips/10.0/mipsel/multilib/n64/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/mipsel/multilib/n64
diff --git a/profiles/default/linux/mips/10.0/mipsel/multilib/n64/parent b/profiles/default/linux/mips/10.0/mipsel/multilib/n64/parent
deleted file mode 100644
index d74eb45..0000000
--- a/profiles/default/linux/mips/10.0/mipsel/multilib/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../..
-../../../../../../../arch/mips/mipsel/mips64el/multilib/n64
diff --git a/profiles/default/linux/mips/10.0/mipsel/multilib/parent b/profiles/default/linux/mips/10.0/mipsel/multilib/parent
deleted file mode 100644
index 5d7957a..0000000
--- a/profiles/default/linux/mips/10.0/mipsel/multilib/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/mips/mipsel/mips64el/multilib
diff --git a/profiles/default/linux/mips/10.0/mipsel/n32/deprecated b/profiles/default/linux/mips/10.0/mipsel/n32/deprecated
deleted file mode 100644
index c5d3623..0000000
--- a/profiles/default/linux/mips/10.0/mipsel/n32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/mipsel/n32
diff --git a/profiles/default/linux/mips/10.0/mipsel/n32/desktop/parent b/profiles/default/linux/mips/10.0/mipsel/n32/desktop/parent
deleted file mode 100644
index fae96e8..0000000
--- a/profiles/default/linux/mips/10.0/mipsel/n32/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop
diff --git a/profiles/default/linux/mips/10.0/mipsel/n32/developer/parent b/profiles/default/linux/mips/10.0/mipsel/n32/developer/parent
deleted file mode 100644
index 4bb06e4..0000000
--- a/profiles/default/linux/mips/10.0/mipsel/n32/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/developer
diff --git a/profiles/default/linux/mips/10.0/mipsel/n32/parent b/profiles/default/linux/mips/10.0/mipsel/n32/parent
deleted file mode 100644
index 58de0a9..0000000
--- a/profiles/default/linux/mips/10.0/mipsel/n32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/mips/mipsel/mips64el/n32
diff --git a/profiles/default/linux/mips/10.0/mipsel/n32/server/parent b/profiles/default/linux/mips/10.0/mipsel/n32/server/parent
deleted file mode 100644
index 8c11cb5..0000000
--- a/profiles/default/linux/mips/10.0/mipsel/n32/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/server
diff --git a/profiles/default/linux/mips/10.0/mipsel/n64/deprecated b/profiles/default/linux/mips/10.0/mipsel/n64/deprecated
deleted file mode 100644
index 208814e..0000000
--- a/profiles/default/linux/mips/10.0/mipsel/n64/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/mipsel/n64
diff --git a/profiles/default/linux/mips/10.0/mipsel/n64/desktop/parent b/profiles/default/linux/mips/10.0/mipsel/n64/desktop/parent
deleted file mode 100644
index fae96e8..0000000
--- a/profiles/default/linux/mips/10.0/mipsel/n64/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop
diff --git a/profiles/default/linux/mips/10.0/mipsel/n64/developer/parent b/profiles/default/linux/mips/10.0/mipsel/n64/developer/parent
deleted file mode 100644
index 4bb06e4..0000000
--- a/profiles/default/linux/mips/10.0/mipsel/n64/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/developer
diff --git a/profiles/default/linux/mips/10.0/mipsel/n64/parent b/profiles/default/linux/mips/10.0/mipsel/n64/parent
deleted file mode 100644
index ef8c3e9..0000000
--- a/profiles/default/linux/mips/10.0/mipsel/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/mips/mipsel/mips64el/n64
diff --git a/profiles/default/linux/mips/10.0/mipsel/n64/server/parent b/profiles/default/linux/mips/10.0/mipsel/n64/server/parent
deleted file mode 100644
index 8c11cb5..0000000
--- a/profiles/default/linux/mips/10.0/mipsel/n64/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/server
diff --git a/profiles/default/linux/mips/10.0/mipsel/parent b/profiles/default/linux/mips/10.0/mipsel/parent
deleted file mode 100644
index 1adf6c9..0000000
--- a/profiles/default/linux/mips/10.0/mipsel/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/mips/mipsel/
diff --git a/profiles/default/linux/mips/10.0/mipsel/server/parent b/profiles/default/linux/mips/10.0/mipsel/server/parent
deleted file mode 100644
index 2e085a6..0000000
--- a/profiles/default/linux/mips/10.0/mipsel/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/server
diff --git a/profiles/default/linux/mips/10.0/multilib/deprecated b/profiles/default/linux/mips/10.0/multilib/deprecated
deleted file mode 100644
index 523aa41..0000000
--- a/profiles/default/linux/mips/10.0/multilib/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/multilib
diff --git a/profiles/default/linux/mips/10.0/multilib/n32/deprecated b/profiles/default/linux/mips/10.0/multilib/n32/deprecated
deleted file mode 100644
index 57b2c0b..0000000
--- a/profiles/default/linux/mips/10.0/multilib/n32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/multilib/n32
diff --git a/profiles/default/linux/mips/10.0/multilib/n32/parent b/profiles/default/linux/mips/10.0/multilib/n32/parent
deleted file mode 100644
index c48bd88..0000000
--- a/profiles/default/linux/mips/10.0/multilib/n32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../..
-../../../../../../arch/mips/mips64/multilib/n32
diff --git a/profiles/default/linux/mips/10.0/multilib/n64/deprecated b/profiles/default/linux/mips/10.0/multilib/n64/deprecated
deleted file mode 100644
index 261ef04..0000000
--- a/profiles/default/linux/mips/10.0/multilib/n64/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/multilib/n64
diff --git a/profiles/default/linux/mips/10.0/multilib/n64/parent b/profiles/default/linux/mips/10.0/multilib/n64/parent
deleted file mode 100644
index c77705f..0000000
--- a/profiles/default/linux/mips/10.0/multilib/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../..
-../../../../../../arch/mips/mips64/multilib/n64
diff --git a/profiles/default/linux/mips/10.0/multilib/parent b/profiles/default/linux/mips/10.0/multilib/parent
deleted file mode 100644
index 107ec55..0000000
--- a/profiles/default/linux/mips/10.0/multilib/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/mips/mips64/multilib
diff --git a/profiles/default/linux/mips/10.0/n32/deprecated b/profiles/default/linux/mips/10.0/n32/deprecated
deleted file mode 100644
index f2e1752..0000000
--- a/profiles/default/linux/mips/10.0/n32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/n32
diff --git a/profiles/default/linux/mips/10.0/n32/desktop/parent b/profiles/default/linux/mips/10.0/n32/desktop/parent
deleted file mode 100644
index db8ce08..0000000
--- a/profiles/default/linux/mips/10.0/n32/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/mips/10.0/n32/developer/parent b/profiles/default/linux/mips/10.0/n32/developer/parent
deleted file mode 100644
index 5c8258a..0000000
--- a/profiles/default/linux/mips/10.0/n32/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/mips/10.0/n32/parent b/profiles/default/linux/mips/10.0/n32/parent
deleted file mode 100644
index ae0dc93..0000000
--- a/profiles/default/linux/mips/10.0/n32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/mips/mips64/n32
diff --git a/profiles/default/linux/mips/10.0/n32/server/parent b/profiles/default/linux/mips/10.0/n32/server/parent
deleted file mode 100644
index 2e085a6..0000000
--- a/profiles/default/linux/mips/10.0/n32/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/server
diff --git a/profiles/default/linux/mips/10.0/n64/deprecated b/profiles/default/linux/mips/10.0/n64/deprecated
deleted file mode 100644
index cc12a87..0000000
--- a/profiles/default/linux/mips/10.0/n64/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/n64
diff --git a/profiles/default/linux/mips/10.0/n64/desktop/parent b/profiles/default/linux/mips/10.0/n64/desktop/parent
deleted file mode 100644
index db8ce08..0000000
--- a/profiles/default/linux/mips/10.0/n64/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/mips/10.0/n64/developer/parent b/profiles/default/linux/mips/10.0/n64/developer/parent
deleted file mode 100644
index 5c8258a..0000000
--- a/profiles/default/linux/mips/10.0/n64/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/mips/10.0/n64/parent b/profiles/default/linux/mips/10.0/n64/parent
deleted file mode 100644
index 8011027..0000000
--- a/profiles/default/linux/mips/10.0/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/mips/mips64/n64
diff --git a/profiles/default/linux/mips/10.0/n64/server/parent b/profiles/default/linux/mips/10.0/n64/server/parent
deleted file mode 100644
index 2e085a6..0000000
--- a/profiles/default/linux/mips/10.0/n64/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/server
diff --git a/profiles/default/linux/mips/10.0/parent b/profiles/default/linux/mips/10.0/parent
deleted file mode 100644
index 605d043..0000000
--- a/profiles/default/linux/mips/10.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/10.0
diff --git a/profiles/default/linux/mips/10.0/server/eapi b/profiles/default/linux/mips/10.0/server/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/mips/10.0/server/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/mips/10.0/server/parent b/profiles/default/linux/mips/10.0/server/parent
deleted file mode 100644
index c399016..0000000
--- a/profiles/default/linux/mips/10.0/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/server
diff --git a/profiles/default/linux/mips/13.0/desktop/eapi b/profiles/default/linux/mips/13.0/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/mips/13.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/mips/13.0/desktop/parent b/profiles/default/linux/mips/13.0/desktop/parent
deleted file mode 100644
index ad6c5e1..0000000
--- a/profiles/default/linux/mips/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/mips/13.0/developer/eapi b/profiles/default/linux/mips/13.0/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/mips/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/mips/13.0/developer/parent b/profiles/default/linux/mips/13.0/developer/parent
deleted file mode 100644
index 4c89374..0000000
--- a/profiles/default/linux/mips/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/mips/13.0/eapi b/profiles/default/linux/mips/13.0/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/mips/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/mips/13.0/mipsel/desktop/parent b/profiles/default/linux/mips/13.0/mipsel/desktop/parent
deleted file mode 100644
index db8ce08..0000000
--- a/profiles/default/linux/mips/13.0/mipsel/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/mips/13.0/mipsel/developer/parent b/profiles/default/linux/mips/13.0/mipsel/developer/parent
deleted file mode 100644
index 5c8258a..0000000
--- a/profiles/default/linux/mips/13.0/mipsel/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/mips/13.0/mipsel/multilib/n32/parent b/profiles/default/linux/mips/13.0/mipsel/multilib/n32/parent
deleted file mode 100644
index b2a2317..0000000
--- a/profiles/default/linux/mips/13.0/mipsel/multilib/n32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../..
-../../../../../../../arch/mips/mipsel/mips64el/multilib/n32
diff --git a/profiles/default/linux/mips/13.0/mipsel/multilib/n64/parent b/profiles/default/linux/mips/13.0/mipsel/multilib/n64/parent
deleted file mode 100644
index d74eb45..0000000
--- a/profiles/default/linux/mips/13.0/mipsel/multilib/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../..
-../../../../../../../arch/mips/mipsel/mips64el/multilib/n64
diff --git a/profiles/default/linux/mips/13.0/mipsel/multilib/parent b/profiles/default/linux/mips/13.0/mipsel/multilib/parent
deleted file mode 100644
index 5d7957a..0000000
--- a/profiles/default/linux/mips/13.0/mipsel/multilib/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/mips/mipsel/mips64el/multilib
diff --git a/profiles/default/linux/mips/13.0/mipsel/n32/desktop/parent b/profiles/default/linux/mips/13.0/mipsel/n32/desktop/parent
deleted file mode 100644
index fae96e8..0000000
--- a/profiles/default/linux/mips/13.0/mipsel/n32/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop
diff --git a/profiles/default/linux/mips/13.0/mipsel/n32/developer/parent b/profiles/default/linux/mips/13.0/mipsel/n32/developer/parent
deleted file mode 100644
index 4bb06e4..0000000
--- a/profiles/default/linux/mips/13.0/mipsel/n32/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/developer
diff --git a/profiles/default/linux/mips/13.0/mipsel/n32/parent b/profiles/default/linux/mips/13.0/mipsel/n32/parent
deleted file mode 100644
index 58de0a9..0000000
--- a/profiles/default/linux/mips/13.0/mipsel/n32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/mips/mipsel/mips64el/n32
diff --git a/profiles/default/linux/mips/13.0/mipsel/n64/desktop/parent b/profiles/default/linux/mips/13.0/mipsel/n64/desktop/parent
deleted file mode 100644
index fae96e8..0000000
--- a/profiles/default/linux/mips/13.0/mipsel/n64/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop
diff --git a/profiles/default/linux/mips/13.0/mipsel/n64/developer/parent b/profiles/default/linux/mips/13.0/mipsel/n64/developer/parent
deleted file mode 100644
index 4bb06e4..0000000
--- a/profiles/default/linux/mips/13.0/mipsel/n64/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/developer
diff --git a/profiles/default/linux/mips/13.0/mipsel/n64/parent b/profiles/default/linux/mips/13.0/mipsel/n64/parent
deleted file mode 100644
index ef8c3e9..0000000
--- a/profiles/default/linux/mips/13.0/mipsel/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/mips/mipsel/mips64el/n64
diff --git a/profiles/default/linux/mips/13.0/mipsel/parent b/profiles/default/linux/mips/13.0/mipsel/parent
deleted file mode 100644
index 1adf6c9..0000000
--- a/profiles/default/linux/mips/13.0/mipsel/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/mips/mipsel/
diff --git a/profiles/default/linux/mips/13.0/multilib/n32/parent b/profiles/default/linux/mips/13.0/multilib/n32/parent
deleted file mode 100644
index c48bd88..0000000
--- a/profiles/default/linux/mips/13.0/multilib/n32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../..
-../../../../../../arch/mips/mips64/multilib/n32
diff --git a/profiles/default/linux/mips/13.0/multilib/n64/parent b/profiles/default/linux/mips/13.0/multilib/n64/parent
deleted file mode 100644
index c77705f..0000000
--- a/profiles/default/linux/mips/13.0/multilib/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../..
-../../../../../../arch/mips/mips64/multilib/n64
diff --git a/profiles/default/linux/mips/13.0/multilib/parent b/profiles/default/linux/mips/13.0/multilib/parent
deleted file mode 100644
index 107ec55..0000000
--- a/profiles/default/linux/mips/13.0/multilib/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/mips/mips64/multilib
diff --git a/profiles/default/linux/mips/13.0/n32/desktop/parent b/profiles/default/linux/mips/13.0/n32/desktop/parent
deleted file mode 100644
index db8ce08..0000000
--- a/profiles/default/linux/mips/13.0/n32/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/mips/13.0/n32/developer/parent b/profiles/default/linux/mips/13.0/n32/developer/parent
deleted file mode 100644
index 5c8258a..0000000
--- a/profiles/default/linux/mips/13.0/n32/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/mips/13.0/n32/parent b/profiles/default/linux/mips/13.0/n32/parent
deleted file mode 100644
index ae0dc93..0000000
--- a/profiles/default/linux/mips/13.0/n32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/mips/mips64/n32
diff --git a/profiles/default/linux/mips/13.0/n64/desktop/parent b/profiles/default/linux/mips/13.0/n64/desktop/parent
deleted file mode 100644
index db8ce08..0000000
--- a/profiles/default/linux/mips/13.0/n64/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/mips/13.0/n64/developer/parent b/profiles/default/linux/mips/13.0/n64/developer/parent
deleted file mode 100644
index 5c8258a..0000000
--- a/profiles/default/linux/mips/13.0/n64/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/mips/13.0/n64/parent b/profiles/default/linux/mips/13.0/n64/parent
deleted file mode 100644
index 8011027..0000000
--- a/profiles/default/linux/mips/13.0/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/mips/mips64/n64
diff --git a/profiles/default/linux/mips/13.0/parent b/profiles/default/linux/mips/13.0/parent
deleted file mode 100644
index 7c03775..0000000
--- a/profiles/default/linux/mips/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/13.0
diff --git a/profiles/default/linux/mips/parent b/profiles/default/linux/mips/parent
deleted file mode 100644
index 2f30ebb..0000000
--- a/profiles/default/linux/mips/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../base
-..
-../../../arch/mips
diff --git a/profiles/default/linux/package.use b/profiles/default/linux/package.use
deleted file mode 100644
index fd09979..0000000
--- a/profiles/default/linux/package.use
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/package.use,v 1.1 2011/02/13 17:50:16 arfrever Exp $
-
-# Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> (13 Feb 2011)
-# Disable deprecated bsddb module of Python 2 by default.
-=dev-lang/python-2* -berkdb
diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask
deleted file mode 100644
index 5573404..0000000
--- a/profiles/default/linux/package.use.mask
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/package.use.mask,v 1.44 2013/11/10 20:43:20 hwoarang Exp $
-
-# Markos Chandras <hwoarang@gentoo.org> (10 Nov 2013)
-# Does not build with polarssl in the tree.
-# see eg 9e36f0475f011912ee0897aa6487d7b9c190600e
-# in polarssl upstream.
-# The polarssl use flag may go away if the rtmpdump
-# upstream will not fix this problem soon
-media-video/rtmpdump polarssl
-
-# Anthony G. Basile <blueness@gentoo.org> (10 Aug 2013)
-# mask php and mono bindings pending more testing
-=dev-libs/xapian-bindings-1.3.1 php mono
-
-# Pacho Ramos (02 Apr 2013)
-# brasero-3.4 was removed.
-=media-sound/rhythmbox-2.97 cdr
-
-# Diego Elio Pettenò (27 Aug 2012)
-# The libpci access is only used for linux.
-net-analyzer/net-snmp -pci
-
-# Richard Yao <ryao@gentoo.org> (22 August 2012)
-# USE=kernel-builtin is dangerous. Only those that know what they are doing
-# should use it until documentation improves.
-sys-fs/zfs kernel-builtin
-
-# Diego Elio Pettenò (20 Aug 2012)
-# The prevent-removal USE flag is only implemented for Linux.
-sys-auth/pam_mktemp -prevent-removal
-
-sys-devel/gcc hardened
-sys-libs/glibc hardened
-
-# Anthony G. Basile <blueness@gentoo.org> (23 Jul 2012)
-# USE=system-libs is potentially unreliable and insecure
-# Bug #426798
-app-backup/spideroak-bin system-libs
-
-# Samuli Suominen <ssuominen@gentoo.org> (30 Apr 2012)
-# This is replaced by native CONFIG_INOTIFY_USER support wrt #413403
-=dev-libs/glib-2* fam
-
-# Samuli Suominen <ssuominen@gentoo.org (20 Mar 2012)
-# This is masked in base/package.use.mask as Linux only.
-sys-auth/consolekit -acl
-
-# Samuli Suominen <ssuominen@gentoo.org> (10 Jan 2012)
-# Masked in base/package.use.mask as Linux -only feature
-app-arch/libarchive -e2fsprogs
-
-# Diego E. Pettenò <flameeyes@gentoo.org> (20 Aug 2009)
-#
-# Mask oss USE flag for PulseAudio; it's present for compatibility
-# with FreeBSD and other operating systems that have no better
-# interfaces, but people would probably abuse it with Linux as well.
-#
-# Older versions also had an OSS compatibility wrapper on that USE so
-# they are excluded.
->=media-sound/pulseaudio-0.9.16_rc5 oss
-
-# Diego E. Pettenò <flameeyes@gentoo.org> (9 Mar 2011)
-#
-# Mask usb USE flag for newest PCSC-Lite, since on Linux we want to
-# use libudev instead.
->=sys-apps/pcsc-lite-1.7.0 usb
-
-# Diego E. Pettenò <flameeyes@gentoo.org> (27 Mar 2011)
-#
-# Unmask pdnsd's Linux-specific USE flags.
-net-dns/pdnsd -isdn -urandom
diff --git a/profiles/default/linux/packages b/profiles/default/linux/packages
deleted file mode 100644
index 5b35ef5..0000000
--- a/profiles/default/linux/packages
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2004 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/packages,v 1.2 2011/11/14 17:12:55 vapier Exp $
-
-# This file extends the base packages file for the default profile that all
-# architectures will enjoy.  Please note that default is what most architectures
-# will have.  Some will have an selinux profile (see ${PORTDIR}/profiles/selinux).
-# The idea is to only create a new family of profiles when absolutely necessary.
-
-*sys-apps/busybox
-*sys-apps/man-pages
-*sys-apps/net-tools
-*sys-apps/util-linux
diff --git a/profiles/default/linux/packages.build b/profiles/default/linux/packages.build
deleted file mode 100644
index 98353c0..0000000
--- a/profiles/default/linux/packages.build
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/packages.build,v 1.12 2013/07/30 00:27:07 mattst88 Exp $
-
-# This file describes the packages needed to build a stage1 based on this
-# profile.  Packages in this file are built in order.
-
-# While shadow could be in here, it breaks stage 1 and stage 2 building for the
-# releases.  PLEASE DO NOT ENABLE THIS UNLESS YOU HAVE THOROUGHLY TESTED IT!
-
-app-arch/bzip2
-app-arch/gzip
-app-arch/xz-utils
-app-arch/tar
-app-shells/bash
-net-misc/rsync
-net-misc/wget
-sys-devel/autoconf
-sys-devel/automake
-sys-devel/libtool
-sys-apps/baselayout
-sys-apps/makedev
-sys-apps/coreutils
-sys-apps/diffutils
-sys-apps/file
-sys-apps/findutils
-sys-apps/gawk
-sys-apps/grep
-sys-apps/less
-sys-apps/net-tools
-sys-apps/sed
-sys-devel/binutils
-sys-devel/bison
-sys-devel/flex
-sys-devel/gcc
-sys-devel/gettext
-sys-devel/gnuconfig
-sys-devel/make
-sys-devel/patch
-virtual/editor
-virtual/libc
-virtual/os-headers
-virtual/package-manager
-virtual/udev
-virtual/shadow
-
-# This was added too soon.
-# The new udev version needs to stabled first
-#sys-apps/kmod
diff --git a/profiles/default/linux/powerpc/parent b/profiles/default/linux/powerpc/parent
deleted file mode 100644
index 728caca..0000000
--- a/profiles/default/linux/powerpc/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../base
-..
-../../../arch/powerpc
diff --git a/profiles/default/linux/powerpc/ppc32/10.0/deprecated b/profiles/default/linux/powerpc/ppc32/10.0/deprecated
deleted file mode 100644
index 9eda18c..0000000
--- a/profiles/default/linux/powerpc/ppc32/10.0/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc32/13.0
diff --git a/profiles/default/linux/powerpc/ppc32/10.0/desktop/deprecated b/profiles/default/linux/powerpc/ppc32/10.0/desktop/deprecated
deleted file mode 100644
index ccbc063..0000000
--- a/profiles/default/linux/powerpc/ppc32/10.0/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc32/13.0/desktop
diff --git a/profiles/default/linux/powerpc/ppc32/10.0/desktop/eapi b/profiles/default/linux/powerpc/ppc32/10.0/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc32/10.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc32/10.0/desktop/gnome/deprecated b/profiles/default/linux/powerpc/ppc32/10.0/desktop/gnome/deprecated
deleted file mode 100644
index 7fca6d4..0000000
--- a/profiles/default/linux/powerpc/ppc32/10.0/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc32/13.0/desktop/gnome
diff --git a/profiles/default/linux/powerpc/ppc32/10.0/desktop/gnome/eapi b/profiles/default/linux/powerpc/ppc32/10.0/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc32/10.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc32/10.0/desktop/gnome/parent b/profiles/default/linux/powerpc/ppc32/10.0/desktop/gnome/parent
deleted file mode 100644
index 9e06c45..0000000
--- a/profiles/default/linux/powerpc/ppc32/10.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/powerpc/ppc32/10.0/desktop/kde/deprecated b/profiles/default/linux/powerpc/ppc32/10.0/desktop/kde/deprecated
deleted file mode 100644
index 63ee0df..0000000
--- a/profiles/default/linux/powerpc/ppc32/10.0/desktop/kde/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc32/13.0/desktop/kde
diff --git a/profiles/default/linux/powerpc/ppc32/10.0/desktop/kde/eapi b/profiles/default/linux/powerpc/ppc32/10.0/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc32/10.0/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc32/10.0/desktop/kde/parent b/profiles/default/linux/powerpc/ppc32/10.0/desktop/kde/parent
deleted file mode 100644
index f8a0399..0000000
--- a/profiles/default/linux/powerpc/ppc32/10.0/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/powerpc/ppc32/10.0/desktop/parent b/profiles/default/linux/powerpc/ppc32/10.0/desktop/parent
deleted file mode 100644
index db8ce08..0000000
--- a/profiles/default/linux/powerpc/ppc32/10.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/powerpc/ppc32/10.0/developer/deprecated b/profiles/default/linux/powerpc/ppc32/10.0/developer/deprecated
deleted file mode 100644
index 8b79f5e..0000000
--- a/profiles/default/linux/powerpc/ppc32/10.0/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc32/13.0/developer
diff --git a/profiles/default/linux/powerpc/ppc32/10.0/developer/eapi b/profiles/default/linux/powerpc/ppc32/10.0/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc32/10.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc32/10.0/developer/parent b/profiles/default/linux/powerpc/ppc32/10.0/developer/parent
deleted file mode 100644
index 5c8258a..0000000
--- a/profiles/default/linux/powerpc/ppc32/10.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/powerpc/ppc32/10.0/eapi b/profiles/default/linux/powerpc/ppc32/10.0/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc32/10.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc32/10.0/parent b/profiles/default/linux/powerpc/ppc32/10.0/parent
deleted file mode 100644
index 8ae9641..0000000
--- a/profiles/default/linux/powerpc/ppc32/10.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../releases/10.0
diff --git a/profiles/default/linux/powerpc/ppc32/10.0/server/deprecated b/profiles/default/linux/powerpc/ppc32/10.0/server/deprecated
deleted file mode 100644
index 9eda18c..0000000
--- a/profiles/default/linux/powerpc/ppc32/10.0/server/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc32/13.0
diff --git a/profiles/default/linux/powerpc/ppc32/10.0/server/eapi b/profiles/default/linux/powerpc/ppc32/10.0/server/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc32/10.0/server/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc32/10.0/server/parent b/profiles/default/linux/powerpc/ppc32/10.0/server/parent
deleted file mode 100644
index 2e085a6..0000000
--- a/profiles/default/linux/powerpc/ppc32/10.0/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/server
diff --git a/profiles/default/linux/powerpc/ppc32/10.0/server/profile.bashrc b/profiles/default/linux/powerpc/ppc32/10.0/server/profile.bashrc
deleted file mode 100644
index d14972b..0000000
--- a/profiles/default/linux/powerpc/ppc32/10.0/server/profile.bashrc
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/powerpc/ppc32/10.0/server/profile.bashrc,v 1.1 2009/08/06 07:13:02 ssuominen Exp $
-
-if [[ "${EBUILD_PHASE}" == "setup" ]]
-then
-	if [[ ! "${I_KNOW_WHAT_I_AM_DOING}" == "yes" ]]
-	then
-		ewarn "This profile has not been tested thoroughly and is not considered to be"
-		ewarn "a supported server profile at this time.  For a supported server"
-		ewarn "profile, please check the Hardened project (http://hardened.gentoo.org)."
-		echo
-		ewarn "This profile is merely a convenience for people who require a more"
-		ewarn "minimal profile, yet are unable to use hardened due to restrictions in"
-		ewarn "the software being used on the server. This profile should also be used"
-		ewarn "if you require GCC 4.1 or Glibc 2.4 support. If you don't know if this"
-		ewarn "applies to you, then it doesn't and you should probably be using"
-		ewarn "Hardened, instead."
-		echo
-	fi
-fi
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/desktop/eapi b/profiles/default/linux/powerpc/ppc32/13.0/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/eapi b/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/parent b/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/parent
deleted file mode 100644
index 9e06c45..0000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/parent
deleted file mode 100644
index f7739b4..0000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/desktop/kde/eapi b/profiles/default/linux/powerpc/ppc32/13.0/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/desktop/kde/parent b/profiles/default/linux/powerpc/ppc32/13.0/desktop/kde/parent
deleted file mode 100644
index f8a0399..0000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/desktop/kde/systemd/parent b/profiles/default/linux/powerpc/ppc32/13.0/desktop/kde/systemd/parent
deleted file mode 100644
index f7739b4..0000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/desktop/kde/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/desktop/parent b/profiles/default/linux/powerpc/ppc32/13.0/desktop/parent
deleted file mode 100644
index db8ce08..0000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/developer/eapi b/profiles/default/linux/powerpc/ppc32/13.0/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/developer/parent b/profiles/default/linux/powerpc/ppc32/13.0/developer/parent
deleted file mode 100644
index 5c8258a..0000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/eapi b/profiles/default/linux/powerpc/ppc32/13.0/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/parent b/profiles/default/linux/powerpc/ppc32/13.0/parent
deleted file mode 100644
index 697ad58..0000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../releases/13.0
diff --git a/profiles/default/linux/powerpc/ppc32/parent b/profiles/default/linux/powerpc/ppc32/parent
deleted file mode 100644
index dd20c2a..0000000
--- a/profiles/default/linux/powerpc/ppc32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../arch/powerpc/ppc32
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/deprecated b/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/deprecated
deleted file mode 100644
index 7219574..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc64/13.0/32bit-userland
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/deprecated b/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/deprecated
deleted file mode 100644
index 0dedafd..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc64/13.0/32bit-userland/desktop
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/eapi b/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/gnome/deprecated b/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/gnome/deprecated
deleted file mode 100644
index 9819827..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/gnome/eapi b/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/gnome/parent b/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/gnome/parent
deleted file mode 100644
index d5a56a1..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/kde/deprecated b/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/kde/deprecated
deleted file mode 100644
index 4a10b43..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/kde/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/kde
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/kde/eapi b/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/kde/parent b/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/kde/parent
deleted file mode 100644
index dbb1df9..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/parent b/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/parent
deleted file mode 100644
index fae96e8..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/developer/deprecated b/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/developer/deprecated
deleted file mode 100644
index 737a9dd..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc64/13.0/32bit-userland/developer
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/developer/eapi b/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/developer/parent b/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/developer/parent
deleted file mode 100644
index 4bb06e4..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/developer
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/eapi b/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/parent b/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/parent
deleted file mode 100644
index 898d55c..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/powerpc/ppc64/32ul
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/server/deprecated b/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/server/deprecated
deleted file mode 100644
index 7219574..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/server/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc64/13.0/32bit-userland
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/server/eapi b/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/server/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/server/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/server/parent b/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/server/parent
deleted file mode 100644
index 8c11cb5..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/server
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/server/profile.bashrc b/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/server/profile.bashrc
deleted file mode 100644
index ea250ac..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/server/profile.bashrc
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/powerpc/ppc64/10.0/32bit-userland/server/profile.bashrc,v 1.1 2009/08/06 07:19:13 ssuominen Exp $
-
-if [[ "${EBUILD_PHASE}" == "setup" ]]
-then
-	if [[ ! "${I_KNOW_WHAT_I_AM_DOING}" == "yes" ]]
-	then
-		ewarn "This profile has not been tested thoroughly and is not considered to be"
-		ewarn "a supported server profile at this time.  For a supported server"
-		ewarn "profile, please check the Hardened project (http://hardened.gentoo.org)."
-		echo
-		ewarn "This profile is merely a convenience for people who require a more"
-		ewarn "minimal profile, yet are unable to use hardened due to restrictions in"
-		ewarn "the software being used on the server. This profile should also be used"
-		ewarn "if you require GCC 4.1 or Glibc 2.4 support. If you don't know if this"
-		ewarn "applies to you, then it doesn't and you should probably be using"
-		ewarn "Hardened, instead."
-		echo
-	fi
-fi
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/deprecated b/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/deprecated
deleted file mode 100644
index f42afce..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc64/13.0/64bit-userland
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/deprecated b/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/deprecated
deleted file mode 100644
index 692113f..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc64/13.0/64bit-userland/desktop
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/eapi b/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/gnome/deprecated b/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/gnome/deprecated
deleted file mode 100644
index 69ba933..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/gnome/eapi b/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/gnome/parent b/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/gnome/parent
deleted file mode 100644
index d5a56a1..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/kde/deprecated b/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/kde/deprecated
deleted file mode 100644
index cff50ce..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/kde/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/kde
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/kde/eapi b/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/kde/parent b/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/kde/parent
deleted file mode 100644
index dbb1df9..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/parent b/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/parent
deleted file mode 100644
index fae96e8..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/developer/deprecated b/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/developer/deprecated
deleted file mode 100644
index dcca355..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc64/13.0/64bit-userland/developer
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/developer/eapi b/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/developer/parent b/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/developer/parent
deleted file mode 100644
index 4bb06e4..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/developer
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/eapi b/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/parent b/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/parent
deleted file mode 100644
index 0e4ae17..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/powerpc/ppc64/64ul
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/server/deprecated b/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/server/deprecated
deleted file mode 100644
index f42afce..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/server/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc64/13.0/64bit-userland
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/server/eapi b/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/server/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/server/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/server/parent b/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/server/parent
deleted file mode 100644
index 8c11cb5..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/server
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/server/profile.bashrc b/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/server/profile.bashrc
deleted file mode 100644
index a714044..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/server/profile.bashrc
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/powerpc/ppc64/10.0/64bit-userland/server/profile.bashrc,v 1.1 2009/08/06 07:19:14 ssuominen Exp $
-
-if [[ "${EBUILD_PHASE}" == "setup" ]]
-then
-	if [[ ! "${I_KNOW_WHAT_I_AM_DOING}" == "yes" ]]
-	then
-		ewarn "This profile has not been tested thoroughly and is not considered to be"
-		ewarn "a supported server profile at this time.  For a supported server"
-		ewarn "profile, please check the Hardened project (http://hardened.gentoo.org)."
-		echo
-		ewarn "This profile is merely a convenience for people who require a more"
-		ewarn "minimal profile, yet are unable to use hardened due to restrictions in"
-		ewarn "the software being used on the server. This profile should also be used"
-		ewarn "if you require GCC 4.1 or Glibc 2.4 support. If you don't know if this"
-		ewarn "applies to you, then it doesn't and you should probably be using"
-		ewarn "Hardened, instead."
-		echo
-	fi
-fi
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/desktop/eapi b/profiles/default/linux/powerpc/ppc64/10.0/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/desktop/gnome/eapi b/profiles/default/linux/powerpc/ppc64/10.0/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/desktop/gnome/parent b/profiles/default/linux/powerpc/ppc64/10.0/desktop/gnome/parent
deleted file mode 100644
index 9e06c45..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/desktop/kde/eapi b/profiles/default/linux/powerpc/ppc64/10.0/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/desktop/kde/parent b/profiles/default/linux/powerpc/ppc64/10.0/desktop/kde/parent
deleted file mode 100644
index f8a0399..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/desktop/parent b/profiles/default/linux/powerpc/ppc64/10.0/desktop/parent
deleted file mode 100644
index db8ce08..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/developer/eapi b/profiles/default/linux/powerpc/ppc64/10.0/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/developer/parent b/profiles/default/linux/powerpc/ppc64/10.0/developer/parent
deleted file mode 100644
index 5c8258a..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/eapi b/profiles/default/linux/powerpc/ppc64/10.0/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/parent b/profiles/default/linux/powerpc/ppc64/10.0/parent
deleted file mode 100644
index 8ae9641..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../releases/10.0
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/server/eapi b/profiles/default/linux/powerpc/ppc64/10.0/server/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/server/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/10.0/server/parent b/profiles/default/linux/powerpc/ppc64/10.0/server/parent
deleted file mode 100644
index 2e085a6..0000000
--- a/profiles/default/linux/powerpc/ppc64/10.0/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/server
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/eapi b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/eapi b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/parent b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/parent
deleted file mode 100644
index d5a56a1..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/parent b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/parent
deleted file mode 100644
index 5d9d87f..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/kde/eapi b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/kde/parent b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/kde/parent
deleted file mode 100644
index dbb1df9..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/kde/systemd/parent b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/kde/systemd/parent
deleted file mode 100644
index 5d9d87f..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/kde/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/parent b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/parent
deleted file mode 100644
index fae96e8..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/developer/eapi b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/developer/parent b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/developer/parent
deleted file mode 100644
index 4bb06e4..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/developer
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/eapi b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/parent b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/parent
deleted file mode 100644
index 898d55c..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/powerpc/ppc64/32ul
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/eapi b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/eapi b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/parent b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/parent
deleted file mode 100644
index d5a56a1..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/systemd/parent b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/systemd/parent
deleted file mode 100644
index 5d9d87f..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/kde/eapi b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/kde/parent b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/kde/parent
deleted file mode 100644
index dbb1df9..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/kde/systemd/parent b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/kde/systemd/parent
deleted file mode 100644
index 5d9d87f..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/kde/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/parent b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/parent
deleted file mode 100644
index fae96e8..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/developer/eapi b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/developer/parent b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/developer/parent
deleted file mode 100644
index 4bb06e4..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/developer
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/eapi b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/parent b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/parent
deleted file mode 100644
index 0e4ae17..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/powerpc/ppc64/64ul
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/desktop/eapi b/profiles/default/linux/powerpc/ppc64/13.0/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/eapi b/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/parent b/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/parent
deleted file mode 100644
index 9e06c45..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/systemd/parent
deleted file mode 100644
index f7739b4..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/desktop/kde/eapi b/profiles/default/linux/powerpc/ppc64/13.0/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/desktop/kde/parent b/profiles/default/linux/powerpc/ppc64/13.0/desktop/kde/parent
deleted file mode 100644
index f8a0399..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/desktop/kde/systemd/parent b/profiles/default/linux/powerpc/ppc64/13.0/desktop/kde/systemd/parent
deleted file mode 100644
index f7739b4..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/desktop/kde/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/desktop/parent b/profiles/default/linux/powerpc/ppc64/13.0/desktop/parent
deleted file mode 100644
index db8ce08..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/developer/eapi b/profiles/default/linux/powerpc/ppc64/13.0/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/developer/parent b/profiles/default/linux/powerpc/ppc64/13.0/developer/parent
deleted file mode 100644
index 5c8258a..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/eapi b/profiles/default/linux/powerpc/ppc64/13.0/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/parent b/profiles/default/linux/powerpc/ppc64/13.0/parent
deleted file mode 100644
index 697ad58..0000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../releases/13.0
diff --git a/profiles/default/linux/powerpc/ppc64/parent b/profiles/default/linux/powerpc/ppc64/parent
deleted file mode 100644
index 023ae2f..0000000
--- a/profiles/default/linux/powerpc/ppc64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../arch/powerpc/ppc64
diff --git a/profiles/default/linux/s390/10.0/deprecated b/profiles/default/linux/s390/10.0/deprecated
deleted file mode 100644
index c7146a8..0000000
--- a/profiles/default/linux/s390/10.0/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/s390/13.0
diff --git a/profiles/default/linux/s390/10.0/eapi b/profiles/default/linux/s390/10.0/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/s390/10.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/s390/10.0/parent b/profiles/default/linux/s390/10.0/parent
deleted file mode 100644
index 58b2e7a..0000000
--- a/profiles/default/linux/s390/10.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../releases/10.0
-..
diff --git a/profiles/default/linux/s390/10.0/s390x/deprecated b/profiles/default/linux/s390/10.0/s390x/deprecated
deleted file mode 100644
index 899f38f..0000000
--- a/profiles/default/linux/s390/10.0/s390x/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/s390/13.0/s390x
diff --git a/profiles/default/linux/s390/10.0/s390x/parent b/profiles/default/linux/s390/10.0/s390x/parent
deleted file mode 100644
index 9e170a6..0000000
--- a/profiles/default/linux/s390/10.0/s390x/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/s390/s390x
diff --git a/profiles/default/linux/s390/10.0/server/deprecated b/profiles/default/linux/s390/10.0/server/deprecated
deleted file mode 100644
index c7146a8..0000000
--- a/profiles/default/linux/s390/10.0/server/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/s390/13.0
diff --git a/profiles/default/linux/s390/10.0/server/eapi b/profiles/default/linux/s390/10.0/server/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/s390/10.0/server/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/s390/10.0/server/parent b/profiles/default/linux/s390/10.0/server/parent
deleted file mode 100644
index c399016..0000000
--- a/profiles/default/linux/s390/10.0/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/server
diff --git a/profiles/default/linux/s390/10.0/server/s390x/deprecated b/profiles/default/linux/s390/10.0/server/s390x/deprecated
deleted file mode 100644
index 899f38f..0000000
--- a/profiles/default/linux/s390/10.0/server/s390x/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/s390/13.0/s390x
diff --git a/profiles/default/linux/s390/10.0/server/s390x/parent b/profiles/default/linux/s390/10.0/server/s390x/parent
deleted file mode 100644
index 569e7bb..0000000
--- a/profiles/default/linux/s390/10.0/server/s390x/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/s390/s390x
diff --git a/profiles/default/linux/s390/13.0/eapi b/profiles/default/linux/s390/13.0/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/s390/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/s390/13.0/parent b/profiles/default/linux/s390/13.0/parent
deleted file mode 100644
index 99a816a..0000000
--- a/profiles/default/linux/s390/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../releases/13.0
-..
diff --git a/profiles/default/linux/s390/13.0/s390x/parent b/profiles/default/linux/s390/13.0/s390x/parent
deleted file mode 100644
index 9e170a6..0000000
--- a/profiles/default/linux/s390/13.0/s390x/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/s390/s390x
diff --git a/profiles/default/linux/s390/parent b/profiles/default/linux/s390/parent
deleted file mode 100644
index 1879cff..0000000
--- a/profiles/default/linux/s390/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../base
-..
-../../../arch/s390
diff --git a/profiles/default/linux/sh/10.0/deprecated b/profiles/default/linux/sh/10.0/deprecated
deleted file mode 100644
index c543112..0000000
--- a/profiles/default/linux/sh/10.0/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/sh/13.0
diff --git a/profiles/default/linux/sh/10.0/desktop/deprecated b/profiles/default/linux/sh/10.0/desktop/deprecated
deleted file mode 100644
index 6d02089..0000000
--- a/profiles/default/linux/sh/10.0/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/sh/13.0/desktop
diff --git a/profiles/default/linux/sh/10.0/desktop/eapi b/profiles/default/linux/sh/10.0/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/sh/10.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/sh/10.0/desktop/gnome/deprecated b/profiles/default/linux/sh/10.0/desktop/gnome/deprecated
deleted file mode 100644
index 7676029..0000000
--- a/profiles/default/linux/sh/10.0/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/sh/13.0/desktop/gnome
diff --git a/profiles/default/linux/sh/10.0/desktop/gnome/eapi b/profiles/default/linux/sh/10.0/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/sh/10.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/sh/10.0/desktop/gnome/parent b/profiles/default/linux/sh/10.0/desktop/gnome/parent
deleted file mode 100644
index 6589a0e..0000000
--- a/profiles/default/linux/sh/10.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/sh/10.0/desktop/kde/deprecated b/profiles/default/linux/sh/10.0/desktop/kde/deprecated
deleted file mode 100644
index 5f2ae80..0000000
--- a/profiles/default/linux/sh/10.0/desktop/kde/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/sh/13.0/desktop/kde
diff --git a/profiles/default/linux/sh/10.0/desktop/kde/eapi b/profiles/default/linux/sh/10.0/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/sh/10.0/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/sh/10.0/desktop/kde/parent b/profiles/default/linux/sh/10.0/desktop/kde/parent
deleted file mode 100644
index b4d42bb..0000000
--- a/profiles/default/linux/sh/10.0/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/sh/10.0/desktop/parent b/profiles/default/linux/sh/10.0/desktop/parent
deleted file mode 100644
index ad6c5e1..0000000
--- a/profiles/default/linux/sh/10.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/sh/10.0/developer/deprecated b/profiles/default/linux/sh/10.0/developer/deprecated
deleted file mode 100644
index 449f8c5..0000000
--- a/profiles/default/linux/sh/10.0/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/sh/13.0/developer
diff --git a/profiles/default/linux/sh/10.0/developer/eapi b/profiles/default/linux/sh/10.0/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/sh/10.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/sh/10.0/developer/parent b/profiles/default/linux/sh/10.0/developer/parent
deleted file mode 100644
index 4c89374..0000000
--- a/profiles/default/linux/sh/10.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/sh/10.0/eapi b/profiles/default/linux/sh/10.0/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/sh/10.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/sh/10.0/parent b/profiles/default/linux/sh/10.0/parent
deleted file mode 100644
index 605d043..0000000
--- a/profiles/default/linux/sh/10.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/10.0
diff --git a/profiles/default/linux/sh/10.0/server/deprecated b/profiles/default/linux/sh/10.0/server/deprecated
deleted file mode 100644
index c543112..0000000
--- a/profiles/default/linux/sh/10.0/server/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/sh/13.0
diff --git a/profiles/default/linux/sh/10.0/server/eapi b/profiles/default/linux/sh/10.0/server/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/sh/10.0/server/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/sh/10.0/server/parent b/profiles/default/linux/sh/10.0/server/parent
deleted file mode 100644
index c399016..0000000
--- a/profiles/default/linux/sh/10.0/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/server
diff --git a/profiles/default/linux/sh/13.0/desktop/eapi b/profiles/default/linux/sh/13.0/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/sh/13.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/sh/13.0/desktop/gnome/eapi b/profiles/default/linux/sh/13.0/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/sh/13.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/sh/13.0/desktop/gnome/parent b/profiles/default/linux/sh/13.0/desktop/gnome/parent
deleted file mode 100644
index 6589a0e..0000000
--- a/profiles/default/linux/sh/13.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/sh/13.0/desktop/kde/eapi b/profiles/default/linux/sh/13.0/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/sh/13.0/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/sh/13.0/desktop/kde/parent b/profiles/default/linux/sh/13.0/desktop/kde/parent
deleted file mode 100644
index b4d42bb..0000000
--- a/profiles/default/linux/sh/13.0/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/sh/13.0/desktop/parent b/profiles/default/linux/sh/13.0/desktop/parent
deleted file mode 100644
index ad6c5e1..0000000
--- a/profiles/default/linux/sh/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/sh/13.0/developer/eapi b/profiles/default/linux/sh/13.0/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/sh/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/sh/13.0/developer/parent b/profiles/default/linux/sh/13.0/developer/parent
deleted file mode 100644
index 4c89374..0000000
--- a/profiles/default/linux/sh/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/sh/13.0/eapi b/profiles/default/linux/sh/13.0/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/sh/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/sh/13.0/parent b/profiles/default/linux/sh/13.0/parent
deleted file mode 100644
index 7c03775..0000000
--- a/profiles/default/linux/sh/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/13.0
diff --git a/profiles/default/linux/sh/parent b/profiles/default/linux/sh/parent
deleted file mode 100644
index 97ad3e3..0000000
--- a/profiles/default/linux/sh/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../base
-..
-../../../arch/sh
diff --git a/profiles/default/linux/sparc/10.0/deprecated b/profiles/default/linux/sparc/10.0/deprecated
deleted file mode 100644
index d03da49..0000000
--- a/profiles/default/linux/sparc/10.0/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/sparc/13.0
diff --git a/profiles/default/linux/sparc/10.0/desktop/deprecated b/profiles/default/linux/sparc/10.0/desktop/deprecated
deleted file mode 100644
index 5aa11e2..0000000
--- a/profiles/default/linux/sparc/10.0/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/sparc/13.0/desktop
diff --git a/profiles/default/linux/sparc/10.0/desktop/eapi b/profiles/default/linux/sparc/10.0/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/sparc/10.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/sparc/10.0/desktop/gnome/deprecated b/profiles/default/linux/sparc/10.0/desktop/gnome/deprecated
deleted file mode 100644
index def4590..0000000
--- a/profiles/default/linux/sparc/10.0/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/sparc/13.0/desktop/gnome
diff --git a/profiles/default/linux/sparc/10.0/desktop/gnome/eapi b/profiles/default/linux/sparc/10.0/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/sparc/10.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/sparc/10.0/desktop/gnome/parent b/profiles/default/linux/sparc/10.0/desktop/gnome/parent
deleted file mode 100644
index 6589a0e..0000000
--- a/profiles/default/linux/sparc/10.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/sparc/10.0/desktop/kde/deprecated b/profiles/default/linux/sparc/10.0/desktop/kde/deprecated
deleted file mode 100644
index f1607c4..0000000
--- a/profiles/default/linux/sparc/10.0/desktop/kde/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/sparc/13.0/desktop/kde
diff --git a/profiles/default/linux/sparc/10.0/desktop/kde/eapi b/profiles/default/linux/sparc/10.0/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/sparc/10.0/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/sparc/10.0/desktop/kde/parent b/profiles/default/linux/sparc/10.0/desktop/kde/parent
deleted file mode 100644
index b4d42bb..0000000
--- a/profiles/default/linux/sparc/10.0/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/sparc/10.0/desktop/parent b/profiles/default/linux/sparc/10.0/desktop/parent
deleted file mode 100644
index ad6c5e1..0000000
--- a/profiles/default/linux/sparc/10.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/sparc/10.0/developer/deprecated b/profiles/default/linux/sparc/10.0/developer/deprecated
deleted file mode 100644
index 76bcdc3..0000000
--- a/profiles/default/linux/sparc/10.0/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/sparc/13.0/developer
diff --git a/profiles/default/linux/sparc/10.0/developer/eapi b/profiles/default/linux/sparc/10.0/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/sparc/10.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/sparc/10.0/developer/parent b/profiles/default/linux/sparc/10.0/developer/parent
deleted file mode 100644
index 4c89374..0000000
--- a/profiles/default/linux/sparc/10.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/sparc/10.0/eapi b/profiles/default/linux/sparc/10.0/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/sparc/10.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/sparc/10.0/package.use.mask b/profiles/default/linux/sparc/10.0/package.use.mask
deleted file mode 100644
index 967b557..0000000
--- a/profiles/default/linux/sparc/10.0/package.use.mask
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/sparc/10.0/package.use.mask,v 1.1 2011/12/21 17:30:07 blueness Exp $
-
-# Anthony G. Basile <blueness@gentoo.org> (Dec 21, 2011)
-#
-# Mask the vde flag on tinc because net-misc/vde is not
-# keyworded for sparc
-net-misc/tinc vde
diff --git a/profiles/default/linux/sparc/10.0/packages b/profiles/default/linux/sparc/10.0/packages
deleted file mode 100644
index e88580c..0000000
--- a/profiles/default/linux/sparc/10.0/packages
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/sparc/10.0/packages,v 1.1 2009/08/06 06:51:40 ssuominen Exp $
-
-# 2008.0 sparc profile
-
-# 64 bit kernel compiler
-*>=sys-devel/kgcc64-4.1.2
diff --git a/profiles/default/linux/sparc/10.0/parent b/profiles/default/linux/sparc/10.0/parent
deleted file mode 100644
index 25a06e1..0000000
--- a/profiles/default/linux/sparc/10.0/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-..
-../../../../releases/10.0
-../../../../features/32bit-userland
diff --git a/profiles/default/linux/sparc/10.0/server/deprecated b/profiles/default/linux/sparc/10.0/server/deprecated
deleted file mode 100644
index d03da49..0000000
--- a/profiles/default/linux/sparc/10.0/server/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/sparc/13.0
diff --git a/profiles/default/linux/sparc/10.0/server/eapi b/profiles/default/linux/sparc/10.0/server/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/sparc/10.0/server/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/sparc/10.0/server/parent b/profiles/default/linux/sparc/10.0/server/parent
deleted file mode 100644
index c399016..0000000
--- a/profiles/default/linux/sparc/10.0/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/server
diff --git a/profiles/default/linux/sparc/10.0/use.mask b/profiles/default/linux/sparc/10.0/use.mask
deleted file mode 100644
index 0d40fc1..0000000
--- a/profiles/default/linux/sparc/10.0/use.mask
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/sparc/10.0/use.mask,v 1.4 2012/07/19 20:50:29 blueness Exp $
-
-# this is not a multilib profile
-multilib
-
-# Anthony G. Basile <blueness@gentoo.org> (15 Apr 2012)
-# Pulls in net-libs/axtls which is not keyworded for arch
-curl_ssl_axtls
-curl_ssl_cyassl
diff --git a/profiles/default/linux/sparc/13.0/desktop/eapi b/profiles/default/linux/sparc/13.0/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/sparc/13.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/sparc/13.0/desktop/gnome/eapi b/profiles/default/linux/sparc/13.0/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/sparc/13.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/sparc/13.0/desktop/gnome/parent b/profiles/default/linux/sparc/13.0/desktop/gnome/parent
deleted file mode 100644
index 6589a0e..0000000
--- a/profiles/default/linux/sparc/13.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/sparc/13.0/desktop/kde/eapi b/profiles/default/linux/sparc/13.0/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/sparc/13.0/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/sparc/13.0/desktop/kde/parent b/profiles/default/linux/sparc/13.0/desktop/kde/parent
deleted file mode 100644
index b4d42bb..0000000
--- a/profiles/default/linux/sparc/13.0/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/sparc/13.0/desktop/parent b/profiles/default/linux/sparc/13.0/desktop/parent
deleted file mode 100644
index ad6c5e1..0000000
--- a/profiles/default/linux/sparc/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/sparc/13.0/developer/eapi b/profiles/default/linux/sparc/13.0/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/sparc/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/sparc/13.0/developer/parent b/profiles/default/linux/sparc/13.0/developer/parent
deleted file mode 100644
index 4c89374..0000000
--- a/profiles/default/linux/sparc/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/sparc/13.0/eapi b/profiles/default/linux/sparc/13.0/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/sparc/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/sparc/13.0/package.use.mask b/profiles/default/linux/sparc/13.0/package.use.mask
deleted file mode 100644
index 208a2a8..0000000
--- a/profiles/default/linux/sparc/13.0/package.use.mask
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/sparc/13.0/package.use.mask,v 1.1 2013/01/18 19:48:22 dilfridge Exp $
-
-# Anthony G. Basile <blueness@gentoo.org> (Dec 21, 2011)
-#
-# Mask the vde flag on tinc because net-misc/vde is not
-# keyworded for sparc
-net-misc/tinc vde
diff --git a/profiles/default/linux/sparc/13.0/packages b/profiles/default/linux/sparc/13.0/packages
deleted file mode 100644
index e029862..0000000
--- a/profiles/default/linux/sparc/13.0/packages
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/sparc/13.0/packages,v 1.1 2013/01/18 19:48:22 dilfridge Exp $
-
-# 2008.0 sparc profile
-
-# 64 bit kernel compiler
-*>=sys-devel/kgcc64-4.1.2
diff --git a/profiles/default/linux/sparc/13.0/parent b/profiles/default/linux/sparc/13.0/parent
deleted file mode 100644
index 222c2cf..0000000
--- a/profiles/default/linux/sparc/13.0/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-..
-../../../../releases/13.0
-../../../../features/32bit-userland
diff --git a/profiles/default/linux/sparc/13.0/use.mask b/profiles/default/linux/sparc/13.0/use.mask
deleted file mode 100644
index bf9d5e6..0000000
--- a/profiles/default/linux/sparc/13.0/use.mask
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/sparc/13.0/use.mask,v 1.1 2013/01/18 19:48:22 dilfridge Exp $
-
-# this is not a multilib profile
-multilib
-
-# Anthony G. Basile <blueness@gentoo.org> (15 Apr 2012)
-# Pulls in net-libs/axtls which is not keyworded for arch
-curl_ssl_axtls
-curl_ssl_cyassl
diff --git a/profiles/default/linux/sparc/experimental/multilib/desktop/parent b/profiles/default/linux/sparc/experimental/multilib/desktop/parent
deleted file mode 100644
index db8ce08..0000000
--- a/profiles/default/linux/sparc/experimental/multilib/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/sparc/experimental/multilib/developer/parent b/profiles/default/linux/sparc/experimental/multilib/developer/parent
deleted file mode 100644
index 5c8258a..0000000
--- a/profiles/default/linux/sparc/experimental/multilib/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/sparc/experimental/multilib/make.defaults b/profiles/default/linux/sparc/experimental/multilib/make.defaults
deleted file mode 100644
index 18948af..0000000
--- a/profiles/default/linux/sparc/experimental/multilib/make.defaults
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/sparc/experimental/multilib/make.defaults,v 1.3 2009/04/02 22:19:31 bluebird Exp $
-
-# Multilib stuff
-MULTILIB_ABIS="sparc32 sparc64"
-
-# without this glibc will segfault when compiling a sparc64 abi
-FEATURES="userpriv"
-
-# can't set this in the top level make.defaults as it breaks
-# sys-kernel/linux-headers for non-multilib profiles
-CFLAGS_sparc64="-m64"
diff --git a/profiles/default/linux/sparc/experimental/multilib/package.use.mask b/profiles/default/linux/sparc/experimental/multilib/package.use.mask
deleted file mode 100644
index 4ccf538..0000000
--- a/profiles/default/linux/sparc/experimental/multilib/package.use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/sparc/experimental/multilib/package.use.mask,v 1.2 2009/07/31 11:19:09 ssuominen Exp $
-
-# Needs all X libraries in both 32 and 64 bit..
-sys-devel/gcc gtk
diff --git a/profiles/default/linux/sparc/experimental/multilib/packages b/profiles/default/linux/sparc/experimental/multilib/packages
deleted file mode 100644
index e7ab10a..0000000
--- a/profiles/default/linux/sparc/experimental/multilib/packages
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/sparc/experimental/multilib/packages,v 1.1 2008/12/26 11:09:43 bluebird Exp $
-
-# older versions of gcc don't support biarch
-*>=sys-devel/gcc-4.3.2-r1
-
-# building a sparc64 ABI with older versions doesn't work right
-*>=sys-libs/glibc-2.7
diff --git a/profiles/default/linux/sparc/experimental/multilib/parent b/profiles/default/linux/sparc/experimental/multilib/parent
deleted file mode 100644
index 2b1b522..0000000
--- a/profiles/default/linux/sparc/experimental/multilib/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-..
-../../../../../releases/10.0
-../../../../../features/multilib/lib32
diff --git a/profiles/default/linux/sparc/experimental/multilib/profile.bashrc b/profiles/default/linux/sparc/experimental/multilib/profile.bashrc
deleted file mode 100644
index 451dfea..0000000
--- a/profiles/default/linux/sparc/experimental/multilib/profile.bashrc
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/sparc/experimental/multilib/profile.bashrc,v 1.2 2009/01/01 22:15:42 bluebird Exp $
-
-if [[ "${EBUILD_PHASE}" == "setup" ]]
-then
-	if [[ ! "${I_READ_THE_MULTILIB_MIGRATION_GUIDE}" == "yes" ]]
-	then
-		ewarn "When migrating to the new sparc mutlilib profile please keep in mind that it"
-		ewarn "is still in an experimental state. Also note that you need to follow the"
-		ewarn "migration guide [0], otherwise important packages such as gcc or glibc will"
-		ewarn "fail to compile and most other packages will be installed incorrectly."
-		ewarn ""
-		ewarn "[0] http://sparc.gentoo.org/multilib.xml"
-		echo
-	fi
-fi
diff --git a/profiles/default/linux/sparc/experimental/multilib/server/parent b/profiles/default/linux/sparc/experimental/multilib/server/parent
deleted file mode 100644
index 2e085a6..0000000
--- a/profiles/default/linux/sparc/experimental/multilib/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/server
diff --git a/profiles/default/linux/sparc/experimental/parent b/profiles/default/linux/sparc/experimental/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/default/linux/sparc/experimental/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/linux/sparc/parent b/profiles/default/linux/sparc/parent
deleted file mode 100644
index f8f0663..0000000
--- a/profiles/default/linux/sparc/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../base
-..
-../../../arch/sparc
diff --git a/profiles/default/linux/use.mask b/profiles/default/linux/use.mask
deleted file mode 100644
index b48fc8b..0000000
--- a/profiles/default/linux/use.mask
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/use.mask,v 1.5 2013/04/19 15:26:02 ssuominen Exp $
-
-# This file masks out USE flags that are simply NOT allowed in the default
-# profile for any architecture.  This works, for example, if a non-default
-# profile (such as the selinux profiles) have a USE flag associated with
-# them.
-
-# amd64 only:
-emul-linux-x86
-
-# ppc and x86/amd64
-x264
-
-# Diego Elio Pettenò <flameeyes@gentoo.org> (27 Aug 2012)
-# netlink is a Linux-specific interface
--netlink
-
-# Samuli Suominen <ssuominen@gentoo.org> (19 Apr 2013)
-# Linux specific module loading/unloading support
--kmod
diff --git a/profiles/default/linux/x86/10.0/deprecated b/profiles/default/linux/x86/10.0/deprecated
deleted file mode 100644
index 493e355..0000000
--- a/profiles/default/linux/x86/10.0/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/x86/13.0
diff --git a/profiles/default/linux/x86/10.0/desktop/deprecated b/profiles/default/linux/x86/10.0/desktop/deprecated
deleted file mode 100644
index 9f8b260..0000000
--- a/profiles/default/linux/x86/10.0/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/x86/13.0/desktop
diff --git a/profiles/default/linux/x86/10.0/desktop/eapi b/profiles/default/linux/x86/10.0/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/x86/10.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/x86/10.0/desktop/gnome/deprecated b/profiles/default/linux/x86/10.0/desktop/gnome/deprecated
deleted file mode 100644
index a05c9a9..0000000
--- a/profiles/default/linux/x86/10.0/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/x86/13.0/desktop/gnome
diff --git a/profiles/default/linux/x86/10.0/desktop/gnome/eapi b/profiles/default/linux/x86/10.0/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/x86/10.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/x86/10.0/desktop/gnome/parent b/profiles/default/linux/x86/10.0/desktop/gnome/parent
deleted file mode 100644
index 6589a0e..0000000
--- a/profiles/default/linux/x86/10.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/x86/10.0/desktop/kde/deprecated b/profiles/default/linux/x86/10.0/desktop/kde/deprecated
deleted file mode 100644
index 7689fcb..0000000
--- a/profiles/default/linux/x86/10.0/desktop/kde/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/x86/13.0/desktop/kde
diff --git a/profiles/default/linux/x86/10.0/desktop/kde/eapi b/profiles/default/linux/x86/10.0/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/x86/10.0/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/x86/10.0/desktop/kde/parent b/profiles/default/linux/x86/10.0/desktop/kde/parent
deleted file mode 100644
index b4d42bb..0000000
--- a/profiles/default/linux/x86/10.0/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/x86/10.0/desktop/parent b/profiles/default/linux/x86/10.0/desktop/parent
deleted file mode 100644
index ad6c5e1..0000000
--- a/profiles/default/linux/x86/10.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/x86/10.0/developer/deprecated b/profiles/default/linux/x86/10.0/developer/deprecated
deleted file mode 100644
index 0b85b2a..0000000
--- a/profiles/default/linux/x86/10.0/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/x86/13.0/developer
diff --git a/profiles/default/linux/x86/10.0/developer/eapi b/profiles/default/linux/x86/10.0/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/x86/10.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/x86/10.0/developer/make.defaults b/profiles/default/linux/x86/10.0/developer/make.defaults
deleted file mode 100644
index 8e3ed30..0000000
--- a/profiles/default/linux/x86/10.0/developer/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/x86/10.0/developer/make.defaults,v 1.1 2010/08/15 07:29:22 fauli Exp $
-
-# Adding -Wl,--hash-style=gnu to default LDFLAGS for linux/x86 dev profile
-# This will help developers track down packages, that don't respect LDFLAGS,
-# more easily
-LDFLAGS="-Wl,--hash-style=gnu ${LDFLAGS}"
diff --git a/profiles/default/linux/x86/10.0/developer/parent b/profiles/default/linux/x86/10.0/developer/parent
deleted file mode 100644
index 4c89374..0000000
--- a/profiles/default/linux/x86/10.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/x86/10.0/eapi b/profiles/default/linux/x86/10.0/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/x86/10.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/x86/10.0/parent b/profiles/default/linux/x86/10.0/parent
deleted file mode 100644
index 605d043..0000000
--- a/profiles/default/linux/x86/10.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/10.0
diff --git a/profiles/default/linux/x86/10.0/selinux/deprecated b/profiles/default/linux/x86/10.0/selinux/deprecated
deleted file mode 100644
index 8246da9..0000000
--- a/profiles/default/linux/x86/10.0/selinux/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/x86/13.0/selinux
diff --git a/profiles/default/linux/x86/10.0/selinux/eapi b/profiles/default/linux/x86/10.0/selinux/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/x86/10.0/selinux/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/x86/10.0/selinux/parent b/profiles/default/linux/x86/10.0/selinux/parent
deleted file mode 100644
index 933e679..0000000
--- a/profiles/default/linux/x86/10.0/selinux/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../features/selinux
diff --git a/profiles/default/linux/x86/10.0/server/deprecated b/profiles/default/linux/x86/10.0/server/deprecated
deleted file mode 100644
index 493e355..0000000
--- a/profiles/default/linux/x86/10.0/server/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/x86/13.0
diff --git a/profiles/default/linux/x86/10.0/server/eapi b/profiles/default/linux/x86/10.0/server/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/x86/10.0/server/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/x86/10.0/server/parent b/profiles/default/linux/x86/10.0/server/parent
deleted file mode 100644
index c399016..0000000
--- a/profiles/default/linux/x86/10.0/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/server
diff --git a/profiles/default/linux/x86/10.0/server/profile.bashrc b/profiles/default/linux/x86/10.0/server/profile.bashrc
deleted file mode 100644
index f9d4908..0000000
--- a/profiles/default/linux/x86/10.0/server/profile.bashrc
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/x86/10.0/server/profile.bashrc,v 1.1 2009/08/06 07:29:54 ssuominen Exp $
-
-if [[ "${EBUILD_PHASE}" == "setup" ]]
-then
-	if [[ ! "${I_KNOW_WHAT_I_AM_DOING}" == "yes" ]]
-	then
-		ewarn "This profile has not been tested thoroughly and is not considered to be"
-		ewarn "a supported server profile at this time.  For a supported server"
-		ewarn "profile, please check the Hardened project (http://hardened.gentoo.org)."
-		echo
-		ewarn "This profile is merely a convenience for people who require a more"
-		ewarn "minimal profile, yet are unable to use hardened due to restrictions in"
-		ewarn "the software being used on the server. This profile should also be used"
-		ewarn "if you require GCC 4.1 or Glibc 2.4 support. If you don't know if this"
-		ewarn "applies to you, then it doesn't and you should probably be using"
-		ewarn "Hardened, instead."
-		echo
-	fi
-fi
diff --git a/profiles/default/linux/x86/13.0/desktop/eapi b/profiles/default/linux/x86/13.0/desktop/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/x86/13.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/x86/13.0/desktop/gnome/eapi b/profiles/default/linux/x86/13.0/desktop/gnome/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/x86/13.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/x86/13.0/desktop/gnome/parent b/profiles/default/linux/x86/13.0/desktop/gnome/parent
deleted file mode 100644
index 6589a0e..0000000
--- a/profiles/default/linux/x86/13.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/x86/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/x86/13.0/desktop/gnome/systemd/parent
deleted file mode 100644
index 44f88d3..0000000
--- a/profiles/default/linux/x86/13.0/desktop/gnome/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/systemd
diff --git a/profiles/default/linux/x86/13.0/desktop/kde/eapi b/profiles/default/linux/x86/13.0/desktop/kde/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/x86/13.0/desktop/kde/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/x86/13.0/desktop/kde/parent b/profiles/default/linux/x86/13.0/desktop/kde/parent
deleted file mode 100644
index b4d42bb..0000000
--- a/profiles/default/linux/x86/13.0/desktop/kde/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/kde
diff --git a/profiles/default/linux/x86/13.0/desktop/kde/systemd/parent b/profiles/default/linux/x86/13.0/desktop/kde/systemd/parent
deleted file mode 100644
index 44f88d3..0000000
--- a/profiles/default/linux/x86/13.0/desktop/kde/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/systemd
diff --git a/profiles/default/linux/x86/13.0/desktop/parent b/profiles/default/linux/x86/13.0/desktop/parent
deleted file mode 100644
index ad6c5e1..0000000
--- a/profiles/default/linux/x86/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/x86/13.0/developer/eapi b/profiles/default/linux/x86/13.0/developer/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/x86/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/x86/13.0/developer/make.defaults b/profiles/default/linux/x86/13.0/developer/make.defaults
deleted file mode 100644
index f6f1479..0000000
--- a/profiles/default/linux/x86/13.0/developer/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/x86/13.0/developer/make.defaults,v 1.1 2013/01/18 19:55:06 dilfridge Exp $
-
-# Adding -Wl,--hash-style=gnu to default LDFLAGS for linux/x86 dev profile
-# This will help developers track down packages, that don't respect LDFLAGS,
-# more easily
-LDFLAGS="-Wl,--hash-style=gnu ${LDFLAGS}"
diff --git a/profiles/default/linux/x86/13.0/developer/parent b/profiles/default/linux/x86/13.0/developer/parent
deleted file mode 100644
index 4c89374..0000000
--- a/profiles/default/linux/x86/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/x86/13.0/eapi b/profiles/default/linux/x86/13.0/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/default/linux/x86/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/x86/13.0/package.use.stable.mask b/profiles/default/linux/x86/13.0/package.use.stable.mask
deleted file mode 100644
index 3ddf4b1..0000000
--- a/profiles/default/linux/x86/13.0/package.use.stable.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Michał Górny <mgorny@gentoo.org> (16 Nov 2013)
-# Don't apply stable masks to python-exec since we're forcing every
-# impl there anyway. Please keep this in sync with use.stable.mask.
-dev-lang/python-exec -python_targets_pypy2_0
-dev-lang/python-exec -python_single_target_pypy2_0
-dev-python/python-exec -python_targets_pypy2_0
-dev-python/python-exec -python_single_target_pypy2_0
diff --git a/profiles/default/linux/x86/13.0/parent b/profiles/default/linux/x86/13.0/parent
deleted file mode 100644
index 7c03775..0000000
--- a/profiles/default/linux/x86/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/13.0
diff --git a/profiles/default/linux/x86/13.0/selinux/eapi b/profiles/default/linux/x86/13.0/selinux/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/default/linux/x86/13.0/selinux/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/default/linux/x86/13.0/selinux/parent b/profiles/default/linux/x86/13.0/selinux/parent
deleted file mode 100644
index 933e679..0000000
--- a/profiles/default/linux/x86/13.0/selinux/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../features/selinux
diff --git a/profiles/default/linux/x86/13.0/use.mask b/profiles/default/linux/x86/13.0/use.mask
deleted file mode 100644
index fd1805a..0000000
--- a/profiles/default/linux/x86/13.0/use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/x86/13.0/use.mask,v 1.2 2013/08/07 22:11:08 mgorny Exp $
-
-# Michał Górny <mgorny@gentoo.org> (19 Jan 2013)
-# PyPy is keyworded on this arch.
--python_targets_pypy2_0
--python_single_target_pypy2_0
diff --git a/profiles/default/linux/x86/13.0/use.stable.mask b/profiles/default/linux/x86/13.0/use.stable.mask
deleted file mode 100644
index d64fd69..0000000
--- a/profiles/default/linux/x86/13.0/use.stable.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/x86/13.0/use.stable.mask,v 1.2 2013/08/07 22:11:08 mgorny Exp $
-
-# Michał Górny <mgorny@gentoo.org> (19 Jan 2013)
-# PyPy is unstable on this arch.
-python_targets_pypy2_0
-python_single_target_pypy2_0
diff --git a/profiles/default/linux/x86/parent b/profiles/default/linux/x86/parent
deleted file mode 100644
index 03cb31c..0000000
--- a/profiles/default/linux/x86/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../base
-..
-../../../arch/x86
diff --git a/profiles/eapi-5-files/eapi b/profiles/eapi-5-files/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/eapi-5-files/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/eapi-5-files/package.use.stable.force b/profiles/eapi-5-files/package.use.stable.force
deleted file mode 100644
index 506e533..0000000
--- a/profiles/eapi-5-files/package.use.stable.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/eapi-5-files/package.use.stable.force,v 1.1 2013/01/14 20:47:01 dilfridge Exp $
-
-# This file requires eapi 5 or later. New entries go on top.
-# Please use the same syntax as in package.use.force
diff --git a/profiles/eapi-5-files/package.use.stable.mask b/profiles/eapi-5-files/package.use.stable.mask
deleted file mode 100644
index 6749405..0000000
--- a/profiles/eapi-5-files/package.use.stable.mask
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/eapi-5-files/package.use.stable.mask,v 1.31 2013/11/17 09:03:01 pacho Exp $
-
-# This file requires eapi 5 or later. New entries go on top.
-# Please use the same syntax as in package.use.mask
-
-# Pacho Ramos <pacho@gentoo.org> (17 Nov 2013)
-# Still needs gnutls-3
->=net-nntp/pan-0.139 ssl
-
-# Michał Górny <mgorny@gentoo.org> (16 Nov 2013)
-# Don't apply stable masks to python-exec since we're forcing every
-# impl there anyway. Please keep this in sync with use.stable.mask.
-dev-lang/python-exec -python_targets_python3_3
-dev-lang/python-exec -python_single_target_python3_3
-dev-python/python-exec -python_targets_python3_3
-dev-python/python-exec -python_single_target_python3_3
-
-# Sergey Popov <pinkbyte@gentoo.org> (28 Oct 2013)
-# sys-cluster/cman is still in ~arch.
-sys-cluster/pacemaker cman
-
-# Alexandre Rostovtsev <tetromino@gentoo.org> (02 Oct 2013)
-# We want to stabilize zukitwo before gnome-shell
-x11-themes/zukitwo gnome-shell
-
-# Mike Gilbert <floppym@gentoo.org> (21 Sep 2013)
-# sys-fs/zfs isn't going stable anytime soon.
-sys-boot/grub libzfs
-
-# Doug Goldstein <cardoe@gentoo.org> (12 Sep 2013)
-# Waiting on glusterfs maintainers in bug #484016
-app-emulation/qemu glusterfs
-
-# Pacho Ramos <pacho@gentoo.org> (07 Sep 2013)
-# It requires newer emul sets to be stabilized (#477182#c5)
-~sci-libs/fftw-3.3.3 abi_x86_32
-
-# Agostino Sarubbo <ago@gentoo.org> (31 Aug 2013)
-# Clang is not stable
-app-portage/eix clang
-
-# Samuli Suominen <ssuominen@gentoo.org> (01 Aug 2013)
-# The dependencies for these flags are still in ~arch.
-sys-fs/lvm2 clvm cman
-
-# Chris Reffett <creffett@gentoo.org> (23 Nov 2012)
-# CMake's PHP module can't find our install location, so
-# libkolab(xml) fails with the php flag enabled, bug #430858.
-net-libs/libkolab php
-net-libs/libkolabxml php
-
-# Samuli Suominen <ssuominen@gentoo.org> (12 Apr 2013)
-# Waiting for >=app-cdr/brasero-3 stabilization
-app-pda/gtkpod cdr
-
-# Pacho Ramos <pacho@gentoo.org> (01 Apr 2013)
-# Needed to stabilize anjuta-3.6
-=dev-util/devhelp-3.6.1-r1 gedit
-
-# Andreas K. Huettel <dilfridge@gentoo.org> (28 Mar 2013)
-# No stable sci-chemistry/avogadro yet but we want kde-4.10 to go stable
->=kde-base/kalzium-4.10.0 editor
-
-# Sergey Popov <pinkbyte@gentoo.org> (08 Jun 2013)
-# Mask unstable dependencies in leechcraft metapackage
-app-leechcraft/leechcraft-meta unstable
diff --git a/profiles/eapi-5-files/use.stable.force b/profiles/eapi-5-files/use.stable.force
deleted file mode 100644
index 197c0b0..0000000
--- a/profiles/eapi-5-files/use.stable.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/eapi-5-files/use.stable.force,v 1.1 2013/01/14 20:47:01 dilfridge Exp $
-
-# This file requires eapi 5 or later. New entries go on top.
-# Please use the same syntax as in use.force
diff --git a/profiles/eapi-5-files/use.stable.mask b/profiles/eapi-5-files/use.stable.mask
deleted file mode 100644
index 1a90330..0000000
--- a/profiles/eapi-5-files/use.stable.mask
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/eapi-5-files/use.stable.mask,v 1.7 2013/08/23 14:13:52 ago Exp $
-
-# This file requires eapi 5 or later. New entries go on top.
-# Please use the same syntax as in use.mask
-
-# Alexandre Rostovtsev <tetromino@gentoo.org> (30 Apr 2013)
-# Remove when Python 3.3 is unmasked and ready for stabilization (bug #467894)
-python_targets_python3_3
-python_single_target_python3_3
-
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (27 Mar 2013
-# wayland is not stable, bug #419473
-wayland
diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
deleted file mode 100644
index 1a6f7a5..0000000
--- a/profiles/embedded/make.defaults
+++ /dev/null
@@ -1,38 +0,0 @@
-USE="kdrive minimal multicall zlib"
-CFLAGS="-Os -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-
-CLEAN_DELAY="0"
-EPAUSE_IGNORE="1"
-EBEEP_IGNORE="1"
-PORTAGE_WORKDIR_MODE="2775"
-PORTAGE_ECLASS_WARNING_ENABLE="0"
-
-INPUT_DEVICES="evdev mouse keyboard tslib"
-VIDEO_CARDS="fbdev"
-KERNEL="linux"
-USERLAND="GNU"
-LINGUAS="en"
-
-# Profile IUSE injection (applies only to ebuilds which use EAPI 5 or later)
-IUSE_IMPLICIT="prefix"
-USE_EXPAND_UNPREFIXED="ARCH"
-USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND"
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux hppa hppa-hpux ia64 ia64-hpux ia64-linux m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos ppc-openbsd s390 sh sparc sparc64-freebsd sparc64-solaris sparc-fbsd sparc-solaris x64-freebsd x64-macos x64-openbsd x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-openbsd x86-solaris x86-winnt"
-USE_EXPAND_VALUES_ELIBC="AIX Cygwin Darwin FreeBSD glibc HPUX Interix mintlib NetBSD OpenBSD SunOS uclibc Winnt"
-USE_EXPAND_VALUES_KERNEL="AIX Cygwin Darwin FreeBSD freemint HPUX Interix linux NetBSD OpenBSD SunOS Winnt"
-USE_EXPAND_VALUES_USERLAND="BSD GNU"
-
-# Env vars to expand into USE vars.  Modifying this requires prior
-# discussion on gentoo-dev@gentoo.org.
-USE_EXPAND="APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES ENLIGHTENMENT_MODULES FOO2ZJS_DEVICES FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS LCD_DEVICES CAMERAS NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS RUBY_TARGETS PHP_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL XFCE_PLUGINS XTABLES_ADDONS GPSD_PROTOCOLS COLLECTD_PLUGINS DRACUT_MODULES OFED_DRIVERS GRUB_PLATFORMS FFTOOLS PYTHON_TARGETS CURL_SSL OPENMPI_FABRICS OPENMPI_RM OPENMPI_OFED_FEATURES LIBREOFFICE_EXTENSIONS VOICEMAIL_STORAGE PYTHON_SINGLE_TARGET ABI_MIPS ABI_X86"
-
-# USE_EXPAND variables whose contents are not shown in package manager
-# output. Changes need discussion on gentoo-dev.
-USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ABI_MIPS ABI_X86"
-
-# Variables that are set exclusively by the profile
-# and not by user configuration files.
-PROFILE_ONLY_VARIABLES="ARCH ELIBC IUSE_IMPLICIT KERNEL USERLAND USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ARCH USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL USE_EXPAND_VALUES_USERLAND"
diff --git a/profiles/embedded/package.use b/profiles/embedded/package.use
deleted file mode 100644
index 49943b1..0000000
--- a/profiles/embedded/package.use
+++ /dev/null
@@ -1 +0,0 @@
-sys-apps/busybox make-symlinks
diff --git a/profiles/embedded/packages b/profiles/embedded/packages
deleted file mode 100644
index d4c5ea6..0000000
--- a/profiles/embedded/packages
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/embedded/packages,v 1.3 2008/05/04 07:55:10 solar Exp $
-
-# base generic embedded profile
-
-*>=sys-apps/busybox-0.60.5-r1
diff --git a/profiles/embedded/use.force b/profiles/embedded/use.force
deleted file mode 100644
index 5885fdd..0000000
--- a/profiles/embedded/use.force
+++ /dev/null
@@ -1,2 +0,0 @@
-kernel_linux
-userland_GNU
diff --git a/profiles/embedded/use.mask b/profiles/embedded/use.mask
deleted file mode 100644
index 41d28d0..0000000
--- a/profiles/embedded/use.mask
+++ /dev/null
@@ -1,9 +0,0 @@
-# Zac Medico <zmedico@gentoo.org>
-# must use a prefix profile
-prefix
-
-# Chris PeBenito <pebenito@gentoo.org>
-# must use a SELinux profile
-selinux
-
-emul-linux-x86
diff --git a/profiles/features/selinux/make.defaults b/profiles/features/selinux/make.defaults
deleted file mode 100644
index ebcfce0..0000000
--- a/profiles/features/selinux/make.defaults
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/make.defaults,v 1.1 2011/05/17 10:46:49 blueness Exp $
-#
-
-USE="-acl selinux open_perms"
-
-FEATURES="selinux sesandbox sfperms"
-
-POLICY_TYPES="strict targeted"
-PORTAGE_T="portage_t"
-PORTAGE_FETCH_T="portage_fetch_t"
-PORTAGE_SANDBOX_T="portage_sandbox_t"
diff --git a/profiles/features/selinux/package.use.force b/profiles/features/selinux/package.use.force
deleted file mode 100644
index afaa049..0000000
--- a/profiles/features/selinux/package.use.force
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/package.use.force,v 1.8 2013/05/21 19:02:54 swift Exp $
-
-# Sven Vermeulen <swift@gentoo.org> (19 Apr 2013)
-# sys-apps/policycoreutils (semanage command) uses sepolgen, which requires libselinux with USE="python". 
-# sys-apps/policycoreutils also requires libsemanage with USE="python" and
-# setools with USE="python"
-sys-libs/libselinux python
-sys-libs/libsemanage python
-app-admin/setools python
-
-# Sven Vermeulen <swift@gentoo.org> (21 May 2013)
-# sys-apps/policycoreutils has PYTHON_USE_WITH="xml" set, so we force it
-# here to allow stages to build with USE=xml on python
-dev-lang/python xml
diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask
deleted file mode 100644
index d540803..0000000
--- a/profiles/features/selinux/package.use.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/package.use.mask,v 1.5 2013/03/19 19:47:50 swift Exp $
-
-# Saleem Abdulrasool <compnerd@gentoo.org> (23 Nov 2007)
-# Unmask when we get HAL 0.5.10 straightened out
-media-sound/pulseaudio policykit
diff --git a/profiles/features/selinux/packages b/profiles/features/selinux/packages
deleted file mode 100644
index 7d21ab0..0000000
--- a/profiles/features/selinux/packages
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/packages,v 1.3 2012/06/20 14:38:44 swift Exp $
-
-# Base SELinux packages
-*sys-libs/libsepol
-*sys-libs/libselinux
-*sys-libs/libsemanage
-*sys-apps/checkpolicy
-*sys-apps/policycoreutils
-*sec-policy/selinux-base-policy
diff --git a/profiles/features/selinux/profile.bashrc b/profiles/features/selinux/profile.bashrc
deleted file mode 100644
index d28d6c3..0000000
--- a/profiles/features/selinux/profile.bashrc
+++ /dev/null
@@ -1,5 +0,0 @@
-# SELinux-aware progams write to entries here
-SANDBOX_WRITE="${SANDBOX_WRITE}:/selinux/:/sys/fs/selinux/"
-
-# for setfscreatecon
-SANDBOX_WRITE="${SANDBOX_WRITE}:/proc/self/"
diff --git a/profiles/features/selinux/use.force b/profiles/features/selinux/use.force
deleted file mode 100644
index a651b20..0000000
--- a/profiles/features/selinux/use.force
+++ /dev/null
@@ -1 +0,0 @@
-selinux
diff --git a/profiles/features/selinux/use.mask b/profiles/features/selinux/use.mask
deleted file mode 100644
index d1ee8c0..0000000
--- a/profiles/features/selinux/use.mask
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/use.mask,v 1.3 2011/07/17 19:35:56 blueness Exp $
-
-# This file masks out USE flags that are simply NOT allowed in the default
-# profile for any architecture.  This works, for example, if a non-default
-# profile (such as the selinux profiles) have a USE flag associated with
-# them.
-
--hardened
--selinux
-
-# amd64 only:
-emul-linux-x86
-
-# tcc is x86-only
-tcc
diff --git a/profiles/hardened/README b/profiles/hardened/README
deleted file mode 100644
index 202df5e..0000000
--- a/profiles/hardened/README
+++ /dev/null
@@ -1,6 +0,0 @@
-
-Note that the hardened/arches profiles have been deprecated in
-favor of the hardened/linux/arches profiles.  Please use a supported
-profile which you can list using "eselect profile list" and select
-with "eselect profile set #".
-
diff --git a/profiles/hardened/linux/amd64/desktop/deprecated b/profiles/hardened/linux/amd64/desktop/deprecated
deleted file mode 100644
index d287b94..0000000
--- a/profiles/hardened/linux/amd64/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-hardened/linux/amd64
diff --git a/profiles/hardened/linux/amd64/desktop/parent b/profiles/hardened/linux/amd64/desktop/parent
deleted file mode 100644
index 8bd8630..0000000
--- a/profiles/hardened/linux/amd64/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../targets/desktop
diff --git a/profiles/hardened/linux/amd64/developer/deprecated b/profiles/hardened/linux/amd64/developer/deprecated
deleted file mode 100644
index d287b94..0000000
--- a/profiles/hardened/linux/amd64/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-hardened/linux/amd64
diff --git a/profiles/hardened/linux/amd64/developer/parent b/profiles/hardened/linux/amd64/developer/parent
deleted file mode 100644
index b558d90..0000000
--- a/profiles/hardened/linux/amd64/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../targets/developer
diff --git a/profiles/hardened/linux/amd64/eapi b/profiles/hardened/linux/amd64/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/amd64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/amd64/make.defaults b/profiles/hardened/linux/amd64/make.defaults
deleted file mode 100644
index 61b0126..0000000
--- a/profiles/hardened/linux/amd64/make.defaults
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/make.defaults,v 1.7 2012/06/16 11:44:13 jlec Exp $
-
-USE="justify -pic"
-
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
diff --git a/profiles/hardened/linux/amd64/no-multilib/make.defaults b/profiles/hardened/linux/amd64/no-multilib/make.defaults
deleted file mode 100644
index 49d1166..0000000
--- a/profiles/hardened/linux/amd64/no-multilib/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/no-multilib/make.defaults,v 1.3 2013/05/16 19:29:27 zorry Exp $
-
-ARCH="amd64"
-ACCEPT_KEYWORDS="${ARCH}"
-
-MULTILIB_ABIS="amd64"
-
-# Mirror profile/amd64/no-multilib/make.defaults
-USE_EXPAND_HIDDEN="ABI_X86"
-
diff --git a/profiles/hardened/linux/amd64/no-multilib/package.use.force b/profiles/hardened/linux/amd64/no-multilib/package.use.force
deleted file mode 100644
index 3c36907..0000000
--- a/profiles/hardened/linux/amd64/no-multilib/package.use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/no-multilib/package.use.force,v 1.1 2013/05/16 19:29:27 zorry Exp $
-
-# Alexandre Rostovtsev <tetromino@gentoo.org> (24 Jun 2012)
-# Force 64-bit parts of wine, bug #351436
-app-emulation/wine win64
diff --git a/profiles/hardened/linux/amd64/no-multilib/package.use.mask b/profiles/hardened/linux/amd64/no-multilib/package.use.mask
deleted file mode 100644
index 87936b2..0000000
--- a/profiles/hardened/linux/amd64/no-multilib/package.use.mask
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/no-multilib/package.use.mask,v 1.2 2013/05/16 19:29:27 zorry Exp $
-
-# Mirror profile/amd64/no-multilib/package.use.mask
-# Alexandre Rostovtsev <tetromino@gentoo.org> (24 Jun 2012)
-# Disable 32-bit parts of wine, bug #351436
-app-emulation/wine mono win32
-
-# Apr 28, 2008 Sébastien Fabbro <bicatali@gentoo.org>
-# ifc masked
-sci-libs/acml ifc
-
-# Intel Integrated Primitive (sci-libs/ipp) support
-media-libs/opencv ipp
diff --git a/profiles/hardened/linux/amd64/no-multilib/parent b/profiles/hardened/linux/amd64/no-multilib/parent
deleted file mode 100644
index 8305c35..0000000
--- a/profiles/hardened/linux/amd64/no-multilib/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../features/64bit-native
diff --git a/profiles/hardened/linux/amd64/no-multilib/selinux/parent b/profiles/hardened/linux/amd64/no-multilib/selinux/parent
deleted file mode 100644
index 933e679..0000000
--- a/profiles/hardened/linux/amd64/no-multilib/selinux/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../features/selinux
diff --git a/profiles/hardened/linux/amd64/no-multilib/use.mask b/profiles/hardened/linux/amd64/no-multilib/use.mask
deleted file mode 100644
index 5cd1ab9..0000000
--- a/profiles/hardened/linux/amd64/no-multilib/use.mask
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/no-multilib/use.mask,v 1.2 2013/05/16 19:29:27 zorry Exp $
-
-# Mask the multilib flags back for non-multilib profile.
-abi_x86_32
-
-# Mirror profile/amd64/no-multilib/use.mask
-
-# 2007/08/29 Christoph Mende <angelos@gentoo.org>
-# app-accessibility/mbrola is x86 only
-mbrola
-
-# 2007/08/24 Michael Marineau <marineam@gentoo.org>
-# Xen HVM support requires building 32-bit binaries.
-hvm
-
-# 2009/05/11 Doug Goldstein <cardoe@gentoo.org>
-# Mask 32bit since this will always require emulation packages
-32bit
-
-# Matt Turner <mattst88@gentoo.org) (10 Feb 2012)
-# mask d3d since wine is 32-bit
-d3d
diff --git a/profiles/hardened/linux/amd64/package.use b/profiles/hardened/linux/amd64/package.use
deleted file mode 100644
index 9bd09a8..0000000
--- a/profiles/hardened/linux/amd64/package.use
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/package.use,v 1.3 2011/03/25 16:19:06 blueness Exp $
-
-# Magnus Granberg <zorry@gentoo.org> (06 Mar 2011)
-# We will have pic enable on older package but not
-# new one. This will be removed when newer get
-# stable and older package is not in portage tree 
-# any longer. Tracker bug #348050
-<media-libs/mesa-7.10.1 pic
-<media-libs/xvid-1.3.0 pic
-<dev-lang/php-5.3.5-r1 pic
-
-# Magnus Grenberg <zorry@gentoo.org> (17 Mar 2011)
-# Bug 358929 the pic flag need to be on don't know way.
-# Anthony Basile <blueness@gentoo.org>
-# Bug 348050 comment 5 - fixed mispelling
-app-emulation/open-vm-tools pic
-
diff --git a/profiles/hardened/linux/amd64/package.use.mask b/profiles/hardened/linux/amd64/package.use.mask
deleted file mode 100644
index 551f261..0000000
--- a/profiles/hardened/linux/amd64/package.use.mask
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/package.use.mask,v 1.25 2013/09/24 08:19:29 mgorny Exp $
-
-# When you add an entry to the top of this file, add your name, the date, and
-# an explanation of why something is getting masked. Please be extremely
-# careful not to commit atoms that are not valid, as it can cause large-scale
-# breakage, especially if it ends up in the daily snapshot.
-#
-## Example:
-##
-## # Dev E. Loper <developer@gentoo.org> (28 Jun 2012)
-## # Masking foo USE flag until we can get the
-## # foo stuff to work properly again (bug 12345)
-## =media-video/mplayer-0.90_pre5 foo
-## =media-video/mplayer-0.90_pre5-r1 foo
-
-# Kacper Kowalik <xarthisius@gentoo.org> (29 Jul 2011)
-# mask assembler as it currently doesn't work
-dev-lang/path64 assembler
-
-# Magnus Granberg <zorry@gentoo.org> (20 Nov 2012)
-# mask X for we still mis the docs for revdep-pax
-# else hell will rule. (RWX in the libs)
-# Bug 433121
-# also mask tools as it requires X -zerochaos
-x11-drivers/nvidia-drivers X tools
-
-# Magnus Granberg <zorry@gentoo.org> (29 Nov 2012)
-# Bug #444786 disable nvidia on app-admin/conky
-app-admin/conky nvidia
diff --git a/profiles/hardened/linux/amd64/package.use.stable.mask b/profiles/hardened/linux/amd64/package.use.stable.mask
deleted file mode 100644
index f1f011e..0000000
--- a/profiles/hardened/linux/amd64/package.use.stable.mask
+++ /dev/null
@@ -1,405 +0,0 @@
-# Michał Górny <mgorny@gentoo.org> (24 Sep 2013)
-# on behalf of gx86-multilib project <multilib@gentoo.org>
-# Mask abi_x86_32 on stable until emul-* packages are made
-# fully redundant and end-user experience in resolving
-# flag changes and blockages is generally smooth.
-# Please keep in sync with default/linux/amd64/13.0.
-app-admin/fam abi_x86_32
-app-admin/gamin abi_x86_32
-app-arch/bzip2 abi_x86_32
-app-arch/xz-utils abi_x86_32
-app-crypt/mit-krb5 abi_x86_32
-app-emulation/emul-linux-x86-baselibs abi_x86_32
-app-emulation/emul-linux-x86-compat abi_x86_32
-app-emulation/emul-linux-x86-cpplibs abi_x86_32
-app-emulation/emul-linux-x86-db abi_x86_32
-app-emulation/emul-linux-x86-glibc-errno-compat abi_x86_32
-app-emulation/emul-linux-x86-gstplugins abi_x86_32
-app-emulation/emul-linux-x86-gtklibs abi_x86_32
-app-emulation/emul-linux-x86-gtkmmlibs abi_x86_32
-app-emulation/emul-linux-x86-java abi_x86_32
-app-emulation/emul-linux-x86-jna abi_x86_32
-app-emulation/emul-linux-x86-medialibs abi_x86_32
-app-emulation/emul-linux-x86-motif abi_x86_32
-app-emulation/emul-linux-x86-opengl abi_x86_32
-app-emulation/emul-linux-x86-qtlibs abi_x86_32
-app-emulation/emul-linux-x86-sdl abi_x86_32
-app-emulation/emul-linux-x86-soundlibs abi_x86_32
-app-emulation/emul-linux-x86-xlibs abi_x86_32
-app-misc/lirc abi_x86_32
-app-text/libpaper abi_x86_32
-dev-cpp/atkmm abi_x86_32
-dev-cpp/cairomm abi_x86_32
-dev-cpp/glibmm abi_x86_32
-dev-cpp/gtest abi_x86_32
-dev-cpp/gtkmm abi_x86_32
-dev-cpp/libglademm abi_x86_32
-dev-cpp/pangomm abi_x86_32
-dev-db/myodbc abi_x86_32
-dev-db/mysql abi_x86_32
-dev-db/sqlite abi_x86_32
-dev-db/unixODBC abi_x86_32
-dev-games/physfs abi_x86_32
-dev-java/jna abi_x86_32
-dev-lang/orc abi_x86_32
-dev-lang/perl abi_x86_32
-dev-lang/python abi_x86_32
-dev-libs/angelscript abi_x86_32
-dev-libs/atk abi_x86_32
-dev-libs/boost abi_x86_32
-dev-libs/dbus-glib abi_x86_32
-dev-libs/ding-libs abi_x86_32
-dev-libs/DirectFB abi_x86_32
-dev-libs/elfutils abi_x86_32
-dev-libs/expat abi_x86_32
-dev-libs/fribidi abi_x86_32
-dev-libs/glib abi_x86_32
-dev-libs/gmp abi_x86_32
-dev-libs/json-c abi_x86_32
-dev-libs/libcdio abi_x86_32
-dev-libs/libconfig abi_x86_32
-dev-libs/libcss abi_x86_32
-dev-libs/libedit abi_x86_32
-dev-libs/libelf abi_x86_32
-dev-libs/libffi abi_x86_32
-dev-libs/libgamin abi_x86_32
-dev-libs/libgcrypt abi_x86_32
-dev-libs/libgpg-error abi_x86_32
-dev-libs/libiconv abi_x86_32
-dev-libs/libIDL abi_x86_32
-dev-libs/libnl abi_x86_32
-dev-libs/libnsfb abi_x86_32
-dev-libs/liboil abi_x86_32
-dev-libs/libparserutils abi_x86_32
-dev-libs/libpcre abi_x86_32
-dev-libs/libpthread-stubs abi_x86_32
-dev-libs/libRocket abi_x86_32
-dev-libs/libsigc++ abi_x86_32
-dev-libs/libtasn1 abi_x86_32
-dev-libs/libusb abi_x86_32
-dev-libs/libusbx abi_x86_32
-dev-libs/libusb-compat abi_x86_32
-dev-libs/libwapcaplet abi_x86_32
-dev-libs/libxml2 abi_x86_32
-dev-libs/libxslt abi_x86_32
-dev-libs/lzo abi_x86_32
-dev-libs/nettle abi_x86_32
-dev-libs/nsgenbind abi_x86_32
-dev-libs/nspr abi_x86_32
-dev-libs/nss abi_x86_32
-dev-libs/openssl abi_x86_32
-dev-libs/re2 abi_x86_32
-dev-libs/udis86 abi_x86_32
-dev-libs/yajl abi_x86_32
-gnome-base/gconf abi_x86_32
-gnome-base/gnome-vfs abi_x86_32
-gnome-base/libglade abi_x86_32
-gnome-base/orbit abi_x86_32
-media-gfx/sane-backends abi_x86_32
-media-libs/a52dec abi_x86_32
-media-libs/allegro abi_x86_32
-media-libs/alsa-lib abi_x86_32
-media-libs/alsa-oss abi_x86_32
-media-libs/audiofile abi_x86_32
-media-libs/celt abi_x86_32
-media-libs/dumb abi_x86_32
-media-libs/faac abi_x86_32
-media-libs/faad2 abi_x86_32
-media-libs/fdk-aac abi_x86_32
-media-libs/flac abi_x86_32
-media-libs/fontconfig abi_x86_32
-media-libs/freealut abi_x86_32
-media-libs/freeglut abi_x86_32
-media-libs/freetype abi_x86_32
-media-libs/game-music-emu abi_x86_32
-media-libs/gavl abi_x86_32
-media-libs/giflib abi_x86_32
-media-libs/glew abi_x86_32
-media-libs/glu abi_x86_32
-media-libs/gst-plugins-bad abi_x86_32
-media-libs/gst-plugins-base abi_x86_32
-media-libs/gst-plugins-good abi_x86_32
-media-libs/gst-plugins-ugly abi_x86_32
-media-libs/gstreamer abi_x86_32
-media-libs/ilmbase abi_x86_32
-media-libs/imlib abi_x86_32
-media-libs/jbigkit abi_x86_32
-media-libs/jpeg abi_x86_32
-media-libs/ladspa-sdk abi_x86_32
-media-libs/lcms abi_x86_32
-media-libs/libaacplus abi_x86_32
-media-libs/libao abi_x86_32
-media-libs/libart_lgpl abi_x86_32
-media-libs/libcddb abi_x86_32
-media-libs/libcuefile abi_x86_32
-media-libs/libdc1394 abi_x86_32
-media-libs/libdca abi_x86_32
-media-libs/libdv abi_x86_32
-media-libs/libdvdnav abi_x86_32
-media-libs/libdvdread abi_x86_32
-media-libs/libexif abi_x86_32
-media-libs/libfame abi_x86_32
-media-libs/libgii abi_x86_32
-media-libs/libgphoto2 abi_x86_32
-media-libs/libid3tag abi_x86_32
-media-libs/libiec61883 abi_x86_32
-media-libs/libjpeg-turbo abi_x86_32
-media-libs/libmad abi_x86_32
-media-libs/libmikmod abi_x86_32
-media-libs/libmimic abi_x86_32
-media-libs/libmms abi_x86_32
-media-libs/libmng abi_x86_32
-media-libs/libmodplug abi_x86_32
-media-libs/libmpeg2 abi_x86_32
-media-libs/libnsbmp abi_x86_32
-media-libs/libnsgif abi_x86_32
-media-libs/libofa abi_x86_32
-media-libs/libogg abi_x86_32
-media-libs/libpng abi_x86_32
-media-libs/libreplaygain abi_x86_32
-media-libs/librosprite abi_x86_32
-media-libs/libsamplerate abi_x86_32
-media-libs/libsdl abi_x86_32
-media-libs/libshout abi_x86_32
-media-libs/libsidplay abi_x86_32
-media-libs/libsndfile abi_x86_32
-media-libs/libsvgtiny abi_x86_32
-media-libs/libtheora abi_x86_32
-media-libs/libv4l abi_x86_32
-media-libs/libvisual abi_x86_32
-media-libs/libvorbis abi_x86_32
-media-libs/libvpx abi_x86_32
-media-libs/libwebp abi_x86_32
-media-libs/libXcm abi_x86_32
-media-libs/mesa abi_x86_32
-media-libs/nas abi_x86_32
-media-libs/openal abi_x86_32
-media-libs/opencore-amr abi_x86_32
-media-libs/openexr abi_x86_32
-media-libs/openjpeg abi_x86_32
-media-libs/opus abi_x86_32
-media-libs/oyranos abi_x86_32
-media-libs/phonon abi_x86_32
-media-libs/portaudio abi_x86_32
-media-libs/schroedinger abi_x86_32
-media-libs/sdl-image abi_x86_32
-media-libs/sdl-mixer abi_x86_32
-media-libs/sdl-net abi_x86_32
-media-libs/sdl-sound abi_x86_32
-media-libs/sdl-ttf abi_x86_32
-media-libs/smpeg abi_x86_32
-media-libs/soxr abi_x86_32
-media-libs/speex abi_x86_32
-media-libs/taglib abi_x86_32
-media-libs/tiff abi_x86_32
-media-libs/vo-aacenc abi_x86_32
-media-libs/vo-amrwbenc abi_x86_32
-media-libs/webrtc-audio-processing abi_x86_32
-media-libs/x264 abi_x86_32
-media-libs/xvid abi_x86_32
-media-plugins/alsaequal abi_x86_32
-media-plugins/alsa-plugins abi_x86_32
-media-plugins/caps-plugins abi_x86_32
-media-plugins/gst-plugins-a52dec abi_x86_32
-media-plugins/gst-plugins-alsa abi_x86_32
-media-plugins/gst-plugins-annodex abi_x86_32
-media-plugins/gst-plugins-cdio abi_x86_32
-media-plugins/gst-plugins-cdparanoia abi_x86_32
-media-plugins/gst-plugins-dts abi_x86_32
-media-plugins/gst-plugins-dv abi_x86_32
-media-plugins/gst-plugins-dvb abi_x86_32
-media-plugins/gst-plugins-dvdread abi_x86_32
-media-plugins/gst-plugins-faac abi_x86_32
-media-plugins/gst-plugins-faad abi_x86_32
-media-plugins/gst-plugins-ffmpeg abi_x86_32
-media-plugins/gst-plugins-flac abi_x86_32
-media-plugins/gst-plugins-gconf abi_x86_32
-media-plugins/gst-plugins-gio abi_x86_32
-media-plugins/gst-plugins-gnomevfs abi_x86_32
-media-plugins/gst-plugins-jpeg abi_x86_32
-media-plugins/gst-plugins-ladspa abi_x86_32
-media-plugins/gst-plugins-lame abi_x86_32
-media-plugins/gst-plugins-libmms abi_x86_32
-media-plugins/gst-plugins-libpng abi_x86_32
-media-plugins/gst-plugins-libvisual abi_x86_32
-media-plugins/gst-plugins-mad abi_x86_32
-media-plugins/gst-plugins-meta abi_x86_32
-media-plugins/gst-plugins-mimic abi_x86_32
-media-plugins/gst-plugins-modplug abi_x86_32
-media-plugins/gst-plugins-mpeg2dec abi_x86_32
-media-plugins/gst-plugins-mplex abi_x86_32
-media-plugins/gst-plugins-musepack abi_x86_32
-media-plugins/gst-plugins-neon abi_x86_32
-media-plugins/gst-plugins-ofa abi_x86_32
-media-plugins/gst-plugins-ogg abi_x86_32
-media-plugins/gst-plugins-oss abi_x86_32
-media-plugins/gst-plugins-pango abi_x86_32
-media-plugins/gst-plugins-pulse abi_x86_32
-media-plugins/gst-plugins-raw1394 abi_x86_32
-media-plugins/gst-plugins-resindvd abi_x86_32
-media-plugins/gst-plugins-shout2 abi_x86_32
-media-plugins/gst-plugins-sidplay abi_x86_32
-media-plugins/gst-plugins-soup abi_x86_32
-media-plugins/gst-plugins-speex abi_x86_32
-media-plugins/gst-plugins-taglib abi_x86_32
-media-plugins/gst-plugins-theora abi_x86_32
-media-plugins/gst-plugins-twolame abi_x86_32
-media-plugins/gst-plugins-v4l2 abi_x86_32
-media-plugins/gst-plugins-vorbis abi_x86_32
-media-plugins/gst-plugins-vp8 abi_x86_32
-media-plugins/gst-plugins-wavpack abi_x86_32
-media-plugins/gst-plugins-x abi_x86_32
-media-plugins/gst-plugins-x264 abi_x86_32
-media-plugins/gst-plugins-ximagesrc abi_x86_32
-media-plugins/gst-plugins-xvid abi_x86_32
-media-plugins/gst-plugins-xvideo abi_x86_32
-media-plugins/swh-plugins abi_x86_32
-media-sound/cdparanoia abi_x86_32
-media-sound/gsm abi_x86_32
-media-sound/jack-audio-connection-kit abi_x86_32
-media-sound/lame abi_x86_32
-media-sound/mpg123 abi_x86_32
-media-sound/musepack-tools abi_x86_32
-media-sound/pulseaudio abi_x86_32
-media-sound/twolame abi_x86_32
-media-sound/wavpack abi_x86_32
-media-video/dirac abi_x86_32
-media-video/ffmpeg abi_x86_32
-media-video/mjpegtools abi_x86_32
-media-video/vcdimager abi_x86_32
-net-dialup/capi4k-utils abi_x86_32
-net-dns/libidn abi_x86_32
-net-libs/gnutls abi_x86_32
-net-libs/libdom abi_x86_32
-net-libs/libgssglue abi_x86_32
-net-libs/libhubbub abi_x86_32
-net-libs/libsoup abi_x86_32
-net-libs/libtirpc abi_x86_32
-net-libs/nacl abi_x86_32
-net-libs/neon abi_x86_32
-net-misc/curl abi_x86_32
-net-nds/openldap abi_x86_32
-net-print/cups abi_x86_32
-net-wireless/bluez abi_x86_32
-sci-libs/djbfft abi_x86_32
-sci-libs/fftw abi_x86_32
-sys-apps/acl abi_x86_32
-sys-apps/attr abi_x86_32
-sys-apps/dbus abi_x86_32
-sys-apps/file abi_x86_32
-sys-apps/keyutils abi_x86_32
-sys-apps/pciutils abi_x86_32
-sys-apps/systemd abi_x86_32
-sys-apps/tcp-wrappers abi_x86_32
-sys-apps/util-linux abi_x86_32
-sys-auth/nss_ldap abi_x86_32
-sys-auth/nss-mdns abi_x86_32
-sys-auth/openpam abi_x86_32
-sys-auth/pam_ldap abi_x86_32
-sys-devel/binutils abi_x86_32
-sys-devel/clang abi_x86_32
-sys-devel/gettext abi_x86_32
-sys-devel/libperl abi_x86_32
-sys-devel/libtool abi_x86_32
-sys-devel/llvm abi_x86_32
-sys-freebsd/freebsd-lib abi_x86_32
-sys-freebsd/freebsd-libexec abi_x86_32
-sys-freebsd/freebsd-ubin abi_x86_32
-sys-fs/e2fsprogs abi_x86_32
-sys-fs/eudev abi_x86_32
-sys-fs/udev abi_x86_32
-sys-libs/cracklib abi_x86_32
-sys-libs/db abi_x86_32
-sys-libs/e2fsprogs-libs abi_x86_32
-sys-libs/gdbm abi_x86_32
-sys-libs/gpm abi_x86_32
-sys-libs/libavc1394 abi_x86_32
-sys-libs/lib-compat abi_x86_32
-sys-libs/libcxx abi_x86_32
-sys-libs/libcxxrt abi_x86_32
-sys-libs/libieee1284 abi_x86_32
-sys-libs/libraw1394 abi_x86_32
-sys-libs/libsepol abi_x86_32
-sys-libs/libstdc++-v3 abi_x86_32
-sys-libs/ncurses abi_x86_32
-sys-libs/pam abi_x86_32
-sys-libs/pwdb abi_x86_32
-sys-libs/readline abi_x86_32
-sys-libs/slang abi_x86_32
-sys-libs/talloc abi_x86_32
-sys-libs/zlib abi_x86_32
-virtual/fam abi_x86_32
-virtual/glu abi_x86_32
-virtual/jpeg abi_x86_32
-virtual/libffi abi_x86_32
-virtual/libiconv abi_x86_32
-virtual/libusb abi_x86_32
-virtual/opengl abi_x86_32
-virtual/udev abi_x86_32
-x11-libs/cairo abi_x86_32
-x11-libs/gdk-pixbuf abi_x86_32
-x11-libs/gtk+ abi_x86_32
-x11-libs/libdrm abi_x86_32
-x11-libs/libICE abi_x86_32
-x11-libs/libnotify abi_x86_32
-x11-libs/libpciaccess abi_x86_32
-x11-libs/libSM abi_x86_32
-x11-libs/libvdpau abi_x86_32
-x11-libs/libX11 abi_x86_32
-x11-libs/libXau abi_x86_32
-x11-libs/libXaw abi_x86_32
-x11-libs/libxcb abi_x86_32
-x11-libs/libXcomposite abi_x86_32
-x11-libs/libXcursor abi_x86_32
-x11-libs/libXdamage abi_x86_32
-x11-libs/libXdmcp abi_x86_32
-x11-libs/libXext abi_x86_32
-x11-libs/libXfixes abi_x86_32
-x11-libs/libXft abi_x86_32
-x11-libs/libXi abi_x86_32
-x11-libs/libXinerama abi_x86_32
-x11-libs/libXmu abi_x86_32
-x11-libs/libXp abi_x86_32
-x11-libs/libXpm abi_x86_32
-x11-libs/libXrandr abi_x86_32
-x11-libs/libXrender abi_x86_32
-x11-libs/libXScrnSaver abi_x86_32
-x11-libs/libXt abi_x86_32
-x11-libs/libXtst abi_x86_32
-x11-libs/libXv abi_x86_32
-x11-libs/libXvMC abi_x86_32
-x11-libs/libXxf86dga abi_x86_32
-x11-libs/libXxf86vm abi_x86_32
-x11-libs/motif abi_x86_32
-x11-libs/pango abi_x86_32
-x11-libs/pixman abi_x86_32
-x11-libs/qt-core abi_x86_32
-x11-libs/qt-dbus abi_x86_32
-x11-libs/qt-gui abi_x86_32
-x11-libs/qt-opengl abi_x86_32
-x11-libs/qt-script abi_x86_32
-x11-libs/qt-sql abi_x86_32
-x11-libs/qt-svg abi_x86_32
-x11-libs/qt-webkit abi_x86_32
-x11-libs/qt-xmlpatterns abi_x86_32
-x11-proto/compositeproto abi_x86_32
-x11-proto/damageproto abi_x86_32
-x11-proto/fixesproto abi_x86_32
-x11-proto/inputproto abi_x86_32
-x11-proto/kbproto abi_x86_32
-x11-proto/printproto abi_x86_32
-x11-proto/randrproto abi_x86_32
-x11-proto/recordproto abi_x86_32
-x11-proto/renderproto abi_x86_32
-x11-proto/scrnsaverproto abi_x86_32
-x11-proto/videoproto abi_x86_32
-x11-proto/xcb-proto abi_x86_32
-x11-proto/xextproto abi_x86_32
-x11-proto/xf86bigfontproto abi_x86_32
-x11-proto/xf86dgaproto abi_x86_32
-x11-proto/xf86vidmodeproto abi_x86_32
-x11-proto/xineramaproto abi_x86_32
-x11-proto/xproto abi_x86_32
-x11-themes/gtk-engines abi_x86_32
-x11-themes/gtk-engines-murrine abi_x86_32
-x11-themes/gtk-engines-xfce abi_x86_32
diff --git a/profiles/hardened/linux/amd64/parent b/profiles/hardened/linux/amd64/parent
deleted file mode 100644
index f2e50ba..0000000
--- a/profiles/hardened/linux/amd64/parent
+++ /dev/null
@@ -1,4 +0,0 @@
-../../../base
-../../../default/linux
-../../../arch/amd64
-..
diff --git a/profiles/hardened/linux/amd64/selinux/parent b/profiles/hardened/linux/amd64/selinux/parent
deleted file mode 100644
index e5c7cef..0000000
--- a/profiles/hardened/linux/amd64/selinux/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../features/selinux
diff --git a/profiles/hardened/linux/amd64/server/deprecated b/profiles/hardened/linux/amd64/server/deprecated
deleted file mode 100644
index d287b94..0000000
--- a/profiles/hardened/linux/amd64/server/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-hardened/linux/amd64
diff --git a/profiles/hardened/linux/amd64/server/parent b/profiles/hardened/linux/amd64/server/parent
deleted file mode 100644
index 9c7a195..0000000
--- a/profiles/hardened/linux/amd64/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../targets/server
diff --git a/profiles/hardened/linux/amd64/use.mask b/profiles/hardened/linux/amd64/use.mask
deleted file mode 100644
index 1a7f429..0000000
--- a/profiles/hardened/linux/amd64/use.mask
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/use.mask,v 1.7 2012/11/27 02:03:24 zerochaos Exp $
-
-# Rick Farina <zerochaos@gentoo.org> 26 Nov 2012
-video_cards_nvidia
-# removing mask on nvidia use flag as it is used by monitoring tools
-# which may be desireable for cuda users
-#nvidia
-# adjusting use flag mask as nvidia-drivers are usable for cuda at least
-#cuda
diff --git a/profiles/hardened/linux/amd64/x32/make.defaults b/profiles/hardened/linux/amd64/x32/make.defaults
deleted file mode 100644
index ab350e0..0000000
--- a/profiles/hardened/linux/amd64/x32/make.defaults
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/x32/make.defaults,v 1.1 2012/08/31 17:49:11 vapier Exp $
-
-CHOST="x86_64-pc-linux-gnux32"
diff --git a/profiles/hardened/linux/amd64/x32/parent b/profiles/hardened/linux/amd64/x32/parent
deleted file mode 100644
index 382293d..0000000
--- a/profiles/hardened/linux/amd64/x32/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-..
-../../../../features/multilib/
-../../../../arch/amd64/x32/
diff --git a/profiles/hardened/linux/arm/armv4/eapi b/profiles/hardened/linux/arm/armv4/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/arm/armv4/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/arm/armv4/parent b/profiles/hardened/linux/arm/armv4/parent
deleted file mode 100644
index 5a3c05a..0000000
--- a/profiles/hardened/linux/arm/armv4/parent
+++ /dev/null
@@ -1,4 +0,0 @@
-../../../../base
-../../../../default/linux/
-../../../../arch/arm/armv4/
-..
diff --git a/profiles/hardened/linux/arm/armv4t/eapi b/profiles/hardened/linux/arm/armv4t/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/arm/armv4t/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/arm/armv4t/parent b/profiles/hardened/linux/arm/armv4t/parent
deleted file mode 100644
index ac82505..0000000
--- a/profiles/hardened/linux/arm/armv4t/parent
+++ /dev/null
@@ -1,4 +0,0 @@
-../../../../base
-../../../../default/linux/
-../../../../arch/arm/armv4t/
-..
diff --git a/profiles/hardened/linux/arm/armv5te/eapi b/profiles/hardened/linux/arm/armv5te/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/arm/armv5te/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/arm/armv5te/parent b/profiles/hardened/linux/arm/armv5te/parent
deleted file mode 100644
index 2b3f2a0..0000000
--- a/profiles/hardened/linux/arm/armv5te/parent
+++ /dev/null
@@ -1,4 +0,0 @@
-../../../../base
-../../../../default/linux/
-../../../../arch/arm/armv5te/
-..
diff --git a/profiles/hardened/linux/arm/armv6j/eapi b/profiles/hardened/linux/arm/armv6j/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/arm/armv6j/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/arm/armv6j/parent b/profiles/hardened/linux/arm/armv6j/parent
deleted file mode 100644
index bc2ce36..0000000
--- a/profiles/hardened/linux/arm/armv6j/parent
+++ /dev/null
@@ -1,4 +0,0 @@
-../../../../base
-../../../../default/linux/
-../../../../arch/arm/armv6j/
-..
diff --git a/profiles/hardened/linux/arm/armv7a/eapi b/profiles/hardened/linux/arm/armv7a/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/arm/armv7a/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/arm/armv7a/parent b/profiles/hardened/linux/arm/armv7a/parent
deleted file mode 100644
index d01782d..0000000
--- a/profiles/hardened/linux/arm/armv7a/parent
+++ /dev/null
@@ -1,4 +0,0 @@
-../../../../base
-../../../../default/linux/
-../../../../arch/arm/armv7a/
-..
diff --git a/profiles/hardened/linux/arm/armv7a/selinux/eapi b/profiles/hardened/linux/arm/armv7a/selinux/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/arm/armv7a/selinux/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/arm/armv7a/selinux/parent b/profiles/hardened/linux/arm/armv7a/selinux/parent
deleted file mode 100644
index 933e679..0000000
--- a/profiles/hardened/linux/arm/armv7a/selinux/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../features/selinux
diff --git a/profiles/hardened/linux/arm/eapi b/profiles/hardened/linux/arm/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/arm/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/arm/parent b/profiles/hardened/linux/arm/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/hardened/linux/arm/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/hardened/linux/ia64/desktop/deprecated b/profiles/hardened/linux/ia64/desktop/deprecated
deleted file mode 100644
index 09ee42c..0000000
--- a/profiles/hardened/linux/ia64/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-hardened/linux/ia64
diff --git a/profiles/hardened/linux/ia64/desktop/parent b/profiles/hardened/linux/ia64/desktop/parent
deleted file mode 100644
index 8bd8630..0000000
--- a/profiles/hardened/linux/ia64/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../targets/desktop
diff --git a/profiles/hardened/linux/ia64/developer/deprecated b/profiles/hardened/linux/ia64/developer/deprecated
deleted file mode 100644
index 09ee42c..0000000
--- a/profiles/hardened/linux/ia64/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-hardened/linux/ia64
diff --git a/profiles/hardened/linux/ia64/developer/parent b/profiles/hardened/linux/ia64/developer/parent
deleted file mode 100644
index b558d90..0000000
--- a/profiles/hardened/linux/ia64/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../targets/developer
diff --git a/profiles/hardened/linux/ia64/eapi b/profiles/hardened/linux/ia64/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/ia64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/ia64/make.defaults b/profiles/hardened/linux/ia64/make.defaults
deleted file mode 100644
index 60d24dd..0000000
--- a/profiles/hardened/linux/ia64/make.defaults
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/ia64/make.defaults,v 1.3 2011/11/17 01:14:26 jmbsvicetto Exp $
diff --git a/profiles/hardened/linux/ia64/parent b/profiles/hardened/linux/ia64/parent
deleted file mode 100644
index 8683acb..0000000
--- a/profiles/hardened/linux/ia64/parent
+++ /dev/null
@@ -1,4 +0,0 @@
-../../../base
-../../../default/linux
-../../../arch/ia64
-..
diff --git a/profiles/hardened/linux/ia64/server/deprecated b/profiles/hardened/linux/ia64/server/deprecated
deleted file mode 100644
index 09ee42c..0000000
--- a/profiles/hardened/linux/ia64/server/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-hardened/linux/ia64
diff --git a/profiles/hardened/linux/ia64/server/parent b/profiles/hardened/linux/ia64/server/parent
deleted file mode 100644
index 9c7a195..0000000
--- a/profiles/hardened/linux/ia64/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../targets/server
diff --git a/profiles/hardened/linux/make.defaults b/profiles/hardened/linux/make.defaults
deleted file mode 100644
index cdedd1a..0000000
--- a/profiles/hardened/linux/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/make.defaults,v 1.17 2012/06/26 13:36:21 blueness Exp $
-
-# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
-# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pax_kernel pic -jit -orc"
-
-USE="-fortran hardened -jit pax_kernel pic urandom -orc"
diff --git a/profiles/hardened/linux/mips/eapi b/profiles/hardened/linux/mips/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/mips/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/mips/mipsel/eapi b/profiles/hardened/linux/mips/mipsel/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/mips/mipsel/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/mips/mipsel/multilib/eapi b/profiles/hardened/linux/mips/mipsel/multilib/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/mips/mipsel/multilib/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/mips/mipsel/multilib/n32/eapi b/profiles/hardened/linux/mips/mipsel/multilib/n32/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/mips/mipsel/multilib/n32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/mips/mipsel/multilib/n32/parent b/profiles/hardened/linux/mips/mipsel/multilib/n32/parent
deleted file mode 100644
index 96eb536..0000000
--- a/profiles/hardened/linux/mips/mipsel/multilib/n32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../../../default/linux/mips/13.0/mipsel/multilib/n32
-..
diff --git a/profiles/hardened/linux/mips/mipsel/multilib/n64/eapi b/profiles/hardened/linux/mips/mipsel/multilib/n64/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/mips/mipsel/multilib/n64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/mips/mipsel/multilib/n64/parent b/profiles/hardened/linux/mips/mipsel/multilib/n64/parent
deleted file mode 100644
index 64bafbb..0000000
--- a/profiles/hardened/linux/mips/mipsel/multilib/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../../../default/linux/mips/13.0/mipsel/multilib/n64
-..
diff --git a/profiles/hardened/linux/mips/mipsel/multilib/parent b/profiles/hardened/linux/mips/mipsel/multilib/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/hardened/linux/mips/mipsel/multilib/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/hardened/linux/mips/mipsel/n32/eapi b/profiles/hardened/linux/mips/mipsel/n32/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/mips/mipsel/n32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/mips/mipsel/n32/parent b/profiles/hardened/linux/mips/mipsel/n32/parent
deleted file mode 100644
index 3798606..0000000
--- a/profiles/hardened/linux/mips/mipsel/n32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../../default/linux/mips/13.0/mipsel/n32
-..
diff --git a/profiles/hardened/linux/mips/mipsel/n64/eapi b/profiles/hardened/linux/mips/mipsel/n64/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/mips/mipsel/n64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/mips/mipsel/n64/parent b/profiles/hardened/linux/mips/mipsel/n64/parent
deleted file mode 100644
index 2a19715..0000000
--- a/profiles/hardened/linux/mips/mipsel/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../../default/linux/mips/13.0/mipsel/n64
-..
diff --git a/profiles/hardened/linux/mips/mipsel/parent b/profiles/hardened/linux/mips/mipsel/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/hardened/linux/mips/mipsel/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/hardened/linux/mips/multilib/eapi b/profiles/hardened/linux/mips/multilib/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/mips/multilib/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/mips/multilib/n32/eapi b/profiles/hardened/linux/mips/multilib/n32/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/mips/multilib/n32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/mips/multilib/n32/parent b/profiles/hardened/linux/mips/multilib/n32/parent
deleted file mode 100644
index 1c6cb6d..0000000
--- a/profiles/hardened/linux/mips/multilib/n32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../../default/linux/mips/13.0/multilib/n32
-..
diff --git a/profiles/hardened/linux/mips/multilib/n64/eapi b/profiles/hardened/linux/mips/multilib/n64/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/mips/multilib/n64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/mips/multilib/n64/parent b/profiles/hardened/linux/mips/multilib/n64/parent
deleted file mode 100644
index abca1be..0000000
--- a/profiles/hardened/linux/mips/multilib/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../../default/linux/mips/13.0/multilib/n64
-..
diff --git a/profiles/hardened/linux/mips/multilib/parent b/profiles/hardened/linux/mips/multilib/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/hardened/linux/mips/multilib/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/hardened/linux/mips/n32/eapi b/profiles/hardened/linux/mips/n32/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/mips/n32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/mips/n32/parent b/profiles/hardened/linux/mips/n32/parent
deleted file mode 100644
index 4503d56..0000000
--- a/profiles/hardened/linux/mips/n32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../default/linux/mips/13.0/n32
-..
diff --git a/profiles/hardened/linux/mips/n64/eapi b/profiles/hardened/linux/mips/n64/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/mips/n64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/mips/n64/parent b/profiles/hardened/linux/mips/n64/parent
deleted file mode 100644
index 822543c..0000000
--- a/profiles/hardened/linux/mips/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../default/linux/mips/13.0/n64
-..
diff --git a/profiles/hardened/linux/mips/parent b/profiles/hardened/linux/mips/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/hardened/linux/mips/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/hardened/linux/musl/amd64/eapi b/profiles/hardened/linux/musl/amd64/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/musl/amd64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/musl/amd64/make.defaults b/profiles/hardened/linux/musl/amd64/make.defaults
deleted file mode 100644
index 7a0714c..0000000
--- a/profiles/hardened/linux/musl/amd64/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/make.defaults,v 1.1 2013/06/22 21:32:09 blueness Exp $
-
-ARCH="amd64"
-ACCEPT_KEYWORDS="${ARCH}"
-
-CHOST="x86_64-gentoo-linux-musl"
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
diff --git a/profiles/hardened/linux/musl/amd64/parent b/profiles/hardened/linux/musl/amd64/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/hardened/linux/musl/amd64/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/hardened/linux/musl/amd64/use.force b/profiles/hardened/linux/musl/amd64/use.force
deleted file mode 100644
index 790053d..0000000
--- a/profiles/hardened/linux/musl/amd64/use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/use.force,v 1.1 2013/06/22 21:32:10 blueness Exp $
-
-# Force the flag which corresponds to ARCH.
-amd64
diff --git a/profiles/hardened/linux/musl/amd64/use.mask b/profiles/hardened/linux/musl/amd64/use.mask
deleted file mode 100644
index ddfd439..0000000
--- a/profiles/hardened/linux/musl/amd64/use.mask
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/use.mask,v 1.1 2013/06/22 21:32:10 blueness Exp $
-
-# Unmask the flag which corresponds to ARCH.
--amd64
-
-# unmask all SIMD assembler flags
--mmx
--mmxext
--sse
--sse2
--sse3
--sse4
--sse4a
--ssse3
--3dnow
--3dnowext
-
-# Lilo works on amd64
--lilo
-
-# These work
--input_devices_synaptics
--input_devices_wacom
--video_cards_qxl
diff --git a/profiles/hardened/linux/musl/make.defaults b/profiles/hardened/linux/musl/make.defaults
deleted file mode 100644
index 9090a02..0000000
--- a/profiles/hardened/linux/musl/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/make.defaults,v 1.1 2013/06/22 21:32:09 blueness Exp $
-
-ELIBC="musl"
-
-FEATURES="sandbox sfperms strict"
-
-USE="hardened nptl pax_kernel pic unicode xattr -berkdb -jit -orc"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened nptl pax_kernel pic -berkdb -jit -orc"
-
-SYMLINK_LIB="no"
diff --git a/profiles/hardened/linux/musl/packages b/profiles/hardened/linux/musl/packages
deleted file mode 100644
index f155327..0000000
--- a/profiles/hardened/linux/musl/packages
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/packages,v 1.1 2013/06/22 21:32:09 blueness Exp $
-
-*app-misc/pax-utils
-*dev-libs/libiconv
--*sys-apps/man-pages
diff --git a/profiles/hardened/linux/musl/packages.build b/profiles/hardened/linux/musl/packages.build
deleted file mode 100644
index 6aa0a08..0000000
--- a/profiles/hardened/linux/musl/packages.build
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/packages.build,v 1.1 2013/06/22 21:32:09 blueness Exp $
-
-# This file lists extra packages needed to build for
-# a stage 1 based on this profile.
-
-dev-util/pkgconfig
-dev-libs/libiconv
-sys-apps/attr
-dev-python/pyxattr
diff --git a/profiles/hardened/linux/musl/parent b/profiles/hardened/linux/musl/parent
deleted file mode 100644
index c3ff51e..0000000
--- a/profiles/hardened/linux/musl/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../base/
-../../../default/linux
diff --git a/profiles/hardened/linux/musl/use.force b/profiles/hardened/linux/musl/use.force
deleted file mode 100644
index 5454b9d..0000000
--- a/profiles/hardened/linux/musl/use.force
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/use.force,v 1.1 2013/06/22 21:32:09 blueness Exp $
-
-elibc_musl
diff --git a/profiles/hardened/linux/musl/use.mask b/profiles/hardened/linux/musl/use.mask
deleted file mode 100644
index d1b81a5..0000000
--- a/profiles/hardened/linux/musl/use.mask
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/use.mask,v 1.1 2013/06/22 21:32:09 blueness Exp $
-
-nls
-pam
-
-emul-linux-x86
-
--elibc_musl
-elibc_uclibc
-elibc_glibc
-
--hardened
diff --git a/profiles/hardened/linux/musl/x86/eapi b/profiles/hardened/linux/musl/x86/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/musl/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/musl/x86/make.defaults b/profiles/hardened/linux/musl/x86/make.defaults
deleted file mode 100644
index b94780e..0000000
--- a/profiles/hardened/linux/musl/x86/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/x86/make.defaults,v 1.1 2013/08/09 09:47:51 blueness Exp $
-
-ARCH="x86"
-ACCEPT_KEYWORDS="${ARCH}"
-
-CHOST="i686-gentoo-linux-musl"
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
diff --git a/profiles/hardened/linux/musl/x86/parent b/profiles/hardened/linux/musl/x86/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/hardened/linux/musl/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/hardened/linux/musl/x86/use.force b/profiles/hardened/linux/musl/x86/use.force
deleted file mode 100644
index 79f05b2..0000000
--- a/profiles/hardened/linux/musl/x86/use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/x86/use.force,v 1.1 2013/08/09 09:47:51 blueness Exp $
-
-# Force the flag which corresponds to ARCH.
-x86
diff --git a/profiles/hardened/linux/musl/x86/use.mask b/profiles/hardened/linux/musl/x86/use.mask
deleted file mode 100644
index 213dbec..0000000
--- a/profiles/hardened/linux/musl/x86/use.mask
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/x86/use.mask,v 1.1 2013/08/09 09:47:51 blueness Exp $
-
-# Unmask the flag which corresponds to ARCH.
--x86
-
-# unmask all SIMD assembler flags
--mmx
--mmxext
--sse
--sse2
--sse3
--sse4
--sse4a
--ssse3
--3dnow
--3dnowext
diff --git a/profiles/hardened/linux/package.use.force b/profiles/hardened/linux/package.use.force
deleted file mode 100644
index a8f4a28..0000000
--- a/profiles/hardened/linux/package.use.force
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/package.use.force,v 1.2 2013/03/18 03:18:19 blueness Exp $
-
-# Kacper Kowalik <xarthisius@gentoo.org> (24 Aug 2011)
-# Force hardened flag to make repoman happy
-app-emulation/wine hardened
-
-# Needed for XATTR_PAX flags (17 Mar 2013)
-# Thanks Arfrever
-sys-apps/portage xattr
diff --git a/profiles/hardened/linux/package.use.mask b/profiles/hardened/linux/package.use.mask
deleted file mode 100644
index 052dabe..0000000
--- a/profiles/hardened/linux/package.use.mask
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/package.use.mask,v 1.15 2013/08/09 09:02:17 xarthisius Exp $
-
-sys-apps/hwloc gl
-
-sys-devel/gcc -hardened
-sys-libs/glibc -hardened
-
-# bug 407689
-media-tv/xbmc profile
-
-# Have no way to disable jit in esr release.
-=www-client/firefox-10* pgo
-
-# bug #468404
-net-analyzer/wireshark profile
diff --git a/profiles/hardened/linux/packages b/profiles/hardened/linux/packages
deleted file mode 100644
index af71a62..0000000
--- a/profiles/hardened/linux/packages
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/packages,v 1.3 2013/03/25 00:26:32 blueness Exp $
-
-# This file extends the base packages file for all hardened profiles
-
-*sys-apps/paxctl
-*sys-apps/elfix
diff --git a/profiles/hardened/linux/parent b/profiles/hardened/linux/parent
deleted file mode 100644
index 6560aec..0000000
--- a/profiles/hardened/linux/parent
+++ /dev/null
@@ -1 +0,0 @@
-../../releases/13.0
diff --git a/profiles/hardened/linux/powerpc/eapi b/profiles/hardened/linux/powerpc/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/powerpc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/powerpc/make.defaults b/profiles/hardened/linux/powerpc/make.defaults
deleted file mode 100644
index 96cbb6a..0000000
--- a/profiles/hardened/linux/powerpc/make.defaults
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2005-2008 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/make.defaults,v 1.1 2008/04/01 17:41:18 wolf31o2 Exp $
-
-FEATURES="-sandbox"
diff --git a/profiles/hardened/linux/powerpc/package.use.mask b/profiles/hardened/linux/powerpc/package.use.mask
deleted file mode 100644
index 9b6e65a..0000000
--- a/profiles/hardened/linux/powerpc/package.use.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# Diego Pettenò <flameeyes@gentoo.org> (10 Nov 2007)
-# Tests for Linux-PAM 0.99 require >=sys-libs/glibc-2.4
->=sys-libs/pam-0.99.8 test
diff --git a/profiles/hardened/linux/powerpc/parent b/profiles/hardened/linux/powerpc/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/hardened/linux/powerpc/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/hardened/linux/powerpc/ppc32/desktop/deprecated b/profiles/hardened/linux/powerpc/ppc32/desktop/deprecated
deleted file mode 100644
index f46e716..0000000
--- a/profiles/hardened/linux/powerpc/ppc32/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-hardened/linux/powerpc/ppc32
diff --git a/profiles/hardened/linux/powerpc/ppc32/desktop/parent b/profiles/hardened/linux/powerpc/ppc32/desktop/parent
deleted file mode 100644
index ad6c5e1..0000000
--- a/profiles/hardened/linux/powerpc/ppc32/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/hardened/linux/powerpc/ppc32/developer/deprecated b/profiles/hardened/linux/powerpc/ppc32/developer/deprecated
deleted file mode 100644
index f46e716..0000000
--- a/profiles/hardened/linux/powerpc/ppc32/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-hardened/linux/powerpc/ppc32
diff --git a/profiles/hardened/linux/powerpc/ppc32/developer/parent b/profiles/hardened/linux/powerpc/ppc32/developer/parent
deleted file mode 100644
index 4c89374..0000000
--- a/profiles/hardened/linux/powerpc/ppc32/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/hardened/linux/powerpc/ppc32/eapi b/profiles/hardened/linux/powerpc/ppc32/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/powerpc/ppc32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/powerpc/ppc32/make.defaults b/profiles/hardened/linux/powerpc/ppc32/make.defaults
deleted file mode 100644
index e3ab6ce..0000000
--- a/profiles/hardened/linux/powerpc/ppc32/make.defaults
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc32/make.defaults,v 1.3 2011/11/17 01:14:26 jmbsvicetto Exp $
diff --git a/profiles/hardened/linux/powerpc/ppc32/parent b/profiles/hardened/linux/powerpc/ppc32/parent
deleted file mode 100644
index 227873e..0000000
--- a/profiles/hardened/linux/powerpc/ppc32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../default/linux/powerpc/ppc32
-..
diff --git a/profiles/hardened/linux/powerpc/ppc32/server/deprecated b/profiles/hardened/linux/powerpc/ppc32/server/deprecated
deleted file mode 100644
index f46e716..0000000
--- a/profiles/hardened/linux/powerpc/ppc32/server/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-hardened/linux/powerpc/ppc32
diff --git a/profiles/hardened/linux/powerpc/ppc32/server/parent b/profiles/hardened/linux/powerpc/ppc32/server/parent
deleted file mode 100644
index c399016..0000000
--- a/profiles/hardened/linux/powerpc/ppc32/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/server
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/desktop/deprecated b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/desktop/deprecated
deleted file mode 100644
index 2d27182..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-hardened/linux/powerpc/ppc64/32bit-userland
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/desktop/parent b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/desktop/parent
deleted file mode 100644
index db8ce08..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/developer/deprecated b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/developer/deprecated
deleted file mode 100644
index 2d27182..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-hardened/linux/powerpc/ppc64/32bit-userland
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/developer/parent b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/developer/parent
deleted file mode 100644
index 5c8258a..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/eapi b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/make.defaults b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/make.defaults
deleted file mode 100644
index d0804ca..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc64/32bit-userland/make.defaults,v 1.1 2010/11/14 15:44:27 blueness Exp $
-
-# All extra USE/etc should be specified in sub-profiles.
-# DO NOT POLLUTE USE ON THIS PROFILE.
-
-ACCEPT_KEYWORDS="-* ${ARCH}"
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask
deleted file mode 100644
index c420587..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask,v 1.1 2012/04/25 19:26:57 xarthisius Exp $
-
-# Kacper Kowalik <xarthisius@gentoo.org> (25 Apr 2012)
-# Masking due to unsolved dependencies
-app-admin/puppet rrdtool
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent
deleted file mode 100644
index 926c328..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../features/32bit-userland
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/server/deprecated b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/server/deprecated
deleted file mode 100644
index 2d27182..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/server/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-hardened/linux/powerpc/ppc64/32bit-userland
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/server/parent b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/server/parent
deleted file mode 100644
index 2e085a6..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/server
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/use.force b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/use.force
deleted file mode 100644
index 8b2e740..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/use.force
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc64/32bit-userland/use.force,v 1.1 2012/04/26 13:50:39 xarthisius Exp $
-
-# Force the flag which corresponds to ARCH.
-ppc
-
-# Unforce the flag which corresponds to the 64-bit ARCH.
--ppc64
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/use.mask b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/use.mask
deleted file mode 100644
index eeb112a..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/use.mask
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc64/32bit-userland/use.mask,v 1.2 2012/04/26 13:59:23 xarthisius Exp $
-
-# We mask this since we're not really a multilib profile
-multilib
-
-# Unmask the flag which corresponds to ARCH.
--ppc
-
-# Mask the flag which corresponds to the 64-bit ARCH.
-ppc64
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/desktop/deprecated b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/desktop/deprecated
deleted file mode 100644
index d41a1d8..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-hardened/linux/powerpc/ppc64/64bit-userland
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/desktop/parent b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/desktop/parent
deleted file mode 100644
index db8ce08..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/developer/deprecated b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/developer/deprecated
deleted file mode 100644
index d41a1d8..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-hardened/linux/powerpc/ppc64/64bit-userland
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/developer/parent b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/developer/parent
deleted file mode 100644
index 5c8258a..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/eapi b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/package.use.mask b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/package.use.mask
deleted file mode 100644
index e1498ab..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/package.use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc64/64bit-userland/package.use.mask,v 1.1 2012/04/25 18:41:04 xarthisius Exp $
-
-# Kacper Kowalik <xarthisius@gentoo.org> (25 Apr 2012)
-# Masking wrt bug 274847 and other unsolved 
-# dependencies
-app-admin/conky apcupsd xmms2 hddtemp
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent
deleted file mode 100644
index 52bcba7..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../features/64bit-native
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/server/deprecated b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/server/deprecated
deleted file mode 100644
index d41a1d8..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/server/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-hardened/linux/powerpc/ppc64/64bit-userland
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/server/parent b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/server/parent
deleted file mode 100644
index 2e085a6..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/server
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/use.mask b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/use.mask
deleted file mode 100644
index 26f21e5..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/use.mask
+++ /dev/null
@@ -1,10 +0,0 @@
-# We mask this since we don't have a stable sys-process/audit yet
-audit
-
-# Mirror mask from nonhardened 64ul on app-admin/hddtemp
-hddtemp
-
-# Mirror mask from nonhardened 64ul on media-plugins/frei0r-plugins
-# Kacper Kowalik <xarthisius@gentoo.org> (10 Aug 2011)
-# Masking frei0r wrt bug #365451
-frei0r
diff --git a/profiles/hardened/linux/powerpc/ppc64/desktop/deprecated b/profiles/hardened/linux/powerpc/ppc64/desktop/deprecated
deleted file mode 100644
index 17c05d7..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-hardened/linux/powerpc/ppc64
diff --git a/profiles/hardened/linux/powerpc/ppc64/desktop/parent b/profiles/hardened/linux/powerpc/ppc64/desktop/parent
deleted file mode 100644
index ad6c5e1..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/hardened/linux/powerpc/ppc64/developer/deprecated b/profiles/hardened/linux/powerpc/ppc64/developer/deprecated
deleted file mode 100644
index 17c05d7..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-hardened/linux/powerpc/ppc64
diff --git a/profiles/hardened/linux/powerpc/ppc64/developer/parent b/profiles/hardened/linux/powerpc/ppc64/developer/parent
deleted file mode 100644
index 4c89374..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/hardened/linux/powerpc/ppc64/eapi b/profiles/hardened/linux/powerpc/ppc64/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/powerpc/ppc64/make.defaults b/profiles/hardened/linux/powerpc/ppc64/make.defaults
deleted file mode 100644
index c3d1e05..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/make.defaults
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc64/make.defaults,v 1.3 2011/11/17 01:14:27 jmbsvicetto Exp $
diff --git a/profiles/hardened/linux/powerpc/ppc64/parent b/profiles/hardened/linux/powerpc/ppc64/parent
deleted file mode 100644
index eb7e3e4..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../default/linux/powerpc/ppc64
-..
diff --git a/profiles/hardened/linux/powerpc/ppc64/server/deprecated b/profiles/hardened/linux/powerpc/ppc64/server/deprecated
deleted file mode 100644
index 17c05d7..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/server/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-hardened/linux/powerpc/ppc64
diff --git a/profiles/hardened/linux/powerpc/ppc64/server/parent b/profiles/hardened/linux/powerpc/ppc64/server/parent
deleted file mode 100644
index c399016..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/server
diff --git a/profiles/hardened/linux/powerpc/ppc64/use.mask b/profiles/hardened/linux/powerpc/ppc64/use.mask
deleted file mode 100644
index 281b8b1..0000000
--- a/profiles/hardened/linux/powerpc/ppc64/use.mask
+++ /dev/null
@@ -1,55 +0,0 @@
-# this is a list of USE flags
-# that should not be used on PPC64
-# Tom Gall <tgall@gentoo.org> manages this list
-mplayer
-ruby
-mono
-
-# should be ok
-jikes
-junit
-
-guile
-
-# need to test libaio
-aio
-# needs some asm written
-ocaml
-
-# until media-libs/portaudio is keyworded for ppc64
-portaudio
-
-# mask mozilla/firefox (bug #108020)
-mozilla
-firefox
-seamonkey
-
-# 2006/03/20 - Donnie Berkholz <dberkholz@gentoo.org>
-# Modular X: mask for architectures on which they aren't available
-video_cards_apm
-video_cards_ark
-video_cards_cyrix
-video_cards_i128
-video_cards_i740
-video_cards_intel
-video_cards_neomagic
-video_cards_nsc
-video_cards_rendition
-video_cards_siliconmotion
-video_cards_sis
-video_cards_tga
-video_cards_tseng
-video_cards_vesa
-video_cards_via
-
-# Masked p2p for bug #155302 <josejx@gentoo.org>
-p2p
-
-# 02 Dec 2006; Tony Vroon <chainsaw@gentoo.org> 
-# Keywording wpa_supplicant, but I don't have madwifi(-ng) hardware to test with, only BCM4306.
-madwifi
-
-# USE=audit masked prior to testing on alpha, arm, hppa, ppc64, s390, sh.
-# Bug #184563, 18 Sep 2007 
-# Robin H. Johnson <robbat2@gentoo.org>
-audit
diff --git a/profiles/hardened/linux/uclibc/amd64/eapi b/profiles/hardened/linux/uclibc/amd64/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/uclibc/amd64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/uclibc/amd64/make.defaults b/profiles/hardened/linux/uclibc/amd64/make.defaults
deleted file mode 100644
index 90e4da7..0000000
--- a/profiles/hardened/linux/uclibc/amd64/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/amd64/make.defaults,v 1.3 2012/10/08 17:57:51 blueness Exp $
-
-ARCH="amd64"
-ACCEPT_KEYWORDS="${ARCH}"
-
-CHOST="x86_64-gentoo-linux-uclibc"
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
diff --git a/profiles/hardened/linux/uclibc/amd64/parent b/profiles/hardened/linux/uclibc/amd64/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/hardened/linux/uclibc/amd64/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/hardened/linux/uclibc/amd64/use.force b/profiles/hardened/linux/uclibc/amd64/use.force
deleted file mode 100644
index df126ae..0000000
--- a/profiles/hardened/linux/uclibc/amd64/use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/amd64/use.force,v 1.1 2012/11/21 18:15:47 blueness Exp $
-
-# Force the flag which corresponds to ARCH.
-amd64
diff --git a/profiles/hardened/linux/uclibc/amd64/use.mask b/profiles/hardened/linux/uclibc/amd64/use.mask
deleted file mode 100644
index bc6d5a4..0000000
--- a/profiles/hardened/linux/uclibc/amd64/use.mask
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/amd64/use.mask,v 1.3 2013/06/01 03:05:24 blueness Exp $
-
-# Unmask the flag which corresponds to ARCH.
--amd64
-
-# unmask all SIMD assembler flags
--mmx
--mmxext
--sse
--sse2
--sse3
--sse4
--sse4a
--ssse3
--3dnow
--3dnowext
-
-# Lilo works on amd64
--lilo
-
-# These work
--input_devices_synaptics
--input_devices_wacom
--video_cards_qxl
diff --git a/profiles/hardened/linux/uclibc/arm/armv6j/eapi b/profiles/hardened/linux/uclibc/arm/armv6j/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/uclibc/arm/armv6j/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/uclibc/arm/armv6j/make.defaults b/profiles/hardened/linux/uclibc/arm/armv6j/make.defaults
deleted file mode 100644
index 78a0db6..0000000
--- a/profiles/hardened/linux/uclibc/arm/armv6j/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/arm/armv6j/make.defaults,v 1.3 2013/06/14 12:55:51 blueness Exp $
-
-CHOST="armv6j-hardfloat-linux-uclibceabi"
-CFLAGS="-O2 -pipe -march=armv6j -mfpu=vfp -mfloat-abi=hard"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
diff --git a/profiles/hardened/linux/uclibc/arm/armv6j/parent b/profiles/hardened/linux/uclibc/arm/armv6j/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/hardened/linux/uclibc/arm/armv6j/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/hardened/linux/uclibc/arm/armv7a/eapi b/profiles/hardened/linux/uclibc/arm/armv7a/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/uclibc/arm/armv7a/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/uclibc/arm/armv7a/make.defaults b/profiles/hardened/linux/uclibc/arm/armv7a/make.defaults
deleted file mode 100644
index 95e4960..0000000
--- a/profiles/hardened/linux/uclibc/arm/armv7a/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/arm/armv7a/make.defaults,v 1.3 2013/06/14 12:55:51 blueness Exp $
-
-CHOST="armv7a-hardfloat-linux-uclibceabi"
-CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
diff --git a/profiles/hardened/linux/uclibc/arm/armv7a/parent b/profiles/hardened/linux/uclibc/arm/armv7a/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/hardened/linux/uclibc/arm/armv7a/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/hardened/linux/uclibc/arm/eapi b/profiles/hardened/linux/uclibc/arm/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/uclibc/arm/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/uclibc/arm/make.defaults b/profiles/hardened/linux/uclibc/arm/make.defaults
deleted file mode 100644
index a33b3a9..0000000
--- a/profiles/hardened/linux/uclibc/arm/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/arm/make.defaults,v 1.2 2012/10/07 11:42:37 blueness Exp $
-
-ARCH="arm"
-ACCEPT_KEYWORDS="${ARCH}"
-
-CHOST="arm-unknown-linux-uclibc"
-CFLAGS="-O2"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
diff --git a/profiles/hardened/linux/uclibc/arm/parent b/profiles/hardened/linux/uclibc/arm/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/hardened/linux/uclibc/arm/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/hardened/linux/uclibc/arm/use.force b/profiles/hardened/linux/uclibc/arm/use.force
deleted file mode 100644
index dee102a..0000000
--- a/profiles/hardened/linux/uclibc/arm/use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/arm/use.force,v 1.1 2012/11/21 18:15:48 blueness Exp $
-
-# Force the flag which corresponds to ARCH.
-arm
diff --git a/profiles/hardened/linux/uclibc/arm/use.mask b/profiles/hardened/linux/uclibc/arm/use.mask
deleted file mode 100644
index dd8155c..0000000
--- a/profiles/hardened/linux/uclibc/arm/use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/arm/use.mask,v 1.1 2012/11/20 16:24:59 blueness Exp $
-
-# Unmask the flag which corresponds to ARCH.
--arm
diff --git a/profiles/hardened/linux/uclibc/make.defaults b/profiles/hardened/linux/uclibc/make.defaults
deleted file mode 100644
index 0daccd2..0000000
--- a/profiles/hardened/linux/uclibc/make.defaults
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/make.defaults,v 1.5 2013/05/28 14:48:04 blueness Exp $
-
-PORTAGE_LIBC="uClibc"
-ELIBC=uclibc
-
-FEATURES="sandbox sfperms strict"
-
-USE="hardened nptl pax_kernel pic unicode xattr -berkdb -jit -orc"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened nptl pax_kernel pic -berkdb -jit -orc"
-
-SYMLINK_LIB="no"
diff --git a/profiles/hardened/linux/uclibc/mips/eapi b/profiles/hardened/linux/uclibc/mips/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/uclibc/mips/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/uclibc/mips/make.defaults b/profiles/hardened/linux/uclibc/mips/make.defaults
deleted file mode 100644
index 9399b1d..0000000
--- a/profiles/hardened/linux/uclibc/mips/make.defaults
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/mips/make.defaults,v 1.4 2013/08/03 21:18:24 blueness Exp $
-
-ARCH="mips"
-ACCEPT_KEYWORDS="${ARCH} ~${ARCH}"
-
-CHOST="mips-gentoo-linux-uclibc"
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-
-DEFAULT_ABI="o32"
-ABI="${DEFAULT_ABI}"
-LIBDIR_o32="lib"
diff --git a/profiles/hardened/linux/uclibc/mips/mipsel/make.defaults b/profiles/hardened/linux/uclibc/mips/mipsel/make.defaults
deleted file mode 100644
index 7df601f..0000000
--- a/profiles/hardened/linux/uclibc/mips/mipsel/make.defaults
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/mips/mipsel/make.defaults,v 1.3 2012/10/08 17:57:51 blueness Exp $
-
-CHOST="mipsel-gentoo-linux-uclibc"
diff --git a/profiles/hardened/linux/uclibc/mips/mipsel/parent b/profiles/hardened/linux/uclibc/mips/mipsel/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/hardened/linux/uclibc/mips/mipsel/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/hardened/linux/uclibc/mips/parent b/profiles/hardened/linux/uclibc/mips/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/hardened/linux/uclibc/mips/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/hardened/linux/uclibc/mips/use.force b/profiles/hardened/linux/uclibc/mips/use.force
deleted file mode 100644
index 7662780..0000000
--- a/profiles/hardened/linux/uclibc/mips/use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/mips/use.force,v 1.1 2012/11/21 18:15:48 blueness Exp $
-
-# Force the flag which corresponds to ARCH.
-mips
diff --git a/profiles/hardened/linux/uclibc/mips/use.mask b/profiles/hardened/linux/uclibc/mips/use.mask
deleted file mode 100644
index 110c1bc..0000000
--- a/profiles/hardened/linux/uclibc/mips/use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/mips/use.mask,v 1.1 2012/11/20 16:24:59 blueness Exp $
-
-# Unmask the flag which corresponds to ARCH.
--mips
diff --git a/profiles/hardened/linux/uclibc/packages b/profiles/hardened/linux/uclibc/packages
deleted file mode 100644
index 9978e1e..0000000
--- a/profiles/hardened/linux/uclibc/packages
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/packages,v 1.2 2012/10/07 11:42:37 blueness Exp $
-
-*app-misc/pax-utils
-*dev-libs/libiconv
--*sys-apps/man-pages
diff --git a/profiles/hardened/linux/uclibc/packages.build b/profiles/hardened/linux/uclibc/packages.build
deleted file mode 100644
index 4dbd258..0000000
--- a/profiles/hardened/linux/uclibc/packages.build
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/packages.build,v 1.3 2012/10/25 23:57:41 blueness Exp $
-
-# This file lists extra packages needed to build for
-# a stage 1 based on this profile.
-
-dev-util/pkgconfig
-dev-libs/libiconv
-sys-apps/attr
-dev-python/pyxattr
diff --git a/profiles/hardened/linux/uclibc/parent b/profiles/hardened/linux/uclibc/parent
deleted file mode 100644
index c3ff51e..0000000
--- a/profiles/hardened/linux/uclibc/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../base/
-../../../default/linux
diff --git a/profiles/hardened/linux/uclibc/ppc/eapi b/profiles/hardened/linux/uclibc/ppc/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/uclibc/ppc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/uclibc/ppc/make.defaults b/profiles/hardened/linux/uclibc/ppc/make.defaults
deleted file mode 100644
index 282e43d..0000000
--- a/profiles/hardened/linux/uclibc/ppc/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/ppc/make.defaults,v 1.3 2012/10/08 17:57:52 blueness Exp $
-
-ARCH="ppc"
-ACCEPT_KEYWORDS="${ARCH}"
-
-CHOST="powerpc-gentoo-linux-uclibc"
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
diff --git a/profiles/hardened/linux/uclibc/ppc/package.use.mask b/profiles/hardened/linux/uclibc/ppc/package.use.mask
deleted file mode 100644
index 786961b..0000000
--- a/profiles/hardened/linux/uclibc/ppc/package.use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/ppc/package.use.mask,v 1.2 2012/10/07 11:42:38 blueness Exp $
-
-dev-libs/libpcre cxx
-sys-libs/ncurses cxx
diff --git a/profiles/hardened/linux/uclibc/ppc/parent b/profiles/hardened/linux/uclibc/ppc/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/hardened/linux/uclibc/ppc/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/hardened/linux/uclibc/ppc/use.force b/profiles/hardened/linux/uclibc/ppc/use.force
deleted file mode 100644
index 8d7a826..0000000
--- a/profiles/hardened/linux/uclibc/ppc/use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/ppc/use.force,v 1.1 2012/11/21 18:15:48 blueness Exp $
-
-# Force the flag which corresponds to ARCH.
-ppc
diff --git a/profiles/hardened/linux/uclibc/use.force b/profiles/hardened/linux/uclibc/use.force
deleted file mode 100644
index 87a29fe..0000000
--- a/profiles/hardened/linux/uclibc/use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/use.force,v 1.3 2012/10/07 15:57:43 blueness Exp $
-
-elibc_uclibc
-uclibc
diff --git a/profiles/hardened/linux/uclibc/use.mask b/profiles/hardened/linux/uclibc/use.mask
deleted file mode 100644
index d51b1c3..0000000
--- a/profiles/hardened/linux/uclibc/use.mask
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/use.mask,v 1.4 2013/05/28 14:48:04 blueness Exp $
-
-nls
-pam
-
-emul-linux-x86
--uclibc
-
--elibc_uclibc
-elibc_glibc
-
--hardened
diff --git a/profiles/hardened/linux/uclibc/x86/eapi b/profiles/hardened/linux/uclibc/x86/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/uclibc/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/uclibc/x86/make.defaults b/profiles/hardened/linux/uclibc/x86/make.defaults
deleted file mode 100644
index a047b68..0000000
--- a/profiles/hardened/linux/uclibc/x86/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/x86/make.defaults,v 1.3 2012/10/08 17:57:52 blueness Exp $
-
-ARCH="x86"
-ACCEPT_KEYWORDS="${ARCH}"
-
-CHOST="i686-gentoo-linux-uclibc"
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
diff --git a/profiles/hardened/linux/uclibc/x86/parent b/profiles/hardened/linux/uclibc/x86/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/hardened/linux/uclibc/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/hardened/linux/uclibc/x86/use.force b/profiles/hardened/linux/uclibc/x86/use.force
deleted file mode 100644
index b886e6b..0000000
--- a/profiles/hardened/linux/uclibc/x86/use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/x86/use.force,v 1.1 2012/11/21 18:15:48 blueness Exp $
-
-# Force the flag which corresponds to ARCH.
-x86
diff --git a/profiles/hardened/linux/uclibc/x86/use.mask b/profiles/hardened/linux/uclibc/x86/use.mask
deleted file mode 100644
index ac2458f..0000000
--- a/profiles/hardened/linux/uclibc/x86/use.mask
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/x86/use.mask,v 1.3 2013/05/28 15:18:43 blueness Exp $
-
-# Unmask the flag which corresponds to ARCH.
--x86
-
-# unmask all SIMD assembler flags
--mmx
--mmxext
--sse
--sse2
--sse3
--sse4
--sse4a
--ssse3
--3dnow
--3dnowext
-
-# Masked on all profiles but x86, bug #458354
--video_cards_geode
diff --git a/profiles/hardened/linux/use.mask b/profiles/hardened/linux/use.mask
deleted file mode 100644
index ada1a49..0000000
--- a/profiles/hardened/linux/use.mask
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/use.mask,v 1.18 2013/01/12 12:36:18 zorry Exp $
-
--hardened
-
-emul-linux-x86
-
-# tcc is x86-only
-tcc
-
-# precompiled headers are not compat with ASLR.
-pch
-
-# prelink is masked for hardened
-prelink
diff --git a/profiles/hardened/linux/x86/desktop/deprecated b/profiles/hardened/linux/x86/desktop/deprecated
deleted file mode 100644
index 3638124..0000000
--- a/profiles/hardened/linux/x86/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-hardened/linux/x86
diff --git a/profiles/hardened/linux/x86/desktop/parent b/profiles/hardened/linux/x86/desktop/parent
deleted file mode 100644
index 8bd8630..0000000
--- a/profiles/hardened/linux/x86/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../targets/desktop
diff --git a/profiles/hardened/linux/x86/developer/deprecated b/profiles/hardened/linux/x86/developer/deprecated
deleted file mode 100644
index 3638124..0000000
--- a/profiles/hardened/linux/x86/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-hardened/linux/x86
diff --git a/profiles/hardened/linux/x86/developer/parent b/profiles/hardened/linux/x86/developer/parent
deleted file mode 100644
index b558d90..0000000
--- a/profiles/hardened/linux/x86/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../targets/developer
diff --git a/profiles/hardened/linux/x86/eapi b/profiles/hardened/linux/x86/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/hardened/linux/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/x86/make.defaults b/profiles/hardened/linux/x86/make.defaults
deleted file mode 100644
index e55210b..0000000
--- a/profiles/hardened/linux/x86/make.defaults
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/make.defaults,v 1.13 2012/10/15 15:58:18 chithanh Exp $
-
-ARCH="x86"
-ACCEPT_KEYWORDS="x86"
-
-CHOST="i686-pc-linux-gnu"
-CFLAGS="-march=i686 -O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-
-USE="nptl"
-
-# 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
-# Defaults for video drivers
-VIDEO_CARDS="apm ark chips cirrus cyrix dummy fbdev glint i128 i740 intel \
-	mach64 mga nsc nv r128 radeon rendition s3 s3virge savage \
-	siliconmotion sis sisusb tdfx tga trident tseng v4l vesa via vmware \
-	voodoo"
-
-# 2006/12/21 - Andrej Kacian <ticho@gentoo.org>
-# Defaults for audio drivers
-ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1 \
-	emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m \
-	maestro3 trident usb-audio via82xx via82xx-modem ymfpci"
diff --git a/profiles/hardened/linux/x86/minimal/deprecated b/profiles/hardened/linux/x86/minimal/deprecated
deleted file mode 100644
index 3638124..0000000
--- a/profiles/hardened/linux/x86/minimal/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-hardened/linux/x86
diff --git a/profiles/hardened/linux/x86/minimal/make.defaults b/profiles/hardened/linux/x86/minimal/make.defaults
deleted file mode 100644
index 141c258..0000000
--- a/profiles/hardened/linux/x86/minimal/make.defaults
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/minimal/make.defaults,v 1.4 2012/06/16 11:44:13 jlec Exp $
-
-# - TESTING PROFILE - TESTING PROFILE - 
-#  ------ USE AT YOUR OWN RISK ------
-
-USE="-* crypt hardened minimal multicall ncurses pic readline zlib"
-
-CFLAGS="-march=i686 -Os -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-FEATURES="nodoc noinfo noman"
-
diff --git a/profiles/hardened/linux/x86/minimal/parent b/profiles/hardened/linux/x86/minimal/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/hardened/linux/x86/minimal/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/hardened/linux/x86/package.use.mask b/profiles/hardened/linux/x86/package.use.mask
deleted file mode 100644
index 010e4be..0000000
--- a/profiles/hardened/linux/x86/package.use.mask
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/package.use.mask,v 1.19 2012/12/27 11:17:38 pinkbyte Exp $
-
-# cyrus-sasl doesn't work w/ USE=berkdb (#192753)
-dev-libs/cyrus-sasl berkdb
-
-# Rick Farina <zerochaos@gentoo.org> (26 Nov 2012)
-# mask X and tools for we still miss the docs for revdep-pax
-# else hell will rule. (RWX in the libs)
-# Propogating changes from amd64.
-# Bug 433121
-x11-drivers/nvidia-drivers X tools
-
-# Magnus Granberg <zorry@gentoo.org> (29 Nov 2012)
-# Bug #444786 disable nvidia on app-admin/conky 
-app-admin/conky nvidia
diff --git a/profiles/hardened/linux/x86/parent b/profiles/hardened/linux/x86/parent
deleted file mode 100644
index e93ab13..0000000
--- a/profiles/hardened/linux/x86/parent
+++ /dev/null
@@ -1,4 +0,0 @@
-../../../base
-../../../default/linux
-../../../arch/x86
-..
diff --git a/profiles/hardened/linux/x86/selinux/parent b/profiles/hardened/linux/x86/selinux/parent
deleted file mode 100644
index e5c7cef..0000000
--- a/profiles/hardened/linux/x86/selinux/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../features/selinux
diff --git a/profiles/hardened/linux/x86/server/deprecated b/profiles/hardened/linux/x86/server/deprecated
deleted file mode 100644
index 3638124..0000000
--- a/profiles/hardened/linux/x86/server/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-hardened/linux/x86
diff --git a/profiles/hardened/linux/x86/server/parent b/profiles/hardened/linux/x86/server/parent
deleted file mode 100644
index 9c7a195..0000000
--- a/profiles/hardened/linux/x86/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../targets/server
diff --git a/profiles/hardened/linux/x86/use.mask b/profiles/hardened/linux/x86/use.mask
deleted file mode 100644
index e12e5c6..0000000
--- a/profiles/hardened/linux/x86/use.mask
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/use.mask,v 1.7 2012/11/27 02:03:24 zerochaos Exp $
-
-# Rick Farina <zerochaos@gentoo.org> 26 Nov 2012          
-video_cards_nvidia
-# removing mask on nvidia use flag as it is used by monitoring tools
-# which may be desireable for cuda users
-#nvidia
-# adjusting use flag mask as nvidia-drivers are usable for cuda at least
-#cuda
diff --git a/profiles/prefix/aix/5.2.0.0/package.provided b/profiles/prefix/aix/5.2.0.0/package.provided
deleted file mode 100644
index 3bb025e..0000000
--- a/profiles/prefix/aix/5.2.0.0/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/aix/5.2.0.0/package.provided,v 1.1 2009/06/06 03:54:34 solar Exp $
-
-sys-aix/libc-5.2
diff --git a/profiles/prefix/aix/5.2.0.0/parent b/profiles/prefix/aix/5.2.0.0/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/aix/5.2.0.0/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/aix/5.2.0.0/ppc/make.defaults b/profiles/prefix/aix/5.2.0.0/ppc/make.defaults
deleted file mode 100644
index ca1155a..0000000
--- a/profiles/prefix/aix/5.2.0.0/ppc/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/aix/5.2.0.0/ppc/make.defaults,v 1.1 2009/06/06 03:54:35 solar Exp $
-
-ARCH="ppc-aix"
-CHOST="powerpc-ibm-aix5.2.0.0"
-ACCEPT_KEYWORDS="~ppc-aix"
diff --git a/profiles/prefix/aix/5.2.0.0/ppc/parent b/profiles/prefix/aix/5.2.0.0/ppc/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/aix/5.2.0.0/ppc/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/aix/5.3.0.0/package.provided b/profiles/prefix/aix/5.3.0.0/package.provided
deleted file mode 100644
index 34cd5db..0000000
--- a/profiles/prefix/aix/5.3.0.0/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/aix/5.3.0.0/package.provided,v 1.1 2009/06/06 03:54:35 solar Exp $
-
-sys-aix/libc-5.3
diff --git a/profiles/prefix/aix/5.3.0.0/parent b/profiles/prefix/aix/5.3.0.0/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/aix/5.3.0.0/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/aix/5.3.0.0/ppc/make.defaults b/profiles/prefix/aix/5.3.0.0/ppc/make.defaults
deleted file mode 100644
index fa4bf24..0000000
--- a/profiles/prefix/aix/5.3.0.0/ppc/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/aix/5.3.0.0/ppc/make.defaults,v 1.1 2009/06/06 03:54:36 solar Exp $
-
-ARCH="ppc-aix"
-CHOST="powerpc-ibm-aix5.3.0.0"
-ACCEPT_KEYWORDS="~ppc-aix"
diff --git a/profiles/prefix/aix/5.3.0.0/ppc/parent b/profiles/prefix/aix/5.3.0.0/ppc/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/aix/5.3.0.0/ppc/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/aix/6.1.0.0/package.provided b/profiles/prefix/aix/6.1.0.0/package.provided
deleted file mode 100644
index 85520cf..0000000
--- a/profiles/prefix/aix/6.1.0.0/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/aix/6.1.0.0/package.provided,v 1.1 2009/06/06 03:54:36 solar Exp $
-
-sys-aix/libc-6.1
diff --git a/profiles/prefix/aix/6.1.0.0/parent b/profiles/prefix/aix/6.1.0.0/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/aix/6.1.0.0/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/aix/6.1.0.0/ppc/make.defaults b/profiles/prefix/aix/6.1.0.0/ppc/make.defaults
deleted file mode 100644
index 862942a..0000000
--- a/profiles/prefix/aix/6.1.0.0/ppc/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/aix/6.1.0.0/ppc/make.defaults,v 1.1 2009/06/06 03:54:37 solar Exp $
-
-ARCH="ppc-aix"
-CHOST="powerpc-ibm-aix6.1.0.0"
-ACCEPT_KEYWORDS="~ppc-aix"
diff --git a/profiles/prefix/aix/6.1.0.0/ppc/parent b/profiles/prefix/aix/6.1.0.0/ppc/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/aix/6.1.0.0/ppc/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/aix/7.1.0.0/package.provided b/profiles/prefix/aix/7.1.0.0/package.provided
deleted file mode 100644
index 584a329..0000000
--- a/profiles/prefix/aix/7.1.0.0/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/aix/7.1.0.0/package.provided,v 1.1 2012/03/12 14:33:53 haubi Exp $
-
-sys-aix/libc-7.1
diff --git a/profiles/prefix/aix/7.1.0.0/parent b/profiles/prefix/aix/7.1.0.0/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/aix/7.1.0.0/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/aix/7.1.0.0/ppc/make.defaults b/profiles/prefix/aix/7.1.0.0/ppc/make.defaults
deleted file mode 100644
index b96ac6a..0000000
--- a/profiles/prefix/aix/7.1.0.0/ppc/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/aix/7.1.0.0/ppc/make.defaults,v 1.1 2012/03/12 14:33:53 haubi Exp $
-
-ARCH="ppc-aix"
-CHOST="powerpc-ibm-aix7.1.0.0"
-ACCEPT_KEYWORDS="~ppc-aix"
diff --git a/profiles/prefix/aix/7.1.0.0/ppc/parent b/profiles/prefix/aix/7.1.0.0/ppc/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/aix/7.1.0.0/ppc/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/aix/make.defaults b/profiles/prefix/aix/make.defaults
deleted file mode 100644
index b8cb99e..0000000
--- a/profiles/prefix/aix/make.defaults
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/aix/make.defaults,v 1.2 2009/06/30 16:34:58 darkside Exp $
-
-# System-wide defaults for all AIX profiles
-# This file should rarely need to be changed
-
-# 'Sane' defaults
-ELIBC="AIX"
-KERNEL="AIX"
-
-# no scanelf
-FEATURES="nostrip"
diff --git a/profiles/prefix/aix/package.use.force b/profiles/prefix/aix/package.use.force
deleted file mode 100644
index 99c639d..0000000
--- a/profiles/prefix/aix/package.use.force
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/aix/package.use.force,v 1.1 2009/06/06 03:54:34 solar Exp $
-
-# Michael Haubenwallner <haubi@gentoo.org> (2009-03-18)
-# Plugins need to be built and installed using libtool (#261186)
-net-nds/openldap minimal
-
-# Michael Haubenwallner <haubi@gentoo.org> (2008-05-09)
-# Gentoo's PIE patch for gcc-3 does not work on AIX.
-# One might want to use gcc-3.4 on AIX, because IBM Rational Purify
-# might not support gcc-4. The first gcc-support (gcc-3.4) has come
-# with PurifyPlus Interim Fix v7.0.0.0-010 (released in February 2008).
-=sys-devel/gcc-3* nopie
diff --git a/profiles/prefix/aix/package.use.mask b/profiles/prefix/aix/package.use.mask
deleted file mode 100644
index f15be0c..0000000
--- a/profiles/prefix/aix/package.use.mask
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/aix/package.use.mask,v 1.2 2012/02/16 12:46:57 haubi Exp $
-
-# Michael Haubenwallner <haubi@gentoo.org> (16 Feb 2012)
-# JIT implementation in pcre does not know about AIX.
-dev-libs/libpcre jit
-
-# Michael Haubenwallner <haubi@gentoo.org> (08 May 2009)
-# IBM does not provide "Java Communications API support" for AIX
-dev-java/ibm-jdk-bin javacomm
diff --git a/profiles/prefix/aix/packages b/profiles/prefix/aix/packages
deleted file mode 100644
index e91babe..0000000
--- a/profiles/prefix/aix/packages
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/aix/packages,v 1.1 2009/06/06 03:54:34 solar Exp $
-
-# AIX uses the native (non-source available) linker
-*sys-devel/native-cctools
-# because AIX ar isn't able to unpack .deb files, we need deb2targz
-*app-arch/deb2targz
-# need some dll helpers on AIX
-*sys-apps/aix-miscutils
diff --git a/profiles/prefix/aix/parent b/profiles/prefix/aix/parent
deleted file mode 100644
index cd11492..0000000
--- a/profiles/prefix/aix/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../base
-..
diff --git a/profiles/prefix/aix/profile.bashrc b/profiles/prefix/aix/profile.bashrc
deleted file mode 100644
index 5ca600a..0000000
--- a/profiles/prefix/aix/profile.bashrc
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/aix/profile.bashrc,v 1.4 2010/03/10 14:48:01 haubi Exp $
-
-# never use /bin/sh as CONFIG_SHELL on AIX: it is ways too slow,
-# as well as broken in some corner cases.
-export CONFIG_SHELL=${BASH}
diff --git a/profiles/prefix/aix/use.force b/profiles/prefix/aix/use.force
deleted file mode 100644
index 5cc013f..0000000
--- a/profiles/prefix/aix/use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/aix/use.force,v 1.1 2009/06/06 03:54:34 solar Exp $
-
-# Re-add AIX OS
-kernel_AIX
-elibc_AIX
diff --git a/profiles/prefix/aix/use.mask b/profiles/prefix/aix/use.mask
deleted file mode 100644
index b26f2c9..0000000
--- a/profiles/prefix/aix/use.mask
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/aix/use.mask,v 1.4 2013/02/02 13:12:27 grobian Exp $
-
-# Re-add AIX libc
--elibc_AIX
--kernel_AIX
-
-# these will more than likely never work on AIX
-3dfx
-3dnow
-3dnowext
-acpi
-alsa
-apm
-cap
-caps
-cman
-clvm
-directfb
-divx4linux
-djbfft
-emul-linux-x86
-fbcon
-fdftk
-fmod
-ggi
-gpm
-hardened
-icc
-icc-pgo
-mmx
-mmx2
-# the following USE flag requires device-mapper
-on-the-fly-crypt
-oss
-solid
-sse
-sse2
-svga
-sybase
-sybase-ct
-rtc
-uclibc
-voodoo3
-pvm
-v4l
diff --git a/profiles/prefix/bsd/freebsd/7.1/package.provided b/profiles/prefix/bsd/freebsd/7.1/package.provided
deleted file mode 100644
index 15d4011..0000000
--- a/profiles/prefix/bsd/freebsd/7.1/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/7.1/package.provided,v 1.1 2009/06/06 03:54:38 solar Exp $
-
-sys-freebsd/libc-7.1
diff --git a/profiles/prefix/bsd/freebsd/7.1/parent b/profiles/prefix/bsd/freebsd/7.1/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/bsd/freebsd/7.1/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/bsd/freebsd/7.1/x64/make.defaults b/profiles/prefix/bsd/freebsd/7.1/x64/make.defaults
deleted file mode 100644
index 8fa9a74..0000000
--- a/profiles/prefix/bsd/freebsd/7.1/x64/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/7.1/x64/make.defaults,v 1.1 2009/06/06 03:54:39 solar Exp $
-
-# retain backwards compatability for freebsd keywords/conditionals
-ARCH="amd64-fbsd"
-CHOST="x86_64-pc-freebsd7.1"
-ACCEPT_KEYWORDS="~x64-freebsd"
-
diff --git a/profiles/prefix/bsd/freebsd/7.1/x64/parent b/profiles/prefix/bsd/freebsd/7.1/x64/parent
deleted file mode 100644
index fc24616..0000000
--- a/profiles/prefix/bsd/freebsd/7.1/x64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x64
-..
diff --git a/profiles/prefix/bsd/freebsd/7.1/x86/make.defaults b/profiles/prefix/bsd/freebsd/7.1/x86/make.defaults
deleted file mode 100644
index 883dd6e..0000000
--- a/profiles/prefix/bsd/freebsd/7.1/x86/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/7.1/x86/make.defaults,v 1.1 2009/06/06 03:54:39 solar Exp $
-
-# retain backwards compatability for freebsd keywords/conditionals
-ARCH="x86-fbsd"
-CHOST="i686-pc-freebsd7.1"
-ACCEPT_KEYWORDS="~x86-freebsd"
-
diff --git a/profiles/prefix/bsd/freebsd/7.1/x86/parent b/profiles/prefix/bsd/freebsd/7.1/x86/parent
deleted file mode 100644
index 4a6aa36..0000000
--- a/profiles/prefix/bsd/freebsd/7.1/x86/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x86
-..
diff --git a/profiles/prefix/bsd/freebsd/7.2/package.provided b/profiles/prefix/bsd/freebsd/7.2/package.provided
deleted file mode 100644
index df5d9b6..0000000
--- a/profiles/prefix/bsd/freebsd/7.2/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/7.2/package.provided,v 1.1 2009/06/06 03:54:40 solar Exp $
-
-sys-freebsd/libc-7.1
diff --git a/profiles/prefix/bsd/freebsd/7.2/parent b/profiles/prefix/bsd/freebsd/7.2/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/bsd/freebsd/7.2/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/bsd/freebsd/7.2/x64/make.defaults b/profiles/prefix/bsd/freebsd/7.2/x64/make.defaults
deleted file mode 100644
index 7bea7da..0000000
--- a/profiles/prefix/bsd/freebsd/7.2/x64/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/7.2/x64/make.defaults,v 1.1 2009/06/06 03:54:40 solar Exp $
-
-# retain backwards compatability for freebsd keywords/conditionals
-ARCH="amd64-fbsd"
-CHOST="x86_64-pc-freebsd7.2"
-ACCEPT_KEYWORDS="~x64-freebsd"
-
diff --git a/profiles/prefix/bsd/freebsd/7.2/x64/parent b/profiles/prefix/bsd/freebsd/7.2/x64/parent
deleted file mode 100644
index fc24616..0000000
--- a/profiles/prefix/bsd/freebsd/7.2/x64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x64
-..
diff --git a/profiles/prefix/bsd/freebsd/7.2/x86/make.defaults b/profiles/prefix/bsd/freebsd/7.2/x86/make.defaults
deleted file mode 100644
index 15c01a6..0000000
--- a/profiles/prefix/bsd/freebsd/7.2/x86/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/7.2/x86/make.defaults,v 1.1 2009/06/06 03:54:41 solar Exp $
-
-# retain backwards compatability for freebsd keywords/conditionals
-ARCH="x86-fbsd"
-CHOST="i686-pc-freebsd7.2"
-ACCEPT_KEYWORDS="~x86-freebsd"
-
diff --git a/profiles/prefix/bsd/freebsd/7.2/x86/parent b/profiles/prefix/bsd/freebsd/7.2/x86/parent
deleted file mode 100644
index 4a6aa36..0000000
--- a/profiles/prefix/bsd/freebsd/7.2/x86/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x86
-..
diff --git a/profiles/prefix/bsd/freebsd/8.0/package.provided b/profiles/prefix/bsd/freebsd/8.0/package.provided
deleted file mode 100644
index e40fdae..0000000
--- a/profiles/prefix/bsd/freebsd/8.0/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/8.0/package.provided,v 1.1 2009/12/21 20:38:28 grobian Exp $
-
-sys-freebsd/libc-8.0
diff --git a/profiles/prefix/bsd/freebsd/8.0/parent b/profiles/prefix/bsd/freebsd/8.0/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/bsd/freebsd/8.0/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/bsd/freebsd/8.0/x64/make.defaults b/profiles/prefix/bsd/freebsd/8.0/x64/make.defaults
deleted file mode 100644
index b9f0c20..0000000
--- a/profiles/prefix/bsd/freebsd/8.0/x64/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/8.0/x64/make.defaults,v 1.1 2009/12/21 20:38:29 grobian Exp $
-
-# retain backwards compatability for freebsd keywords/conditionals
-ARCH="amd64-fbsd"
-CHOST="x86_64-pc-freebsd8.0"
-ACCEPT_KEYWORDS="~x64-freebsd"
-
diff --git a/profiles/prefix/bsd/freebsd/8.0/x64/parent b/profiles/prefix/bsd/freebsd/8.0/x64/parent
deleted file mode 100644
index fc24616..0000000
--- a/profiles/prefix/bsd/freebsd/8.0/x64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x64
-..
diff --git a/profiles/prefix/bsd/freebsd/8.0/x86/make.defaults b/profiles/prefix/bsd/freebsd/8.0/x86/make.defaults
deleted file mode 100644
index 48dc928..0000000
--- a/profiles/prefix/bsd/freebsd/8.0/x86/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/8.0/x86/make.defaults,v 1.1 2009/12/21 20:38:29 grobian Exp $
-
-# retain backwards compatability for freebsd keywords/conditionals
-ARCH="x86-fbsd"
-CHOST="i686-pc-freebsd8.0"
-ACCEPT_KEYWORDS="~x86-freebsd"
-
diff --git a/profiles/prefix/bsd/freebsd/8.0/x86/parent b/profiles/prefix/bsd/freebsd/8.0/x86/parent
deleted file mode 100644
index 4a6aa36..0000000
--- a/profiles/prefix/bsd/freebsd/8.0/x86/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x86
-..
diff --git a/profiles/prefix/bsd/freebsd/8.1/package.provided b/profiles/prefix/bsd/freebsd/8.1/package.provided
deleted file mode 100644
index efb33d1..0000000
--- a/profiles/prefix/bsd/freebsd/8.1/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/8.1/package.provided,v 1.1 2010/12/14 20:13:53 grobian Exp $
-
-sys-freebsd/libc-8.1
diff --git a/profiles/prefix/bsd/freebsd/8.1/parent b/profiles/prefix/bsd/freebsd/8.1/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/bsd/freebsd/8.1/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/bsd/freebsd/8.1/sparc64/make.defaults b/profiles/prefix/bsd/freebsd/8.1/sparc64/make.defaults
deleted file mode 100644
index 276ab8c..0000000
--- a/profiles/prefix/bsd/freebsd/8.1/sparc64/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/8.1/sparc64/make.defaults,v 1.1 2010/12/14 20:13:53 grobian Exp $
-
-# retain backwards compatability for freebsd keywords/conditionals
-ARCH="sparc64-fbsd"
-CHOST="sparc64-unknown-freebsd8.1"
-ACCEPT_KEYWORDS="~sparc64-freebsd"
-
diff --git a/profiles/prefix/bsd/freebsd/8.1/sparc64/parent b/profiles/prefix/bsd/freebsd/8.1/sparc64/parent
deleted file mode 100644
index 9dbef0d..0000000
--- a/profiles/prefix/bsd/freebsd/8.1/sparc64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/sparc64
-..
diff --git a/profiles/prefix/bsd/freebsd/8.1/x64/make.defaults b/profiles/prefix/bsd/freebsd/8.1/x64/make.defaults
deleted file mode 100644
index 25334f0..0000000
--- a/profiles/prefix/bsd/freebsd/8.1/x64/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/8.1/x64/make.defaults,v 1.1 2010/12/14 20:13:53 grobian Exp $
-
-# retain backwards compatability for freebsd keywords/conditionals
-ARCH="amd64-fbsd"
-CHOST="x86_64-pc-freebsd8.1"
-ACCEPT_KEYWORDS="~x64-freebsd"
-
diff --git a/profiles/prefix/bsd/freebsd/8.1/x64/parent b/profiles/prefix/bsd/freebsd/8.1/x64/parent
deleted file mode 100644
index fc24616..0000000
--- a/profiles/prefix/bsd/freebsd/8.1/x64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x64
-..
diff --git a/profiles/prefix/bsd/freebsd/8.1/x86/make.defaults b/profiles/prefix/bsd/freebsd/8.1/x86/make.defaults
deleted file mode 100644
index 6366dba..0000000
--- a/profiles/prefix/bsd/freebsd/8.1/x86/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/8.1/x86/make.defaults,v 1.1 2010/12/14 20:13:53 grobian Exp $
-
-# retain backwards compatability for freebsd keywords/conditionals
-ARCH="x86-fbsd"
-CHOST="i686-pc-freebsd8.1"
-ACCEPT_KEYWORDS="~x86-freebsd"
-
diff --git a/profiles/prefix/bsd/freebsd/8.1/x86/parent b/profiles/prefix/bsd/freebsd/8.1/x86/parent
deleted file mode 100644
index 4a6aa36..0000000
--- a/profiles/prefix/bsd/freebsd/8.1/x86/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x86
-..
diff --git a/profiles/prefix/bsd/freebsd/8.2/package.provided b/profiles/prefix/bsd/freebsd/8.2/package.provided
deleted file mode 100644
index 4f0e63e..0000000
--- a/profiles/prefix/bsd/freebsd/8.2/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/8.2/package.provided,v 1.1 2011/05/01 19:05:45 grobian Exp $
-
-sys-freebsd/libc-8.2
diff --git a/profiles/prefix/bsd/freebsd/8.2/parent b/profiles/prefix/bsd/freebsd/8.2/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/bsd/freebsd/8.2/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/bsd/freebsd/8.2/x64/make.defaults b/profiles/prefix/bsd/freebsd/8.2/x64/make.defaults
deleted file mode 100644
index 55794d1..0000000
--- a/profiles/prefix/bsd/freebsd/8.2/x64/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/8.2/x64/make.defaults,v 1.1 2011/05/01 19:05:45 grobian Exp $
-
-# retain backwards compatability for freebsd keywords/conditionals
-ARCH="amd64-fbsd"
-CHOST="x86_64-pc-freebsd8.2"
-ACCEPT_KEYWORDS="~x64-freebsd"
-
diff --git a/profiles/prefix/bsd/freebsd/8.2/x64/parent b/profiles/prefix/bsd/freebsd/8.2/x64/parent
deleted file mode 100644
index fc24616..0000000
--- a/profiles/prefix/bsd/freebsd/8.2/x64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x64
-..
diff --git a/profiles/prefix/bsd/freebsd/8.2/x86/make.defaults b/profiles/prefix/bsd/freebsd/8.2/x86/make.defaults
deleted file mode 100644
index 01bc94b..0000000
--- a/profiles/prefix/bsd/freebsd/8.2/x86/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/8.2/x86/make.defaults,v 1.1 2011/08/04 22:04:27 abcd Exp $
-
-# retain backwards compatability for freebsd keywords/conditionals
-ARCH="x86-fbsd"
-CHOST="i686-pc-freebsd8.2"
-ACCEPT_KEYWORDS="~x86-freebsd"
-
diff --git a/profiles/prefix/bsd/freebsd/8.2/x86/parent b/profiles/prefix/bsd/freebsd/8.2/x86/parent
deleted file mode 100644
index 4a6aa36..0000000
--- a/profiles/prefix/bsd/freebsd/8.2/x86/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x86
-..
diff --git a/profiles/prefix/bsd/freebsd/9.0/package.provided b/profiles/prefix/bsd/freebsd/9.0/package.provided
deleted file mode 100644
index a986802..0000000
--- a/profiles/prefix/bsd/freebsd/9.0/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/9.0/package.provided,v 1.1 2011/12/26 10:50:45 grobian Exp $
-
-sys-freebsd/libc-9.0
diff --git a/profiles/prefix/bsd/freebsd/9.0/parent b/profiles/prefix/bsd/freebsd/9.0/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/bsd/freebsd/9.0/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/bsd/freebsd/9.0/x64/make.defaults b/profiles/prefix/bsd/freebsd/9.0/x64/make.defaults
deleted file mode 100644
index bf8ae0e..0000000
--- a/profiles/prefix/bsd/freebsd/9.0/x64/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/9.0/x64/make.defaults,v 1.1 2011/12/26 10:50:45 grobian Exp $
-
-# retain backwards compatability for freebsd keywords/conditionals
-ARCH="amd64-fbsd"
-CHOST="x86_64-pc-freebsd9.0"
-ACCEPT_KEYWORDS="~x64-freebsd"
-
diff --git a/profiles/prefix/bsd/freebsd/9.0/x64/parent b/profiles/prefix/bsd/freebsd/9.0/x64/parent
deleted file mode 100644
index fc24616..0000000
--- a/profiles/prefix/bsd/freebsd/9.0/x64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x64
-..
diff --git a/profiles/prefix/bsd/freebsd/9.0/x86/make.defaults b/profiles/prefix/bsd/freebsd/9.0/x86/make.defaults
deleted file mode 100644
index ee52fc1..0000000
--- a/profiles/prefix/bsd/freebsd/9.0/x86/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/9.0/x86/make.defaults,v 1.1 2011/12/26 10:50:45 grobian Exp $
-
-# retain backwards compatability for freebsd keywords/conditionals
-ARCH="x86-fbsd"
-CHOST="i686-pc-freebsd9.0"
-ACCEPT_KEYWORDS="~x86-freebsd"
-
diff --git a/profiles/prefix/bsd/freebsd/9.0/x86/parent b/profiles/prefix/bsd/freebsd/9.0/x86/parent
deleted file mode 100644
index 4a6aa36..0000000
--- a/profiles/prefix/bsd/freebsd/9.0/x86/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x86
-..
diff --git a/profiles/prefix/bsd/freebsd/9.1/package.provided b/profiles/prefix/bsd/freebsd/9.1/package.provided
deleted file mode 100644
index abd40c8..0000000
--- a/profiles/prefix/bsd/freebsd/9.1/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/9.1/package.provided,v 1.2 2012/07/31 16:44:36 grobian Exp $
-
-sys-freebsd/libc-9.1
diff --git a/profiles/prefix/bsd/freebsd/9.1/parent b/profiles/prefix/bsd/freebsd/9.1/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/bsd/freebsd/9.1/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/bsd/freebsd/9.1/x64/make.defaults b/profiles/prefix/bsd/freebsd/9.1/x64/make.defaults
deleted file mode 100644
index e7810b0..0000000
--- a/profiles/prefix/bsd/freebsd/9.1/x64/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/9.1/x64/make.defaults,v 1.2 2012/07/31 16:44:36 grobian Exp $
-
-# retain backwards compatability for freebsd keywords/conditionals
-ARCH="amd64-fbsd"
-CHOST="x86_64-pc-freebsd9.1"
-ACCEPT_KEYWORDS="~x64-freebsd"
-
diff --git a/profiles/prefix/bsd/freebsd/9.1/x64/parent b/profiles/prefix/bsd/freebsd/9.1/x64/parent
deleted file mode 100644
index fc24616..0000000
--- a/profiles/prefix/bsd/freebsd/9.1/x64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x64
-..
diff --git a/profiles/prefix/bsd/freebsd/9.1/x86/make.defaults b/profiles/prefix/bsd/freebsd/9.1/x86/make.defaults
deleted file mode 100644
index 8954b89..0000000
--- a/profiles/prefix/bsd/freebsd/9.1/x86/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/9.1/x86/make.defaults,v 1.2 2012/07/31 16:44:36 grobian Exp $
-
-# retain backwards compatability for freebsd keywords/conditionals
-ARCH="x86-fbsd"
-CHOST="i686-pc-freebsd9.1"
-ACCEPT_KEYWORDS="~x86-freebsd"
-
diff --git a/profiles/prefix/bsd/freebsd/9.1/x86/parent b/profiles/prefix/bsd/freebsd/9.1/x86/parent
deleted file mode 100644
index 4a6aa36..0000000
--- a/profiles/prefix/bsd/freebsd/9.1/x86/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x86
-..
diff --git a/profiles/prefix/bsd/freebsd/arch/sparc64/package.use.mask b/profiles/prefix/bsd/freebsd/arch/sparc64/package.use.mask
deleted file mode 100644
index 9aa1de6..0000000
--- a/profiles/prefix/bsd/freebsd/arch/sparc64/package.use.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/arch/sparc64/package.use.mask,v 1.1 2011/12/30 17:28:18 grobian Exp $
-
-# All the FreeBSD profiles inherit from their matching arch profile here.
-
-
diff --git a/profiles/prefix/bsd/freebsd/arch/x64/package.use.mask b/profiles/prefix/bsd/freebsd/arch/x64/package.use.mask
deleted file mode 100644
index 0b71a0d..0000000
--- a/profiles/prefix/bsd/freebsd/arch/x64/package.use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/arch/x64/package.use.mask,v 1.1 2011/12/30 17:28:18 grobian Exp $
-
-# The 32-bits profile is inherited by the 64-bits one!
-# All the FreeBSD profiles inherit from their matching arch profile here.
-
-
diff --git a/profiles/prefix/bsd/freebsd/arch/x64/parent b/profiles/prefix/bsd/freebsd/arch/x64/parent
deleted file mode 100644
index e6e4a52..0000000
--- a/profiles/prefix/bsd/freebsd/arch/x64/parent
+++ /dev/null
@@ -1 +0,0 @@
-../x86
diff --git a/profiles/prefix/bsd/freebsd/arch/x86/package.use.mask b/profiles/prefix/bsd/freebsd/arch/x86/package.use.mask
deleted file mode 100644
index 8a26c66..0000000
--- a/profiles/prefix/bsd/freebsd/arch/x86/package.use.mask
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/arch/x86/package.use.mask,v 1.2 2012/01/09 04:36:34 tetromino Exp $
-
-# The 32-bits profile is inherited by the 64-bits one!
-# All the FreeBSD profiles inherit from their matching arch profile here.
-
-
-# Alexandre Rostovtsev <tetromono@gentoo.org> (09 Jan 2012)
-# jsc JIT compilation is supported only on amd64/arm/x86 and their prefixes, so
-# it's masked in base profile and unmasked here (bug #396313).
-net-libs/webkit-gtk -jit
diff --git a/profiles/prefix/bsd/freebsd/make.defaults b/profiles/prefix/bsd/freebsd/make.defaults
deleted file mode 100644
index 2c4fb0e..0000000
--- a/profiles/prefix/bsd/freebsd/make.defaults
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/make.defaults,v 1.2 2009/06/30 16:34:59 darkside Exp $
-
-# System-wide defaults for all FreeBSD profiles
-# This file should rarely need to be changed
-
-# 'Sane' defaults
-ELIBC="FreeBSD"
-KERNEL="FreeBSD"
diff --git a/profiles/prefix/bsd/freebsd/parent b/profiles/prefix/bsd/freebsd/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/bsd/freebsd/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/bsd/freebsd/use.force b/profiles/prefix/bsd/freebsd/use.force
deleted file mode 100644
index 96f1c3f..0000000
--- a/profiles/prefix/bsd/freebsd/use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/use.force,v 1.1 2009/06/06 03:54:37 solar Exp $
-
-# Re-add FreeBSD OS
-kernel_FreeBSD
-elibc_FreeBSD
diff --git a/profiles/prefix/bsd/freebsd/use.mask b/profiles/prefix/bsd/freebsd/use.mask
deleted file mode 100644
index d11d12f..0000000
--- a/profiles/prefix/bsd/freebsd/use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/freebsd/use.mask,v 1.1 2009/06/06 03:54:37 solar Exp $
-
-# Re-add FreeBSD libc
--elibc_FreeBSD
--kernel_FreeBSD
-
diff --git a/profiles/prefix/bsd/netbsd/4.0/package.provided b/profiles/prefix/bsd/netbsd/4.0/package.provided
deleted file mode 100644
index 2b0157f..0000000
--- a/profiles/prefix/bsd/netbsd/4.0/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/netbsd/4.0/package.provided,v 1.1 2009/06/06 03:54:42 solar Exp $
-
-sys-netbsd/libc-4.0
diff --git a/profiles/prefix/bsd/netbsd/4.0/parent b/profiles/prefix/bsd/netbsd/4.0/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/bsd/netbsd/4.0/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/bsd/netbsd/4.0/x86/make.defaults b/profiles/prefix/bsd/netbsd/4.0/x86/make.defaults
deleted file mode 100644
index e566094..0000000
--- a/profiles/prefix/bsd/netbsd/4.0/x86/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/netbsd/4.0/x86/make.defaults,v 1.1 2009/06/06 03:54:42 solar Exp $
-
-ARCH="x86-netbsd"
-# we use *-netbsdelf* to avoid the need to patch binutils, gcc and co
-CHOST="i686-pc-netbsdelf4.0"
-ACCEPT_KEYWORDS="~x86-netbsd"
diff --git a/profiles/prefix/bsd/netbsd/4.0/x86/parent b/profiles/prefix/bsd/netbsd/4.0/x86/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/bsd/netbsd/4.0/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/bsd/netbsd/make.defaults b/profiles/prefix/bsd/netbsd/make.defaults
deleted file mode 100644
index 0bd0588..0000000
--- a/profiles/prefix/bsd/netbsd/make.defaults
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/netbsd/make.defaults,v 1.2 2009/06/30 16:34:59 darkside Exp $
-
-# System-wide defaults for all NetBSD profiles
-# This file should rarely need to be changed
-
-# 'Sane' defaults
-ELIBC="NetBSD"
-KERNEL="NetBSD"
diff --git a/profiles/prefix/bsd/netbsd/parent b/profiles/prefix/bsd/netbsd/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/bsd/netbsd/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/bsd/netbsd/use.force b/profiles/prefix/bsd/netbsd/use.force
deleted file mode 100644
index aa40905..0000000
--- a/profiles/prefix/bsd/netbsd/use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/netbsd/use.force,v 1.1 2009/06/06 03:54:41 solar Exp $
-
-# Re-add NetBSD OS
-kernel_NetBSD
-elibc_NetBSD
diff --git a/profiles/prefix/bsd/netbsd/use.mask b/profiles/prefix/bsd/netbsd/use.mask
deleted file mode 100644
index 5a8b228..0000000
--- a/profiles/prefix/bsd/netbsd/use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/netbsd/use.mask,v 1.1 2009/06/06 03:54:41 solar Exp $
-
-# Re-add NetBSD libc
--elibc_NetBSD
--kernel_NetBSD
-
diff --git a/profiles/prefix/bsd/openbsd/4.2/package.provided b/profiles/prefix/bsd/openbsd/4.2/package.provided
deleted file mode 100644
index 4ad8229..0000000
--- a/profiles/prefix/bsd/openbsd/4.2/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/openbsd/4.2/package.provided,v 1.1 2009/06/06 03:54:43 solar Exp $
-
-sys-openbsd/libc-4.2
diff --git a/profiles/prefix/bsd/openbsd/4.2/parent b/profiles/prefix/bsd/openbsd/4.2/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/bsd/openbsd/4.2/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/bsd/openbsd/4.2/ppc/make.defaults b/profiles/prefix/bsd/openbsd/4.2/ppc/make.defaults
deleted file mode 100644
index fa5a1b1..0000000
--- a/profiles/prefix/bsd/openbsd/4.2/ppc/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/openbsd/4.2/ppc/make.defaults,v 1.1 2009/06/06 03:54:44 solar Exp $
-
-ARCH="ppc-openbsd"
-CHOST="powerpc-unknown-openbsd4.2"
-ACCEPT_KEYWORDS="~ppc-openbsd"
-
diff --git a/profiles/prefix/bsd/openbsd/4.2/ppc/parent b/profiles/prefix/bsd/openbsd/4.2/ppc/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/bsd/openbsd/4.2/ppc/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/bsd/openbsd/4.2/x64/make.defaults b/profiles/prefix/bsd/openbsd/4.2/x64/make.defaults
deleted file mode 100644
index da44440..0000000
--- a/profiles/prefix/bsd/openbsd/4.2/x64/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/openbsd/4.2/x64/make.defaults,v 1.1 2009/06/06 03:54:44 solar Exp $
-
-ARCH="x64-openbsd"
-CHOST="x86_64-pc-openbsd4.2"
-ACCEPT_KEYWORDS="~x64-openbsd"
-
diff --git a/profiles/prefix/bsd/openbsd/4.2/x64/parent b/profiles/prefix/bsd/openbsd/4.2/x64/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/bsd/openbsd/4.2/x64/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/bsd/openbsd/4.2/x86/make.defaults b/profiles/prefix/bsd/openbsd/4.2/x86/make.defaults
deleted file mode 100644
index ab1f476..0000000
--- a/profiles/prefix/bsd/openbsd/4.2/x86/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/openbsd/4.2/x86/make.defaults,v 1.1 2009/06/06 03:54:45 solar Exp $
-
-ARCH="x86-openbsd"
-CHOST="i686-pc-openbsd4.2"
-ACCEPT_KEYWORDS="~x86-openbsd"
-
diff --git a/profiles/prefix/bsd/openbsd/4.2/x86/parent b/profiles/prefix/bsd/openbsd/4.2/x86/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/bsd/openbsd/4.2/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/bsd/openbsd/make.defaults b/profiles/prefix/bsd/openbsd/make.defaults
deleted file mode 100644
index b692bde..0000000
--- a/profiles/prefix/bsd/openbsd/make.defaults
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/openbsd/make.defaults,v 1.2 2009/06/30 16:35:00 darkside Exp $
-
-# System-wide defaults for all OpenBSD profiles
-# This file should rarely need to be changed
-
-# 'Sane' defaults
-ELIBC="OpenBSD"
-KERNEL="OpenBSD"
diff --git a/profiles/prefix/bsd/openbsd/parent b/profiles/prefix/bsd/openbsd/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/bsd/openbsd/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/bsd/openbsd/use.force b/profiles/prefix/bsd/openbsd/use.force
deleted file mode 100644
index 2198030..0000000
--- a/profiles/prefix/bsd/openbsd/use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/openbsd/use.force,v 1.1 2009/06/06 03:54:43 solar Exp $
-
-# Re-add OpenBSD OS
-kernel_OpenBSD
-elibc_OpenBSD
diff --git a/profiles/prefix/bsd/openbsd/use.mask b/profiles/prefix/bsd/openbsd/use.mask
deleted file mode 100644
index 5276a4d..0000000
--- a/profiles/prefix/bsd/openbsd/use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/openbsd/use.mask,v 1.1 2009/06/06 03:54:43 solar Exp $
-
-# Re-add OpenBSD libc
--elibc_OpenBSD
--kernel_OpenBSD
-
diff --git a/profiles/prefix/bsd/package.use.mask b/profiles/prefix/bsd/package.use.mask
deleted file mode 100644
index fdb9082..0000000
--- a/profiles/prefix/bsd/package.use.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/package.use.mask,v 1.1 2009/09/30 10:19:53 haubi Exp $
-
-# Michael Haubenwallner <haubi@gentoo.org> (30 Sep 2009)
-# *bsd do have an uuid implementation in libc (#230981).
-x11-libs/libSM -uuid
diff --git a/profiles/prefix/bsd/packages b/profiles/prefix/bsd/packages
deleted file mode 100644
index bd1b8fc..0000000
--- a/profiles/prefix/bsd/packages
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/packages,v 1.2 2009/06/21 13:21:07 grobian Exp $
-
-*sys-devel/binutils
-*sys-process/pidof-bsd
diff --git a/profiles/prefix/bsd/parent b/profiles/prefix/bsd/parent
deleted file mode 100644
index cd11492..0000000
--- a/profiles/prefix/bsd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../base
-..
diff --git a/profiles/prefix/bsd/use.mask b/profiles/prefix/bsd/use.mask
deleted file mode 100644
index b5f1000..0000000
--- a/profiles/prefix/bsd/use.mask
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/use.mask,v 1.5 2013/02/02 13:12:27 grobian Exp $
-
-# these will more than likely never work on bsd
-3dfx
-3dnow
-3dnowext
-acpi
-alsa
-apm
-cap
-caps
-cman
-clvm
-directfb
-divx4linux
-djbfft
-emul-linux-x86
-fbcon
-fdftk
-fmod
-ggi
-gpm
-hardened
-icc
-icc-pgo
-mmx
-mmx2
-# the following USE flag requires device-mapper
-on-the-fly-crypt
-solid
-sse
-sse2
-svga
-sybase
-sybase-ct
-rtc
-uclibc
-voodoo3
-pvm
-v4l
diff --git a/profiles/prefix/darwin/macos/10.4/eapi b/profiles/prefix/darwin/macos/10.4/eapi
deleted file mode 100644
index d00491f..0000000
--- a/profiles/prefix/darwin/macos/10.4/eapi
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/profiles/prefix/darwin/macos/10.4/make.defaults b/profiles/prefix/darwin/macos/10.4/make.defaults
deleted file mode 100644
index c9438d7..0000000
--- a/profiles/prefix/darwin/macos/10.4/make.defaults
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/make.defaults,v 1.1 2009/06/06 03:54:47 solar Exp $
-
-MACOSX_DEPLOYMENT_TARGET="10.4"
diff --git a/profiles/prefix/darwin/macos/10.4/package.provided b/profiles/prefix/darwin/macos/10.4/package.provided
deleted file mode 100644
index adf5b1e..0000000
--- a/profiles/prefix/darwin/macos/10.4/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/package.provided,v 1.1 2009/06/06 03:54:47 solar Exp $
-
-sys-darwin/libsystem-71
diff --git a/profiles/prefix/darwin/macos/10.4/package.use.mask b/profiles/prefix/darwin/macos/10.4/package.use.mask
deleted file mode 100644
index 5b704bb..0000000
--- a/profiles/prefix/darwin/macos/10.4/package.use.mask
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/package.use.mask,v 1.1 2011/12/30 15:49:34 grobian Exp $
-
-
-# Fabian Groffen <grobian@gentoo.org> (28 Apr 2008)
-# mach_override.h missing
-# http://www.erlang.org/pipermail/erlang-questions/2007-July/027870.html
-dev-lang/erlang hipe
-
-# Elias Pipping <pipping@gentoo.org> (25 Nov 2007)
-# there's no (official) java6 on macosx
-dev-util/checkstyle test
diff --git a/profiles/prefix/darwin/macos/10.4/parent b/profiles/prefix/darwin/macos/10.4/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/darwin/macos/10.4/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/darwin/macos/10.4/ppc/make.defaults b/profiles/prefix/darwin/macos/10.4/ppc/make.defaults
deleted file mode 100644
index f979451..0000000
--- a/profiles/prefix/darwin/macos/10.4/ppc/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/ppc/make.defaults,v 1.1 2009/06/06 03:54:47 solar Exp $
-
-ARCH="ppc-macos"
-CHOST="powerpc-apple-darwin8"
-ACCEPT_KEYWORDS="~ppc-macos"
diff --git a/profiles/prefix/darwin/macos/10.4/ppc/package.use.mask b/profiles/prefix/darwin/macos/10.4/ppc/package.use.mask
deleted file mode 100644
index 2b8ffe1..0000000
--- a/profiles/prefix/darwin/macos/10.4/ppc/package.use.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/ppc/package.use.mask,v 1.2 2011/12/30 15:49:34 grobian Exp $
-
diff --git a/profiles/prefix/darwin/macos/10.4/ppc/parent b/profiles/prefix/darwin/macos/10.4/ppc/parent
deleted file mode 100644
index 6cb6381..0000000
--- a/profiles/prefix/darwin/macos/10.4/ppc/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/ppc
-..
diff --git a/profiles/prefix/darwin/macos/10.4/ppc/use.mask b/profiles/prefix/darwin/macos/10.4/ppc/use.mask
deleted file mode 100644
index cf12838..0000000
--- a/profiles/prefix/darwin/macos/10.4/ppc/use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/ppc/use.mask,v 1.1 2009/06/06 03:54:47 solar Exp $
-
--altivec
diff --git a/profiles/prefix/darwin/macos/10.4/ppc64/make.defaults b/profiles/prefix/darwin/macos/10.4/ppc64/make.defaults
deleted file mode 100644
index ed1c06b..0000000
--- a/profiles/prefix/darwin/macos/10.4/ppc64/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/ppc64/make.defaults,v 1.1 2009/06/06 03:54:48 solar Exp $
-
-ARCH="ppc64-macos"
-CHOST="powerpc64-apple-darwin8"
-ACCEPT_KEYWORDS="~ppc64-macos"
diff --git a/profiles/prefix/darwin/macos/10.4/ppc64/package.use.mask b/profiles/prefix/darwin/macos/10.4/ppc64/package.use.mask
deleted file mode 100644
index d0c06b6..0000000
--- a/profiles/prefix/darwin/macos/10.4/ppc64/package.use.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/ppc64/package.use.mask,v 1.2 2011/12/30 15:49:34 grobian Exp $
-
diff --git a/profiles/prefix/darwin/macos/10.4/ppc64/parent b/profiles/prefix/darwin/macos/10.4/ppc64/parent
deleted file mode 100644
index 4d64089..0000000
--- a/profiles/prefix/darwin/macos/10.4/ppc64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/ppc64
-..
diff --git a/profiles/prefix/darwin/macos/10.4/ppc64/use.mask b/profiles/prefix/darwin/macos/10.4/ppc64/use.mask
deleted file mode 100644
index 3dd174c..0000000
--- a/profiles/prefix/darwin/macos/10.4/ppc64/use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/ppc64/use.mask,v 1.1 2009/06/06 03:54:48 solar Exp $
-
--altivec
diff --git a/profiles/prefix/darwin/macos/10.4/profile.bashrc b/profiles/prefix/darwin/macos/10.4/profile.bashrc
deleted file mode 100644
index 254f794..0000000
--- a/profiles/prefix/darwin/macos/10.4/profile.bashrc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/profile.bashrc,v 1.1 2009/06/06 03:54:47 solar Exp $
-
-export MACOSX_DEPLOYMENT_TARGET=10.4
diff --git a/profiles/prefix/darwin/macos/10.4/x86/make.defaults b/profiles/prefix/darwin/macos/10.4/x86/make.defaults
deleted file mode 100644
index bba2e1d..0000000
--- a/profiles/prefix/darwin/macos/10.4/x86/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/x86/make.defaults,v 1.2 2011/02/13 16:53:40 arfrever Exp $
-
-ARCH="x86-macos"
-CHOST="i686-apple-darwin8"
-ACCEPT_KEYWORDS="~x86-macos"
-
-USE="mmx mmxext sse sse2"
-# set arch to prescott for all MacTel users, as this enables SSE and MMX
-# support in GCC
-CFLAGS="-march=prescott"
diff --git a/profiles/prefix/darwin/macos/10.4/x86/package.unmask b/profiles/prefix/darwin/macos/10.4/x86/package.unmask
deleted file mode 100644
index c990fd0..0000000
--- a/profiles/prefix/darwin/macos/10.4/x86/package.unmask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/x86/package.unmask,v 1.1 2012/09/29 11:15:45 grobian Exp $
-
-# Fabian Groffen <grobian@gentoo.org> (29 Sep 2012)
-# This is the only way to get Java6 here
-dev-java/soylatte-jdk-bin
diff --git a/profiles/prefix/darwin/macos/10.4/x86/package.use.force b/profiles/prefix/darwin/macos/10.4/x86/package.use.force
deleted file mode 100644
index 0db9a43..0000000
--- a/profiles/prefix/darwin/macos/10.4/x86/package.use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/x86/package.use.force,v 1.1 2009/06/06 03:54:48 solar Exp $
-
-# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
-# compiles with -aqua, doesn't work, though
-media-video/mplayer aqua
diff --git a/profiles/prefix/darwin/macos/10.4/x86/package.use.mask b/profiles/prefix/darwin/macos/10.4/x86/package.use.mask
deleted file mode 100644
index 8b5d9ac..0000000
--- a/profiles/prefix/darwin/macos/10.4/x86/package.use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/x86/package.use.mask,v 1.4 2011/12/30 15:49:35 grobian Exp $
-
-
diff --git a/profiles/prefix/darwin/macos/10.4/x86/parent b/profiles/prefix/darwin/macos/10.4/x86/parent
deleted file mode 100644
index 4a6aa36..0000000
--- a/profiles/prefix/darwin/macos/10.4/x86/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x86
-..
diff --git a/profiles/prefix/darwin/macos/10.4/x86/use.mask b/profiles/prefix/darwin/macos/10.4/x86/use.mask
deleted file mode 100644
index aab08f7..0000000
--- a/profiles/prefix/darwin/macos/10.4/x86/use.mask
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/x86/use.mask,v 1.4 2013/06/13 18:24:25 ulm Exp $
-
-# This file masks out USE flags that are simply NOT allowed in the default
-# x86 profile.  This works, for example, if another architecture's
-# profile have a USE flag associated with (such as altivec, mmx, etc).
-
-# Unmask x86 instruction sets
--icc
--icc-pgo
--ifc
--mmx
--mmxext
--sse
--sse2
--ssse3
--svga
--kqemu
-
-# Unmask nvidia XvMC support
--nvidia
-
-# Unmask dev-db/oracle-instantclient-basic support
--oci8-instant-client
-
-# Unmask osp, used by asterisk; bug 115798
--osp
-
-# Modular X: unmask for architectures on which they are available
--input_devices_synaptics
--input_devices_vmmouse
--input_devices_wacom
--video_cards_nvidia
--video_cards_fglrx
--video_cards_vmware
-
-# Modular X: mask for architectures on which they aren't available
-video_cards_newport
-
-#codec support
--x264
-
-# lvm2 cluster
--gulm
-
-# ibm is only used for ppc64 stuff
-ibm
-
-# psyco works on x86
--psyco
-
-# Adobe FDF toolkit is x86 only.
--fdftk
diff --git a/profiles/prefix/darwin/macos/10.5/eapi b/profiles/prefix/darwin/macos/10.5/eapi
deleted file mode 100644
index d00491f..0000000
--- a/profiles/prefix/darwin/macos/10.5/eapi
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/profiles/prefix/darwin/macos/10.5/make.defaults b/profiles/prefix/darwin/macos/10.5/make.defaults
deleted file mode 100644
index 250751e..0000000
--- a/profiles/prefix/darwin/macos/10.5/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/make.defaults,v 1.3 2013/02/26 21:23:59 grobian Exp $
-
-MACOSX_DEPLOYMENT_TARGET="10.5"
-
-# sandbox is working with use of Mac OS X's seatbelt (since 10.5)
-# but it generates problems, #456234
-#FEATURES="sandbox"
diff --git a/profiles/prefix/darwin/macos/10.5/package.provided b/profiles/prefix/darwin/macos/10.5/package.provided
deleted file mode 100644
index 65cedd8..0000000
--- a/profiles/prefix/darwin/macos/10.5/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/package.provided,v 1.1 2009/06/06 03:54:49 solar Exp $
-
-sys-darwin/libsystem-71
diff --git a/profiles/prefix/darwin/macos/10.5/package.use.mask b/profiles/prefix/darwin/macos/10.5/package.use.mask
deleted file mode 100644
index 0528d36..0000000
--- a/profiles/prefix/darwin/macos/10.5/package.use.mask
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/package.use.mask,v 1.2 2011/12/30 15:49:35 grobian Exp $
-
-
-# Fabian Groffen <grobian@gentoo.org> (28 Apr 2008)
-# mach_override.h missing
-# http://www.erlang.org/pipermail/erlang-questions/2007-July/027870.html
-dev-lang/erlang hipe
-
-# Elias Pipping <pipping@gentoo.org> (25 Nov 2007)
-# there's no (official) java6 on macosx
-dev-util/checkstyle test
diff --git a/profiles/prefix/darwin/macos/10.5/parent b/profiles/prefix/darwin/macos/10.5/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/darwin/macos/10.5/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/darwin/macos/10.5/ppc/make.defaults b/profiles/prefix/darwin/macos/10.5/ppc/make.defaults
deleted file mode 100644
index 09f0763..0000000
--- a/profiles/prefix/darwin/macos/10.5/ppc/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/ppc/make.defaults,v 1.1 2009/06/06 03:54:49 solar Exp $
-
-ARCH="ppc-macos"
-CHOST="powerpc-apple-darwin9"
-ACCEPT_KEYWORDS="~ppc-macos"
diff --git a/profiles/prefix/darwin/macos/10.5/ppc/package.unmask b/profiles/prefix/darwin/macos/10.5/ppc/package.unmask
deleted file mode 100644
index 4240d66..0000000
--- a/profiles/prefix/darwin/macos/10.5/ppc/package.unmask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/ppc/package.unmask,v 1.1 2012/10/30 20:28:53 grobian Exp $
-
-# Fabian Groffen <grobian@gentoo.org> (30 Oct 2012)
-# This is the only way to get Java7 here (no Java6 possible)
-dev-java/soylatte-jdk-bin
diff --git a/profiles/prefix/darwin/macos/10.5/ppc/package.use.force b/profiles/prefix/darwin/macos/10.5/ppc/package.use.force
deleted file mode 100644
index 93280a3..0000000
--- a/profiles/prefix/darwin/macos/10.5/ppc/package.use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/ppc/package.use.force,v 1.1 2009/06/06 03:54:49 solar Exp $
-
-# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
-# compiles with -aqua, doesn't work, though
-media-video/mplayer aqua
diff --git a/profiles/prefix/darwin/macos/10.5/ppc/package.use.mask b/profiles/prefix/darwin/macos/10.5/ppc/package.use.mask
deleted file mode 100644
index 8325924..0000000
--- a/profiles/prefix/darwin/macos/10.5/ppc/package.use.mask
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/ppc/package.use.mask,v 1.10 2013/06/13 18:24:25 ulm Exp $
-
-
-# flag returns compile errors
-media-video/mplayer livecd cpudetection
-# libs mising
-media-video/mplayer gtk sdl libcaca dv nas musepack bidi enca cdparanoia samba xanim live openal
diff --git a/profiles/prefix/darwin/macos/10.5/ppc/parent b/profiles/prefix/darwin/macos/10.5/ppc/parent
deleted file mode 100644
index 6cb6381..0000000
--- a/profiles/prefix/darwin/macos/10.5/ppc/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/ppc
-..
diff --git a/profiles/prefix/darwin/macos/10.5/ppc/use.mask b/profiles/prefix/darwin/macos/10.5/ppc/use.mask
deleted file mode 100644
index 2ed7290..0000000
--- a/profiles/prefix/darwin/macos/10.5/ppc/use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/ppc/use.mask,v 1.1 2009/06/06 03:54:49 solar Exp $
-
--altivec
diff --git a/profiles/prefix/darwin/macos/10.5/ppc64/make.defaults b/profiles/prefix/darwin/macos/10.5/ppc64/make.defaults
deleted file mode 100644
index ae52caf..0000000
--- a/profiles/prefix/darwin/macos/10.5/ppc64/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/ppc64/make.defaults,v 1.1 2011/01/05 12:30:31 grobian Exp $
-
-ARCH="ppc64-macos"
-CHOST="powerpc64-apple-darwin9"
-ACCEPT_KEYWORDS="~ppc64-macos"
diff --git a/profiles/prefix/darwin/macos/10.5/ppc64/package.use.mask b/profiles/prefix/darwin/macos/10.5/ppc64/package.use.mask
deleted file mode 100644
index aa759d6..0000000
--- a/profiles/prefix/darwin/macos/10.5/ppc64/package.use.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/ppc64/package.use.mask,v 1.2 2011/12/30 15:49:35 grobian Exp $
-
diff --git a/profiles/prefix/darwin/macos/10.5/ppc64/parent b/profiles/prefix/darwin/macos/10.5/ppc64/parent
deleted file mode 100644
index 4d64089..0000000
--- a/profiles/prefix/darwin/macos/10.5/ppc64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/ppc64
-..
diff --git a/profiles/prefix/darwin/macos/10.5/ppc64/use.mask b/profiles/prefix/darwin/macos/10.5/ppc64/use.mask
deleted file mode 100644
index 088b115..0000000
--- a/profiles/prefix/darwin/macos/10.5/ppc64/use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/ppc64/use.mask,v 1.1 2011/01/05 12:30:31 grobian Exp $
-
--altivec
diff --git a/profiles/prefix/darwin/macos/10.5/profile.bashrc b/profiles/prefix/darwin/macos/10.5/profile.bashrc
deleted file mode 100644
index 31ca603..0000000
--- a/profiles/prefix/darwin/macos/10.5/profile.bashrc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/profile.bashrc,v 1.1 2009/06/06 03:54:49 solar Exp $
-
-export MACOSX_DEPLOYMENT_TARGET=10.5
diff --git a/profiles/prefix/darwin/macos/10.5/x64/make.defaults b/profiles/prefix/darwin/macos/10.5/x64/make.defaults
deleted file mode 100644
index e79db9c..0000000
--- a/profiles/prefix/darwin/macos/10.5/x64/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/x64/make.defaults,v 1.2 2011/02/13 16:53:40 arfrever Exp $
-
-ARCH="x64-macos"
-CHOST="x86_64-apple-darwin9"
-ACCEPT_KEYWORDS="~x64-macos"
-
-USE="mmx mmxext sse sse2"
-# set arch to nocona for all MacTel users, as this enables SSE and MMX
-# support in GCC, nocona = Core2Duo = 64-bits
-CFLAGS="-march=nocona"
diff --git a/profiles/prefix/darwin/macos/10.5/x64/package.unmask b/profiles/prefix/darwin/macos/10.5/x64/package.unmask
deleted file mode 100644
index 8289f65..0000000
--- a/profiles/prefix/darwin/macos/10.5/x64/package.unmask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/x64/package.unmask,v 1.2 2012/11/01 16:20:08 grobian Exp $
-
diff --git a/profiles/prefix/darwin/macos/10.5/x64/package.use.force b/profiles/prefix/darwin/macos/10.5/x64/package.use.force
deleted file mode 100644
index fceff3b..0000000
--- a/profiles/prefix/darwin/macos/10.5/x64/package.use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/x64/package.use.force,v 1.1 2009/06/06 03:54:50 solar Exp $
-
-# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
-# compiles with -aqua, doesn't work, though
-media-video/mplayer aqua
diff --git a/profiles/prefix/darwin/macos/10.5/x64/package.use.mask b/profiles/prefix/darwin/macos/10.5/x64/package.use.mask
deleted file mode 100644
index 64b290d..0000000
--- a/profiles/prefix/darwin/macos/10.5/x64/package.use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/x64/package.use.mask,v 1.5 2011/12/30 15:49:35 grobian Exp $
-
-
diff --git a/profiles/prefix/darwin/macos/10.5/x64/parent b/profiles/prefix/darwin/macos/10.5/x64/parent
deleted file mode 100644
index fc24616..0000000
--- a/profiles/prefix/darwin/macos/10.5/x64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x64
-..
diff --git a/profiles/prefix/darwin/macos/10.5/x64/use.mask b/profiles/prefix/darwin/macos/10.5/x64/use.mask
deleted file mode 100644
index 6ac7baa..0000000
--- a/profiles/prefix/darwin/macos/10.5/x64/use.mask
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/x64/use.mask,v 1.4 2013/06/13 18:24:25 ulm Exp $
-
-# This file masks out USE flags that are simply NOT allowed in the default
-# x86 profile.  This works, for example, if another architecture's
-# profile have a USE flag associated with (such as altivec, mmx, etc).
-
-# Unmask x86 instruction sets
--icc
--icc-pgo
--ifc
--mmx
--mmxext
--sse
--sse2
--ssse3
--svga
--kqemu
-
-# Unmask nvidia XvMC support
--nvidia
-
-# Unmask dev-db/oracle-instantclient-basic support
--oci8-instant-client
-
-# Unmask osp, used by asterisk; bug 115798
--osp
-
-# Modular X: unmask for architectures on which they are available
--input_devices_synaptics
--input_devices_vmmouse
--input_devices_wacom
--video_cards_nvidia
--video_cards_fglrx
--video_cards_vmware
-
-# Modular X: mask for architectures on which they aren't available
-video_cards_newport
-
-#codec support
--x264
-
-# lvm2 cluster
--gulm
-
-# ibm is only used for ppc64 stuff
-ibm
-
-# psyco works on x86
--psyco
-
-# Adobe FDF toolkit is x86 only.
--fdftk
diff --git a/profiles/prefix/darwin/macos/10.5/x86/make.defaults b/profiles/prefix/darwin/macos/10.5/x86/make.defaults
deleted file mode 100644
index b4a9d97..0000000
--- a/profiles/prefix/darwin/macos/10.5/x86/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/x86/make.defaults,v 1.2 2011/02/13 16:53:40 arfrever Exp $
-
-ARCH="x86-macos"
-CHOST="i686-apple-darwin9"
-ACCEPT_KEYWORDS="~x86-macos"
-
-USE="mmx mmxext sse sse2"
-# set arch to prescott for all MacTel users, as this enables SSE and MMX
-# support in GCC
-CFLAGS="-march=prescott"
diff --git a/profiles/prefix/darwin/macos/10.5/x86/package.unmask b/profiles/prefix/darwin/macos/10.5/x86/package.unmask
deleted file mode 100644
index c3f7961..0000000
--- a/profiles/prefix/darwin/macos/10.5/x86/package.unmask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/x86/package.unmask,v 1.2 2012/11/01 16:20:08 grobian Exp $
-
diff --git a/profiles/prefix/darwin/macos/10.5/x86/package.use.force b/profiles/prefix/darwin/macos/10.5/x86/package.use.force
deleted file mode 100644
index c85dc84..0000000
--- a/profiles/prefix/darwin/macos/10.5/x86/package.use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/x86/package.use.force,v 1.1 2009/06/06 03:54:51 solar Exp $
-
-# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
-# compiles with -aqua, doesn't work, though
-media-video/mplayer aqua
diff --git a/profiles/prefix/darwin/macos/10.5/x86/package.use.mask b/profiles/prefix/darwin/macos/10.5/x86/package.use.mask
deleted file mode 100644
index 40b737e..0000000
--- a/profiles/prefix/darwin/macos/10.5/x86/package.use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/x86/package.use.mask,v 1.6 2011/12/30 15:49:35 grobian Exp $
-
-
diff --git a/profiles/prefix/darwin/macos/10.5/x86/parent b/profiles/prefix/darwin/macos/10.5/x86/parent
deleted file mode 100644
index 4a6aa36..0000000
--- a/profiles/prefix/darwin/macos/10.5/x86/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x86
-..
diff --git a/profiles/prefix/darwin/macos/10.5/x86/use.mask b/profiles/prefix/darwin/macos/10.5/x86/use.mask
deleted file mode 100644
index fbcf9c9..0000000
--- a/profiles/prefix/darwin/macos/10.5/x86/use.mask
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/x86/use.mask,v 1.4 2013/06/13 18:24:25 ulm Exp $
-
-# This file masks out USE flags that are simply NOT allowed in the default
-# x86 profile.  This works, for example, if another architecture's
-# profile have a USE flag associated with (such as altivec, mmx, etc).
-
-# Unmask x86 instruction sets
--icc
--icc-pgo
--ifc
--mmx
--mmxext
--sse
--sse2
--ssse3
--svga
--kqemu
-
-# Unmask nvidia XvMC support
--nvidia
-
-# Unmask dev-db/oracle-instantclient-basic support
--oci8-instant-client
-
-# Unmask osp, used by asterisk; bug 115798
--osp
-
-# Modular X: unmask for architectures on which they are available
--input_devices_synaptics
--input_devices_vmmouse
--input_devices_wacom
--video_cards_nvidia
--video_cards_fglrx
--video_cards_vmware
-
-# Modular X: mask for architectures on which they aren't available
-video_cards_newport
-
-#codec support
--x264
-
-# lvm2 cluster
--gulm
-
-# ibm is only used for ppc64 stuff
-ibm
-
-# psyco works on x86
--psyco
-
-# Adobe FDF toolkit is x86 only.
--fdftk
diff --git a/profiles/prefix/darwin/macos/10.6/eapi b/profiles/prefix/darwin/macos/10.6/eapi
deleted file mode 100644
index d00491f..0000000
--- a/profiles/prefix/darwin/macos/10.6/eapi
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/profiles/prefix/darwin/macos/10.6/make.defaults b/profiles/prefix/darwin/macos/10.6/make.defaults
deleted file mode 100644
index 9c86730..0000000
--- a/profiles/prefix/darwin/macos/10.6/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.6/make.defaults,v 1.3 2013/02/26 21:24:00 grobian Exp $
-
-MACOSX_DEPLOYMENT_TARGET="10.6"
-
-# sandbox is working with use of Mac OS X's seatbelt (since 10.5)
-# but it generates problems, #456234
-#FEATURES="sandbox"
diff --git a/profiles/prefix/darwin/macos/10.6/package.provided b/profiles/prefix/darwin/macos/10.6/package.provided
deleted file mode 100644
index dcb0b79..0000000
--- a/profiles/prefix/darwin/macos/10.6/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.6/package.provided,v 1.1 2009/08/17 09:46:54 grobian Exp $
-
-sys-darwin/libsystem-71
diff --git a/profiles/prefix/darwin/macos/10.6/package.use.mask b/profiles/prefix/darwin/macos/10.6/package.use.mask
deleted file mode 100644
index aaf2b77..0000000
--- a/profiles/prefix/darwin/macos/10.6/package.use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.6/package.use.mask,v 1.3 2011/12/30 15:49:35 grobian Exp $
-
-
-# Elias Pipping <pipping@gentoo.org> (25 Nov 2007)
-# there's no (official) java6 on macosx
-dev-util/checkstyle test
diff --git a/profiles/prefix/darwin/macos/10.6/parent b/profiles/prefix/darwin/macos/10.6/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/darwin/macos/10.6/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/darwin/macos/10.6/profile.bashrc b/profiles/prefix/darwin/macos/10.6/profile.bashrc
deleted file mode 100644
index 16471c0..0000000
--- a/profiles/prefix/darwin/macos/10.6/profile.bashrc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.6/profile.bashrc,v 1.1 2009/08/17 09:46:54 grobian Exp $
-
-export MACOSX_DEPLOYMENT_TARGET=10.6
diff --git a/profiles/prefix/darwin/macos/10.6/x64/make.defaults b/profiles/prefix/darwin/macos/10.6/x64/make.defaults
deleted file mode 100644
index df956e2..0000000
--- a/profiles/prefix/darwin/macos/10.6/x64/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.6/x64/make.defaults,v 1.2 2011/02/13 16:53:40 arfrever Exp $
-
-ARCH="x64-macos"
-CHOST="x86_64-apple-darwin10"
-ACCEPT_KEYWORDS="~x64-macos"
-
-USE="mmx mmxext sse sse2"
-# set arch to nocona for all MacTel users, as this enables SSE and MMX
-# support in GCC, nocona = Core2Duo = 64-bits
-CFLAGS="-march=nocona"
diff --git a/profiles/prefix/darwin/macos/10.6/x64/package.use.force b/profiles/prefix/darwin/macos/10.6/x64/package.use.force
deleted file mode 100644
index cc8ce82..0000000
--- a/profiles/prefix/darwin/macos/10.6/x64/package.use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.6/x64/package.use.force,v 1.1 2009/08/17 09:46:55 grobian Exp $
-
-# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
-# compiles with -aqua, doesn't work, though
-media-video/mplayer aqua
diff --git a/profiles/prefix/darwin/macos/10.6/x64/package.use.mask b/profiles/prefix/darwin/macos/10.6/x64/package.use.mask
deleted file mode 100644
index 191ff80..0000000
--- a/profiles/prefix/darwin/macos/10.6/x64/package.use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.6/x64/package.use.mask,v 1.5 2011/12/30 15:49:35 grobian Exp $
-
-
diff --git a/profiles/prefix/darwin/macos/10.6/x64/parent b/profiles/prefix/darwin/macos/10.6/x64/parent
deleted file mode 100644
index fc24616..0000000
--- a/profiles/prefix/darwin/macos/10.6/x64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x64
-..
diff --git a/profiles/prefix/darwin/macos/10.6/x64/use.mask b/profiles/prefix/darwin/macos/10.6/x64/use.mask
deleted file mode 100644
index 58c690a..0000000
--- a/profiles/prefix/darwin/macos/10.6/x64/use.mask
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.6/x64/use.mask,v 1.4 2013/06/13 18:24:25 ulm Exp $
-
-# This file masks out USE flags that are simply NOT allowed in the default
-# x86 profile.  This works, for example, if another architecture's
-# profile have a USE flag associated with (such as altivec, mmx, etc).
-
-# Unmask x86 instruction sets
--icc
--icc-pgo
--ifc
--mmx
--mmxext
--sse
--sse2
--ssse3
--svga
--kqemu
-
-# Unmask nvidia XvMC support
--nvidia
-
-# Unmask dev-db/oracle-instantclient-basic support
--oci8-instant-client
-
-# Unmask osp, used by asterisk; bug 115798
--osp
-
-# Modular X: unmask for architectures on which they are available
--input_devices_synaptics
--input_devices_vmmouse
--input_devices_wacom
--video_cards_nvidia
--video_cards_fglrx
--video_cards_vmware
-
-# Modular X: mask for architectures on which they aren't available
-video_cards_newport
-
-#codec support
--x264
-
-# lvm2 cluster
--gulm
-
-# ibm is only used for ppc64 stuff
-ibm
-
-# psyco works on x86
--psyco
-
-# Adobe FDF toolkit is x86 only.
--fdftk
diff --git a/profiles/prefix/darwin/macos/10.6/x86/make.defaults b/profiles/prefix/darwin/macos/10.6/x86/make.defaults
deleted file mode 100644
index e1e9377..0000000
--- a/profiles/prefix/darwin/macos/10.6/x86/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.6/x86/make.defaults,v 1.4 2011/02/13 16:53:40 arfrever Exp $
-
-ARCH="x86-macos"
-CHOST="i686-apple-darwin10"
-ACCEPT_KEYWORDS="~x86-macos"
-
-USE="mmx mmxext sse sse2"
-# normally we set arch to prescott for all MacTel users, as this enables
-# SSE and MMX support in GCC
-CFLAGS="-march=prescott"
diff --git a/profiles/prefix/darwin/macos/10.6/x86/package.use.force b/profiles/prefix/darwin/macos/10.6/x86/package.use.force
deleted file mode 100644
index 5ef8412..0000000
--- a/profiles/prefix/darwin/macos/10.6/x86/package.use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.6/x86/package.use.force,v 1.1 2009/09/07 18:48:35 grobian Exp $
-
-# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
-# compiles with -aqua, doesn't work, though
-media-video/mplayer aqua
diff --git a/profiles/prefix/darwin/macos/10.6/x86/package.use.mask b/profiles/prefix/darwin/macos/10.6/x86/package.use.mask
deleted file mode 100644
index 067c294..0000000
--- a/profiles/prefix/darwin/macos/10.6/x86/package.use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.6/x86/package.use.mask,v 1.6 2011/12/30 15:49:35 grobian Exp $
-
-
diff --git a/profiles/prefix/darwin/macos/10.6/x86/parent b/profiles/prefix/darwin/macos/10.6/x86/parent
deleted file mode 100644
index 4a6aa36..0000000
--- a/profiles/prefix/darwin/macos/10.6/x86/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x86
-..
diff --git a/profiles/prefix/darwin/macos/10.6/x86/use.mask b/profiles/prefix/darwin/macos/10.6/x86/use.mask
deleted file mode 100644
index bbcc342..0000000
--- a/profiles/prefix/darwin/macos/10.6/x86/use.mask
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.6/x86/use.mask,v 1.4 2013/06/13 18:24:25 ulm Exp $
-
-# This file masks out USE flags that are simply NOT allowed in the default
-# x86 profile.  This works, for example, if another architecture's
-# profile have a USE flag associated with (such as altivec, mmx, etc).
-
-# Unmask x86 instruction sets
--icc
--icc-pgo
--ifc
--mmx
--mmxext
--sse
--sse2
--ssse3
--svga
--kqemu
-
-# Unmask nvidia XvMC support
--nvidia
-
-# Unmask dev-db/oracle-instantclient-basic support
--oci8-instant-client
-
-# Unmask osp, used by asterisk; bug 115798
--osp
-
-# Modular X: unmask for architectures on which they are available
--input_devices_synaptics
--input_devices_vmmouse
--input_devices_wacom
--video_cards_nvidia
--video_cards_fglrx
--video_cards_vmware
-
-# Modular X: mask for architectures on which they aren't available
-video_cards_newport
-
-#codec support
--x264
-
-# lvm2 cluster
--gulm
-
-# ibm is only used for ppc64 stuff
-ibm
-
-# psyco works on x86
--psyco
-
-# Adobe FDF toolkit is x86 only.
--fdftk
diff --git a/profiles/prefix/darwin/macos/10.7/eapi b/profiles/prefix/darwin/macos/10.7/eapi
deleted file mode 100644
index d00491f..0000000
--- a/profiles/prefix/darwin/macos/10.7/eapi
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/profiles/prefix/darwin/macos/10.7/make.defaults b/profiles/prefix/darwin/macos/10.7/make.defaults
deleted file mode 100644
index 3319821..0000000
--- a/profiles/prefix/darwin/macos/10.7/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.7/make.defaults,v 1.3 2013/02/26 21:24:00 grobian Exp $
-
-MACOSX_DEPLOYMENT_TARGET="10.7"
-
-# sandbox is working with use of Mac OS X's seatbelt (since 10.5)
-# but it generates problems, #456234
-#FEATURES="sandbox"
diff --git a/profiles/prefix/darwin/macos/10.7/package.provided b/profiles/prefix/darwin/macos/10.7/package.provided
deleted file mode 100644
index 324f3f2..0000000
--- a/profiles/prefix/darwin/macos/10.7/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.7/package.provided,v 1.1 2011/07/04 08:27:53 grobian Exp $
-
-sys-darwin/libsystem-71
diff --git a/profiles/prefix/darwin/macos/10.7/package.use.mask b/profiles/prefix/darwin/macos/10.7/package.use.mask
deleted file mode 100644
index 6eca464..0000000
--- a/profiles/prefix/darwin/macos/10.7/package.use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.7/package.use.mask,v 1.1 2011/07/04 08:27:53 grobian Exp $
-
-# Fabian Groffen <grobian@gentoo.org> (10 Apr 2011)
-# as long as util-linux installs uuid.h which breaks the system headers
-# (hence we don't) we can't do uuid support here
-x11-libs/libSM -uuid
diff --git a/profiles/prefix/darwin/macos/10.7/parent b/profiles/prefix/darwin/macos/10.7/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/darwin/macos/10.7/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/darwin/macos/10.7/profile.bashrc b/profiles/prefix/darwin/macos/10.7/profile.bashrc
deleted file mode 100644
index 11409a5..0000000
--- a/profiles/prefix/darwin/macos/10.7/profile.bashrc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.7/profile.bashrc,v 1.1 2011/07/04 08:27:53 grobian Exp $
-
-export MACOSX_DEPLOYMENT_TARGET=10.7
diff --git a/profiles/prefix/darwin/macos/10.7/x64/make.defaults b/profiles/prefix/darwin/macos/10.7/x64/make.defaults
deleted file mode 100644
index ad07c48..0000000
--- a/profiles/prefix/darwin/macos/10.7/x64/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.7/x64/make.defaults,v 1.1 2011/07/04 08:27:54 grobian Exp $
-
-ARCH="x64-macos"
-CHOST="x86_64-apple-darwin11"
-ACCEPT_KEYWORDS="~x64-macos"
-
-USE="mmx mmxext sse sse2"
-# set arch to nocona for all MacTel users, as this enables SSE and MMX
-# support in GCC, nocona = Core2Duo = 64-bits
-CFLAGS="-march=nocona"
diff --git a/profiles/prefix/darwin/macos/10.7/x64/package.use.force b/profiles/prefix/darwin/macos/10.7/x64/package.use.force
deleted file mode 100644
index 41dd387..0000000
--- a/profiles/prefix/darwin/macos/10.7/x64/package.use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.7/x64/package.use.force,v 1.1 2011/07/04 08:27:54 grobian Exp $
-
-# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
-# compiles with -aqua, doesn't work, though
-media-video/mplayer aqua
diff --git a/profiles/prefix/darwin/macos/10.7/x64/package.use.mask b/profiles/prefix/darwin/macos/10.7/x64/package.use.mask
deleted file mode 100644
index ce97a81..0000000
--- a/profiles/prefix/darwin/macos/10.7/x64/package.use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.7/x64/package.use.mask,v 1.2 2011/12/30 15:49:35 grobian Exp $
-
-
diff --git a/profiles/prefix/darwin/macos/10.7/x64/parent b/profiles/prefix/darwin/macos/10.7/x64/parent
deleted file mode 100644
index fc24616..0000000
--- a/profiles/prefix/darwin/macos/10.7/x64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x64
-..
diff --git a/profiles/prefix/darwin/macos/10.7/x64/use.mask b/profiles/prefix/darwin/macos/10.7/x64/use.mask
deleted file mode 100644
index 595437d..0000000
--- a/profiles/prefix/darwin/macos/10.7/x64/use.mask
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.7/x64/use.mask,v 1.4 2013/06/13 18:24:26 ulm Exp $
-
-# This file masks out USE flags that are simply NOT allowed in the default
-# x86 profile.  This works, for example, if another architecture's
-# profile have a USE flag associated with (such as altivec, mmx, etc).
-
-# Unmask x86 instruction sets
--icc
--icc-pgo
--ifc
--mmx
--mmxext
--sse
--sse2
--ssse3
--svga
--kqemu
-
-# Unmask nvidia XvMC support
--nvidia
-
-# Unmask dev-db/oracle-instantclient-basic support
--oci8-instant-client
-
-# Unmask osp, used by asterisk; bug 115798
--osp
-
-# Modular X: unmask for architectures on which they are available
--input_devices_synaptics
--input_devices_vmmouse
--input_devices_wacom
--video_cards_nvidia
--video_cards_fglrx
--video_cards_vmware
-
-# Modular X: mask for architectures on which they aren't available
-video_cards_newport
-
-#codec support
--x264
-
-# lvm2 cluster
--gulm
-
-# ibm is only used for ppc64 stuff
-ibm
-
-# psyco works on x86
--psyco
-
-# Adobe FDF toolkit is x86 only.
--fdftk
diff --git a/profiles/prefix/darwin/macos/10.7/x86/make.defaults b/profiles/prefix/darwin/macos/10.7/x86/make.defaults
deleted file mode 100644
index 1a5a73f..0000000
--- a/profiles/prefix/darwin/macos/10.7/x86/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.7/x86/make.defaults,v 1.1 2011/07/04 08:27:54 grobian Exp $
-
-ARCH="x86-macos"
-CHOST="i686-apple-darwin11"
-ACCEPT_KEYWORDS="~x86-macos"
-
-USE="mmx mmxext sse sse2"
-# normally we set arch to prescott for all MacTel users, as this enables
-# SSE and MMX support in GCC
-CFLAGS="-march=prescott"
diff --git a/profiles/prefix/darwin/macos/10.7/x86/package.use.force b/profiles/prefix/darwin/macos/10.7/x86/package.use.force
deleted file mode 100644
index abb6d05..0000000
--- a/profiles/prefix/darwin/macos/10.7/x86/package.use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.7/x86/package.use.force,v 1.1 2011/07/04 08:27:54 grobian Exp $
-
-# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
-# compiles with -aqua, doesn't work, though
-media-video/mplayer aqua
diff --git a/profiles/prefix/darwin/macos/10.7/x86/package.use.mask b/profiles/prefix/darwin/macos/10.7/x86/package.use.mask
deleted file mode 100644
index 79f4e3d..0000000
--- a/profiles/prefix/darwin/macos/10.7/x86/package.use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.7/x86/package.use.mask,v 1.2 2011/12/30 15:49:35 grobian Exp $
-
-
diff --git a/profiles/prefix/darwin/macos/10.7/x86/parent b/profiles/prefix/darwin/macos/10.7/x86/parent
deleted file mode 100644
index 4a6aa36..0000000
--- a/profiles/prefix/darwin/macos/10.7/x86/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x86
-..
diff --git a/profiles/prefix/darwin/macos/10.7/x86/use.mask b/profiles/prefix/darwin/macos/10.7/x86/use.mask
deleted file mode 100644
index c56108e..0000000
--- a/profiles/prefix/darwin/macos/10.7/x86/use.mask
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.7/x86/use.mask,v 1.4 2013/06/13 18:24:26 ulm Exp $
-
-# This file masks out USE flags that are simply NOT allowed in the default
-# x86 profile.  This works, for example, if another architecture's
-# profile have a USE flag associated with (such as altivec, mmx, etc).
-
-# Unmask x86 instruction sets
--icc
--icc-pgo
--ifc
--mmx
--mmxext
--sse
--sse2
--ssse3
--svga
--kqemu
-
-# Unmask nvidia XvMC support
--nvidia
-
-# Unmask dev-db/oracle-instantclient-basic support
--oci8-instant-client
-
-# Unmask osp, used by asterisk; bug 115798
--osp
-
-# Modular X: unmask for architectures on which they are available
--input_devices_synaptics
--input_devices_vmmouse
--input_devices_wacom
--video_cards_nvidia
--video_cards_fglrx
--video_cards_vmware
-
-# Modular X: mask for architectures on which they aren't available
-video_cards_newport
-
-#codec support
--x264
-
-# lvm2 cluster
--gulm
-
-# ibm is only used for ppc64 stuff
-ibm
-
-# psyco works on x86
--psyco
-
-# Adobe FDF toolkit is x86 only.
--fdftk
diff --git a/profiles/prefix/darwin/macos/10.8/eapi b/profiles/prefix/darwin/macos/10.8/eapi
deleted file mode 100644
index d00491f..0000000
--- a/profiles/prefix/darwin/macos/10.8/eapi
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/profiles/prefix/darwin/macos/10.8/make.defaults b/profiles/prefix/darwin/macos/10.8/make.defaults
deleted file mode 100644
index f6c0a34..0000000
--- a/profiles/prefix/darwin/macos/10.8/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.8/make.defaults,v 1.4 2013/02/26 21:24:00 grobian Exp $
-
-MACOSX_DEPLOYMENT_TARGET="10.8"
-
-# sandbox is working with use of Mac OS X's seatbelt (since 10.5)
-# but it generates problems, #456234
-#FEATURES="sandbox"
diff --git a/profiles/prefix/darwin/macos/10.8/package.provided b/profiles/prefix/darwin/macos/10.8/package.provided
deleted file mode 100644
index fd89f53..0000000
--- a/profiles/prefix/darwin/macos/10.8/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.8/package.provided,v 1.1 2012/07/31 16:19:51 grobian Exp $
-
-sys-darwin/libsystem-71
diff --git a/profiles/prefix/darwin/macos/10.8/package.use.mask b/profiles/prefix/darwin/macos/10.8/package.use.mask
deleted file mode 100644
index ea62448..0000000
--- a/profiles/prefix/darwin/macos/10.8/package.use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.8/package.use.mask,v 1.1 2012/07/31 16:19:51 grobian Exp $
-
-# Fabian Groffen <grobian@gentoo.org> (10 Apr 2011)
-# as long as util-linux installs uuid.h which breaks the system headers
-# (hence we don't) we can't do uuid support here
-x11-libs/libSM -uuid
diff --git a/profiles/prefix/darwin/macos/10.8/parent b/profiles/prefix/darwin/macos/10.8/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/darwin/macos/10.8/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/darwin/macos/10.8/profile.bashrc b/profiles/prefix/darwin/macos/10.8/profile.bashrc
deleted file mode 100644
index e62efd3..0000000
--- a/profiles/prefix/darwin/macos/10.8/profile.bashrc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.8/profile.bashrc,v 1.2 2012/07/31 16:25:04 grobian Exp $
-
-export MACOSX_DEPLOYMENT_TARGET=10.8
diff --git a/profiles/prefix/darwin/macos/10.8/x64/make.defaults b/profiles/prefix/darwin/macos/10.8/x64/make.defaults
deleted file mode 100644
index 5037e73..0000000
--- a/profiles/prefix/darwin/macos/10.8/x64/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.8/x64/make.defaults,v 1.1 2012/07/31 16:19:51 grobian Exp $
-
-ARCH="x64-macos"
-CHOST="x86_64-apple-darwin12"
-ACCEPT_KEYWORDS="~x64-macos"
-
-USE="mmx mmxext sse sse2"
-# set arch to nocona for all MacTel users, as this enables SSE and MMX
-# support in GCC, nocona = Core2Duo = 64-bits
-CFLAGS="-march=nocona"
diff --git a/profiles/prefix/darwin/macos/10.8/x64/package.use.force b/profiles/prefix/darwin/macos/10.8/x64/package.use.force
deleted file mode 100644
index 11326e9..0000000
--- a/profiles/prefix/darwin/macos/10.8/x64/package.use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.8/x64/package.use.force,v 1.1 2012/07/31 16:19:51 grobian Exp $
-
-# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
-# compiles with -aqua, doesn't work, though
-media-video/mplayer aqua
diff --git a/profiles/prefix/darwin/macos/10.8/x64/package.use.mask b/profiles/prefix/darwin/macos/10.8/x64/package.use.mask
deleted file mode 100644
index ea23901..0000000
--- a/profiles/prefix/darwin/macos/10.8/x64/package.use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.8/x64/package.use.mask,v 1.1 2012/07/31 16:19:51 grobian Exp $
-
-
diff --git a/profiles/prefix/darwin/macos/10.8/x64/parent b/profiles/prefix/darwin/macos/10.8/x64/parent
deleted file mode 100644
index fc24616..0000000
--- a/profiles/prefix/darwin/macos/10.8/x64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x64
-..
diff --git a/profiles/prefix/darwin/macos/10.8/x64/use.mask b/profiles/prefix/darwin/macos/10.8/x64/use.mask
deleted file mode 100644
index f324511..0000000
--- a/profiles/prefix/darwin/macos/10.8/x64/use.mask
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.8/x64/use.mask,v 1.4 2013/06/13 18:24:26 ulm Exp $
-
-# This file masks out USE flags that are simply NOT allowed in the default
-# x86 profile.  This works, for example, if another architecture's
-# profile have a USE flag associated with (such as altivec, mmx, etc).
-
-# Unmask x86 instruction sets
--icc
--icc-pgo
--ifc
--mmx
--mmxext
--sse
--sse2
--ssse3
--svga
--kqemu
-
-# Unmask nvidia XvMC support
--nvidia
-
-# Unmask dev-db/oracle-instantclient-basic support
--oci8-instant-client
-
-# Unmask osp, used by asterisk; bug 115798
--osp
-
-# Modular X: unmask for architectures on which they are available
--input_devices_synaptics
--input_devices_vmmouse
--input_devices_wacom
--video_cards_nvidia
--video_cards_fglrx
--video_cards_vmware
-
-# Modular X: mask for architectures on which they aren't available
-video_cards_newport
-
-#codec support
--x264
-
-# lvm2 cluster
--gulm
-
-# ibm is only used for ppc64 stuff
-ibm
-
-# psyco works on x86
--psyco
-
-# Adobe FDF toolkit is x86 only.
--fdftk
diff --git a/profiles/prefix/darwin/macos/10.8/x86/make.defaults b/profiles/prefix/darwin/macos/10.8/x86/make.defaults
deleted file mode 100644
index b353315..0000000
--- a/profiles/prefix/darwin/macos/10.8/x86/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.8/x86/make.defaults,v 1.1 2012/07/31 16:19:51 grobian Exp $
-
-ARCH="x86-macos"
-CHOST="i686-apple-darwin12"
-ACCEPT_KEYWORDS="~x86-macos"
-
-USE="mmx mmxext sse sse2"
-# normally we set arch to prescott for all MacTel users, as this enables
-# SSE and MMX support in GCC
-CFLAGS="-march=prescott"
diff --git a/profiles/prefix/darwin/macos/10.8/x86/package.use.force b/profiles/prefix/darwin/macos/10.8/x86/package.use.force
deleted file mode 100644
index a5a837a..0000000
--- a/profiles/prefix/darwin/macos/10.8/x86/package.use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.8/x86/package.use.force,v 1.1 2012/07/31 16:19:51 grobian Exp $
-
-# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
-# compiles with -aqua, doesn't work, though
-media-video/mplayer aqua
diff --git a/profiles/prefix/darwin/macos/10.8/x86/package.use.mask b/profiles/prefix/darwin/macos/10.8/x86/package.use.mask
deleted file mode 100644
index dc8ee8d..0000000
--- a/profiles/prefix/darwin/macos/10.8/x86/package.use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.8/x86/package.use.mask,v 1.1 2012/07/31 16:19:51 grobian Exp $
-
-
diff --git a/profiles/prefix/darwin/macos/10.8/x86/parent b/profiles/prefix/darwin/macos/10.8/x86/parent
deleted file mode 100644
index 4a6aa36..0000000
--- a/profiles/prefix/darwin/macos/10.8/x86/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x86
-..
diff --git a/profiles/prefix/darwin/macos/10.8/x86/use.mask b/profiles/prefix/darwin/macos/10.8/x86/use.mask
deleted file mode 100644
index ea83f40..0000000
--- a/profiles/prefix/darwin/macos/10.8/x86/use.mask
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.8/x86/use.mask,v 1.4 2013/06/13 18:24:26 ulm Exp $
-
-# This file masks out USE flags that are simply NOT allowed in the default
-# x86 profile.  This works, for example, if another architecture's
-# profile have a USE flag associated with (such as altivec, mmx, etc).
-
-# Unmask x86 instruction sets
--icc
--icc-pgo
--ifc
--mmx
--mmxext
--sse
--sse2
--ssse3
--svga
--kqemu
-
-# Unmask nvidia XvMC support
--nvidia
-
-# Unmask dev-db/oracle-instantclient-basic support
--oci8-instant-client
-
-# Unmask osp, used by asterisk; bug 115798
--osp
-
-# Modular X: unmask for architectures on which they are available
--input_devices_synaptics
--input_devices_vmmouse
--input_devices_wacom
--video_cards_nvidia
--video_cards_fglrx
--video_cards_vmware
-
-# Modular X: mask for architectures on which they aren't available
-video_cards_newport
-
-#codec support
--x264
-
-# lvm2 cluster
--gulm
-
-# ibm is only used for ppc64 stuff
-ibm
-
-# psyco works on x86
--psyco
-
-# Adobe FDF toolkit is x86 only.
--fdftk
diff --git a/profiles/prefix/darwin/macos/10.9/eapi b/profiles/prefix/darwin/macos/10.9/eapi
deleted file mode 100644
index d00491f..0000000
--- a/profiles/prefix/darwin/macos/10.9/eapi
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/profiles/prefix/darwin/macos/10.9/make.defaults b/profiles/prefix/darwin/macos/10.9/make.defaults
deleted file mode 100644
index f9ff91d..0000000
--- a/profiles/prefix/darwin/macos/10.9/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.9/make.defaults,v 1.1 2013/10/31 18:02:29 grobian Exp $
-
-MACOSX_DEPLOYMENT_TARGET="10.9"
-
-# sandbox is working with use of Mac OS X's seatbelt (since 10.5)
-# but it generates problems, #456234
-#FEATURES="sandbox"
diff --git a/profiles/prefix/darwin/macos/10.9/package.provided b/profiles/prefix/darwin/macos/10.9/package.provided
deleted file mode 100644
index 588f719..0000000
--- a/profiles/prefix/darwin/macos/10.9/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.9/package.provided,v 1.1 2013/10/31 18:02:29 grobian Exp $
-
-sys-darwin/libsystem-71
diff --git a/profiles/prefix/darwin/macos/10.9/package.use.mask b/profiles/prefix/darwin/macos/10.9/package.use.mask
deleted file mode 100644
index 60887df..0000000
--- a/profiles/prefix/darwin/macos/10.9/package.use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.9/package.use.mask,v 1.1 2013/10/31 18:02:29 grobian Exp $
-
-# Fabian Groffen <grobian@gentoo.org> (10 Apr 2011)
-# as long as util-linux installs uuid.h which breaks the system headers
-# (hence we don't) we can't do uuid support here
-x11-libs/libSM -uuid
diff --git a/profiles/prefix/darwin/macos/10.9/parent b/profiles/prefix/darwin/macos/10.9/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/darwin/macos/10.9/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/darwin/macos/10.9/profile.bashrc b/profiles/prefix/darwin/macos/10.9/profile.bashrc
deleted file mode 100644
index 75ad347..0000000
--- a/profiles/prefix/darwin/macos/10.9/profile.bashrc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.9/profile.bashrc,v 1.1 2013/10/31 18:02:29 grobian Exp $
-
-export MACOSX_DEPLOYMENT_TARGET=10.9
diff --git a/profiles/prefix/darwin/macos/10.9/x64/make.defaults b/profiles/prefix/darwin/macos/10.9/x64/make.defaults
deleted file mode 100644
index ceedcfc..0000000
--- a/profiles/prefix/darwin/macos/10.9/x64/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.9/x64/make.defaults,v 1.1 2013/10/31 18:02:29 grobian Exp $
-
-ARCH="x64-macos"
-CHOST="x86_64-apple-darwin13"
-ACCEPT_KEYWORDS="~x64-macos"
-
-USE="mmx mmxext sse sse2"
-# set arch to nocona for all MacTel users, as this enables SSE and MMX
-# support in GCC, nocona = Core2Duo = 64-bits
-CFLAGS="-march=nocona"
diff --git a/profiles/prefix/darwin/macos/10.9/x64/package.use.force b/profiles/prefix/darwin/macos/10.9/x64/package.use.force
deleted file mode 100644
index 0348b39..0000000
--- a/profiles/prefix/darwin/macos/10.9/x64/package.use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.9/x64/package.use.force,v 1.1 2013/10/31 18:02:29 grobian Exp $
-
-# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
-# compiles with -aqua, doesn't work, though
-media-video/mplayer aqua
diff --git a/profiles/prefix/darwin/macos/10.9/x64/package.use.mask b/profiles/prefix/darwin/macos/10.9/x64/package.use.mask
deleted file mode 100644
index 8598cc4..0000000
--- a/profiles/prefix/darwin/macos/10.9/x64/package.use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.9/x64/package.use.mask,v 1.1 2013/10/31 18:02:29 grobian Exp $
-
-
diff --git a/profiles/prefix/darwin/macos/10.9/x64/parent b/profiles/prefix/darwin/macos/10.9/x64/parent
deleted file mode 100644
index fc24616..0000000
--- a/profiles/prefix/darwin/macos/10.9/x64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x64
-..
diff --git a/profiles/prefix/darwin/macos/10.9/x64/use.mask b/profiles/prefix/darwin/macos/10.9/x64/use.mask
deleted file mode 100644
index 6c8b8ae..0000000
--- a/profiles/prefix/darwin/macos/10.9/x64/use.mask
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.9/x64/use.mask,v 1.1 2013/10/31 18:02:29 grobian Exp $
-
-# This file masks out USE flags that are simply NOT allowed in the default
-# x86 profile.  This works, for example, if another architecture's
-# profile have a USE flag associated with (such as altivec, mmx, etc).
-
-# Unmask x86 instruction sets
--icc
--icc-pgo
--ifc
--mmx
--mmxext
--sse
--sse2
--ssse3
--svga
--kqemu
-
-# Unmask nvidia XvMC support
--nvidia
-
-# Unmask dev-db/oracle-instantclient-basic support
--oci8-instant-client
-
-# Unmask osp, used by asterisk; bug 115798
--osp
-
-# Modular X: unmask for architectures on which they are available
--input_devices_synaptics
--input_devices_vmmouse
--input_devices_wacom
--video_cards_nvidia
--video_cards_fglrx
--video_cards_vmware
-
-# Modular X: mask for architectures on which they aren't available
-video_cards_newport
-
-#codec support
--x264
-
-# lvm2 cluster
--gulm
-
-# ibm is only used for ppc64 stuff
-ibm
-
-# psyco works on x86
--psyco
-
-# Adobe FDF toolkit is x86 only.
--fdftk
diff --git a/profiles/prefix/darwin/macos/10.9/x86/make.defaults b/profiles/prefix/darwin/macos/10.9/x86/make.defaults
deleted file mode 100644
index 847d8d9..0000000
--- a/profiles/prefix/darwin/macos/10.9/x86/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.9/x86/make.defaults,v 1.1 2013/10/31 18:02:30 grobian Exp $
-
-ARCH="x86-macos"
-CHOST="i686-apple-darwin13"
-ACCEPT_KEYWORDS="~x86-macos"
-
-USE="mmx mmxext sse sse2"
-# normally we set arch to prescott for all MacTel users, as this enables
-# SSE and MMX support in GCC
-CFLAGS="-march=prescott"
diff --git a/profiles/prefix/darwin/macos/10.9/x86/package.use.force b/profiles/prefix/darwin/macos/10.9/x86/package.use.force
deleted file mode 100644
index d8dee9b..0000000
--- a/profiles/prefix/darwin/macos/10.9/x86/package.use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.9/x86/package.use.force,v 1.1 2013/10/31 18:02:30 grobian Exp $
-
-# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
-# compiles with -aqua, doesn't work, though
-media-video/mplayer aqua
diff --git a/profiles/prefix/darwin/macos/10.9/x86/package.use.mask b/profiles/prefix/darwin/macos/10.9/x86/package.use.mask
deleted file mode 100644
index bc70099..0000000
--- a/profiles/prefix/darwin/macos/10.9/x86/package.use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.9/x86/package.use.mask,v 1.1 2013/10/31 18:02:30 grobian Exp $
-
-
diff --git a/profiles/prefix/darwin/macos/10.9/x86/parent b/profiles/prefix/darwin/macos/10.9/x86/parent
deleted file mode 100644
index 4a6aa36..0000000
--- a/profiles/prefix/darwin/macos/10.9/x86/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x86
-..
diff --git a/profiles/prefix/darwin/macos/10.9/x86/use.mask b/profiles/prefix/darwin/macos/10.9/x86/use.mask
deleted file mode 100644
index 522886c..0000000
--- a/profiles/prefix/darwin/macos/10.9/x86/use.mask
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.9/x86/use.mask,v 1.1 2013/10/31 18:02:30 grobian Exp $
-
-# This file masks out USE flags that are simply NOT allowed in the default
-# x86 profile.  This works, for example, if another architecture's
-# profile have a USE flag associated with (such as altivec, mmx, etc).
-
-# Unmask x86 instruction sets
--icc
--icc-pgo
--ifc
--mmx
--mmxext
--sse
--sse2
--ssse3
--svga
--kqemu
-
-# Unmask nvidia XvMC support
--nvidia
-
-# Unmask dev-db/oracle-instantclient-basic support
--oci8-instant-client
-
-# Unmask osp, used by asterisk; bug 115798
--osp
-
-# Modular X: unmask for architectures on which they are available
--input_devices_synaptics
--input_devices_vmmouse
--input_devices_wacom
--video_cards_nvidia
--video_cards_fglrx
--video_cards_vmware
-
-# Modular X: mask for architectures on which they aren't available
-video_cards_newport
-
-#codec support
--x264
-
-# lvm2 cluster
--gulm
-
-# ibm is only used for ppc64 stuff
-ibm
-
-# psyco works on x86
--psyco
-
-# Adobe FDF toolkit is x86 only.
--fdftk
diff --git a/profiles/prefix/darwin/macos/arch/ppc/package.use.mask b/profiles/prefix/darwin/macos/arch/ppc/package.use.mask
deleted file mode 100644
index 7e82fc2..0000000
--- a/profiles/prefix/darwin/macos/arch/ppc/package.use.mask
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/arch/ppc/package.use.mask,v 1.2 2012/06/14 23:33:44 pesa Exp $
-
-# The 32-bits profile is inherited by the 64-bits one!
-# All the Mac OS X profiles inherit from their matching arch profile here.
-
-
-# Elias Pipping <pipping@gentoo.org> (01 Sep 2007)
-# imlib2 does not compile with USE=mmx
-media-libs/imlib2 mmx
-
-# Elias Pipping <pipping@gentoo.org> (01 Sep 2007)
-# libpng does not compile with USE=mmx
-media-libs/libpng mmx
-
-# Elias Pipping <pipping@gentoo.org> (01 Sep 2007)
-# mpg123 does not compile with USE=mmx
-media-sound/mpg123 mmx
diff --git a/profiles/prefix/darwin/macos/arch/ppc64/package.use.mask b/profiles/prefix/darwin/macos/arch/ppc64/package.use.mask
deleted file mode 100644
index ac534b4..0000000
--- a/profiles/prefix/darwin/macos/arch/ppc64/package.use.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/arch/ppc64/package.use.mask,v 1.1 2011/12/30 15:49:36 grobian Exp $
-
-# The 32-bits profile is inherited by the 64-bits one!
-# All the Mac OS X profiles inherit from their matching arch profile here.
-
diff --git a/profiles/prefix/darwin/macos/arch/ppc64/parent b/profiles/prefix/darwin/macos/arch/ppc64/parent
deleted file mode 100644
index 3f4be82..0000000
--- a/profiles/prefix/darwin/macos/arch/ppc64/parent
+++ /dev/null
@@ -1 +0,0 @@
-../ppc
diff --git a/profiles/prefix/darwin/macos/arch/x64/package.use.mask b/profiles/prefix/darwin/macos/arch/x64/package.use.mask
deleted file mode 100644
index 52bab7b..0000000
--- a/profiles/prefix/darwin/macos/arch/x64/package.use.mask
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/arch/x64/package.use.mask,v 1.1 2011/12/30 15:49:36 grobian Exp $
-
-# The 32-bits profile is inherited by the 64-bits one!
-# All the Mac OS X profiles inherit from their matching arch profile here.
-
-
-# Jeremy Olexa <darkside@gentoo.org> (29 Jul 2010)
-# Relocation issues on 32-bit OSX only, bug #329859
-media-sound/mpg123 -mmx -sse
-
-# Fabian Groffen <grobian@gentoo.org> (01 Feb 2009)
-# Doesn't compile on 32-bits OSX only, bug #257225
-media-video/ffmpeg -mmx
diff --git a/profiles/prefix/darwin/macos/arch/x64/parent b/profiles/prefix/darwin/macos/arch/x64/parent
deleted file mode 100644
index e6e4a52..0000000
--- a/profiles/prefix/darwin/macos/arch/x64/parent
+++ /dev/null
@@ -1 +0,0 @@
-../x86
diff --git a/profiles/prefix/darwin/macos/arch/x86/package.use.force b/profiles/prefix/darwin/macos/arch/x86/package.use.force
deleted file mode 100644
index bb0be3d..0000000
--- a/profiles/prefix/darwin/macos/arch/x86/package.use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/arch/x86/package.use.force,v 1.1 2012/03/24 16:09:10 grobian Exp $
-
-# Fabian Groffen <grobian@gentoo.org> (24 Mar 2012)
-# Non-threaded target doesn't exist for Mac OS X Intel
-media-gfx/tachyon threads opengl
diff --git a/profiles/prefix/darwin/macos/arch/x86/package.use.mask b/profiles/prefix/darwin/macos/arch/x86/package.use.mask
deleted file mode 100644
index d8f0028..0000000
--- a/profiles/prefix/darwin/macos/arch/x86/package.use.mask
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/arch/x86/package.use.mask,v 1.2 2012/01/09 04:36:35 tetromino Exp $
-
-# The 32-bits profile is inherited by the 64-bits one!
-# All the Mac OS X profiles inherit from their matching arch profile here.
-
-
-# Alexandre Rostovtsev <tetromono@gentoo.org> (09 Jan 2012)
-# jsc JIT compilation is supported only on amd64/arm/x86 and their prefixes, so
-# it's masked in base profile and unmasked here (bug #396313).
-net-libs/webkit-gtk -jit
-
-# Jeremy Olexa <darkside@gentoo.org> (29 Jul 2010)
-# Relocation issues on 32-bit OSX, bug #329859
-media-sound/mpg123 mmx sse
-
-# Fabian Groffen <grobian@gentoo.org> (01 Feb 2009)
-# Doesn't compile, bug #257225
-media-video/ffmpeg mmx
diff --git a/profiles/prefix/darwin/macos/make.defaults b/profiles/prefix/darwin/macos/make.defaults
deleted file mode 100644
index 63a345c..0000000
--- a/profiles/prefix/darwin/macos/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/make.defaults,v 1.2 2012/09/09 10:23:33 grobian Exp $
-
-# on OSX one should have objc available
-USE="objc objc++"
-
-# we have OSX, so let's use it's virtues
-USE="${USE} aqua coreaudio ipv6"
diff --git a/profiles/prefix/darwin/macos/package.use.force b/profiles/prefix/darwin/macos/package.use.force
deleted file mode 100644
index 2d35c20..0000000
--- a/profiles/prefix/darwin/macos/package.use.force
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/package.use.force,v 1.1 2009/06/06 03:54:46 solar Exp $
-
-# Elias Pipping <pipping@gentoo.org> (01 Jan 2008)
-# only GUI that works under macosx
-app-editor/gvim aqua
-
-# Elias Pipping <pipping@gentoo.org> (29 Nov 2007)
-# won't compile without
-media-libs/libsdl opengl
diff --git a/profiles/prefix/darwin/macos/package.use.mask b/profiles/prefix/darwin/macos/package.use.mask
deleted file mode 100644
index 32201e4..0000000
--- a/profiles/prefix/darwin/macos/package.use.mask
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/package.use.mask,v 1.13 2012/08/01 10:46:14 grobian Exp $
-
-# Fabian Groffen <grobian@gentoo.org> (30 Oct 2009)
-# X and linux only
-media-video/mplayer xvmc xv dga X xinerama xscreensaver
-media-video/mplayer dvb lirc svga jack joystick matrox
-
-# Jeremy Olexa <darkside@gentoo.org> (12 Feb 2009)
-# Doesn't work with python support, bug 257572
-gnome-extra/libgsf python
-
-# Fabian Groffen <grobian@gentoo.org> (06 Aug 2008)
-# runtime loading is horribly broken (it uses fixed .so.0, but when
-# that's fixed it still doesn't work)
-dev-vcs/subversion dso
-
-# Elias Pipping <pipping@gentoo.org> (27 Aug 2007)
-# elinks does not compile with USE=perl (tested with 0.11.{2,3})
-www-client/elinks perl
diff --git a/profiles/prefix/darwin/macos/packages b/profiles/prefix/darwin/macos/packages
deleted file mode 100644
index 5e33465..0000000
--- a/profiles/prefix/darwin/macos/packages
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/packages,v 1.1 2009/06/06 03:54:46 solar Exp $
-
-# Mac OS X is built with the Apple branch of the GCC compiler, using FSF
-# GCC results in broken packages in some cases (subversion) due to
-# alignment problems with the kernel.  Hence, we default to gcc-apple.
--*sys-devel/gcc
-*sys-devel/gcc-apple
diff --git a/profiles/prefix/darwin/macos/parent b/profiles/prefix/darwin/macos/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/darwin/macos/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/darwin/macos/use.mask b/profiles/prefix/darwin/macos/use.mask
deleted file mode 100644
index 8b13789..0000000
--- a/profiles/prefix/darwin/macos/use.mask
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/profiles/prefix/darwin/make.defaults b/profiles/prefix/darwin/make.defaults
deleted file mode 100644
index 78ef3b2..0000000
--- a/profiles/prefix/darwin/make.defaults
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/make.defaults,v 1.4 2013/05/30 11:20:45 mgorny Exp $
-
-# System-wide defaults for all Darwin profiles
-# This file should rarely need to be changed
-
-# 'Sane' defaults
-ELIBC="Darwin"
-KERNEL="Darwin"
-
-# strip isn't GNU
-FEATURES="nostrip"
-
-# ALSA + Darwin != working
-USE_EXPAND="-ALSA_CARDS"
-
-# This is the sort of equivalent of --as-needed
-LDFLAGS="-Wl,-dead_strip_dylibs"
diff --git a/profiles/prefix/darwin/package.use.mask b/profiles/prefix/darwin/package.use.mask
deleted file mode 100644
index 081097f..0000000
--- a/profiles/prefix/darwin/package.use.mask
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/package.use.mask,v 1.12 2013/06/13 18:24:25 ulm Exp $
-
-
-# Christoph Junghans <ottxor@gentoo.org> (26 Aug 2012)
-# libutempter support does not work on Darwin (bug #388791)
-x11-terms/eterm utempter
-
-# Fabian Groffen <grobian@gentoo.org> (24 Mar 2012)
-# There's no upstream support for MPI on Darwin
-media-gfx/tachyon mpi
-
-# Fabian Groffen <grobian@gentoo.org> (01 Jan 2012)
-# gdb server is not supported on this platform
-sys-devel/gdb server
-
-# Fabian Groffen <grobian@gentoo.org> (16 Feb 2011)
-# De-mask of OSX-specific USE-flags that are useful for VLC
-media-video/vlc -audioqueue -ios-vout -macosx macosx-audio -macosx-dialog-provider -macosx-eyetv -macosx-quartztext -macosx-qtcapture -macosx-vout
-
-# Fabian Groffen <grobian@gentoo.org> (08 Jan 2011)
-# Darwin has libuuid from util-linux
-x11-libs/libSM -uuid
-
-# Fabian Groffen <grobian@gentoo.org> (30 Oct 2009)
-# linux only
-media-video/mplayer dvb lirc svga jack joystick matrox
-
-# Fabian Groffen <grobian@gentoo.org> (03 Apr 2009)
-# ld: unknown option: -R/Library/Gentoo/usr/lib
-~sys-devel/gcc-4.3.3 gcj
-
-# Elias Pipping <pipping@gentoo.org> (16 Nov 2007)
-# make fails
-sys-devel/gcc objc-gc
diff --git a/profiles/prefix/darwin/packages b/profiles/prefix/darwin/packages
deleted file mode 100644
index f43c7d9..0000000
--- a/profiles/prefix/darwin/packages
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/packages,v 1.4 2011/09/03 10:55:26 grobian Exp $
-
-*sys-apps/darwin-miscutils
-*sys-devel/binutils-apple
-*sys-libs/csu
-*sys-process/pidof-bsd
-*sys-process/pkill-darwin
diff --git a/profiles/prefix/darwin/parent b/profiles/prefix/darwin/parent
deleted file mode 100644
index cd11492..0000000
--- a/profiles/prefix/darwin/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../base
-..
diff --git a/profiles/prefix/darwin/use.force b/profiles/prefix/darwin/use.force
deleted file mode 100644
index c8b2007..0000000
--- a/profiles/prefix/darwin/use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/use.force,v 1.1 2009/06/06 03:54:45 solar Exp $
-
-# Re-add Darwin OS
-kernel_Darwin
-elibc_Darwin
diff --git a/profiles/prefix/darwin/use.mask b/profiles/prefix/darwin/use.mask
deleted file mode 100644
index b6f7fa3..0000000
--- a/profiles/prefix/darwin/use.mask
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/use.mask,v 1.4 2013/02/02 13:12:28 grobian Exp $
-
-#Add USE flags that don't work on Darwin/OpenDarwin/OS X here
-
-# readd globally masked darwin-only flags
--coreaudio
--aqua
-
-# Re-add Darwin libc
--elibc_Darwin
--kernel_Darwin
-
-
-# these will more than likely never work on darwin
-3dfx
-acpi
-alsa
-apm
-cap
-caps
-cman
-clvm
-directfb
-djbfft
-emul-linux-x86
-fbcon
-fmod
-ggi
-gpm
-hardened
-
-# VV requires device-mapper 
-on-the-fly-crypt
-oss
-solid
-sybase
-sybase-ct
-rtc
-voodoo3
-pvm
-v4l
-
-# introspection is far from working on OSX
-introspection
diff --git a/profiles/prefix/eapi b/profiles/prefix/eapi
deleted file mode 100644
index d00491f..0000000
--- a/profiles/prefix/eapi
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/profiles/prefix/hpux/B.11.11/hppa2.0/make.defaults b/profiles/prefix/hpux/B.11.11/hppa2.0/make.defaults
deleted file mode 100644
index e844687..0000000
--- a/profiles/prefix/hpux/B.11.11/hppa2.0/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/hpux/B.11.11/hppa2.0/make.defaults,v 1.1 2009/07/27 09:53:49 haubi Exp $
-
-ARCH="hppa-hpux"
-# config.guess tells for hpux11 on hppa2.0 cpu:
-#   "hppa2.0n-hp-hpux11.11" for 32bit kernel
-#   "hppa2.0w-hp-hpux11.11" for 64bit kernel and 32bit default compiler output
-#   "hppa64-hp-hpux11.11"   for 64bit kernel and 64bit default compiler output
-# This is the 32bit profile, so we use "hppa2.0n"
-CHOST="hppa2.0n-hp-hpux11.11"
-ACCEPT_KEYWORDS="~hppa-hpux"
diff --git a/profiles/prefix/hpux/B.11.11/hppa2.0/parent b/profiles/prefix/hpux/B.11.11/hppa2.0/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/hpux/B.11.11/hppa2.0/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/hpux/B.11.11/package.provided b/profiles/prefix/hpux/B.11.11/package.provided
deleted file mode 100644
index a188246..0000000
--- a/profiles/prefix/hpux/B.11.11/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/hpux/B.11.11/package.provided,v 1.1 2009/07/27 09:53:49 haubi Exp $
-
-sys-hpux/libc-11.11
diff --git a/profiles/prefix/hpux/B.11.11/package.use.mask b/profiles/prefix/hpux/B.11.11/package.use.mask
deleted file mode 100644
index a9692e2..0000000
--- a/profiles/prefix/hpux/B.11.11/package.use.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/hpux/B.11.11/package.use.mask,v 1.1 2009/07/28 13:50:24 haubi Exp $
-
-# Michael Haubenwallner <haubi@gentoo.org> (28 Jul 2009)
-# hpux11.11 has neither /dev/urandom nor /dev/random
-dev-libs/apr urandom
diff --git a/profiles/prefix/hpux/B.11.11/parent b/profiles/prefix/hpux/B.11.11/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/hpux/B.11.11/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/hpux/B.11.23/ia64/make.defaults b/profiles/prefix/hpux/B.11.23/ia64/make.defaults
deleted file mode 100644
index 980147a..0000000
--- a/profiles/prefix/hpux/B.11.23/ia64/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/hpux/B.11.23/ia64/make.defaults,v 1.1 2009/06/06 03:54:52 solar Exp $
-
-ARCH="ia64-hpux"
-CHOST="ia64-hp-hpux11.23"
-ACCEPT_KEYWORDS="~ia64-hpux"
diff --git a/profiles/prefix/hpux/B.11.23/ia64/parent b/profiles/prefix/hpux/B.11.23/ia64/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/hpux/B.11.23/ia64/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/hpux/B.11.23/package.provided b/profiles/prefix/hpux/B.11.23/package.provided
deleted file mode 100644
index fa7d94d..0000000
--- a/profiles/prefix/hpux/B.11.23/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/hpux/B.11.23/package.provided,v 1.1 2009/06/06 03:54:52 solar Exp $
-
-sys-hpux/libc-11.23
diff --git a/profiles/prefix/hpux/B.11.23/parent b/profiles/prefix/hpux/B.11.23/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/hpux/B.11.23/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/hpux/B.11.31/hppa2.0/make.defaults b/profiles/prefix/hpux/B.11.31/hppa2.0/make.defaults
deleted file mode 100644
index 1a5c172..0000000
--- a/profiles/prefix/hpux/B.11.31/hppa2.0/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/hpux/B.11.31/hppa2.0/make.defaults,v 1.2 2009/07/22 14:32:43 haubi Exp $
-
-ARCH="hppa-hpux"
-# config.guess tells for hpux11 on hppa2.0 cpu:
-#   "hppa2.0n-hp-hpux11.31" for 32bit kernel
-#   "hppa2.0w-hp-hpux11.31" for 64bit kernel and 32bit default compiler output
-#   "hppa64-hp-hpux11.31"   for 64bit kernel and 64bit default compiler output
-# This is the 32bit profile, so we use "hppa2.0n"
-CHOST="hppa2.0n-hp-hpux11.31"
-ACCEPT_KEYWORDS="~hppa-hpux"
diff --git a/profiles/prefix/hpux/B.11.31/hppa2.0/parent b/profiles/prefix/hpux/B.11.31/hppa2.0/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/hpux/B.11.31/hppa2.0/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/hpux/B.11.31/ia64/make.defaults b/profiles/prefix/hpux/B.11.31/ia64/make.defaults
deleted file mode 100644
index fdbb220..0000000
--- a/profiles/prefix/hpux/B.11.31/ia64/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/hpux/B.11.31/ia64/make.defaults,v 1.1 2009/06/06 03:54:53 solar Exp $
-
-ARCH="ia64-hpux"
-CHOST="ia64-hp-hpux11.31"
-ACCEPT_KEYWORDS="~ia64-hpux"
diff --git a/profiles/prefix/hpux/B.11.31/ia64/parent b/profiles/prefix/hpux/B.11.31/ia64/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/hpux/B.11.31/ia64/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/hpux/B.11.31/package.provided b/profiles/prefix/hpux/B.11.31/package.provided
deleted file mode 100644
index bb20df1..0000000
--- a/profiles/prefix/hpux/B.11.31/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/hpux/B.11.31/package.provided,v 1.1 2009/06/06 03:54:53 solar Exp $
-
-sys-hpux/libc-11.31
diff --git a/profiles/prefix/hpux/B.11.31/parent b/profiles/prefix/hpux/B.11.31/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/hpux/B.11.31/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/hpux/make.defaults b/profiles/prefix/hpux/make.defaults
deleted file mode 100644
index 3eb4230..0000000
--- a/profiles/prefix/hpux/make.defaults
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/hpux/make.defaults,v 1.2 2009/06/30 16:35:01 darkside Exp $
-
-# System-wide defaults for all HP-UX profiles
-# This file should rarely need to be changed
-
-# 'Sane' defaults
-ELIBC="HPUX"
-KERNEL="HPUX"
-
-# no scanelf
-FEATURES="nostrip"
diff --git a/profiles/prefix/hpux/packages b/profiles/prefix/hpux/packages
deleted file mode 100644
index 4938c0d..0000000
--- a/profiles/prefix/hpux/packages
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/hpux/packages,v 1.1 2009/06/06 03:54:51 solar Exp $
-
-# need GNU as on HP-UX
-*sys-devel/binutils
diff --git a/profiles/prefix/hpux/parent b/profiles/prefix/hpux/parent
deleted file mode 100644
index cd11492..0000000
--- a/profiles/prefix/hpux/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../base
-..
diff --git a/profiles/prefix/hpux/profile.bashrc b/profiles/prefix/hpux/profile.bashrc
deleted file mode 100644
index 81a3e85..0000000
--- a/profiles/prefix/hpux/profile.bashrc
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/hpux/profile.bashrc,v 1.5 2010/12/23 15:15:34 haubi Exp $
-
-# /bin/sh is korn shell, incompatible with bash used by makefiles later.
-# This is a problem with recent libtool detecting non-bashism 'print' fex.
-export CONFIG_SHELL=${BASH}
-
-# On hpux, binary files (executables, shared libraries) in use
-# cannot be replaced during merge.
-# But it is possible to rename them and remove lateron when they are
-# not used any more by any running process.
-#
-# This is a workaround for portage bug#199868,
-# and should be dropped once portage does sth. like this itself.
-
-hpux-busytext-get-listfile() {
-	echo "${ROOT%%/}${EPREFIX}/var/lib/portage/files2bremoved"
-}
-
-hpux-busytext-cleanup() {
-	local removedlist=$(hpux-busytext-get-listfile)
-
-	rm -f "${removedlist}".new
-
-	if [[ -r ${removedlist} ]]; then
-		rm -f "${removedlist}".old
-	fi
-	# restore in case of system fault
-	if [[ -r ${removedlist}.old ]]; then
-		mv "${removedlist}"{.old,}
-	fi
-
-	touch "${removedlist}"{,.new} # ensure they exist
-
-	local rmstem f
-	while read rmstem
-	do
-		# try to remove previously recorded files
-		for f in $(ls "${ROOT}${rmstem}"*); do
-			echo "trying to remove old busy text file ${f}"
-			rm -f "${f}"
-		done
-		# but keep it in list if still exists
-		for f in $(ls "${ROOT}${rmstem}"*); do
-			echo "${rmstem}" >> "${removedlist}".new
-			break
-		done
-	done < "${removedlist}"
-
-	# update the list
-	mv "${removedlist}"{,.old}
-	mv "${removedlist}"{.new,}
-	rm "${removedlist}".old
-}
-
-hpux-busytext-backup() {
-	local removedlist=$(hpux-busytext-get-listfile)
-
-	# now go for current package
-	cd "${D}" || exit 1
-
-	/usr/bin/find ".${EPREFIX}" '!' -type d \
-	| while read f
-	  do
-		  f=${f#./}
-		  [[ ! -f ${ROOT}${f} || -h ${ROOT}${f} ]] && continue
-		  echo "${ROOT}${f}"
-	  done \
-	  | xargs -r /usr/bin/file \
-	  | /usr/bin/grep -E '(object file|shared library|executable)' \
-	  | while read f t
-		do
-			# file prints: "file-argument: type-of-file"
-			f=${f#${ROOT}}
-			f=${f%:}
-			test -r "${ROOT}${f}" || continue
-			rmstem="${f}.removedbyportage"
-			# keep list of old busy text files unique
-			/usr/bin/grep "^${rmstem/[/\\[}$" "${removedlist}" >/dev/null \
-			|| echo "${rmstem}" >> "${removedlist}"
-			n=0
-			while [[ ${n} -lt 100 && -f "${ROOT}${rmstem}${n}" ]]; do
-				n=$((n=n+1))
-			done
-
-			if [[ ${n} -ge 100 ]]; then
-				echo "too many (>=100) old text files busy of '${ROOT}${f}'" >&2
-				exit 1
-			fi
-			echo "backing up text file ${ROOT}${f} (${n})"
-			/usr/bin/mv -f "${ROOT}${f}" "${ROOT}${rmstem}${n}" || exit 1
-			/usr/bin/cp -f "${ROOT}${rmstem}${n}" "${ROOT}${f}" || exit 1
-		done || exit 1
-}
-
-prefix_hpux-post_pkg_preinst() {
-	hpux-busytext-cleanup
-	hpux-busytext-backup
-}
-
-prefix_hpux-pre_pkg_postinst() {
-	hpux-busytext-cleanup
-}
-
-# These are because of
-# http://archives.gentoo.org/gentoo-dev/msg_529a0806ed2cf841a467940a57e2d588.xml
-# The profile-* ones are meant to be used in etc/portage/profile.bashrc by user
-# until there is the registration mechanism.
-profile-post_pkg_preinst() { prefix_hpux-post_pkg_preinst ; }
-        post_pkg_preinst() { prefix_hpux-post_pkg_preinst ; }
-
-profile-pre_pkg_postinst() { prefix_hpux-pre_pkg_postinst ; }
-        pre_pkg_postinst() { prefix_hpux-pre_pkg_postinst ; }
diff --git a/profiles/prefix/hpux/use.force b/profiles/prefix/hpux/use.force
deleted file mode 100644
index 8b98a44..0000000
--- a/profiles/prefix/hpux/use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/hpux/use.force,v 1.1 2009/06/06 03:54:51 solar Exp $
-
-# Re-add HPUX OS
-kernel_HPUX
-elibc_HPUX
diff --git a/profiles/prefix/hpux/use.mask b/profiles/prefix/hpux/use.mask
deleted file mode 100644
index 74febca..0000000
--- a/profiles/prefix/hpux/use.mask
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/hpux/use.mask,v 1.4 2013/02/02 13:12:29 grobian Exp $
-
-# Re-add HPUX libc
--elibc_HPUX
--kernel_HPUX
-
-# these will more than likely never work on HPUX
-3dfx
-3dnow
-3dnowext
-acpi
-alsa
-apm
-cap
-caps
-cman
-clvm
-directfb
-divx4linux
-djbfft
-emul-linux-x86
-fbcon
-fdftk
-fmod
-ggi
-gpm
-hardened
-icc
-icc-pgo
-mmx
-mmx2
-# the following USE flag requires device-mapper
-on-the-fly-crypt
-oss
-solid
-sse
-sse2
-svga
-sybase
-sybase-ct
-rtc
-uclibc
-voodoo3
-pvm
-v4l
diff --git a/profiles/prefix/linux/amd64/eapi b/profiles/prefix/linux/amd64/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/prefix/linux/amd64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/linux/amd64/make.defaults b/profiles/prefix/linux/amd64/make.defaults
deleted file mode 100644
index 8f56a17..0000000
--- a/profiles/prefix/linux/amd64/make.defaults
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/amd64/make.defaults,v 1.3 2013/06/06 01:53:18 ottxor Exp $
-
-#Note: this is Gentoo Prefix specific! (13 Jul 2008, darkside)
-
-ARCH="amd64"
-CHOST="x86_64-pc-linux-gnu"
-# The base profile sets ACCEPT_KEYWORDS=amd64 and we don't have that in prefix.
-ACCEPT_KEYWORDS="-amd64 ~amd64-linux"
-
-# We don't have lib64 in prefix so, remove it here.
-SYMLINK_LIB=""
-LIBDIR_amd64="lib"
diff --git a/profiles/prefix/linux/amd64/package.use.mask b/profiles/prefix/linux/amd64/package.use.mask
deleted file mode 100644
index c06fdde..0000000
--- a/profiles/prefix/linux/amd64/package.use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/amd64/package.use.mask,v 1.1 2012/01/09 04:36:35 tetromino Exp $
-
-# Alexandre Rostovtsev <tetromono@gentoo.org> (09 Jan 2012)
-# jsc JIT compilation is supported only on amd64/arm/x86 and their prefixes, so
-# it's masked in base profile and unmasked here (bug #396313).
-net-libs/webkit-gtk -jit
diff --git a/profiles/prefix/linux/amd64/parent b/profiles/prefix/linux/amd64/parent
deleted file mode 100644
index 16c974f..0000000
--- a/profiles/prefix/linux/amd64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../default/linux/amd64/13.0/no-multilib
-..
diff --git a/profiles/prefix/linux/arm/eapi b/profiles/prefix/linux/arm/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/prefix/linux/arm/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/linux/arm/make.defaults b/profiles/prefix/linux/arm/make.defaults
deleted file mode 100644
index 77d2ab2..0000000
--- a/profiles/prefix/linux/arm/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/arm/make.defaults,v 1.6 2012/12/09 15:39:57 grobian Exp $
-
-ARCH="arm"
-# This is a pretty specific profile to the armv7 arch, we can change that later
-CHOST="armv7a-softfloat-linux-gnueabi"
diff --git a/profiles/prefix/linux/arm/parent b/profiles/prefix/linux/arm/parent
deleted file mode 100644
index c9cb641..0000000
--- a/profiles/prefix/linux/arm/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../default/linux/arm/13.0
-..
diff --git a/profiles/prefix/linux/ia64/eapi b/profiles/prefix/linux/ia64/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/prefix/linux/ia64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/linux/ia64/make.defaults b/profiles/prefix/linux/ia64/make.defaults
deleted file mode 100644
index 112b22d..0000000
--- a/profiles/prefix/linux/ia64/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/ia64/make.defaults,v 1.1 2009/06/06 03:54:56 solar Exp $
-
-# The base profile sets ACCEPT_KEYWORDS=ia64 and we don't have that in prefix.
-ACCEPT_KEYWORDS="-ia64 ~ia64-linux"
diff --git a/profiles/prefix/linux/ia64/parent b/profiles/prefix/linux/ia64/parent
deleted file mode 100644
index ead1e33..0000000
--- a/profiles/prefix/linux/ia64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../default/linux/ia64/13.0
-..
diff --git a/profiles/prefix/linux/make.defaults b/profiles/prefix/linux/make.defaults
deleted file mode 100644
index 363e22e..0000000
--- a/profiles/prefix/linux/make.defaults
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/make.defaults,v 1.6 2011/02/13 16:53:40 arfrever Exp $
-
-# 'Sane' defaults
-ELIBC="glibc"
-KERNEL="linux"
-
-# 2006/10/28 - Luca Barbato <lu_zero@gentoo.org>
-# on glibc system you cannot turn it off
-USE="iconv"
-
-# build gcc with mudflap (pointer checking) and parallelization support
-USE="${USE} mudflap openmp"
-
-# Turn off acl to help with bootstrapping - it isn't as helpful for prefix as it
-# can be for a non-prefix install
-USE="${USE} -acl"
-
-# 2008/07/09 - Doug Goldstein <cardoe@gentoo.org>
-# Adding LDFLAGS="-Wl,-O1 for all Linux profiles by default
-# after discussion on the gentoo-dev ML. As we bang out a clear
-# direction with how LDFLAGS will be set by default, this entry
-# may move.
-# 2010/08/12 - Fabian Groffen <grobian@gentoo.org>
-# Unlike default/linux, we do NOT have --as-needed here, as it seems to
-# break a random amount of packages, that don't break (or just not
-# enough) for non-Prefix installs.
-LDFLAGS="-Wl,-O1"
-
diff --git a/profiles/prefix/linux/package.provided b/profiles/prefix/linux/package.provided
deleted file mode 100644
index 3c23ae8..0000000
--- a/profiles/prefix/linux/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/package.provided,v 1.5 2013/02/03 11:48:34 heroxbd Exp $
-
-sys-linux/glibc-0
diff --git a/profiles/prefix/linux/package.use.mask b/profiles/prefix/linux/package.use.mask
deleted file mode 100644
index 7413044..0000000
--- a/profiles/prefix/linux/package.use.mask
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/package.use.mask,v 1.4 2011/12/01 22:50:18 darkside Exp $
-
-# Fabian Groffen <grobian@gentoo.org> (23 Oct 2010)
-# IPC on Linux is well tested, since it's developed on that platform.
-sys-apps/portage -ipc
-
-# Michael Haubenwallner <haubi@gentoo.org> (30 Sep 2009)
-# linux can have an uuid implementation (#230981).
-x11-libs/libSM -uuid
diff --git a/profiles/prefix/linux/packages b/profiles/prefix/linux/packages
deleted file mode 100644
index f6aef1f..0000000
--- a/profiles/prefix/linux/packages
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/packages,v 1.2 2010/04/21 16:29:06 darkside Exp $
-
-# Add back what the parent removes.
-*sys-devel/binutils
-*sys-process/procps
-*sys-process/psmisc
-
-# Here we remove packages that default/linux/packages pulls in and have no
-# business being in Gentoo Prefix
--*sys-apps/busybox
--*sys-apps/util-linux
diff --git a/profiles/prefix/linux/parent b/profiles/prefix/linux/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/linux/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/linux/ppc64/eapi b/profiles/prefix/linux/ppc64/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/prefix/linux/ppc64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/linux/ppc64/make.defaults b/profiles/prefix/linux/ppc64/make.defaults
deleted file mode 100644
index 6a5e63b..0000000
--- a/profiles/prefix/linux/ppc64/make.defaults
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/ppc64/make.defaults,v 1.2 2012/03/09 13:29:05 darkside Exp $
-
-ARCH="ppc64"
-CHOST="powerpc64-pc-linux-gnu"
-# The base profile sets ACCEPT_KEYWORDS=ppc64 and we don't have that in prefix.
-# Eventually, ~* should be removed once someone is motivated for this arch
-ACCEPT_KEYWORDS="-ppc64 ~ppc64-linux ~*"
-
-# We don't have lib64 in prefix so, remove it here.
-SYMLINK_LIB=""
-LIBDIR_ppc64="lib"
diff --git a/profiles/prefix/linux/ppc64/packages b/profiles/prefix/linux/ppc64/packages
deleted file mode 100644
index 4e5a276..0000000
--- a/profiles/prefix/linux/ppc64/packages
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/ppc64/packages,v 1.1 2012/03/06 23:38:09 darkside Exp $
-
-# Those are part of the base powerpc profile's @system set, but having them as
-# part of @system makes no sense for Gentoo Prefix.
--*sys-fs/hfsutils
--*sys-fs/hfsplusutils
diff --git a/profiles/prefix/linux/ppc64/parent b/profiles/prefix/linux/ppc64/parent
deleted file mode 100644
index 51fedc0..0000000
--- a/profiles/prefix/linux/ppc64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../default/linux/powerpc/ppc64/13.0/64bit-userland
-..
diff --git a/profiles/prefix/linux/profile.bashrc b/profiles/prefix/linux/profile.bashrc
deleted file mode 100644
index 79aa797..0000000
--- a/profiles/prefix/linux/profile.bashrc
+++ /dev/null
@@ -1,17 +0,0 @@
-# This is a ugly issue, see bug 289757 for origins
-# This mimics the check in gcc ebuilds, bug 362315
-#
-# # Remember, bash treats floats like strings..
-
-if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} == unpack ]]; then
-    # Since 2.3 > 2.12 in numerical terms, just compare 2.X to 2.Y, will break
-    # if >=3.0 is ever released
-    VERS=$(/usr/bin/ldd --version | head -n1 | grep -o ") [0-9]\.[0-9]\+" | cut -d. -f2 )
-    if [[ $VERS -lt 12 ]]; then # compare host glibc 2.x to 2.12
-        ewarn "Your host glibc is too old; disabling automatic fortify. bug 289757"
-        EPATCH_EXCLUDE+=" 10_all_gcc-default-fortify-source.patch" # <=gcc-4.5*
-        EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch" # >=gcc-4.6*
-    fi
-fi
-
-# vim: set syn=sh expandtab ts=4:
diff --git a/profiles/prefix/linux/use.force b/profiles/prefix/linux/use.force
deleted file mode 100644
index f5867fc..0000000
--- a/profiles/prefix/linux/use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/use.force,v 1.1 2009/06/06 03:54:55 solar Exp $
-
-# Re-add Linux OS
-kernel_linux
-elibc_glibc
diff --git a/profiles/prefix/linux/use.mask b/profiles/prefix/linux/use.mask
deleted file mode 100644
index cb05897..0000000
--- a/profiles/prefix/linux/use.mask
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/use.mask,v 1.4 2011/03/29 01:58:48 flameeyes Exp $
-
-# Re-add linux stuff that is masked in base/
--elibc_glibc
--kernel_linux
-#
-
-# Re-add acl, as it does work in prefixed Linux (if the host kernel supports it)
--acl
diff --git a/profiles/prefix/linux/x86/eapi b/profiles/prefix/linux/x86/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/prefix/linux/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/linux/x86/make.defaults b/profiles/prefix/linux/x86/make.defaults
deleted file mode 100644
index 8b8de84..0000000
--- a/profiles/prefix/linux/x86/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/x86/make.defaults,v 1.3 2009/11/04 13:25:03 haubi Exp $
-
-ARCH="x86"
-CHOST="i686-pc-linux-gnu"
-# The base profile sets ACCEPT_KEYWORDS=x86 and we don't have that in prefix.
-ACCEPT_KEYWORDS="-x86 ~x86-linux"
-
-# in case we are bootstrapping with the host compiler on an amd64 linux host:
-CFLAGS="${CFLAGS} -m32"
-CXXFLAGS="${CXXFLAGS} -m32"
diff --git a/profiles/prefix/linux/x86/package.use.mask b/profiles/prefix/linux/x86/package.use.mask
deleted file mode 100644
index 9306922..0000000
--- a/profiles/prefix/linux/x86/package.use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/x86/package.use.mask,v 1.1 2012/01/09 04:36:35 tetromino Exp $
-
-# Alexandre Rostovtsev <tetromono@gentoo.org> (09 Jan 2012)
-# jsc JIT compilation is supported only on amd64/arm/x86 and their prefixes, so
-# it's masked in base profile and unmasked here (bug #396313).
-net-libs/webkit-gtk -jit
diff --git a/profiles/prefix/linux/x86/parent b/profiles/prefix/linux/x86/parent
deleted file mode 100644
index 0fbf331..0000000
--- a/profiles/prefix/linux/x86/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../default/linux/x86/13.0
-..
diff --git a/profiles/prefix/linux/x86/profile.bashrc b/profiles/prefix/linux/x86/profile.bashrc
deleted file mode 100644
index 6f7360c..0000000
--- a/profiles/prefix/linux/x86/profile.bashrc
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Id: profile.bashrc,v 1.1 2011/03/29 20:19:15 haubi Exp $
-
-# When x86-linux runs on an amd64 host having /lib32,
-# we need to have binutils to search there too (#360197).
-# The patches to do so are applied upon SYMLINK_LIB=yes,
-# needed when /lib32 is (a symlink to) an existing directory.
-if [[ ${CATEGORY}/${PN} = sys-devel/binutils ]] \
-&& [[ ${EBUILD_PHASE} == setup ]] \
-&& [[ -d ${ROOT}lib32/. ]] \
-; then
-	export SYMLINK_LIB=yes
-fi
diff --git a/profiles/prefix/make.defaults b/profiles/prefix/make.defaults
deleted file mode 100644
index 1825795..0000000
--- a/profiles/prefix/make.defaults
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/make.defaults,v 1.5 2013/04/20 14:46:13 grobian Exp $
-
-# Some USE-flags that only die-hards don't want:
-# readline:  to have some sane command line editing, e.g. in python
-# zlib:      for many things you just want gzip support
-# ncurses:   a nice working console drawing library
-# ssl:       encrypted connections are a nice feature
-USE="readline zlib ncurses ssl"
-
-FEATURES="collision-protect"
-
-# Jeremy Olexa <darkside@gentoo.org> (30 Jun 2009)
-# As of now, there does not exist a reliable working sandbox implementation on
-# any Gentoo Prefix platform. Lately, sandbox has caused *many* issues that
-# the Gentoo Prefix team has no time to fix and/or troubleshoot. see: bug 271424
-# see:
-# http://archives.gentoo.org/gentoo-alt/msg_3c355ca5e70e7975eae293823f1751f2.xml
-# see: bug 274239
-# and other issues, etc etc.
-#
-# If in the future, there does exist a working sandbox implementation then it
-# should be enabled on a per-profile basis only.
-FEATURES="${FEATURES} -sandbox"
-
-# this probably already is like this, but we assure that in prefix we
-# have a GNU userland
-USERLAND="GNU"
diff --git a/profiles/prefix/mint/m68k/make.defaults b/profiles/prefix/mint/m68k/make.defaults
deleted file mode 100644
index 1e296a2..0000000
--- a/profiles/prefix/mint/m68k/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/mint/m68k/make.defaults,v 1.1 2009/06/06 03:54:58 solar Exp $
-
-ARCH="m68k-mint"
-CHOST="m68k-atari-mint"
-ACCEPT_KEYWORDS="~m68k-mint"
diff --git a/profiles/prefix/mint/m68k/parent b/profiles/prefix/mint/m68k/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/mint/m68k/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/mint/m68k/use.mask b/profiles/prefix/mint/m68k/use.mask
deleted file mode 100644
index 0d39d95..0000000
--- a/profiles/prefix/mint/m68k/use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/mint/m68k/use.mask,v 1.1 2009/06/06 03:54:58 solar Exp $
-
-# dlopen() doesn't work in MiNT
-dso
diff --git a/profiles/prefix/mint/make.defaults b/profiles/prefix/mint/make.defaults
deleted file mode 100644
index 6791a62..0000000
--- a/profiles/prefix/mint/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/mint/make.defaults,v 1.5 2012/10/04 06:50:24 grobian Exp $
-
-# System-wide defaults for all MiNT profiles
-# This file should rarely need to be changed
-
-# 'Sane' defaults
-ELIBC="mintlib"
-KERNEL="freemint"
-
-USE="fortran mudflap static-libs"
diff --git a/profiles/prefix/mint/package.provided b/profiles/prefix/mint/package.provided
deleted file mode 100644
index 3abd79a..0000000
--- a/profiles/prefix/mint/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/mint/package.provided,v 1.1 2009/06/06 03:54:57 solar Exp $
-
-sys-mint/mintlib-1
diff --git a/profiles/prefix/mint/package.use.force b/profiles/prefix/mint/package.use.force
deleted file mode 100644
index b41aec6..0000000
--- a/profiles/prefix/mint/package.use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/mint/package.use.force,v 1.2 2011/05/29 18:02:46 grobian Exp $
-
-#364789
-app-arch/libarchive static static-libs
diff --git a/profiles/prefix/mint/package.use.mask b/profiles/prefix/mint/package.use.mask
deleted file mode 100644
index 65edc53..0000000
--- a/profiles/prefix/mint/package.use.mask
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/mint/package.use.mask,v 1.5 2013/10/31 15:03:06 grobian Exp $
-
-
-# Alan Hourihane <alanh@fairlite.co.uk> (30 Dec 2011)
-# xz-utils plays havoc with GNU pth
-app-arch/xz-utils threads
-
-# Alan Hourihane <alanh@fairlite.co.uk> (15 Dec 2011)
-# MiNT doesn't have mmap, and jit requires it.
-dev-libs/libpcre jit
diff --git a/profiles/prefix/mint/packages b/profiles/prefix/mint/packages
deleted file mode 100644
index 37f9bee..0000000
--- a/profiles/prefix/mint/packages
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/mint/packages,v 1.1 2009/06/06 03:54:57 solar Exp $
-
-*sys-devel/binutils
diff --git a/profiles/prefix/mint/parent b/profiles/prefix/mint/parent
deleted file mode 100644
index cd11492..0000000
--- a/profiles/prefix/mint/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../base
-..
diff --git a/profiles/prefix/mint/use.mask b/profiles/prefix/mint/use.mask
deleted file mode 100644
index b78006c..0000000
--- a/profiles/prefix/mint/use.mask
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/mint/use.mask,v 1.6 2013/02/02 13:12:29 grobian Exp $
-
-# Re-add MiNT libc
--elibc_mintlib
--kernel_freemint
-
-# these will more than likely never work on MiNT
-3dfx
-3dnow
-3dnowext
-acpi
-alsa
-apm
-cap
-caps
-cman
-clvm
-directfb
-divx4linux
-djbfft
-emul-linux-x86
-fbcon
-fdftk
-fmod
-ggi
-gpm
-hardened
-icc
-icc-pgo
-ipv6
-mmx
-mmx2
-# the following USE flag requires device-mapper
-on-the-fly-crypt
-oss
-solid
-sse
-sse2
-svga
-sybase
-sybase-ct
-rtc
-uclibc
-voodoo3
-pvm
-v4l
-
-# git doesn't work at this time, bug #339031\
-git
diff --git a/profiles/prefix/package.use.mask b/profiles/prefix/package.use.mask
deleted file mode 100644
index 59f5c18..0000000
--- a/profiles/prefix/package.use.mask
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/package.use.mask,v 1.18 2012/01/14 11:03:44 xarthisius Exp $
-
-# Kacper Kowalik <xarthisius@gentoo.org> (14 Jan 2012)
-# sci-libs/mkl don't have prefix keywords
-dev-python/numexpr mkl
-
-# Fabian Groffen <grobian@gentoo.org> (08 Dec 2011)
-# USE=vanilla produces a broken compiler for Prefix.  Only use this flag
-# when you're absolutely sure what you're doing.  Do NOT report bugs
-# about failing packages when using a vanilla compiler!
-sys-devel/gcc vanilla
-
-# Fabian Groffen <grobian@gentoo.org> (23 Oct 2010)
-# IPC relies on pipes, selects, polls, and more stuff that Python is
-# very bad with, that really causes way more issues than it is worth to
-# have some boundary bugs solved and more robust subshell die support
-sys-apps/portage ipc
-
-# Rafael Goncalves Martins <rafaelmartins@gentoo.org> (29 Sep 2010)
-# dev-libs/judy without prefix keywords
-# (amd64-linux and x86-linux)
-sci-electronics/gtkwave judy
-
-# Michael Haubenwallner <haubi@gentoo.org> (17 Sep 2010)
-# sys-apps/keyutils is a linux only package
-app-crypt/mit-krb5 keyutils
-
-# Jonathan Callen <abcd@gentoo.org> (22 Feb 2010)
-# ppp is not available in Prefix
-kde-base/kdenetwork-meta ppp
-
-# Christian Faulhammer <fauli@gentoo.org> (09 Jan 2010)
-# hesiod and m17n-lib are not available in Prefix
-app-editors/emacs-vcs hesiod m17n-lib
-app-editors/emacs hesiod m17n-lib
-
-# Michael Haubenwallner <haubi@gentoo.org> (30 Sep 2009)
-# Most prefix platforms do/can not have an uuid implementation (#230981).
-x11-libs/libSM uuid
-
-# Jeremy Olexa <darkside@gentoo.org> (30 Sep 2009)
-# berkdb has hardcoded paths all over, breaks on linux at least. Use flag
-# disappearing in next bump: prefix can be early and force it to be not used to
-# save headaches.
-# NOTE to prefix devs: if it needs to not be a global mask, talk to me because
-# it currently causes failures on linux. It can be made a "less global" mask.
-dev-lang/python berkdb
-
-# Jeremy Olexa <darkside@gentoo.org> (02 Sep 2009)
-# these don't work, because they rely on the host having sufficient xorg-server
-# version.
-xfce-base/xfce4-meta session
-
-# Jeremy Olexa <darkside@gentoo.org> (13 Feb 2009)
-# Can't make USE=ssl to work, bad build system. bug #256699
-dev-lang/pike ssl
-
-# Elias Pipping <pipping@gentoo.org> (18 Nov 2007)
-# feynmf fails to build documentation
-dev-tex/feynmf doc
-
-# Elias Pipping <pipping@gentoo.org> (15 Nov 2007)
-# pkg_postinst tries to create/delete a user, fails
-dev-libs/cyrus-sasl berkdb gdbm
diff --git a/profiles/prefix/packages b/profiles/prefix/packages
deleted file mode 100644
index 21c9494..0000000
--- a/profiles/prefix/packages
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/packages,v 1.8 2013/08/29 02:58:55 jcallen Exp $
-
-# Gentoo Base Prefix Profile
-
-# NOTE: THIS IS THE BASE PROFILE FOR *ANY* PREFIX BASED OPERATING SYSTEM.
-# NO MODIFICATIONS MAY BE MADE TO THIS FILE WITHOUT PRIOR DISCUSSION.  IF
-# YOU ARE CREATING A NEW PROFILE, YOU SIMPLY NEED TO INHERIT THIS BASE
-# PROFILE IN YOUR PROFILE DIRECTORY'S "parent" FILE.
-
-# Read the descriptions of ../base/packages for some explanation
-
-# This file removes everything from the base profile which is not
-# necessary/desired in a prefix environment.
-
--*>=sys-apps/baselayout-2
--*net-misc/iputils
--*sys-apps/kbd
--*sys-process/procps
--*sys-process/psmisc
--*sys-fs/e2fsprogs
--*virtual/dev-manager
--*virtual/modutils
--*virtual/shadow
-
-# add back prefix baselayout
-*sys-apps/baselayout-prefix
-
-# we don't want binutils everywhere, only in linux and solaris
--*sys-devel/binutils
-
-# we don't ever will install these, so no need to depend on them
--*virtual/libc
--*virtual/os-headers
-
-# we don't want this either (as baselayout-prefix provides the functions.sh
-# file that this was added to ../base/packages for)
--*sys-apps/openrc
diff --git a/profiles/prefix/profile.bashrc b/profiles/prefix/profile.bashrc
deleted file mode 100644
index a8e6802..0000000
--- a/profiles/prefix/profile.bashrc
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/profile.bashrc,v 1.5 2012/11/10 09:46:11 grobian Exp $
-
-# Hack to avoid every package that uses libiconv/gettext
-# install a charset.alias that will collide with libiconv's one
-# See bugs 169678, 195148 and 256129.
-# Also the discussion on
-# http://archives.gentoo.org/gentoo-dev/msg_8cb1805411f37b4eb168a3e680e531f3.xml
-prefix-post_src_install() {
-	local f
-	if [[ ${PN} != "libiconv" && -n $(ls "${ED}"/usr/lib*/charset.alias 2>/dev/null) ]]; then
-		einfo "automatically removing charset.alias"
-		rm -f "${ED}"/usr/lib*/charset.alias
-	fi
-}
-
-# These are because of
-# http://archives.gentoo.org/gentoo-dev/msg_529a0806ed2cf841a467940a57e2d588.xml
-# The profile-* ones are meant to be used in etc/portage/profile.bashrc by user
-# until there is the registration mechanism.
-profile-post_src_install() { prefix-post_src_install ; }
-        post_src_install() { prefix-post_src_install ; }
diff --git a/profiles/prefix/sunos/make.defaults b/profiles/prefix/sunos/make.defaults
deleted file mode 100644
index 6f90d93..0000000
--- a/profiles/prefix/sunos/make.defaults
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/make.defaults,v 1.2 2009/06/30 16:35:03 darkside Exp $
-
-# System-wide defaults for all SunOS profiles
-# This file should rarely need to be changed
-
-# 'Sane' defaults
-ELIBC="SunOS"
-KERNEL="SunOS"
-
-# stripping stuff works but makes
-# i.e. ldd output completely empty, which is sort of annoying
-FEATURES="nostrip"
diff --git a/profiles/prefix/sunos/packages b/profiles/prefix/sunos/packages
deleted file mode 100644
index ed469f1..0000000
--- a/profiles/prefix/sunos/packages
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/packages,v 1.1 2009/06/06 03:54:58 solar Exp $
-
-*sys-devel/binutils
diff --git a/profiles/prefix/sunos/parent b/profiles/prefix/sunos/parent
deleted file mode 100644
index cd11492..0000000
--- a/profiles/prefix/sunos/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../base
-..
diff --git a/profiles/prefix/sunos/solaris/5.10/package.provided b/profiles/prefix/sunos/solaris/5.10/package.provided
deleted file mode 100644
index 70aec53..0000000
--- a/profiles/prefix/sunos/solaris/5.10/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.10/package.provided,v 1.1 2009/06/06 03:54:59 solar Exp $
-
-sys-sunos/libc-2.10
diff --git a/profiles/prefix/sunos/solaris/5.10/parent b/profiles/prefix/sunos/solaris/5.10/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/sunos/solaris/5.10/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc/make.defaults b/profiles/prefix/sunos/solaris/5.10/sparc/make.defaults
deleted file mode 100644
index d4552bb..0000000
--- a/profiles/prefix/sunos/solaris/5.10/sparc/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.10/sparc/make.defaults,v 1.1 2009/06/06 03:55:00 solar Exp $
-
-ARCH="sparc-solaris"
-CHOST="sparc-sun-solaris2.10"
-ACCEPT_KEYWORDS="~sparc-solaris"
-
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc/package.use.mask b/profiles/prefix/sunos/solaris/5.10/sparc/package.use.mask
deleted file mode 100644
index 50a4e6a..0000000
--- a/profiles/prefix/sunos/solaris/5.10/sparc/package.use.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.10/sparc/package.use.mask,v 1.2 2011/12/30 16:20:16 grobian Exp $
-
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc/parent b/profiles/prefix/sunos/solaris/5.10/sparc/parent
deleted file mode 100644
index 133d186..0000000
--- a/profiles/prefix/sunos/solaris/5.10/sparc/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/sparc
-..
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc64/make.defaults b/profiles/prefix/sunos/solaris/5.10/sparc64/make.defaults
deleted file mode 100644
index 998e138..0000000
--- a/profiles/prefix/sunos/solaris/5.10/sparc64/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.10/sparc64/make.defaults,v 1.1 2009/06/06 03:55:00 solar Exp $
-
-ARCH="sparc64-solaris"
-CHOST="sparcv9-sun-solaris2.10"
-ACCEPT_KEYWORDS="~sparc64-solaris"
-
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc64/package.use.mask b/profiles/prefix/sunos/solaris/5.10/sparc64/package.use.mask
deleted file mode 100644
index ba2a3f2..0000000
--- a/profiles/prefix/sunos/solaris/5.10/sparc64/package.use.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.10/sparc64/package.use.mask,v 1.3 2011/12/30 16:20:16 grobian Exp $
-
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc64/parent b/profiles/prefix/sunos/solaris/5.10/sparc64/parent
deleted file mode 100644
index 9dbef0d..0000000
--- a/profiles/prefix/sunos/solaris/5.10/sparc64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/sparc64
-..
diff --git a/profiles/prefix/sunos/solaris/5.10/x64/make.defaults b/profiles/prefix/sunos/solaris/5.10/x64/make.defaults
deleted file mode 100644
index 975b96e..0000000
--- a/profiles/prefix/sunos/solaris/5.10/x64/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.10/x64/make.defaults,v 1.1 2009/06/06 03:55:01 solar Exp $
-
-ARCH="x64-solaris"
-CHOST="x86_64-pc-solaris2.10"
-ACCEPT_KEYWORDS="~x64-solaris"
-
diff --git a/profiles/prefix/sunos/solaris/5.10/x64/package.use.mask b/profiles/prefix/sunos/solaris/5.10/x64/package.use.mask
deleted file mode 100644
index dad3f41..0000000
--- a/profiles/prefix/sunos/solaris/5.10/x64/package.use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.10/x64/package.use.mask,v 1.1 2009/06/06 03:55:01 solar Exp $
-
-
diff --git a/profiles/prefix/sunos/solaris/5.10/x64/parent b/profiles/prefix/sunos/solaris/5.10/x64/parent
deleted file mode 100644
index fc24616..0000000
--- a/profiles/prefix/sunos/solaris/5.10/x64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x64
-..
diff --git a/profiles/prefix/sunos/solaris/5.10/x86/eapi b/profiles/prefix/sunos/solaris/5.10/x86/eapi
deleted file mode 100644
index d00491f..0000000
--- a/profiles/prefix/sunos/solaris/5.10/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/profiles/prefix/sunos/solaris/5.10/x86/make.defaults b/profiles/prefix/sunos/solaris/5.10/x86/make.defaults
deleted file mode 100644
index 76d1789..0000000
--- a/profiles/prefix/sunos/solaris/5.10/x86/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.10/x86/make.defaults,v 1.1 2009/06/06 03:55:01 solar Exp $
-
-ARCH="x86-solaris"
-CHOST="i386-pc-solaris2.10"
-ACCEPT_KEYWORDS="~x86-solaris"
-
diff --git a/profiles/prefix/sunos/solaris/5.10/x86/package.use.mask b/profiles/prefix/sunos/solaris/5.10/x86/package.use.mask
deleted file mode 100644
index 8ece6c0..0000000
--- a/profiles/prefix/sunos/solaris/5.10/x86/package.use.mask
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.10/x86/package.use.mask,v 1.3 2011/12/30 16:20:16 grobian Exp $
-
-
-# *** This configuration is not supported in the following
-# subdirectories:
-#    target-libada gnattools target-libmudflap target-libssp
-sys-devel/gcc:4.3 mudflap
diff --git a/profiles/prefix/sunos/solaris/5.10/x86/parent b/profiles/prefix/sunos/solaris/5.10/x86/parent
deleted file mode 100644
index 4a6aa36..0000000
--- a/profiles/prefix/sunos/solaris/5.10/x86/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x86
-..
diff --git a/profiles/prefix/sunos/solaris/5.11/package.provided b/profiles/prefix/sunos/solaris/5.11/package.provided
deleted file mode 100644
index 5a748e1..0000000
--- a/profiles/prefix/sunos/solaris/5.11/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.11/package.provided,v 1.1 2009/06/06 03:55:02 solar Exp $
-
-sys-sunos/libc-2.11
diff --git a/profiles/prefix/sunos/solaris/5.11/package.use.mask b/profiles/prefix/sunos/solaris/5.11/package.use.mask
deleted file mode 100644
index 18ef8b8..0000000
--- a/profiles/prefix/sunos/solaris/5.11/package.use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.11/package.use.mask,v 1.1 2011/03/30 08:33:21 grobian Exp $
-
-
-# Fabian Groffen <grobian@gentoo.org> (30 Mar 2011)
-# git is broken with some repack failure (OpenSolaris only)
-sys-devel/gettext git
diff --git a/profiles/prefix/sunos/solaris/5.11/parent b/profiles/prefix/sunos/solaris/5.11/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/sunos/solaris/5.11/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/sunos/solaris/5.11/sparc/make.defaults b/profiles/prefix/sunos/solaris/5.11/sparc/make.defaults
deleted file mode 100644
index 24cba63..0000000
--- a/profiles/prefix/sunos/solaris/5.11/sparc/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.11/sparc/make.defaults,v 1.1 2009/06/06 03:55:02 solar Exp $
-
-ARCH="sparc-solaris"
-CHOST="sparc-sun-solaris2.11"
-ACCEPT_KEYWORDS="~sparc-solaris"
-
diff --git a/profiles/prefix/sunos/solaris/5.11/sparc/package.use.mask b/profiles/prefix/sunos/solaris/5.11/sparc/package.use.mask
deleted file mode 100644
index 18b2198..0000000
--- a/profiles/prefix/sunos/solaris/5.11/sparc/package.use.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.11/sparc/package.use.mask,v 1.2 2011/12/30 16:20:17 grobian Exp $
-
diff --git a/profiles/prefix/sunos/solaris/5.11/sparc/parent b/profiles/prefix/sunos/solaris/5.11/sparc/parent
deleted file mode 100644
index 133d186..0000000
--- a/profiles/prefix/sunos/solaris/5.11/sparc/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/sparc
-..
diff --git a/profiles/prefix/sunos/solaris/5.11/sparc64/make.defaults b/profiles/prefix/sunos/solaris/5.11/sparc64/make.defaults
deleted file mode 100644
index ddc439f..0000000
--- a/profiles/prefix/sunos/solaris/5.11/sparc64/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.11/sparc64/make.defaults,v 1.1 2009/06/06 03:55:03 solar Exp $
-
-ARCH="sparc64-solaris"
-CHOST="sparcv9-sun-solaris2.11"
-ACCEPT_KEYWORDS="~sparc64-solaris"
-
diff --git a/profiles/prefix/sunos/solaris/5.11/sparc64/package.use.mask b/profiles/prefix/sunos/solaris/5.11/sparc64/package.use.mask
deleted file mode 100644
index b131ba7..0000000
--- a/profiles/prefix/sunos/solaris/5.11/sparc64/package.use.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.11/sparc64/package.use.mask,v 1.3 2011/12/30 16:20:17 grobian Exp $
-
diff --git a/profiles/prefix/sunos/solaris/5.11/sparc64/parent b/profiles/prefix/sunos/solaris/5.11/sparc64/parent
deleted file mode 100644
index 9dbef0d..0000000
--- a/profiles/prefix/sunos/solaris/5.11/sparc64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/sparc64
-..
diff --git a/profiles/prefix/sunos/solaris/5.11/x64/make.defaults b/profiles/prefix/sunos/solaris/5.11/x64/make.defaults
deleted file mode 100644
index e7b4a82..0000000
--- a/profiles/prefix/sunos/solaris/5.11/x64/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.11/x64/make.defaults,v 1.1 2009/06/06 03:55:03 solar Exp $
-
-ARCH="x64-solaris"
-CHOST="x86_64-pc-solaris2.11"
-ACCEPT_KEYWORDS="~x64-solaris"
-
diff --git a/profiles/prefix/sunos/solaris/5.11/x64/package.use.mask b/profiles/prefix/sunos/solaris/5.11/x64/package.use.mask
deleted file mode 100644
index c36760d..0000000
--- a/profiles/prefix/sunos/solaris/5.11/x64/package.use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.11/x64/package.use.mask,v 1.1 2009/06/06 03:55:03 solar Exp $
-
-
diff --git a/profiles/prefix/sunos/solaris/5.11/x64/parent b/profiles/prefix/sunos/solaris/5.11/x64/parent
deleted file mode 100644
index fc24616..0000000
--- a/profiles/prefix/sunos/solaris/5.11/x64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x64
-..
diff --git a/profiles/prefix/sunos/solaris/5.11/x86/make.defaults b/profiles/prefix/sunos/solaris/5.11/x86/make.defaults
deleted file mode 100644
index 25f0068..0000000
--- a/profiles/prefix/sunos/solaris/5.11/x86/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.11/x86/make.defaults,v 1.1 2009/06/06 03:55:04 solar Exp $
-
-ARCH="x86-solaris"
-CHOST="i386-pc-solaris2.11"
-ACCEPT_KEYWORDS="~x86-solaris"
-
diff --git a/profiles/prefix/sunos/solaris/5.11/x86/package.use.mask b/profiles/prefix/sunos/solaris/5.11/x86/package.use.mask
deleted file mode 100644
index 0a8804d..0000000
--- a/profiles/prefix/sunos/solaris/5.11/x86/package.use.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.11/x86/package.use.mask,v 1.3 2011/12/30 16:20:17 grobian Exp $
-
diff --git a/profiles/prefix/sunos/solaris/5.11/x86/parent b/profiles/prefix/sunos/solaris/5.11/x86/parent
deleted file mode 100644
index 4a6aa36..0000000
--- a/profiles/prefix/sunos/solaris/5.11/x86/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/x86
-..
diff --git a/profiles/prefix/sunos/solaris/5.9/package.provided b/profiles/prefix/sunos/solaris/5.9/package.provided
deleted file mode 100644
index 01960d1..0000000
--- a/profiles/prefix/sunos/solaris/5.9/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.9/package.provided,v 1.1 2009/06/06 03:55:04 solar Exp $
-
-sys-sunos/libc-2.9
diff --git a/profiles/prefix/sunos/solaris/5.9/package.use.force b/profiles/prefix/sunos/solaris/5.9/package.use.force
deleted file mode 100644
index 246ec0a..0000000
--- a/profiles/prefix/sunos/solaris/5.9/package.use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.9/package.use.force,v 1.1 2009/10/02 15:46:56 haubi Exp $
-
-# still need scandir() from gnulib on solaris2.9
-app-admin/eselect-python gnulib
diff --git a/profiles/prefix/sunos/solaris/5.9/package.use.mask b/profiles/prefix/sunos/solaris/5.9/package.use.mask
deleted file mode 100644
index a255076..0000000
--- a/profiles/prefix/sunos/solaris/5.9/package.use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.9/package.use.mask,v 1.1 2011/11/16 15:44:41 grobian Exp $
-
-# Fabian Groffen <grobian@gentoo.org> (16 Nov 2011)
-# jit not supported on sparc
-dev-libs/libpcre jit
-
diff --git a/profiles/prefix/sunos/solaris/5.9/parent b/profiles/prefix/sunos/solaris/5.9/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/sunos/solaris/5.9/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/sunos/solaris/5.9/sparc/make.defaults b/profiles/prefix/sunos/solaris/5.9/sparc/make.defaults
deleted file mode 100644
index 79144ae..0000000
--- a/profiles/prefix/sunos/solaris/5.9/sparc/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.9/sparc/make.defaults,v 1.1 2009/06/06 03:55:05 solar Exp $
-
-ARCH="sparc-solaris"
-CHOST="sparc-sun-solaris2.9"
-ACCEPT_KEYWORDS="~sparc-solaris"
-
diff --git a/profiles/prefix/sunos/solaris/5.9/sparc/parent b/profiles/prefix/sunos/solaris/5.9/sparc/parent
deleted file mode 100644
index 133d186..0000000
--- a/profiles/prefix/sunos/solaris/5.9/sparc/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/sparc
-..
diff --git a/profiles/prefix/sunos/solaris/5.9/sparc64/make.defaults b/profiles/prefix/sunos/solaris/5.9/sparc64/make.defaults
deleted file mode 100644
index 1cf4b34..0000000
--- a/profiles/prefix/sunos/solaris/5.9/sparc64/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.9/sparc64/make.defaults,v 1.1 2009/06/06 03:55:06 solar Exp $
-
-ARCH="sparc64-solaris"
-CHOST="sparcv9-sun-solaris2.9"
-ACCEPT_KEYWORDS="~sparc64-solaris"
-
diff --git a/profiles/prefix/sunos/solaris/5.9/sparc64/parent b/profiles/prefix/sunos/solaris/5.9/sparc64/parent
deleted file mode 100644
index 9dbef0d..0000000
--- a/profiles/prefix/sunos/solaris/5.9/sparc64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../arch/sparc64
-..
diff --git a/profiles/prefix/sunos/solaris/arch/sparc/package.use.mask b/profiles/prefix/sunos/solaris/arch/sparc/package.use.mask
deleted file mode 100644
index 164c94a..0000000
--- a/profiles/prefix/sunos/solaris/arch/sparc/package.use.mask
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/arch/sparc/package.use.mask,v 1.1 2011/12/30 16:20:17 grobian Exp $
-
-# The 32-bits profile is inherited by the 64-bits one!
-# All the Solaris profiles inherit from their matching arch profile here.
-
-
-# Fabian Groffen <grobian@gentoo.org> (16 Nov 2011)
-# jit not supported on sparc
-dev-libs/libpcre jit
-
diff --git a/profiles/prefix/sunos/solaris/arch/sparc64/package.use.mask b/profiles/prefix/sunos/solaris/arch/sparc64/package.use.mask
deleted file mode 100644
index 3071cd1..0000000
--- a/profiles/prefix/sunos/solaris/arch/sparc64/package.use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/arch/sparc64/package.use.mask,v 1.1 2011/12/30 16:20:17 grobian Exp $
-
-# The 32-bits profile is inherited by the 64-bits one!
-# All the Solaris profiles inherit from their matching arch profile here.
-
-
diff --git a/profiles/prefix/sunos/solaris/arch/sparc64/parent b/profiles/prefix/sunos/solaris/arch/sparc64/parent
deleted file mode 100644
index 0d45c16..0000000
--- a/profiles/prefix/sunos/solaris/arch/sparc64/parent
+++ /dev/null
@@ -1 +0,0 @@
-../sparc
diff --git a/profiles/prefix/sunos/solaris/arch/x64/package.use.mask b/profiles/prefix/sunos/solaris/arch/x64/package.use.mask
deleted file mode 100644
index 4a53a68..0000000
--- a/profiles/prefix/sunos/solaris/arch/x64/package.use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/arch/x64/package.use.mask,v 1.1 2011/12/30 16:20:18 grobian Exp $
-
-# The 32-bits profile is inherited by the 64-bits one!
-# All the Solaris profiles inherit from their matching arch profile here.
-
-
diff --git a/profiles/prefix/sunos/solaris/arch/x64/parent b/profiles/prefix/sunos/solaris/arch/x64/parent
deleted file mode 100644
index e6e4a52..0000000
--- a/profiles/prefix/sunos/solaris/arch/x64/parent
+++ /dev/null
@@ -1 +0,0 @@
-../x86
diff --git a/profiles/prefix/sunos/solaris/arch/x86/package.use.mask b/profiles/prefix/sunos/solaris/arch/x86/package.use.mask
deleted file mode 100644
index 09f46a0..0000000
--- a/profiles/prefix/sunos/solaris/arch/x86/package.use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/arch/x86/package.use.mask,v 1.1 2011/12/30 16:20:18 grobian Exp $
-
-# The 32-bits profile is inherited by the 64-bits one!
-# All the Solaris profiles inherit from their matching arch profile here.
-
-
diff --git a/profiles/prefix/sunos/solaris/make.defaults b/profiles/prefix/sunos/solaris/make.defaults
deleted file mode 100644
index cfb63f6..0000000
--- a/profiles/prefix/sunos/solaris/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/make.defaults,v 1.1 2012/09/09 10:23:33 grobian Exp $
-
-# Solaris comes with ipv6 support since Solaris 7, full ipv6 integration
-# since Solaris 8.  Let's enjoy that we have it.
-USE="ipv6"
diff --git a/profiles/prefix/sunos/solaris/package.use.force b/profiles/prefix/sunos/solaris/package.use.force
deleted file mode 100644
index 7d340ec..0000000
--- a/profiles/prefix/sunos/solaris/package.use.force
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/package.use.force,v 1.1 2011/12/08 08:11:38 grobian Exp $
-
-# Fabian Groffen <grobian@gentoo.org> (08 Dec 2011)
-# Force libssp, Solaris' libc doesn't have stack protection symbols,
-# hence without this, -fstack-protector fails with linker unresolved
-# symbol errors.
-sys-devel/gcc libssp
-
diff --git a/profiles/prefix/sunos/solaris/package.use.mask b/profiles/prefix/sunos/solaris/package.use.mask
deleted file mode 100644
index c85aeb2..0000000
--- a/profiles/prefix/sunos/solaris/package.use.mask
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/package.use.mask,v 1.7 2011/12/30 16:20:16 grobian Exp $
-
-
-# Fabian Groffen <grobian@gentoo.org> (08 Dec 2011)
-# Unmask libssp, Solaris' libc doesn't have stack protection symbols
-sys-devel/gcc -libssp
-
-# Fabian Groffen <grobian@gentoo.org> (05 Sep 2011)
-# gir tries to link c++ code using gcc and obviously fails
-app-text/poppler introspection
-
-# Fabian Groffen <grobian@gentoo.org> (24 Apr 2011)
-# kms seems linux only, bug #319285
-x11-libs/libdrm libkms
-
-# Jeremy Olexa <darkside@gentoo.org> (03 Dec 2008)
-# Fails to compile on Solaris, bug #245659
-media-gfx/inkscape lcms
diff --git a/profiles/prefix/sunos/solaris/parent b/profiles/prefix/sunos/solaris/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/sunos/solaris/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/sunos/solaris/profile.bashrc b/profiles/prefix/sunos/solaris/profile.bashrc
deleted file mode 100644
index e73cb47..0000000
--- a/profiles/prefix/sunos/solaris/profile.bashrc
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/profile.bashrc,v 1.1 2012/11/10 09:46:11 grobian Exp $
-
-# Automatically determine whether or not gen_usr_ldscript should be
-# doing something or not.  This is necessary due to previous screwups,
-# which may have lead to people bootstrapping already without
-# gen_usr_ldscript being active, while existing installs should remain
-# untouched for now.
-if [[ -z ${PREFIX_DISABLE_GEN_USR_LDSCRIPT} ]] ; then
-	[[ ! -e ${EPREFIX}/lib/libz.so.1 ]] \
-		&& PREFIX_DISABLE_GEN_USR_LDSCRIPT=yes
-fi
diff --git a/profiles/prefix/sunos/use.force b/profiles/prefix/sunos/use.force
deleted file mode 100644
index b43713a..0000000
--- a/profiles/prefix/sunos/use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/use.force,v 1.1 2009/06/06 03:54:58 solar Exp $
-
-# Re-add Solaris OS
-kernel_SunOS
-elibc_SunOS
diff --git a/profiles/prefix/sunos/use.mask b/profiles/prefix/sunos/use.mask
deleted file mode 100644
index bc066bf..0000000
--- a/profiles/prefix/sunos/use.mask
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/use.mask,v 1.4 2013/02/02 13:12:29 grobian Exp $
-
-# Re-add SunOS libc
--elibc_SunOS
--kernel_SunOS
-
-# these will more than likely never work on solaris
-3dfx
-3dnow
-3dnowext
-acpi
-alsa
-apm
-cap
-caps
-cman
-clvm
-directfb
-divx4linux
-djbfft
-emul-linux-x86
-fbcon
-fdftk
-fmod
-ggi
-gpm
-hardened
-icc
-icc-pgo
-mmx
-mmx2
-# the following USE flag requires device-mapper
-on-the-fly-crypt
-oss
-solid
-sse
-sse2
-svga
-sybase
-sybase-ct
-rtc
-uclibc
-voodoo3
-pvm
-v4l
diff --git a/profiles/prefix/use.force b/profiles/prefix/use.force
deleted file mode 100644
index 1077439..0000000
--- a/profiles/prefix/use.force
+++ /dev/null
@@ -1,10 +0,0 @@
-# unforce the GNU/Linux ELIBC, KERNEL, and USERLAND
-# flags that come from the base profile
--elibc_glibc
--kernel_linux
-
-# force prefix flag to be set
-prefix
-
-# force GNU userland (even though base profile sets this too)
-userland_GNU
diff --git a/profiles/prefix/use.mask b/profiles/prefix/use.mask
deleted file mode 100644
index c88bbdb..0000000
--- a/profiles/prefix/use.mask
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/use.mask,v 1.7 2012/12/26 11:46:02 heroxbd Exp $
-
-# multilib is never going to work as expected in Prefix
-multilib
-
-# Mask all glibc/linux combination, unmasked in the appropriate profiles
-elibc_glibc
-kernel_linux
-
-# re-add userland GNU
--userland_GNU
-
-# USE flags inherited by the base/use.defaults file that shouldn't be in Prefix
-cups
-gpm
-
-# prefix USE flag should always be unmasked in prefix profiles
--prefix
-
-# USE=acl will probably never work because of how it is related to the kernel
-# and Gentoo Prefix does not have access to that. Also, definately problems with
-# coreutils on darwin.
-acl
-
-# USE=pam just does not make sense in Gentoo Prefix. Should be using the host
-# auth system.
-pam
-
-# USE=udev just does not make sense in Gentoo Prefix. bug 293480
-udev
-
-# The JRuby stack adds *alot* of non-tested ebuilds. If someone has time and
-# motivation, please look into porting this to Gentoo Prefix. bug 302563
-ruby_targets_jruby
-
-# undo:
-# Mike Gilbert <floppym@gentoo.org> (08 Oct 2012)
-# Python 3.3 is masked for testing.
--python_targets_python3_3
--python_single_target_python3_3
-
-# suid requires root privilege, which is not support by prefix in general
-# one example: bug 447340.
-suid
diff --git a/profiles/prefix/windows/cygwin/1.7/package.provided b/profiles/prefix/windows/cygwin/1.7/package.provided
deleted file mode 100644
index 04ceaa8..0000000
--- a/profiles/prefix/windows/cygwin/1.7/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/cygwin/1.7/package.provided,v 1.1 2010/08/31 06:55:40 grobian Exp $
-
-sys-cygwin/libc-1.7
diff --git a/profiles/prefix/windows/cygwin/1.7/parent b/profiles/prefix/windows/cygwin/1.7/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/windows/cygwin/1.7/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/cygwin/1.7/x86/make.defaults b/profiles/prefix/windows/cygwin/1.7/x86/make.defaults
deleted file mode 100644
index 1ca464c..0000000
--- a/profiles/prefix/windows/cygwin/1.7/x86/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/cygwin/1.7/x86/make.defaults,v 1.1 2010/08/31 06:55:40 grobian Exp $
-
-ARCH="x86-cygwin"
-CHOST="i686-pc-cygwin1.7"
-ACCEPT_KEYWORDS="~x86-cygwin"
diff --git a/profiles/prefix/windows/cygwin/1.7/x86/parent b/profiles/prefix/windows/cygwin/1.7/x86/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/windows/cygwin/1.7/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/cygwin/make.defaults b/profiles/prefix/windows/cygwin/make.defaults
deleted file mode 100644
index ac24dae..0000000
--- a/profiles/prefix/windows/cygwin/make.defaults
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/cygwin/make.defaults,v 1.1 2010/08/31 06:55:40 grobian Exp $
-
-# System-wide defaults for all Cygwin profiles
-# This file should rarely need to be changed
-
-# 'Sane' defaults
-ELIBC="Cygwin"
-KERNEL="Cygwin"
-
-# no scanelf
-FEATURES="nostrip"
diff --git a/profiles/prefix/windows/cygwin/parent b/profiles/prefix/windows/cygwin/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/windows/cygwin/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/interix/3.5/package.provided b/profiles/prefix/windows/interix/3.5/package.provided
deleted file mode 100644
index 46dd414..0000000
--- a/profiles/prefix/windows/interix/3.5/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/3.5/package.provided,v 1.1 2009/06/06 03:55:07 solar Exp $
-
-sys-interix/libc-3.5
diff --git a/profiles/prefix/windows/interix/3.5/parent b/profiles/prefix/windows/interix/3.5/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/windows/interix/3.5/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/interix/3.5/x86/make.defaults b/profiles/prefix/windows/interix/3.5/x86/make.defaults
deleted file mode 100644
index aca12b8..0000000
--- a/profiles/prefix/windows/interix/3.5/x86/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/3.5/x86/make.defaults,v 1.1 2009/06/06 03:55:08 solar Exp $
-
-ARCH="x86-interix"
-CHOST="i586-pc-interix3.5"
-ACCEPT_KEYWORDS="~x86-interix"
diff --git a/profiles/prefix/windows/interix/3.5/x86/parent b/profiles/prefix/windows/interix/3.5/x86/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/windows/interix/3.5/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/interix/5.2/package.provided b/profiles/prefix/windows/interix/5.2/package.provided
deleted file mode 100644
index 6bc9115..0000000
--- a/profiles/prefix/windows/interix/5.2/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/5.2/package.provided,v 1.1 2009/06/06 03:55:08 solar Exp $
-
-sys-interix/libc-5.2
diff --git a/profiles/prefix/windows/interix/5.2/parent b/profiles/prefix/windows/interix/5.2/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/windows/interix/5.2/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/interix/5.2/x86/make.defaults b/profiles/prefix/windows/interix/5.2/x86/make.defaults
deleted file mode 100644
index 7c793df..0000000
--- a/profiles/prefix/windows/interix/5.2/x86/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/5.2/x86/make.defaults,v 1.1 2009/06/06 03:55:09 solar Exp $
-
-ARCH="x86-interix"
-CHOST="i586-pc-interix5.2"
-ACCEPT_KEYWORDS="~x86-interix"
diff --git a/profiles/prefix/windows/interix/5.2/x86/parent b/profiles/prefix/windows/interix/5.2/x86/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/windows/interix/5.2/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/interix/6.0/package.provided b/profiles/prefix/windows/interix/6.0/package.provided
deleted file mode 100644
index 7eef109..0000000
--- a/profiles/prefix/windows/interix/6.0/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/6.0/package.provided,v 1.1 2009/06/06 03:55:09 solar Exp $
-
-sys-interix/libc-6.0
diff --git a/profiles/prefix/windows/interix/6.0/parent b/profiles/prefix/windows/interix/6.0/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/windows/interix/6.0/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/interix/6.0/use.mask b/profiles/prefix/windows/interix/6.0/use.mask
deleted file mode 100644
index 3accb43..0000000
--- a/profiles/prefix/windows/interix/6.0/use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/6.0/use.mask,v 1.3 2009/08/14 15:31:30 mduft Exp $
-
-# Markus Duft <mduft@gentoo.org> (7 Jul 2009)
-# Unmask the globally masked i6fork USE flag to allow
-# interix 6 fork to be fixed by linking libi6fork.
--i6fork
diff --git a/profiles/prefix/windows/interix/6.0/x86/make.defaults b/profiles/prefix/windows/interix/6.0/x86/make.defaults
deleted file mode 100644
index 63c928a..0000000
--- a/profiles/prefix/windows/interix/6.0/x86/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/6.0/x86/make.defaults,v 1.3 2011/05/24 12:59:38 mduft Exp $
-
-# the CHOST version number is the version number of the host libc, not the version of the interix SDK package.
-
-ARCH="x86-interix"
-CHOST="i586-pc-interix6.0"
-ACCEPT_KEYWORDS="~x86-interix"
diff --git a/profiles/prefix/windows/interix/6.0/x86/parent b/profiles/prefix/windows/interix/6.0/x86/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/windows/interix/6.0/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/interix/6.1/package.provided b/profiles/prefix/windows/interix/6.1/package.provided
deleted file mode 100644
index af6198d..0000000
--- a/profiles/prefix/windows/interix/6.1/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/6.1/package.provided,v 1.1 2010/03/04 12:45:46 mduft Exp $
-
-sys-interix/libc-6.1
diff --git a/profiles/prefix/windows/interix/6.1/parent b/profiles/prefix/windows/interix/6.1/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/windows/interix/6.1/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/interix/6.1/use.mask b/profiles/prefix/windows/interix/6.1/use.mask
deleted file mode 100644
index d6905bf..0000000
--- a/profiles/prefix/windows/interix/6.1/use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/6.1/use.mask,v 1.1 2010/03/04 12:45:46 mduft Exp $
-
-# Markus Duft <mduft@gentoo.org> (7 Jul 2009)
-# Unmask the globally masked i6fork USE flag to allow
-# interix 6 fork to be fixed by linking libi6fork.
--i6fork
diff --git a/profiles/prefix/windows/interix/6.1/x86/make.defaults b/profiles/prefix/windows/interix/6.1/x86/make.defaults
deleted file mode 100644
index 1d09699..0000000
--- a/profiles/prefix/windows/interix/6.1/x86/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/6.1/x86/make.defaults,v 1.5 2011/05/24 12:59:38 mduft Exp $
-
-# the CHOST version number is the version number of the host libc, not the version of the interix SDK package.
-
-ARCH="x86-interix"
-CHOST="i586-pc-interix6.1"
-ACCEPT_KEYWORDS="~x86-interix"
diff --git a/profiles/prefix/windows/interix/6.1/x86/parent b/profiles/prefix/windows/interix/6.1/x86/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/windows/interix/6.1/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/interix/make.defaults b/profiles/prefix/windows/interix/make.defaults
deleted file mode 100644
index 1105eec..0000000
--- a/profiles/prefix/windows/interix/make.defaults
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/make.defaults,v 1.2 2009/06/30 16:35:03 darkside Exp $
-
-# System-wide defaults for all Interix profiles
-# This file should rarely need to be changed
-
-# 'Sane' defaults
-ELIBC="Interix"
-KERNEL="Interix"
-
-# no scanelf
-FEATURES="nostrip"
diff --git a/profiles/prefix/windows/interix/package.use.force b/profiles/prefix/windows/interix/package.use.force
deleted file mode 100644
index a12ca5f..0000000
--- a/profiles/prefix/windows/interix/package.use.force
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/package.use.force,v 1.2 2010/11/16 08:16:36 mduft Exp $
-
-# Markus Duft <mduft@gentoo.org> (28 Oct 2010)
-# really need them statically, as long as portage uses coreutils
-# during merge. if re-merging suacomp, utilities don't work otherwise.
-sys-apps/coreutils static
-
-sys-devel/binutils-config extwrapper
diff --git a/profiles/prefix/windows/interix/package.use.mask b/profiles/prefix/windows/interix/package.use.mask
deleted file mode 100644
index cb99456..0000000
--- a/profiles/prefix/windows/interix/package.use.mask
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/package.use.mask,v 1.3 2011/08/09 12:36:57 mduft Exp $
-
-# Markus Duft <mduft@gentoo.org> (9 Aug 2011)
-# mask uuid flag on apr, which would tear in util-linux, which is
-# far from building on interix.
-dev-libs/apr uuid
-
-# Markus Duft <mduft@gentoo.org> (9 Aug 2011)
-# mask git flag from gettext, as gettext's build tries to munge
-# some archives with 'root' group, which doesn't exist on interix
-# (not even with user/group mapping through suacomp).
-sys-devel/gettext git
-
-# Markus Duft <mduft@gentoo.org> (28 Oct 2010)
-# mask optimization flags from eix, as they cause build troubles
-# wrt visibility flags - seems gcc 4.2.4 on interix needs another
-# patch (it already has one to disable -fvisibility=, but that
-# seems to miss -fvisibility-inlines-hidden, etc.)
-app-portage/eix optimization strong-optimization
-
-dev-scheme/guile threads
-x11-wm/fluxbox nls
-net-libs/libsoup ssl
-app-arch/pdv X
-
diff --git a/profiles/prefix/windows/interix/packages b/profiles/prefix/windows/interix/packages
deleted file mode 100644
index c455db7..0000000
--- a/profiles/prefix/windows/interix/packages
+++ /dev/null
@@ -1,3 +0,0 @@
-# suacomp library is required on interix now! this is a crucial part of the system.
-# without it, there is only a broken poll, no multi-cpu/core support, etc...
-*sys-libs/suacomp
diff --git a/profiles/prefix/windows/interix/parent b/profiles/prefix/windows/interix/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/windows/interix/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/interix/profile.bashrc b/profiles/prefix/windows/interix/profile.bashrc
deleted file mode 100644
index 3a32d78..0000000
--- a/profiles/prefix/windows/interix/profile.bashrc
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/profile.bashrc,v 1.5 2010/10/22 07:30:09 mduft Exp $
-
-# use bash as config shell. this avoids _big_ problems with new libtool (>=2.2.10),
-# as wrong asumptions about the shell arise when checking against /bin/sh.
-export CONFIG_SHELL=${BASH}
-
-# On interix, binary files (executables, shared libraries) in use
-# cannot be replaced during merge.
-# But it is possible to rename them and remove lateron when they are
-# not used any more by any running program.
-#
-# This is a workaround for portage bug#199868,
-# and should be dropped once portage does sth. like this itself.
-
-interix_cleanup_removed_files() {
-	local removedlist=$1
-	rm -f "${removedlist}".new
-
-	if [[ -r ${removedlist} ]]; then
-		rm -f "${removedlist}".old
-	fi
-	# restore in case of system fault
-	if [[ -r ${removedlist}.old ]]; then
-		mv "${removedlist}"{.old,}
-	fi
-
-	touch "${removedlist}"{,.new} # ensure they exist
-
-	while read rmstem; do
-		# try to remove previously recorded files
-		for f in "${ROOT}${rmstem}"*; do
-			ebegin "trying to remove ${f}"
-			rm -f "${f}" > /dev/null 2>&1
-			eend $?
-		done
-		# but keep it in list if still exists
-		for f in "${ROOT}${rmstem}"*; do
-			[[ -f ${f} ]] && echo "${rmstem}" >> "${removedlist}".new
-			break
-		done
-	done < "${removedlist}"
-
-	# update the list
-	mv "${removedlist}"{,.old}
-	mv "${removedlist}"{.new,}
-	rm "${removedlist}".old
-}
-
-interix_find_removed_slot() {
-	local f=$1
-	local n=0
-	while [[ ${n} -lt 100 && -f "${f}${n}" ]]; do
-		n=$((n=n+1))
-	done
-
-	if [[ ${n} -ge 100 ]]; then
-		echo "too many (>=100) old text files busy of '${f}'" >&2
-		exit 1
-	fi
-
-	echo $n
-}
-
-interix_prepare_file() {
-	local failed=0
-	if [[ ${PN} == libiconv ]]; then
-		# when moving around libiconv, the prefix' coreutils will
-		# be damaged, so we really need to use the systems ones.
-		/bin/cp -p "${1}" "${1}.new" || failed=1
-		/bin/mv "${1}" "${2}" || failed=1
-		/bin/mv "${1}.new" "${1}" || failed=1
-	else
-		my_mv=mv
-
-		[[ "${1}" == */mv ]] && my_mv="${1}.new"
-		[[ -f "${1}.new" ]] && rm -f "${1}.new"
-
-		cp -p "${1}" "${1}.new" || failed=1
-		${my_mv} "${1}" "${2}" || failed=1
-		${my_mv} "${1}.new" "${1}" || failed=1
-	fi
-
-	echo $failed
-}
-
-post_pkg_preinst() {
-	local removedlist="${EROOT}var/lib/portage/files2bremoved"
-	interix_cleanup_removed_files $removedlist
-	
-	# now go for current package
-	cd "${D}"
-	find ".${EROOT}" -type f | while read f;
-	do
-		/usr/bin/file "${f}" | grep ' PE ' > /dev/null || continue
-
-		f=${f#./} # find prints: "./path/to/file"
-		f=${f%:} # file prints: "file-argument: type-of-file"
-		test -r "${ROOT}${f}" || continue
-		rmstem="${f}.removedbyportage"
-		# keep list of old busy text files unique
-		grep -Fx "${rmstem}" "${removedlist}" >/dev/null \
-			|| echo "${rmstem}" >> "${removedlist}"
-
-		local n=$(interix_find_removed_slot ${ROOT}${rmstem})
-		ebegin "preparing ${ROOT}${f} for merge (${n})"
-		eend $(interix_prepare_file "${ROOT}${f}" "${ROOT}${rmstem}${n}")
-	done
-}
-
-post_pkg_prerm() {
-	local removedlist="${EROOT}var/lib/portage/files2bremoved"
-	save_IFS=$IFS
-	IFS='
-';
-	local MY_PR=${PR}
-	[[ ${MY_PR} == r0 ]] && MY_PR=
-	local -a contents=($(<"${EROOT}var/db/pkg/${CATEGORY}/${P}${MY_PR:+-}${MY_PR}/CONTENTS"));
-	IFS=$save_IFS
-	local -a cont
-	for content in "${contents[@]}"; do
-		cont=($content)
-		f=${cont[1]}
-		f=${f#/}
-
-		test -r "${ROOT}${f}" || continue
-
-		if /usr/bin/file "${ROOT}${f}" | grep ' PE ' > /dev/null; then
-			# $f should be an absolute path to the installed file
-			rmstem="${f}.removedbyportage"
-
-			grep "^${rmstem}$" "${removedlist}" > /dev/null \
-				|| echo "${rmstem}" >> "${removedlist}"
-
-			local n=$(interix_find_removed_slot ${ROOT}${rmstem})
-			ebegin "preparing ${ROOT}${f} for unmerge ($n)"
-			eend $(interix_prepare_file "${ROOT}${f}" "${ROOT}${rmstem}${n}")
-		fi
-	done
-}
-
-pre_pkg_postrm() {
-	local removedlist="${EROOT}var/lib/portage/files2bremoved"
-	interix_cleanup_removed_files $removedlist
-}
diff --git a/profiles/prefix/windows/interix/use.force b/profiles/prefix/windows/interix/use.force
deleted file mode 100644
index 19428a0..0000000
--- a/profiles/prefix/windows/interix/use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/use.force,v 1.1 2009/06/06 03:55:07 solar Exp $
-
-# Re-add Interix on Windows OS
-kernel_Interix
-elibc_Interix
diff --git a/profiles/prefix/windows/interix/use.mask b/profiles/prefix/windows/interix/use.mask
deleted file mode 100644
index 7b2ef4e..0000000
--- a/profiles/prefix/windows/interix/use.mask
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/use.mask,v 1.11 2011/11/01 00:56:22 ssuominen Exp $
-
-# Re-add Interix libc
--elibc_Interix
--kernel_Interix
-
-# these will more than likely never work on Interix
-3dfx
-acpi
-alsa
-altivec
-apm
-bluetooth
-cap
-caps
-cdr
-coreaudio
-dga
-directfb
-divx4linux
-djbfft
-dri
-dvdr
-# missing implementation for unexec()
-emacs
-xemacs
-emul-linux-x86
-fbcon
-fdftk
-fmod
-ggi
-glut
-gpm
-gps
-hardened
-hddtemp
-ibm
-icc
-icc-pgo
-ieee1394
-ifc
-ipod
-ipv6
-java
-lm_sensors
-matrox
-netboot
-old-linux
-# requires device-mapper
-on-the-fly-crypt
-opengl
-oss
-pam
-pcmcia
-pda
-rtc
-selinux
-scanner
-smartcard
-svga
-uclibc
-#  totally b0rked on interix
-unicode
-usb
-voodoo3
-pvm
-v4l
-wifi
-
-# these are USE flags that don't _currently_ work, but may will in the future.
-ffmpeg
-fftw
-flac
-jack
-joystick
-kerberos
-ladspa
-libedit
-# bug #310007
-multitarget
-# not working yet on interix
-openmp
-portaudio
-pulseaudio
-qt4
-# libtiff only static, so avoid this!
-tiff
-timidity
diff --git a/profiles/prefix/windows/parent b/profiles/prefix/windows/parent
deleted file mode 100644
index cd11492..0000000
--- a/profiles/prefix/windows/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../base
-..
diff --git a/profiles/prefix/windows/winnt/3.5/package.provided b/profiles/prefix/windows/winnt/3.5/package.provided
deleted file mode 100644
index 86c3f75..0000000
--- a/profiles/prefix/windows/winnt/3.5/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/winnt/3.5/package.provided,v 1.1 2009/06/06 03:55:11 solar Exp $
-
-sys-winnt/libc-3.5
diff --git a/profiles/prefix/windows/winnt/3.5/parent b/profiles/prefix/windows/winnt/3.5/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/windows/winnt/3.5/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/winnt/3.5/x86/make.defaults b/profiles/prefix/windows/winnt/3.5/x86/make.defaults
deleted file mode 100644
index 867e076..0000000
--- a/profiles/prefix/windows/winnt/3.5/x86/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/winnt/3.5/x86/make.defaults,v 1.1 2009/06/06 03:55:11 solar Exp $
-
-ARCH="x86-winnt"
-CHOST="i586-pc-winnt3.5"
-ACCEPT_KEYWORDS="~x86-winnt"
diff --git a/profiles/prefix/windows/winnt/3.5/x86/parent b/profiles/prefix/windows/winnt/3.5/x86/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/windows/winnt/3.5/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/winnt/5.2/package.provided b/profiles/prefix/windows/winnt/5.2/package.provided
deleted file mode 100644
index 99d7293..0000000
--- a/profiles/prefix/windows/winnt/5.2/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/winnt/5.2/package.provided,v 1.1 2009/06/06 03:55:12 solar Exp $
-
-sys-winnt/libc-5.2
diff --git a/profiles/prefix/windows/winnt/5.2/parent b/profiles/prefix/windows/winnt/5.2/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/windows/winnt/5.2/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/winnt/5.2/x86/make.defaults b/profiles/prefix/windows/winnt/5.2/x86/make.defaults
deleted file mode 100644
index f606bd9..0000000
--- a/profiles/prefix/windows/winnt/5.2/x86/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/winnt/5.2/x86/make.defaults,v 1.1 2009/06/06 03:55:12 solar Exp $
-
-ARCH="x86-winnt"
-CHOST="i586-pc-winnt5.2"
-ACCEPT_KEYWORDS="~x86-winnt"
diff --git a/profiles/prefix/windows/winnt/5.2/x86/parent b/profiles/prefix/windows/winnt/5.2/x86/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/windows/winnt/5.2/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/winnt/6.0/package.provided b/profiles/prefix/windows/winnt/6.0/package.provided
deleted file mode 100644
index 579e488..0000000
--- a/profiles/prefix/windows/winnt/6.0/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/winnt/6.0/package.provided,v 1.1 2009/06/06 03:55:13 solar Exp $
-
-sys-winnt/libc-6.0
diff --git a/profiles/prefix/windows/winnt/6.0/parent b/profiles/prefix/windows/winnt/6.0/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/windows/winnt/6.0/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/winnt/6.0/x86/make.defaults b/profiles/prefix/windows/winnt/6.0/x86/make.defaults
deleted file mode 100644
index 2af65d8..0000000
--- a/profiles/prefix/windows/winnt/6.0/x86/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/winnt/6.0/x86/make.defaults,v 1.1 2009/06/06 03:55:13 solar Exp $
-
-ARCH="x86-winnt"
-CHOST="i586-pc-winnt6.0"
-ACCEPT_KEYWORDS="~x86-winnt"
diff --git a/profiles/prefix/windows/winnt/6.0/x86/parent b/profiles/prefix/windows/winnt/6.0/x86/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/windows/winnt/6.0/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/winnt/6.1/package.provided b/profiles/prefix/windows/winnt/6.1/package.provided
deleted file mode 100644
index 9cd529d..0000000
--- a/profiles/prefix/windows/winnt/6.1/package.provided
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/winnt/6.1/package.provided,v 1.1 2010/03/04 12:45:49 mduft Exp $
-
-sys-winnt/libc-6.1
diff --git a/profiles/prefix/windows/winnt/6.1/parent b/profiles/prefix/windows/winnt/6.1/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/windows/winnt/6.1/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/winnt/6.1/x86/make.defaults b/profiles/prefix/windows/winnt/6.1/x86/make.defaults
deleted file mode 100644
index 10bb24b..0000000
--- a/profiles/prefix/windows/winnt/6.1/x86/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/winnt/6.1/x86/make.defaults,v 1.1 2010/03/04 12:45:50 mduft Exp $
-
-ARCH="x86-winnt"
-CHOST="i586-pc-winnt6.1"
-ACCEPT_KEYWORDS="~x86-winnt"
diff --git a/profiles/prefix/windows/winnt/6.1/x86/parent b/profiles/prefix/windows/winnt/6.1/x86/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/windows/winnt/6.1/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/winnt/make.defaults b/profiles/prefix/windows/winnt/make.defaults
deleted file mode 100644
index b574c3b..0000000
--- a/profiles/prefix/windows/winnt/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/winnt/make.defaults,v 1.2 2009/06/30 16:35:04 darkside Exp $
-
-# System-wide defaults for all Windows profiles
-# This file should rarely need to be changed
-
-# 'Sane' defaults
-ELIBC="Winnt"
-KERNEL="Winnt"
-
-FEATURES="nostrip"
diff --git a/profiles/prefix/windows/winnt/packages b/profiles/prefix/windows/winnt/packages
deleted file mode 100644
index 37e9a49..0000000
--- a/profiles/prefix/windows/winnt/packages
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/winnt/packages,v 1.7 2011/12/06 16:03:10 vapier Exp $
-
-# those are packages not available/required on winnt, since
-# winnt can be a child EPREFIX only, which tears it's DEPENDS
-# from a parent (e.g. x86-interix) prefix.
-
--*sys-apps/grep
--*app-arch/gzip
--*sys-devel/libtool
--*virtual/man
--*sys-devel/patch
--*sys-devel/flex
--*sys-apps/gawk
--*app-arch/tar
--*sys-apps/sed
--*sys-devel/bison
--*sys-apps/texinfo
--*sys-apps/file
--*app-arch/bzip2
--*net-misc/rsync
--*sys-devel/automake
--*virtual/editor
--*sys-apps/coreutils
--*sys-devel/make
--*sys-apps/findutils
--*sys-devel/m4
--*net-misc/wget
--*sys-apps/which
--*virtual/pager
--*sys-apps/diffutils
--*sys-apps/baselayout-prefix
--*app-shells/bash
--*virtual/package-manager
--*virtual/ssh
--*sys-devel/autoconf
--*sys-devel/gnuconfig
--*sys-devel/gcc
diff --git a/profiles/prefix/windows/winnt/parent b/profiles/prefix/windows/winnt/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/prefix/windows/winnt/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/winnt/profile.bashrc b/profiles/prefix/windows/winnt/profile.bashrc
deleted file mode 100644
index dfa1244..0000000
--- a/profiles/prefix/windows/winnt/profile.bashrc
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/winnt/profile.bashrc,v 1.1 2009/06/06 03:55:10 solar Exp $
-
-# On windows, binary files (executables, shared libraries) in use
-# cannot be replaced during merge.
-# But it is possible to rename them and remove lateron when they are
-# not used any more by any running program.
-#
-# This is a workaround for portage bug#199868,
-# and should be dropped once portage does sth. like this itself.
-#
-
-# Need to explicitly set PKG_CONFIG_PATH for cross EPREFIX.
-export PKG_CONFIG_PATH="${EPREFIX}/lib/pkgconfig:${EPREFIX}/usr/lib/pkgconfig"
-
-windows_cleanup_removed_files() {
-	local removedlist=$1
-	rm -f "${removedlist}".new
-
-	if [[ -r ${removedlist} ]]; then
-		rm -f "${removedlist}".old
-	fi
-	# restore in case of system fault
-	if [[ -r ${removedlist}.old ]]; then
-		mv "${removedlist}"{.old,}
-	fi
-
-	touch "${removedlist}"{,.new} # ensure they exist
-
-	while read rmstem; do
-		# try to remove previously recorded files
-		for f in "${ROOT}${rmstem}"*; do
-			ebegin "trying to remove ${f}"
-			rm -f "${f}" > /dev/null 2>&1
-			eend $?
-		done
-		# but keep it in list if still exists
-		for f in "${ROOT}${rmstem}"*; do
-			[[ -f ${f} ]] && echo "${rmstem}" >> "${removedlist}".new
-			break
-		done
-	done < "${removedlist}"
-
-	# update the list
-	mv "${removedlist}"{,.old}
-	mv "${removedlist}"{.new,}
-	rm "${removedlist}".old
-}
-
-windows_find_removed_slot() {
-	local f=$1
-	local n=0
-	while [[ ${n} -lt 100 && -f "${f}${n}" ]]; do
-		n=$((n=n+1))
-	done
-
-	if [[ ${n} -ge 100 ]]; then
-		echo "too many (>=100) old text files busy of '${f}'" >&2
-		exit 1
-	fi
-
-	echo $n
-}
-
-windows_prepare_file() {
-	local failed=0
-	my_mv=mv
-
-	[[ "${1}" == */mv ]] && my_mv="${1}.new"
-	[[ -f "${1}.new" ]] && rm -f "${1}.new"
-
-	cp -p "${1}" "${1}.new" || failed=1
-	${my_mv} "${1}" "${2}" || failed=1
-	${my_mv} "${1}.new" "${1}" || failed=1
-
-	echo $failed
-}
-
-post_src_install() {
-	cd "${ED}"
-	find . -name '*.exe' | while read f; do
-		if file "${f}" | grep "GUI" > /dev/null 2>&1; then
-			if test ! -f "${f%.exe}"; then
-				einfo "Windows GUI Executable $f will have no symlink."
-			fi
-		else
-			if test ! -f "${f%.exe}"; then
-				ebegin "creating ${f%.exe} -> ${f} for console accessibility."
-				eend $(ln -sf "$(basename "${f}")" "${f%.exe}" && echo 0 || echo 1)
-			fi
-		fi
-	done
-}
-
-post_pkg_preinst() {
-	local removedlist="${EROOT}var/lib/portage/files2bremoved"
-	windows_cleanup_removed_files $removedlist
-	
-	# now go for current package
-	cd "${D}"
-	find ".${EROOT}" -type f | xargs -r /usr/bin/file | grep ' PE ' | while read f t
-	do
-		f=${f#./} # find prints: "./path/to/file"
-		f=${f%:} # file prints: "file-argument: type-of-file"
-		test -r "${ROOT}${f}" || continue
-		rmstem="${f}.removedbyportage"
-		# keep list of old busy text files unique
-		grep "^${rmstem}$" "${removedlist}" >/dev/null \
-			|| echo "${rmstem}" >> "${removedlist}"
-
-		local n=$(windows_find_removed_slot ${ROOT}${rmstem})
-		ebegin "backing up text file ${ROOT}${f} (${n})"
-		eend $(windows_prepare_file "${ROOT}${f}" "${ROOT}${rmstem}${n}")
-	done
-}
-
-post_pkg_prerm() {
-	local removedlist="${EROOT}var/lib/portage/files2bremoved"
-	save_IFS=$IFS
-	IFS='
-';
-	local MY_PR=${PR}
-	[[ ${MY_PR} == r0 ]] && MY_PR=
-	local -a contents=($(<"${EROOT}var/db/pkg/${CATEGORY}/${P}${MY_PR:+-}${MY_PR}/CONTENTS"));
-	IFS=$save_IFS
-	local -a cont
-	for content in "${contents[@]}"; do
-		cont=($content)
-		f=${cont[1]}
-		f=${f#/}
-
-		test -r "${ROOT}${f}" || continue
-
-		if /usr/bin/file "${ROOT}${f}" | grep ' PE ' > /dev/null; then
-			# $f should be an absolute path to the installed file
-			rmstem="${f}.removedbyportage"
-
-			grep "^${rmstem}$" "${removedlist}" > /dev/null \
-				|| echo "${rmstem}" >> "${removedlist}"
-
-			local n=$(windows_find_removed_slot ${ROOT}${rmstem})
-			ebegin "preparing ${ROOT}${f} for unmerge ($n)"
-			eend $(windows_prepare_file "${ROOT}${f}" "${ROOT}${rmstem}${n}")
-		fi
-	done
-}
-
-pre_pkg_postrm() {
-	local removedlist="${EROOT}var/lib/portage/files2bremoved"
-	windows_cleanup_removed_files $removedlist
-}
diff --git a/profiles/prefix/windows/winnt/use.mask b/profiles/prefix/windows/winnt/use.mask
deleted file mode 100644
index e8ec66d..0000000
--- a/profiles/prefix/windows/winnt/use.mask
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/winnt/use.mask,v 1.8 2011/11/01 00:56:22 ssuominen Exp $
-
-# Re-add Interix libc
--elibc_Winnt
--kernel_Winnt
-
-# these need a review, since they are just copied from interix
-# these will more than likely never work on Windows
-3dfx
-acpi
-alsa
-altivec
-apm
-bluetooth
-cap
-caps
-cdr
-coreaudio
-dga
-directfb
-divx4linux
-djbfft
-dri
-dvdr
-# emacs USE flag is masked because of missing implementation for unexec()
-emacs
-emul-linux-x86
-fbcon
-fdftk
-fmod
-ggi
-glut
-gpm
-gps
-hardened
-hddtemp
-ibm
-icc
-icc-pgo
-ieee1394
-ifc
-ipod
-ipv6
-lm_sensors
-matrox
-ncurses
-netboot
-old-linux
-# the following USE flag requires device-mapper
-on-the-fly-crypt
-opengl
-oss
-pcmcia
-pda
-rtc
-selinux
-scanner
-smartcard
-svga
-uclibc
-# unicode is totally b0rked on interix
-unicode
-usb
-voodoo3
-pvm
-v4l
-wifi
-
-# these are USE flags that don't _currently_ work, but may will in the future.
-ffmpeg
-fftw
-flac
-jack
-joystick
-ladspa
-# opennmp is not working yet on interix
-openmp
-portaudio
-pulseaudio
-qt4
-readline
-# libtiff only static, so avoid the tiff USE flag!
-tiff
-timidity
diff --git a/profiles/releases/10.0/eapi b/profiles/releases/10.0/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/releases/10.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/releases/10.0/make.defaults b/profiles/releases/10.0/make.defaults
deleted file mode 100644
index 57d6166..0000000
--- a/profiles/releases/10.0/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/releases/10.0/make.defaults,v 1.2 2011/02/13 16:53:40 arfrever Exp $
-
-# Adding this one, since it makes sense.
-USE="bzip2"
diff --git a/profiles/releases/10.0/parent b/profiles/releases/10.0/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/releases/10.0/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/releases/13.0/eapi b/profiles/releases/13.0/eapi
deleted file mode 100644
index 0cfbf08..0000000
--- a/profiles/releases/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/releases/13.0/make.defaults b/profiles/releases/13.0/make.defaults
deleted file mode 100644
index 1468b20..0000000
--- a/profiles/releases/13.0/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/releases/13.0/make.defaults,v 1.1 2013/01/14 21:02:57 dilfridge Exp $
-
-# Adding this one, since it makes sense.
-USE="bzip2"
diff --git a/profiles/releases/13.0/parent b/profiles/releases/13.0/parent
deleted file mode 100644
index 4e3b1cc..0000000
--- a/profiles/releases/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../eapi-5-files
diff --git a/profiles/releases/freebsd-8.2/package.use.mask b/profiles/releases/freebsd-8.2/package.use.mask
deleted file mode 100644
index f2b7c14..0000000
--- a/profiles/releases/freebsd-8.2/package.use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/releases/freebsd-8.2/package.use.mask,v 1.1 2012/07/06 23:11:51 naota Exp $
-
-# Not built due to lacking of O_CLOEXEC, bug #390387
-media-libs/mesa egl
diff --git a/profiles/releases/freebsd-8.2/packages b/profiles/releases/freebsd-8.2/packages
deleted file mode 100644
index 7eeb4ea..0000000
--- a/profiles/releases/freebsd-8.2/packages
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/releases/freebsd-8.2/packages,v 1.1 2011/07/06 05:50:23 aballier Exp $
-
-*>=sys-apps/baselayout-2.0.0
-*>=sys-apps/openrc-0.2.5
diff --git a/profiles/releases/freebsd-8.2/parent b/profiles/releases/freebsd-8.2/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/releases/freebsd-8.2/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/releases/freebsd-9.1/packages b/profiles/releases/freebsd-9.1/packages
deleted file mode 100644
index 5306051..0000000
--- a/profiles/releases/freebsd-9.1/packages
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/releases/freebsd-9.1/packages,v 1.1 2012/08/07 20:46:10 aballier Exp $
-
-*>=sys-apps/baselayout-2.0.0
-*>=sys-apps/openrc-0.2.5
diff --git a/profiles/releases/freebsd-9.1/parent b/profiles/releases/freebsd-9.1/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/releases/freebsd-9.1/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/releases/freebsd-9.2/packages b/profiles/releases/freebsd-9.2/packages
deleted file mode 100644
index b4adfee..0000000
--- a/profiles/releases/freebsd-9.2/packages
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/releases/freebsd-9.2/packages,v 1.1 2013/08/09 14:09:22 aballier Exp $
-
-*>=sys-apps/baselayout-2.0.0
-*>=sys-apps/openrc-0.2.5
diff --git a/profiles/releases/freebsd-9.2/parent b/profiles/releases/freebsd-9.2/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/releases/freebsd-9.2/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/releases/make.defaults b/profiles/releases/make.defaults
deleted file mode 100644
index 110c540..0000000
--- a/profiles/releases/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/releases/make.defaults,v 1.5 2013/07/30 00:31:00 mattst88 Exp $
-
-# These USE flags are what is common between the various sub-profiles. Stages 2
-# and 3 are built against these, so be careful what you add.
-USE="acl gdbm nptl unicode"
diff --git a/profiles/targets/desktop/gnome/make.defaults b/profiles/targets/desktop/gnome/make.defaults
deleted file mode 100644
index 39db2da..0000000
--- a/profiles/targets/desktop/gnome/make.defaults
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/gnome/make.defaults,v 1.8 2013/07/11 20:45:39 pacho Exp $
-
-USE="colord eds evo gnome gnome-keyring gnome-online-accounts gstreamer introspection libsecret nautilus pulseaudio socialweb"
diff --git a/profiles/targets/desktop/gnome/package.use b/profiles/targets/desktop/gnome/package.use
deleted file mode 100644
index 2566368..0000000
--- a/profiles/targets/desktop/gnome/package.use
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/gnome/package.use,v 1.19 2013/06/06 05:34:50 tetromino Exp $
-
-# Required for cheese in gnome3
->=media-libs/gst-plugins-base-1.0 theora
-
-# Required for gnome-base/gnome-2.32 to be merged directly, for
-# gnome-extra/hamster-applet-2.32 and x11-misc/alacarte-0.13
-dev-lang/python sqlite
-gnome-base/gnome-menus python
-
-# REQUIRED_USE="?? ( pulseaudio gstreamer )", and we want pulse in gnome
-net-misc/spice-gtk -gstreamer
-
-# Required by app-accessibility/orca-3
-app-accessibility/speech-dispatcher python
-
-# gtk3 input method plugins required for gnome3; gnome-shell wants ibus[dconf]
-app-i18n/ibus dconf gtk3
-app-i18n/uim gtk3
-
-# incompatible with >=evolution-data-server-3.6, bug #449138
-dev-vcs/giggle -eds
-
-# Required for webkit-gtk-2
-media-libs/harfbuzz icu
-
-# Pulled in by net-im/telepathy-connection-managers[msn] (via dev-python/papyon
-# and net-voip/telepathy-butterfly)
-net-libs/farsight2 python
-net-libs/libproxy python
-
-# Required by net-misc/vinagre-3
-net-libs/gtk-vnc gtk3
-
-# Required by dev-libs/folks[libsocialweb]
-net-libs/libsocialweb vala
-
-# The following are required by ekiga-3
-net-libs/opal sip
-net-libs/ptlib wav
-
-# For net-misc/vinagre-3.4 and gnome-boxes
-net-misc/spice-gtk gtk3
-
-# liboauth (required by evolution-data-server[gnome-online-accounts] and
-# gnome-documents in gnome-3.2) has +nss in IUSE, pulls in curl[-gnutls,nss]
-# In >=curl-7.25.0-r1, need CURL_SSL="-gnutls nss -openssl"
-net-misc/curl -curl_ssl_gnutls curl_ssl_nss -curl_ssl_openssl -gnutls nss
-dev-python/pycurl -curl_ssl_gnutls curl_ssl_nss -curl_ssl_openssl
-
-# Required by app-admin/sabayon
-x11-base/xorg-server kdrive
diff --git a/profiles/targets/desktop/gnome/parent b/profiles/targets/desktop/gnome/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/targets/desktop/gnome/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/targets/desktop/kde/make.defaults b/profiles/targets/desktop/kde/make.defaults
deleted file mode 100644
index 74cb1a3..0000000
--- a/profiles/targets/desktop/kde/make.defaults
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/kde/make.defaults,v 1.4 2011/06/06 20:11:28 dilfridge Exp $
-
-USE="consolekit declarative dri kde kipi phonon plasma policykit semantic-desktop xcomposite xinerama xscreensaver"
diff --git a/profiles/targets/desktop/kde/package.use b/profiles/targets/desktop/kde/package.use
deleted file mode 100644
index 08125c4..0000000
--- a/profiles/targets/desktop/kde/package.use
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/kde/package.use,v 1.6 2013/09/21 17:00:56 kensington Exp $
-
-# Required by kde-base/pykde4
-dev-python/PyQt4 script sql webkit
-
-# Required by app-office/akonadi-server
-dev-qt/qtsql mysql
-
-# Required by media-gfx/graphviz which is required by kde-base/kcachegrind
-media-libs/gd fontconfig
-
-# Required by dev-db/virtuoso-server
-sys-libs/zlib minizip
-
-# Not required, but makes life easier with Qt; bug 457934
-app-arch/unzip natspec
-
-# Required by kde-base/libkexiv2
-media-gfx/exiv2 xmp
diff --git a/profiles/targets/desktop/kde/package.use.force b/profiles/targets/desktop/kde/package.use.force
deleted file mode 100644
index dc59eff..0000000
--- a/profiles/targets/desktop/kde/package.use.force
+++ /dev/null
@@ -1,5 +0,0 @@
-# Michael Palimaka <kensington@gentoo.org> (21 Aug 2013)
-# Don't force consolekit on newer KDE versions.
-# It still defaults on in the ebuild, but forcing it can
-# conflict with systemd. See bug #468500.
-<kde-base/kdm-4.11.0 consolekit
diff --git a/profiles/targets/desktop/kde/parent b/profiles/targets/desktop/kde/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/targets/desktop/kde/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/targets/desktop/kde/use.force b/profiles/targets/desktop/kde/use.force
deleted file mode 100644
index 5a52ef0..0000000
--- a/profiles/targets/desktop/kde/use.force
+++ /dev/null
@@ -1,4 +0,0 @@
-# Force policykit on, other configurations are *maybe* possible but 
-# not supported. If you know how to disable this mask, you also know enough to 
-# handle the consequences.
-policykit
diff --git a/profiles/targets/desktop/make.defaults b/profiles/targets/desktop/make.defaults
deleted file mode 100644
index 5c13f82..0000000
--- a/profiles/targets/desktop/make.defaults
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/make.defaults,v 1.26 2013/01/20 13:43:03 dilfridge Exp $
-
-USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr consolekit cups dbus dri dts dvd dvdr emboss encode exif fam firefox flac gif gpm gtk jpeg lcms ldap libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt3support qt4 sdl spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb wxwidgets X xcb x264 xml xv xvid"
diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use
deleted file mode 100644
index 53b75e6..0000000
--- a/profiles/targets/desktop/package.use
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/package.use,v 1.30 2013/04/17 10:48:30 mgorny Exp $
-
-# Samuli Suominen <ssuominen@gentoo.org> (15 May 2012)
-# Replaced by USE="udisks" in make.defaults for -r1 and higher
-<gnome-base/gvfs-1.14 gdu -udisks
-
-# Jeremy Olexa <darkside@gentoo.org> (07 Oct 2011)
-# Required by mesa, ultimately by xorg-server (every desktop) bug 385843
-dev-libs/libxml2 python
-
-# Samuli Suominen <ssuominen@gentoo.org> (27 Sep 2011)
-# Required by mozilla browsers wrt #372419
-media-libs/libpng apng
-
-# Samuli Suominen <ssuominen@gentoo.org> (19 Dec 2010)
-# Required by udev helpers like udisks and upower
-sys-apps/systemd gudev introspection keymap
-sys-fs/eudev gudev hwdb introspection keymap
->=sys-fs/udev-171 gudev hwdb introspection keymap
->=virtual/udev-171 gudev hwdb introspection keymap
-
-# Samuli Suominen <ssuominen@gentoo.org> (19 Dec 2010)
-# Support for desktop file icons
-xfce-base/xfdesktop thunar
-
-# Chris Gianelloni <wolf31o2@gentoo.org> (26 Mar 2008)
-# While we may need LDAP client support, who needs the server on a desktop?
-# Did I mention that this also fixes the horrible perl dependency hell, too?
-net-nds/openldap minimal
diff --git a/profiles/targets/developer/make.defaults b/profiles/targets/developer/make.defaults
deleted file mode 100644
index 271cf5e..0000000
--- a/profiles/targets/developer/make.defaults
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/developer/make.defaults,v 1.12 2012/08/12 08:35:59 ssuominen Exp $
-
-# Remove "multilib-strict" for now wrt #424423
-FEATURES="collision-protect sign splitdebug test test-fail-continue userpriv usersandbox"
-
-# Disable branding (from desktop)
-USE="-branding"
-
-# As much as it pains me, we hope that developers know what they're doing.
-I_KNOW_WHAT_I_AM_DOING="yes"
-
-# Log eqawarn messages
-PORTAGE_ELOG_CLASSES="${PORTAGE_ELOG_CLASSES} qa"
diff --git a/profiles/targets/developer/parent b/profiles/targets/developer/parent
deleted file mode 100644
index 70b69b1..0000000
--- a/profiles/targets/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../server
-../desktop
diff --git a/profiles/targets/server/make.defaults b/profiles/targets/server/make.defaults
deleted file mode 100644
index 2ab279f..0000000
--- a/profiles/targets/server/make.defaults
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/server/make.defaults,v 1.3 2010/11/14 11:03:00 hwoarang Exp $
-
-USE="-perl -python snmp truetype xml"
diff --git a/profiles/targets/systemd/make.defaults b/profiles/targets/systemd/make.defaults
deleted file mode 100644
index d729c26..0000000
--- a/profiles/targets/systemd/make.defaults
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/systemd/make.defaults,v 1.1 2013/10/09 18:07:18 pacho Exp $
-
-USE="systemd"
diff --git a/profiles/targets/systemd/package.use.mask b/profiles/targets/systemd/package.use.mask
deleted file mode 100644
index e1a96b1..0000000
--- a/profiles/targets/systemd/package.use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/systemd/package.use.mask,v 1.1 2013/10/09 18:07:18 pacho Exp $
-
-# 'static-libs' support on sys-apps/systemd is not provided
-virtual/udev static-libs
-sys-fs/cryptsetup static static-libs
-sys-fs/lvm2 static static-libs
diff --git a/profiles/targets/systemd/use.mask b/profiles/targets/systemd/use.mask
deleted file mode 100644
index 1a827f8..0000000
--- a/profiles/targets/systemd/use.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# People running systemd must use logind instead, bug #478258
-consolekit
diff --git a/profiles/uclibc/amd64/make.defaults b/profiles/uclibc/amd64/make.defaults
deleted file mode 100644
index 44f6695..0000000
--- a/profiles/uclibc/amd64/make.defaults
+++ /dev/null
@@ -1,4 +0,0 @@
-ARCH="amd64"
-ACCEPT_KEYWORDS="amd64"
-
-CHOST="x86_64-gentoo-linux-uclibc"
diff --git a/profiles/uclibc/amd64/parent b/profiles/uclibc/amd64/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/uclibc/amd64/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/arm/2.4/parent b/profiles/uclibc/arm/2.4/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/uclibc/arm/2.4/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/arm/armeb/2.4/deprecated b/profiles/uclibc/arm/armeb/2.4/deprecated
deleted file mode 100644
index d6b062e..0000000
--- a/profiles/uclibc/arm/armeb/2.4/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-uclibc/arm/2.4
diff --git a/profiles/uclibc/arm/armeb/2.4/parent b/profiles/uclibc/arm/armeb/2.4/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/uclibc/arm/armeb/2.4/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/arm/armeb/deprecated b/profiles/uclibc/arm/armeb/deprecated
deleted file mode 100644
index 6f0cf29..0000000
--- a/profiles/uclibc/arm/armeb/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-uclibc/arm
diff --git a/profiles/uclibc/arm/armeb/make.defaults b/profiles/uclibc/arm/armeb/make.defaults
deleted file mode 100644
index 46ce233..0000000
--- a/profiles/uclibc/arm/armeb/make.defaults
+++ /dev/null
@@ -1 +0,0 @@
-CHOST="armeb-gentoo-linux-uclibc"
diff --git a/profiles/uclibc/arm/armeb/parent b/profiles/uclibc/arm/armeb/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/uclibc/arm/armeb/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/arm/make.defaults b/profiles/uclibc/arm/make.defaults
deleted file mode 100644
index 417e228..0000000
--- a/profiles/uclibc/arm/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-ARCH="arm"
-ACCEPT_KEYWORDS="arm"
-
-CHOST="set-CHOST-in-your-/etc/make.conf"
-
-UCLIBC_CPU_DEFAULT="GENERIC_ARM"
diff --git a/profiles/uclibc/arm/parent b/profiles/uclibc/arm/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/uclibc/arm/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/make.defaults b/profiles/uclibc/make.defaults
deleted file mode 100644
index d891f0b..0000000
--- a/profiles/uclibc/make.defaults
+++ /dev/null
@@ -1,13 +0,0 @@
-GRP_STAGE23_USE="ncurses readline zlib uclibc"
-USE="ncurses readline zlib uclibc -fortran -pam -berkdb -ipv6 -pppd"
-CFLAGS="-Os"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-PORTAGE_LIBC="uClibc"
-ELIBC=uclibc
-FEATURES="sandbox sfperms strict nodoc noinfo noman"
-
-# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
-# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
-BOOTSTRAP_USE="${BOOTSTRAP_USE} uclibc"
diff --git a/profiles/uclibc/mips/hardened/make.defaults b/profiles/uclibc/mips/hardened/make.defaults
deleted file mode 100644
index 41e2d41..0000000
--- a/profiles/uclibc/mips/hardened/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-GRP_STAGE23_USE="ncurses readline zlib uclibc hardened pic"
-USE="ncurses readline zlib uclibc hardened pic"
-
-# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
-# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic"
diff --git a/profiles/uclibc/mips/hardened/package.use.mask b/profiles/uclibc/mips/hardened/package.use.mask
deleted file mode 100644
index 2b8a41a..0000000
--- a/profiles/uclibc/mips/hardened/package.use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/uclibc/mips/hardened/package.use.mask,v 1.3 2009/07/31 09:56:43 ssuominen Exp $
-
-sys-devel/gcc -hardened
diff --git a/profiles/uclibc/mips/hardened/parent b/profiles/uclibc/mips/hardened/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/uclibc/mips/hardened/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/mips/make.defaults b/profiles/uclibc/mips/make.defaults
deleted file mode 100644
index 2a17bbe..0000000
--- a/profiles/uclibc/mips/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-ARCH="mips"
-ACCEPT_KEYWORDS="mips"
-
-CHOST="set-CHOST-in-your-/etc/make.conf"
-
-FEATURES="-sandbox"
-
-UCLIBC_CPU_DEFAULT="MIPS_ISA_1"
diff --git a/profiles/uclibc/mips/mipsel/deprecated b/profiles/uclibc/mips/mipsel/deprecated
deleted file mode 100644
index d1d399b..0000000
--- a/profiles/uclibc/mips/mipsel/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-uclibc/mips
diff --git a/profiles/uclibc/mips/mipsel/hardened/deprecated b/profiles/uclibc/mips/mipsel/hardened/deprecated
deleted file mode 100644
index 1027bb2..0000000
--- a/profiles/uclibc/mips/mipsel/hardened/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-uclibc/mips/hardened
diff --git a/profiles/uclibc/mips/mipsel/hardened/make.defaults b/profiles/uclibc/mips/mipsel/hardened/make.defaults
deleted file mode 100644
index 41e2d41..0000000
--- a/profiles/uclibc/mips/mipsel/hardened/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-GRP_STAGE23_USE="ncurses readline zlib uclibc hardened pic"
-USE="ncurses readline zlib uclibc hardened pic"
-
-# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
-# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic"
diff --git a/profiles/uclibc/mips/mipsel/hardened/parent b/profiles/uclibc/mips/mipsel/hardened/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/uclibc/mips/mipsel/hardened/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/mips/mipsel/make.defaults b/profiles/uclibc/mips/mipsel/make.defaults
deleted file mode 100644
index 80b7029..0000000
--- a/profiles/uclibc/mips/mipsel/make.defaults
+++ /dev/null
@@ -1 +0,0 @@
-CHOST="mipsel-gentoo-linux-uclibc"
diff --git a/profiles/uclibc/mips/mipsel/parent b/profiles/uclibc/mips/mipsel/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/uclibc/mips/mipsel/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/mips/parent b/profiles/uclibc/mips/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/uclibc/mips/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/mips/use.mask b/profiles/uclibc/mips/use.mask
deleted file mode 100644
index eddef80..0000000
--- a/profiles/uclibc/mips/use.mask
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/uclibc/mips/use.mask,v 1.7 2009/03/03 12:49:06 pva Exp $
-
-# Henrik Brix Andersen <brix@gentoo.org>
-# According to the mips herd, we currently have no way of testing
-# pcmcia on mips, bug #90359
-pcmcia
-
-# Luca Longinotti <chtekk@gentoo.org>
-# Mask php USE on MIPS profiles
-php
-
-# Diego Pettenò <flameeyes@gentoo.org> (6 Dec 2006)
-# Unmask specific MIPS ALSA drivers
--alsa_cards_au1x00
-
-# Daniel Black <dragonheart@gentoo.org> (28 Feb 2007)
-# Use mask l7-filter for iptables dependency - bug #150343 until mips tested
-l7filter
-
-# Peter Volkov <pva@gentoo.org> MPI was never tested on mips, but
-# some programs with this useflag are useful, e.g #227631
-mpi
diff --git a/profiles/uclibc/package.use b/profiles/uclibc/package.use
deleted file mode 100644
index eebbed2..0000000
--- a/profiles/uclibc/package.use
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/uclibc/package.use,v 1.1 2011/04/16 19:38:23 ulm Exp $
-
-virtual/ssh minimal
diff --git a/profiles/uclibc/packages b/profiles/uclibc/packages
deleted file mode 100644
index 569e5b5..0000000
--- a/profiles/uclibc/packages
+++ /dev/null
@@ -1,12 +0,0 @@
-app-misc/pax-utils
-
-# remove stuff not needed on uclibc
--*net-misc/iputils
-# man pages disabled (noman)
--*sys-apps/man
--*virtual/man
--*sys-apps/man-pages
-# this will be added by nls
--*sys-devel/gettext
-
--*sys-apps/hdparm
diff --git a/profiles/uclibc/packages.build b/profiles/uclibc/packages.build
deleted file mode 100644
index 579dfcb..0000000
--- a/profiles/uclibc/packages.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# this should be added by nls only
--sys-devel/gettext
-
-virtual/shadow
diff --git a/profiles/uclibc/parent b/profiles/uclibc/parent
deleted file mode 100644
index 6f0b2fa..0000000
--- a/profiles/uclibc/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../base
-../default/linux
diff --git a/profiles/uclibc/ppc/2.4/parent b/profiles/uclibc/ppc/2.4/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/uclibc/ppc/2.4/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/ppc/hardened/2.4/parent b/profiles/uclibc/ppc/hardened/2.4/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/uclibc/ppc/hardened/2.4/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/ppc/hardened/make.defaults b/profiles/uclibc/ppc/hardened/make.defaults
deleted file mode 100644
index 41e2d41..0000000
--- a/profiles/uclibc/ppc/hardened/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-GRP_STAGE23_USE="ncurses readline zlib uclibc hardened pic"
-USE="ncurses readline zlib uclibc hardened pic"
-
-# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
-# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic"
diff --git a/profiles/uclibc/ppc/hardened/package.use.mask b/profiles/uclibc/ppc/hardened/package.use.mask
deleted file mode 100644
index b702dae..0000000
--- a/profiles/uclibc/ppc/hardened/package.use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/uclibc/ppc/hardened/package.use.mask,v 1.3 2009/07/31 09:57:12 ssuominen Exp $
-
-sys-devel/gcc -hardened
diff --git a/profiles/uclibc/ppc/hardened/parent b/profiles/uclibc/ppc/hardened/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/uclibc/ppc/hardened/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/ppc/make.defaults b/profiles/uclibc/ppc/make.defaults
deleted file mode 100644
index 0514ca7..0000000
--- a/profiles/uclibc/ppc/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-ARCH="ppc"
-ACCEPT_KEYWORDS="ppc"
-
-CHOST="powerpc-gentoo-linux-uclibc"
-
-UCLIBC_CPU_DEFAULT=""
diff --git a/profiles/uclibc/ppc/package.use.mask b/profiles/uclibc/ppc/package.use.mask
deleted file mode 100644
index 83f4d9a..0000000
--- a/profiles/uclibc/ppc/package.use.mask
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/uclibc/ppc/package.use.mask,v 1.3 2009/07/31 09:58:03 ssuominen Exp $
-
-# This file requires >=portage-2.1.1
-
-=dev-java/ibm-jdk-bin-1.5* -nsplugin 
-=dev-java/ibm-jre-bin-1.5* -nsplugin
-
-# Joseph Jezak <josejx@gentoo.org> (28 Jun 2007)
-# Masked Parallel LCD devices for bug #180683
-
-# app-misc/lcd4linux
-app-misc/lcd4linux lcd_devices_hd44780
diff --git a/profiles/uclibc/ppc/parent b/profiles/uclibc/ppc/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/uclibc/ppc/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/ppc/use.mask b/profiles/uclibc/ppc/use.mask
deleted file mode 100644
index 7d21bb6..0000000
--- a/profiles/uclibc/ppc/use.mask
+++ /dev/null
@@ -1,62 +0,0 @@
--altivec
-
-# Diego Pettenò <flameeyes@gentoo.org> (6 Dec 2006)
-# Unmask the Apple drivers
--alsa_cards_aoa
--alsa_cards_aoa-fabric-layout
--alsa_cards_aoa-onyx
--alsa_cards_aoa-soundbus
--alsa_cards_aoa-soundbus-i2s
--alsa_cards_aoa-tas
--alsa_cards_aoa-toonie
--alsa_cards_powermac
-# Mask ALSA drivers for ISA cards
-alsa_cards_cs4232
-alsa_cards_msnd-pinnacle
-alsa_cards_cs4231-lib
-alsa_cards_adlib
-alsa_cards_ad1816a
-alsa_cards_ad1848
-alsa_cards_als100
-alsa_cards_azt2320
-alsa_cards_cmi8330
-alsa_cards_cs4231
-alsa_cards_cs4236
-alsa_cards_dt019x
-alsa_cards_es968
-alsa_cards_es1688
-alsa_cards_es18xx
-alsa_cards_gusclassic
-alsa_cards_gusextreme
-alsa_cards_gusmax
-alsa_cards_interwave
-alsa_cards_interwave-stb
-alsa_cards_opl3sa2
-alsa_cards_opti92x-ad1848
-alsa_cards_opti92x-cs4231
-alsa_cards_opti93x
-alsa_cards_miro
-alsa_cards_sb8
-alsa_cards_sb16
-alsa_cards_sbawe
-alsa_cards_sb16_csp
-alsa_cards_sgalaxy
-alsa_cards_sscape
-alsa_cards_wavefront
-
-# Joseph Jezak <josejx@gentoo.org> (28 Jun 2007)
-# Masked Parallel LCD devices for bug #180683
-
-# app-misc/lcd4linux
-lcd_devices_lph7508
-lcd_devices_m50530
-lcd_devices_noritake
-lcd_devices_routerboard
-
-# app-misc/lcdproc
-lcd_devices_sed1330
-lcd_devices_sed1520
-lcd_devices_stv5730
-
-# Both
-lcd_devices_t6963
diff --git a/profiles/uclibc/sh/2.4/parent b/profiles/uclibc/sh/2.4/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/uclibc/sh/2.4/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/sh/make.defaults b/profiles/uclibc/sh/make.defaults
deleted file mode 100644
index 217d967..0000000
--- a/profiles/uclibc/sh/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-ARCH="sh"
-ACCEPT_KEYWORDS="sh"
-
-CHOST="sh4-gentoo-linux-uclibc"
-
-UCLIBC_CPU_DEFAULT="SH4"
diff --git a/profiles/uclibc/sh/parent b/profiles/uclibc/sh/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/uclibc/sh/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/use.force b/profiles/uclibc/use.force
deleted file mode 100644
index 3904f12..0000000
--- a/profiles/uclibc/use.force
+++ /dev/null
@@ -1 +0,0 @@
-elibc_uclibc
diff --git a/profiles/uclibc/use.mask b/profiles/uclibc/use.mask
deleted file mode 100644
index 33a34e4..0000000
--- a/profiles/uclibc/use.mask
+++ /dev/null
@@ -1,11 +0,0 @@
-iconv
-nls
-nis
-
-emul-linux-x86
--uclibc
-
--elibc_uclibc
-elibc_glibc
-
--hardened
diff --git a/profiles/uclibc/x86/2.4/parent b/profiles/uclibc/x86/2.4/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/uclibc/x86/2.4/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/x86/2005.1/2.4/parent b/profiles/uclibc/x86/2005.1/2.4/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/uclibc/x86/2005.1/2.4/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/x86/2005.1/parent b/profiles/uclibc/x86/2005.1/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/uclibc/x86/2005.1/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/x86/hardened/2.4/parent b/profiles/uclibc/x86/hardened/2.4/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/uclibc/x86/hardened/2.4/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/x86/hardened/make.defaults b/profiles/uclibc/x86/hardened/make.defaults
deleted file mode 100644
index 41e2d41..0000000
--- a/profiles/uclibc/x86/hardened/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-GRP_STAGE23_USE="ncurses readline zlib uclibc hardened pic"
-USE="ncurses readline zlib uclibc hardened pic"
-
-# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
-# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic"
diff --git a/profiles/uclibc/x86/hardened/package.use.mask b/profiles/uclibc/x86/hardened/package.use.mask
deleted file mode 100644
index 885a95c..0000000
--- a/profiles/uclibc/x86/hardened/package.use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/uclibc/x86/hardened/package.use.mask,v 1.3 2009/07/31 09:54:38 ssuominen Exp $
-
-sys-devel/gcc -hardened
diff --git a/profiles/uclibc/x86/hardened/parent b/profiles/uclibc/x86/hardened/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/uclibc/x86/hardened/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/x86/linux24/deprecated b/profiles/uclibc/x86/linux24/deprecated
deleted file mode 100644
index 4545334..0000000
--- a/profiles/uclibc/x86/linux24/deprecated
+++ /dev/null
@@ -1,4 +0,0 @@
-uclibc/x86/2.4
-# cd /etc/
-# rm make.profile
-# ln -s ../usr/portage/profiles/uclibc/x86/2.4 make.profile
diff --git a/profiles/uclibc/x86/linux24/parent b/profiles/uclibc/x86/linux24/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/uclibc/x86/linux24/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/x86/linux26/deprecated b/profiles/uclibc/x86/linux26/deprecated
deleted file mode 100644
index 45729f9..0000000
--- a/profiles/uclibc/x86/linux26/deprecated
+++ /dev/null
@@ -1,4 +0,0 @@
-uclibc/x86
-# cd /etc/
-# rm make.profile
-# ln -s ../usr/portage/profiles/uclibc/x86 make.profile
diff --git a/profiles/uclibc/x86/linux26/parent b/profiles/uclibc/x86/linux26/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/uclibc/x86/linux26/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/x86/make.defaults b/profiles/uclibc/x86/make.defaults
deleted file mode 100644
index 0b41209..0000000
--- a/profiles/uclibc/x86/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-ARCH="x86"
-ACCEPT_KEYWORDS="x86"
-
-CHOST="i386-gentoo-linux-uclibc"
-
-UCLIBC_CPU_DEFAULT="GENERIC_386"
diff --git a/profiles/uclibc/x86/package.use.mask b/profiles/uclibc/x86/package.use.mask
deleted file mode 100644
index f51f310..0000000
--- a/profiles/uclibc/x86/package.use.mask
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/uclibc/x86/package.use.mask,v 1.4 2010/03/31 16:07:57 caster Exp $
-
-# This file requires >=portage-2.1.1
-
->=dev-java/sun-jdk-1.6 -nsplugin
->=dev-java/sun-jre-bin-1.6 -nsplugin
->=dev-java/ibm-jdk-bin-1.5 -nsplugin 
->=dev-java/ibm-jre-bin-1.5 -nsplugin
diff --git a/profiles/uclibc/x86/parent b/profiles/uclibc/x86/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/uclibc/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/x86/use.mask b/profiles/uclibc/x86/use.mask
deleted file mode 100644
index aee15e6..0000000
--- a/profiles/uclibc/x86/use.mask
+++ /dev/null
@@ -1,7 +0,0 @@
--3dnow
--3dnowext
--mmx
--mmxext
--sse
--sse2
--kqemu
diff --git a/profiles/updates/1Q-2008 b/profiles/updates/1Q-2008
deleted file mode 100644
index d65b279..0000000
--- a/profiles/updates/1Q-2008
+++ /dev/null
@@ -1,14 +0,0 @@
-move x11-drivers/xf86-video-ivtvdev x11-drivers/xf86-video-ivtv
-move net-analyzer/cacti-cactid net-analyzer/cacti-spine
-move media-fonts/ezra-sil media-fonts/ttf-sil-ezra
-move dev-lisp/emacs-cl-cvs dev-lisp/emacs-cl
-slotmove app-editors/emacs-cvs 22.0.0 23
-slotmove app-editors/emacs-cvs 23.0.0 23
-slotmove app-editors/emacs-cvs 23-unicode 23
-move sys-fs/mtd sys-fs/mtd-utils
-move media-fonts/fonts-indic media-fonts/lohit-fonts
-move games-action/abuse_sdl games-action/abuse
-move app-misc/pv sys-apps/pv
-move app-portage/gatt-svn app-portage/gatt
-move games-kids/tuxtype2 games-kids/tuxtype
-move sys-apps/tcb sys-auth/tcb
diff --git a/profiles/updates/1Q-2009 b/profiles/updates/1Q-2009
deleted file mode 100644
index 8408a40..0000000
--- a/profiles/updates/1Q-2009
+++ /dev/null
@@ -1,14 +0,0 @@
-move media-gfx/icns2png media-libs/libicns
-move net-libs/icee dev-cpp/IceE
-move app-text/new app-text/fmt-ptrn
-move dev-perl/Params-Check perl-core/Params-Check
-move dev-perl/Module-Load perl-core/Module-Load
-move dev-perl/Module-Load-Conditional perl-core/Module-Load-Conditional
-move dev-perl/IPC-Cmd perl-core/IPC-Cmd
-move games-puzzle/ksudoku kde-base/ksudoku
-move net-p2p/azureus net-p2p/vuze
-move xfce-extra/verve xfce-extra/xfce4-verve
-move dev-perl/Text-Tabs+Wrap perl-core/Text-Tabs+Wrap
-move x11-misc/emacs-desktop app-emacs/emacs-common-gentoo
-move media-plugins/gmpc-lastfm media-plugins/gmpc-last-fm
-move dev-python/gwibber net-misc/gwibber
diff --git a/profiles/updates/1Q-2010 b/profiles/updates/1Q-2010
deleted file mode 100644
index 161069e..0000000
--- a/profiles/updates/1Q-2010
+++ /dev/null
@@ -1,74 +0,0 @@
-move www-client/mozilla-firefox-bin www-client/firefox-bin
-move kde-misc/bilbo kde-misc/blogilo
-move app-i18n/ibus-table-jyutping app-i18n/ibus-table-cantonese
-move app-i18n/ibus-table-additional app-i18n/ibus-table-code
-move app-i18n/ibus-table-stroke5 app-i18n/ibus-table-xingma
-move app-i18n/ibus-table-wubi app-i18n/ibus-table-xingma
-move app-i18n/ibus-table-xinhua app-i18n/ibus-table-xingma
-move app-i18n/ibus-table-zhengma app-i18n/ibus-table-xingma
-move app-i18n/ibus-table-erbi app-i18n/ibus-table-yinma
-move app-i18n/ibus-table-wu app-i18n/ibus-table-yinma
-move app-i18n/ibus-table-yong app-i18n/ibus-table-yinma
-move app-i18n/ibus-table-zhuyin app-i18n/ibus-table-yinma
-move app-i18n/ibus-table-ziranma app-i18n/ibus-table-yinma
-move net-im/pyotr net-im/python-otr
-move dev-embedded/scratchbox-toolchain-cs2009q1 dev-embedded/scratchbox-toolchain-cs2009q1-203sb1
-move app-i18n/ibus-table-easy app-i18n/ibus-table-cangjie
-move app-i18n/ibus-table-quick app-i18n/ibus-table-cangjie
-slotmove =dev-ruby/i18n-0.3* 0 0.3
-move app-i18n/ibus-table-thai app-i18n/ibus-table-tv
-move app-i18n/ibus-table-viqr app-i18n/ibus-table-tv
-move media-libs/apple-opengl media-libs/opengl-apple
-move dev-ruby/ruby-mmap dev-ruby/mmap
-move app-doc/gimp-user-manual app-doc/gimp-help
-move app-dicts/stardict app-text/stardict
-move app-i18n/ibus-table-cantonhk app-i18n/ibus-table-cantonese
-move app-i18n/ibus-table-cns11643 app-i18n/ibus-table-code
-move app-i18n/ibus-table-rustrad app-i18n/ibus-table-cyrillic
-move app-i18n/ibus-table-translit app-i18n/ibus-table-cyrillic
-slotmove =app-doc/pms-2 0 2
-slotmove =app-doc/pms-3 0 3
-slotmove =app-doc/pms-3 2 3
-slotmove =app-doc/pms-99999999 0 live
-move sci-chemistry/psipred sci-biology/psipred
-move dev-util/gitg dev-vcs/gitg
-move dev-util/mr dev-vcs/mr
-move dev-util/giggle dev-vcs/giggle
-move dev-util/qct dev-vcs/qct
-move dev-util/kdesvn dev-vcs/kdesvn
-move dev-util/qsvn dev-vcs/qsvn
-move dev-util/hgview dev-vcs/hgview
-move dev-util/archway dev-vcs/archway
-move app-text/rcs dev-vcs/rcs
-move dev-util/bzr dev-vcs/bzr
-move dev-util/bzrtools dev-vcs/bzrtools
-move dev-util/qbzr dev-vcs/qbzr
-move dev-util/bzr-svn dev-vcs/bzr-svn
-move dev-util/mcvs dev-vcs/mcvs
-move dev-util/cssc dev-vcs/cssc
-move dev-util/monotone dev-vcs/monotone
-move www-client/urlgfe www-client/uget
-move dev-util/statcvs dev-vcs/statcvs
-move dev-util/statsvn dev-vcs/statsvn
-move dev-util/cvsweb www-apps/cvsweb
-move dev-util/colorcvs dev-vcs/colorcvs
-move dev-util/mercurial dev-vcs/mercurial
-move dev-util/hgsubversion dev-vcs/hgsubversion
-move dev-util/hg-git dev-vcs/hg-git
-move dev-util/guilt dev-vcs/guilt
-move dev-util/stgit dev-vcs/stgit
-move dev-util/cvsspam dev-vcs/cvsspam
-move dev-util/svnmailer dev-vcs/svnmailer
-move dev-util/git-sh dev-vcs/git-sh
-slotmove >=sys-freebsd/freebsd-lib-7 7.0 0
-move dev-util/darcs dev-vcs/darcs
-slotmove =dev-haskell/quickcheck-1* 0 1
-move x11-misc/googleearth sci-geosciences/googleearth
-move dev-util/git dev-vcs/git
-move dev-util/colorsvn dev-vcs/colorsvn
-move net-misc/anyremote app-mobilephone/anyremote
-move games-arcade/teeworlds games-action/teeworlds
-move x11-misc/xfce4-notifyd xfce-extra/xfce4-notifyd
-move dev-util/cvs2svn dev-vcs/cvs2svn
-slotmove app-admin/bcfg2 1 0
-move kde-misc/plasma-indicatordisplay kde-misc/plasma-widget-message-indicator
diff --git a/profiles/updates/1Q-2011 b/profiles/updates/1Q-2011
deleted file mode 100644
index c233697..0000000
--- a/profiles/updates/1Q-2011
+++ /dev/null
@@ -1,75 +0,0 @@
-move dev-php5/PEAR-File_Iterator dev-php/file-iterator
-move dev-php5/phpunit dev-php/phpunit
-move dev-php5/PEAR-PHP_TokenStream dev-php/php-tokenstream
-move net-im/silc-plugin net-im/silc-client
-move dev-php5/PEAR-PHP_CodeCoverage dev-php/php-codecoverage
-move dev-php5/PEAR-DbUnit dev-php/dbunit
-move dev-php5/eaccelerator dev-php/eaccelerator
-move dev-php5/doctrine dev-php/doctrine
-move dev-php5/agavi dev-php/agavi
-move dev-php5/phing dev-php/phing
-move dev-php5/phptal dev-php/phptal
-move dev-php5/ZendFramework dev-php/ZendFramework
-move dev-php5/xdebug dev-php/xdebug
-move app-arch/upx app-arch/upx-bin
-move app-emulation/virtualbox-ose-additions app-emulation/virtualbox-additions
-move app-emulation/virtualbox-ose app-emulation/virtualbox
-slotmove kde-misc/kdiff3 1 4
-slotmove dev-libs/libgweather 0 2
-slotmove =dev-java/maven-bin-1.1 1.0 1.1
-move x11-terms/pssh net-misc/pssh
-move x11-terms/clusterssh net-misc/clusterssh
-move kde-misc/kcm_tablet kde-misc/wacomtablet
-move games-strategy/wormux games-strategy/warmux
-move app-vim/latexsuite app-vim/vim-latex
-move sci-biology/allpaths sci-biology/allpathslg
-slotmove gnome-base/gnome-applets 2 0
-slotmove games-mud/kmuddy 0 4
-slotmove kde-mis/bkodama 0 4
-slotmove kde-misc/customizable-weather 0 4
-slotmove kde-misc/kcaldav 0 4
-slotmove kde-misc/kcometen4 0 4
-slotmove kde-misc/kdmthemegenerator 0 4
-slotmove kde-misc/kgrubeditor 0 4
-slotmove kde-misc/kgtk 0 4
-slotmove kde-misc/kopete-antispam 0 4
-slotmove kde-misc/kvkbd 0 4
-slotmove kde-misc/openofficeorg-thumbnail 0 4
-slotmove kde-misc/plasmatvgr 0 4
-slotmove kde-misc/quickaccess 0 4
-slotmove kde-misc/plasma-applet-daisy 0 4
-slotmove media-libs/gluon 0 4
-slotmove media-sound/audex 0 4
-slotmove media-video/kplayer 0 4
-slotmove media-video/kplayer 0.7 4
-slotmove net-misc/guidedog 0 4
-slotmove x11-themes/skulpture 0 4
-slotmove media-gfx/wally 0 4
-slotmove x11-libs/libwnck 2.90 3
-slotmove dev-libs/libunique 0 1
-slotmove x11-libs/libwnck 0 1
-move dev-util/easygit dev-vcs/easygit
-move dev-util/qgit dev-vcs/qgit
-move dev-util/rapidsvn dev-vcs/rapidsvn
-move dev-util/rcsi dev-vcs/rcsi
-move dev-util/svn2cl dev-vcs/svn2cl
-move app-emulation/qemu-softmmu app-emulation/qemu
-slotmove sci-mathematics/rkward 0 4
-move app-pda/synce-libsynce dev-libs/libsynce
-slotmove dev-libs/gdl 0 1
-move dev-perl/Thread-Queue perl-core/Thread-Queue
-move dev-perl/Thread-Semaphore perl-core/Thread-Semaphore
-move dev-dotnet/dbus-glib-sharp dev-dotnet/ndesk-dbus-glib
-move dev-ruby/ruby-serialport dev-ruby/serialport
-move sci-chemistry/caver sci-chemistry/pymol-plugins-caver
-slotmove =x11-libs/fltk-1* 1.1 1
-slotmove dev-libs/libgweather 3 2
-move media-sound/phonon media-libs/phonon
-slotmove dev-cpp/pangomm 2.4 1.4
-move media-sound/phonon-gstreamer media-libs/phonon-gstreamer
-move sci-misc/brlcad media-gfx/brlcad
-move media-sound/phonon-vlc media-libs/phonon-vlc
-move media-sound/phonon-xine media-libs/phonon-xine
-move app-pda/jpilot-Mail app-pda/jpilot-mail
-move sys-apps/eject sys-block/eject
-move dev-php5/symfony dev-php/symfony
diff --git a/profiles/updates/1Q-2012 b/profiles/updates/1Q-2012
deleted file mode 100644
index 9ac0bc1..0000000
--- a/profiles/updates/1Q-2012
+++ /dev/null
@@ -1,23 +0,0 @@
-slotmove kde-misc/kcm-grub2 0 4
-slotmove kde-misc/kfilebox 0 4
-move x11-misc/synergy-plus x11-misc/synergy
-move media-sound/minitunes media-sound/musique
-move dev-perl/sdl-perl dev-perl/SDL
-move net-libs/telepathy-qt4 net-libs/telepathy-qt
-slotmove =dev-libs/libmowgli-2.0.0_alpha1 0 2
-move media-tv/linuxtv-dvb-headers virtual/linuxtv-dvb-headers
-move app-shells/prll sys-process/prll
-move net-wireless/wispy-tools net-wireless/spectools
-slotmove dev-ruby/syslogger 3 0
-move kde-misc/konq-plugins kde-base/konq-plugins
-slotmove <gnome-extra/nautilus-actions-3.2.2 0 2
-move dev-php/php-tokenstream dev-php/PHP_TokenStream
-move dev-php/phpunit-selenium dev-php/PHPUnit_Selenium
-move dev-php/phpunit-mockobject dev-php/PHPUnit_MockObject
-move dev-php/php-texttemplate dev-php/Text_Template
-move dev-php/file-iterator dev-php/File_Iterator
-move dev-php/php-timer dev-php/PHP_Timer
-move dev-php/php-codecoverage dev-php/PHP_CodeCoverage
-move dev-php/yaml dev-php/YAML
-move dev-php/dbunit dev-php/DBUnit
-slotmove media-sound/frescobaldi 4 0
diff --git a/profiles/updates/1Q-2013 b/profiles/updates/1Q-2013
deleted file mode 100644
index c645e11..0000000
--- a/profiles/updates/1Q-2013
+++ /dev/null
@@ -1,98 +0,0 @@
-move media-gfx/opencolorio media-libs/opencolorio
-move dev-util/nvidia-cuda-npp dev-util/nvidia-cuda-toolkit
-move app-cdr/cdemud app-cdr/cdemu-daemon
-slotmove =dev-python/pmw-1.3.3 0 py2
-slotmove =dev-python/pmw-2.0.0 0 py3
-move media-fonts/freefont-ttf media-fonts/freefont
-move sys-cluster/gsh sys-cluster/polysh
-move media-tv/ivtv-firmware sys-firmware/ivtv-firmware
-move net-wireless/zd1201-firmware sys-firmware/zd1201-firmware
-move net-wireless/zd1211-firmware sys-firmware/zd1211-firmware
-move net-wireless/ipw2100-firmware sys-firmware/ipw2100-firmware
-move net-wireless/ipw2200-firmware sys-firmware/ipw2200-firmware
-move app-vim/threesome app-vim/splice
-move app-vim/bufferexplorer app-vim/bufexplorer
-move net-wireless/bluez-firmware sys-firmware/bluez-firmware
-move net-wireless/atmel-firmware sys-firmware/atmel-firmware
-move net-wireless/b43-firmware sys-firmware/b43-firmware
-move net-wireless/b43legacy-firmware sys-firmware/b43legacy-firmware
-move net-wireless/rt61-firmware sys-firmware/rt61-firmware
-slotmove =x11-drivers/ati-drivers-12.6_beta_pre897 1 legacy
-move dev-util/qt-creator dev-qt/qt-creator
-move x11-libs/qt-assistant dev-qt/qthelp
-move x11-libs/qt-bearer dev-qt/qtbearer
-move x11-libs/qt-core dev-qt/qtcore
-move x11-libs/qt-dbus dev-qt/qtdbus
-move x11-libs/qt-declarative dev-qt/qtdeclarative
-move x11-libs/qt-demo dev-qt/qtdemo
-move x11-libs/qt-gui dev-qt/qtgui
-move x11-libs/qt-meta dev-qt/qt-meta
-move x11-libs/qt-mobility dev-qt/qt-mobility
-move x11-libs/qt-multimedia dev-qt/qtmultimedia
-move x11-libs/qt-opengl dev-qt/qtopengl
-move x11-libs/qt-openvg dev-qt/qtopenvg
-move x11-libs/qt-phonon dev-qt/qtphonon
-move x11-libs/qt-qt3support dev-qt/qt3support
-move x11-libs/qt-script dev-qt/qtscript
-move x11-libs/qt-sql dev-qt/qtsql
-move x11-libs/qt-svg dev-qt/qtsvg
-move x11-libs/qt-test dev-qt/qttest
-move x11-libs/qt-webkit dev-qt/qtwebkit
-move x11-libs/qt-xmlpatterns dev-qt/qtxmlpatterns
-move app-editors/leechcraft-popishu app-leechcraft/lc-popishu
-move app-text/leechcraft-monocle app-leechcraft/lc-monocle
-move media-sound/leechcraft-hotstreams app-leechcraft/lc-hotstreams
-move media-sound/leechcraft-lastfmscrobble app-leechcraft/lc-lastfmscrobble
-move media-sound/leechcraft-lmp app-leechcraft/lc-lmp
-move media-sound/leechcraft-musiczombie app-leechcraft/lc-musiczombie
-move media-sound/leechcraft-touchstreams app-leechcraft/lc-touchstreams
-move media-video/leechcraft-laure app-leechcraft/lc-laure
-move net-analyzer/leechcraft-networkmonitor app-leechcraft/lc-networkmonitor
-move net-ftp/leechcraft-lcftp app-leechcraft/lc-lcftp
-move net-im/leechcraft-azoth app-leechcraft/lc-azoth
-move net-misc/leechcraft-advancednotifications app-leechcraft/lc-advancednotifications
-move net-misc/leechcraft-anhero app-leechcraft/lc-anhero
-move net-misc/leechcraft-auscrie app-leechcraft/lc-auscrie
-move net-misc/leechcraft-blogique app-leechcraft/lc-blogique
-move net-misc/leechcraft-core app-leechcraft/lc-core
-move net-misc/leechcraft-cstp app-leechcraft/lc-cstp
-move net-misc/leechcraft-dbusmanager app-leechcraft/lc-dbusmanager
-move net-misc/leechcraft-full app-leechcraft/leechraft-meta
-move net-misc/leechcraft-gacts app-leechcraft/lc-gacts
-move net-misc/leechcraft-glance app-leechcraft/lc-glance
-move net-misc/leechcraft-historyholder app-leechcraft/lc-historyholder
-move net-misc/leechcraft-kinotify app-leechcraft/lc-kinotify
-move net-misc/leechcraft-knowhow app-leechcraft/lc-knowhow
-move net-misc/leechcraft-lackman app-leechcraft/lc-lackman
-move net-misc/leechcraft-launchy app-leechcraft/lc-launchy
-move net-misc/leechcraft-lemon app-leechcraft/lc-lemon
-move net-misc/leechcraft-liznoo app-leechcraft/lc-liznoo
-move net-misc/leechcraft-netstoremanager app-leechcraft/lc-netstoremanager
-move net-misc/leechcraft-newlife app-leechcraft/lc-newlife
-move net-misc/leechcraft-otlozhu app-leechcraft/lc-otlozhu
-move net-misc/leechcraft-pintab app-leechcraft/lc-pintab
-move net-misc/leechcraft-qrosp app-leechcraft/lc-qrosp
-move net-misc/leechcraft-sb2 app-leechcraft/lc-sb2
-move net-misc/leechcraft-secman app-leechcraft/lc-secman
-move net-misc/leechcraft-sidebar app-leechcraft/lc-sidebar
-move net-misc/leechcraft-summary app-leechcraft/lc-summary
-move net-misc/leechcraft-tabpp app-leechcraft/lc-tabpp
-move net-misc/leechcraft-tabsessmanager app-leechcraft/lc-tabsessmanager
-move net-misc/leechcraft-tabslist app-leechcraft/lc-tabslist
-move net-news/leechcraft-aggregator app-leechcraft/lc-aggregator
-move net-p2p/leechcraft-bittorrent app-leechcraft/lc-bittorrent
-move net-p2p/leechcraft-eiskaltdcpp app-leechcraft/lc-eiskaltdcpp
-move net-proxy/leechcraft-xproxy app-leechcraft/lc-xproxy
-move sys-fs/leechcraft-vrooby app-leechcraft/lc-vrooby
-move www-client/leechcraft-deadlyrics app-leechcraft/lc-deadlyrics
-move www-client/leechcraft-dolozhee app-leechcraft/lc-dolozhee
-move www-client/leechcraft-poshuku app-leechcraft/lc-poshuku
-move www-client/leechcraft-vgrabber app-leechcraft/lc-vgrabber
-move www-misc/leechcraft-pogooglue app-leechcraft/lc-pogooglue
-move www-misc/leechcraft-seekthru app-leechcraft/lc-seekthru
-move x11-plugins/leechcraft-lhtr app-leechcraft/lc-lhtr
-move x11-plugins/leechcraft-tpi app-leechcraft/lc-tpi
-move app-leechcraft/leechraft-meta app-leechcraft/leechcraft-meta
-slotmove www-plugins/chrome-binary-plugins 0 unstable
-move dev-php/pecl-zendoptimizerplus dev-php/pecl-zendopcache
-slotmove <media-libs/gupnp-dlna-0.7 0 1.0
diff --git a/profiles/updates/2Q-2008 b/profiles/updates/2Q-2008
deleted file mode 100644
index 262e52d..0000000
--- a/profiles/updates/2Q-2008
+++ /dev/null
@@ -1,36 +0,0 @@
-move media-gfx/gimp-print net-print/gutenprint
-move app-vim/ant app-vim/ant_menu
-move media-libs/x264-svn media-libs/x264
-move media-video/x264-svn-encoder media-video/x264-encoder
-move media-fonts/skinenigmang-fonts media-fonts/vdrsymbols-ttf
-move sys-fs/cryptsetup-luks sys-fs/cryptsetup
-move sys-fs/fuse-python dev-python/fuse-python
-move app-admin/dirvish app-backup/dirvish
-move x11-drivers/xf86-video-amd x11-drivers/xf86-video-geode
-move x11-misc/grpn sci-calculators/grpn
-move xfce-extra/squeeze app-arch/squeeze
-move app-admin/skey sys-auth/skey
-move app-admin/otpcalc sys-auth/otpcalc
-move xfce-extra/xarchiver app-arch/xarchiver
-move gnome-extra/zim x11-misc/zim
-move xfce-extra/xfmedia media-video/xfmedia
-slotmove x11-libs/openmotif 2.1 0
-slotmove x11-libs/openmotif 2.3 0
-slotmove x11-libs/lesstif 2.1 0
-move app-doc/chmlib dev-libs/chmlib
-move app-doc/kchmviewer app-text/kchmviewer
-move media-fonts/ttf-sil-charis media-fonts/sil-charis
-move media-fonts/ttf-sil-arabicfonts media-fonts/sil-arabicfonts
-move media-fonts/ttf-sil-ezra media-fonts/sil-ezra
-move media-fonts/ttf-gentium media-fonts/sil-gentium
-move x11-misc/xchm app-text/xchm
-move media-fonts/ttf-sil-abyssinica media-fonts/sil-abyssinica
-move media-fonts/ttf-sil-doulos media-fonts/sil-doulos
-move media-fonts/ttf-sil-padauk media-fonts/sil-padauk
-move media-fonts/ttf-sil-galatia media-fonts/sil-galatia
-move xfce-extra/xfmpc media-sound/xfmpc
-move media-fonts/fireflysung media-fonts/opendesktop-fonts
-move app-portage/portage-manpages app-portage/eclass-manpages
-move gnome-extra/gnome2-user-docs gnome-extra/gnome-user-docs
-move gnome-base/control-center gnome-base/gnome-control-center
-move media-video/cinelerra-cvs media-video/cinelerra
diff --git a/profiles/updates/2Q-2009 b/profiles/updates/2Q-2009
deleted file mode 100644
index e019040..0000000
--- a/profiles/updates/2Q-2009
+++ /dev/null
@@ -1,85 +0,0 @@
-move net-www/awstats www-misc/awstats
-move net-www/diamondx www-plugins/diamondx
-move net-www/gecko-mediaplayer www-plugins/gecko-mediaplayer
-move net-www/gnash www-plugins/gnash
-move net-www/kaffeine-mozilla-plugin www-plugins/kaffeine-mozilla-plugin
-move net-www/libflashsupport www-plugins/libflashsupport
-move net-www/moonlight www-plugins/moonlight
-move net-www/mozplugger www-plugins/mozplugger
-move net-www/mplayerplug-in www-plugins/mplayerplug-in
-move net-www/netscape-flash www-plugins/adobe-flash
-move net-www/nspluginwrapper www-plugins/nspluginwrapper
-move net-www/swfdec-mozilla www-plugins/swfdec-mozilla
-move net-www/vdradmin-am www-misc/vdradmin-am
-move net-www/xxv www-misc/xxv
-move dev-perl/IO-Compress-Bzip2 perl-core/IO-Compress-Bzip2
-move dev-perl/Compress-Raw-Bzip2 perl-core/Compress-Raw-Bzip2
-slotmove net-voip/linphone 1 0
-move net-misc/kphone net-voip/kphone
-move net-im/ekiga net-voip/ekiga
-move dev-tcltk/tkdiff dev-util/tkdiff
-move net-news/charm net-misc/charm
-move lxde-base/lxsession-lite lxde-base/lxsession
-move app-office/kmm_banking app-office/kmm_kbanking
-slotmove =x11-misc/basket-1.0.3.1 0 3.5
-slotmove =kde-misc/dolphin-0.8.2-r1 0 3.5
-move x11-themes/sylpheed-iconset x11-themes/claws-mail-themes
-move app-misc/screen-profiles app-misc/byobu
-move x11-misc/basket kde-misc/basket
-move media-sound/libspiff media-libs/libxspf
-slotmove media-sound/k3guitune 0 3.5
-move x11-misc/openclipart media-gfx/openclipart
-move net-misc/freenet6 net-misc/gateway6
-slotmove >=media-sound/amarok-2.0.0 2 4
-slotmove media-sound/musicman 0 3.5
-slotmove media-libs/taglib-extras 4 0
-slotmove dev-util/kdevplatform 1 4
-slotmove media-video/kaffeine 0 3.5
-move x11-misc/xinput x11-apps/xinput
-slotmove media-libs/xvid 1 0
-slotmove >=net-p2p/ktorrent-3.2.2 3 4
-slotmove app-admin/kiosktool 0 3.5
-slotmove app-admin/klogview 0 3.5
-slotmove app-antivirus/klamav 0 3.5
-slotmove app-backup/kbackup 0 3.5
-slotmove >=media-gfx/dikigam-0.10 0.10 4
-slotmove kde-misc/kdnssd-avahi 0 3.5
-slotmove app-backup/kdar 0 3.5
-slotmove app-backup/keep 0 3.5
-slotmove dev-util/kprof 0 3.5
-slotmove kde-misc/kerry 0 3.5
-slotmove app-backup/konserve 0 3.5
-slotmove app-cdr/kcdlabel 0 3.5
-slotmove app-cdr/kiso 0 3.5
-slotmove app-cdr/koverartist 0 3.5
-slotmove app-crypt/calcchecksum 0 3.5
-slotmove kde-misc/kkbswitch 0 3.5
-slotmove <x11-themes/polyester-2.0.0 0 3.5
-slotmove net-analyzer/knetscan 0 3.5
-slotmove app-laptop/kthinkbat 0 3.5
-slotmove app-editors/kile 0 3.5
-slotmove app-editors/kxmleditor 0 3.5
-slotmove app-text/kding 0 3.5
-slotmove dev-db/knoda 0 3.5
-slotmove media-gfx/gwenview 0 3.5
-slotmove media-sound/krecord 0 3.5
-move dev-perl/Module-CoreList perl-core/Module-CoreList
-slotmove dev-util/kscope 0 3.5
-slotmove =x11-drivers/ati-drivers-9.6 0 1
-slotmove kde-misc/kdmtheme 0 3.5
-slotmove >=dev-util/kdesvn-1.2.4 2 4
-slotmove <app-office/karbon-2.0.0 0 3.5
-slotmove <app-office/kchart-2.0.0 0 3.5
-slotmove <app-office/kexi-2.0.0 0 3.5
-slotmove <app-office/kformula-2.0.0 0 3.5
-slotmove <app-office/kivio-2.0.0 0 3.5
-slotmove <app-office/koffice-data-2.0.0 0 3.5
-slotmove <app-office/koffice-meta-2.0.0 0 3.5
-slotmove <app-office/koffice-libs-2.0.0 0 3.5
-slotmove <app-office/koshell-2.0.0 0 3.5
-slotmove <app-office/kplato-2.0.0 0 3.5
-slotmove <app-office/kpresenter-2.0.0 0 3.5
-slotmove <app-office/krita-2.0.0 0 3.5
-slotmove <app-office/kspread-2.0.0 0 3.5
-slotmove <app-office/kugar-2.0.0 0 3.5
-slotmove <app-office/kword-2.0.0 0 3.5
diff --git a/profiles/updates/2Q-2010 b/profiles/updates/2Q-2010
deleted file mode 100644
index 81d2391..0000000
--- a/profiles/updates/2Q-2010
+++ /dev/null
@@ -1,39 +0,0 @@
-move x11-libs/compizconfig-backend-kconfig x11-libs/compizconfig-backend-kconfig4
-slotmove kde-misc/youtube-servicemenu 0 4
-move app-i18n/ibus-sunpinyin app-i18n/sunpinyin
-slotmove kde-misc/krusader 2 4
-move dev-util/fossil dev-vcs/fossil
-move dev-util/svk dev-vcs/svk
-move app-admin/mbr sys-boot/mbr
-move net-analyzer/mirmon www-apps/mirmon
-move virtual/flim virtual/emacs-flim
-move kde-base/automoc dev-util/automoc
-move kde-base/qimageblitz media-libs/qimageblitz
-move mail-client/mozilla-thunderbird-bin mail-client/thunderbird-bin
-move media-sound/kradioripper media-sound/kstreamripper
-slotmove =dev-ruby/test-unit-2* 0 2
-move dev-python/jinja2 dev-python/jinja
-move app-mobilephone/openmoko-dfu-util app-mobilephone/dfu-util
-move media-gfx/qtpfsgui media-gfx/luminance-hdr
-move dev-util/cola dev-vcs/cola
-move dev-cpp/Ice dev-libs/Ice
-move mail-client/mozilla-thunderbird mail-client/thunderbird
-move dev-perl/ShadowHash dev-perl/Tie-ShadowHash
-move dev-util/hgsvn dev-vcs/hgsvn
-move x11-libs/libjwc_c dev-libs/libjwc_c
-move x11-libs/libjwc_f dev-libs/libjwc_f
-slotmove <=media-libs/libpng-1.2.43 1.2 0
-move dev-util/tig dev-vcs/tig
-slotmove x11-themes/gtk-theme-switch 2 0
-move dev-util/cvs dev-vcs/cvs
-move dev-util/cvs2cl dev-vcs/cvs2cl
-move dev-util/cvsd dev-vcs/cvsd
-move dev-util/cvsgraph dev-vcs/cvsgraph
-move dev-util/cvsps dev-vcs/cvsps
-move dev-util/cvsq dev-vcs/cvsq
-move dev-util/cvsutils dev-vcs/cvsutils
-move dev-util/gitosis dev-vcs/gitosis
-move dev-util/gitosis-gentoo dev-vcs/gitosis-gentoo
-move dev-util/tkcvs dev-vcs/tkcvs
-move dev-util/subversion dev-vcs/subversion
-move net-misc/neon net-libs/neon
diff --git a/profiles/updates/2Q-2011 b/profiles/updates/2Q-2011
deleted file mode 100644
index e76f9a5..0000000
--- a/profiles/updates/2Q-2011
+++ /dev/null
@@ -1,1676 +0,0 @@
-move sys-apps/gdisk sys-apps/gptfdisk
-move x11-libs/qt dev-qt/qt-meta
-move dev-php5/libchart dev-php/libchart
-move dev-php5/jpgraph dev-php/jpgraph
-move dev-php5/adodb-ext dev-php/adodb-ext
-move dev-php5/onphp dev-php/onphp
-move dev-php5/xcache dev-php/xcache
-move dev-php5/magickwand dev-php/magickwand
-slotmove <app-text/libwpd-0.9 0 0.8
-slotmove >=app-text/libwpd-0.9 0 0.9
-slotmove <media-libs/libwpg-0.2 0 0.1
-slotmove >=media-libs/libwpg-0.2 0 0.2
-slotmove =dev-ruby/builder-3.0.0 0 3
-move app-editors/easyedit app-editors/ee
-move media-gfx/keyjnote app-office/impressive
-move kde-misc/filelight kde-base/filelight
-slotmove =dev-util/cucumber-rails-0.4.1 0 1
-move games-action/chromium games-action/chromium-bsu
-move net-irc/atheme net-irc/atheme-services
-slotmove =dev-ruby/mysql2-0.2.7 0 0.2
-slotmove =dev-ruby/mysql2-0.3.2 0 0.3
-slotmove kde-base/activitymanager 4.5 4
-slotmove kde-base/activitymanager 4.6 4
-slotmove kde-base/akonadi 4.1 4
-slotmove kde-base/akonadi 4.2 4
-slotmove kde-base/akonadi 4.3 4
-slotmove kde-base/akonadi 4.4 4
-slotmove kde-base/akonadiconsole 4.5 4
-slotmove kde-base/akonadiconsole 4.6 4
-slotmove kde-base/akregator 4.1 4
-slotmove kde-base/akregator 4.2 4
-slotmove kde-base/akregator 4.3 4
-slotmove kde-base/akregator 4.4 4
-slotmove kde-base/akregator 4.5 4
-slotmove kde-base/akregator 4.6 4
-slotmove kde-base/amor 4.1 4
-slotmove kde-base/amor 4.2 4
-slotmove kde-base/amor 4.3 4
-slotmove kde-base/amor 4.4 4
-slotmove kde-base/amor 4.5 4
-slotmove kde-base/amor 4.6 4
-slotmove kde-base/ark 4.1 4
-slotmove kde-base/ark 4.2 4
-slotmove kde-base/ark 4.3 4
-slotmove kde-base/ark 4.4 4
-slotmove kde-base/ark 4.5 4
-slotmove kde-base/ark 4.6 4
-slotmove kde-base/attica 4.4 4
-slotmove kde-base/attica 4.5 4
-slotmove kde-base/attica 4.6 4
-slotmove kde-base/blinken 4.1 4
-slotmove kde-base/blinken 4.2 4
-slotmove kde-base/blinken 4.3 4
-slotmove kde-base/blinken 4.4 4
-slotmove kde-base/blinken 4.5 4
-slotmove kde-base/blinken 4.6 4
-slotmove kde-base/blogilo 4.4 4
-slotmove kde-base/blogilo 4.5 4
-slotmove kde-base/blogilo 4.6 4
-slotmove kde-base/bomber 4.2 4
-slotmove kde-base/bomber 4.3 4
-slotmove kde-base/bomber 4.4 4
-slotmove kde-base/bomber 4.5 4
-slotmove kde-base/bomber 4.6 4
-slotmove kde-base/bovo 4.1 4
-slotmove kde-base/bovo 4.2 4
-slotmove kde-base/bovo 4.3 4
-slotmove kde-base/bovo 4.4 4
-slotmove kde-base/bovo 4.5 4
-slotmove kde-base/bovo 4.6 4
-slotmove kde-base/cantor 4.4 4
-slotmove kde-base/cantor 4.5 4
-slotmove kde-base/cantor 4.6 4
-slotmove kde-base/cervisia 4.1 4
-slotmove kde-base/cervisia 4.2 4
-slotmove kde-base/cervisia 4.3 4
-slotmove kde-base/cervisia 4.4 4
-slotmove kde-base/cervisia 4.5 4
-slotmove kde-base/cervisia 4.6 4
-slotmove kde-base/dolphin 4.1 4
-slotmove kde-base/dolphin 4.2 4
-slotmove kde-base/dolphin 4.3 4
-slotmove kde-base/dolphin 4.4 4
-slotmove kde-base/dolphin 4.5 4
-slotmove kde-base/dolphin 4.6 4
-slotmove kde-base/dolphin-plugins 4.5 4
-slotmove kde-base/dolphin-plugins 4.6 4
-slotmove kde-base/dragonplayer 4.1 4
-slotmove kde-base/dragonplayer 4.2 4
-slotmove kde-base/dragonplayer 4.3 4
-slotmove kde-base/dragonplayer 4.4 4
-slotmove kde-base/dragonplayer 4.5 4
-slotmove kde-base/dragonplayer 4.6 4
-slotmove kde-base/drkonqi 4.1 4
-slotmove kde-base/drkonqi 4.2 4
-slotmove kde-base/drkonqi 4.3 4
-slotmove kde-base/drkonqi 4.4 4
-slotmove kde-base/drkonqi 4.5 4
-slotmove kde-base/drkonqi 4.6 4
-slotmove kde-base/ffmpegthumbs 4.5 4
-slotmove kde-base/ffmpegthumbs 4.6 4
-slotmove kde-base/filelight 4.6 4
-slotmove kde-base/freespacenotifier 4.5 4
-slotmove kde-base/freespacenotifier 4.6 4
-slotmove kde-base/granatier 4.4 4
-slotmove kde-base/granatier 4.5 4
-slotmove kde-base/granatier 4.6 4
-slotmove kde-base/gwenview 4.1 4
-slotmove kde-base/gwenview 4.2 4
-slotmove kde-base/gwenview 4.3 4
-slotmove kde-base/gwenview 4.4 4
-slotmove kde-base/gwenview 4.5 4
-slotmove kde-base/gwenview 4.6 4
-slotmove kde-base/jovie 4.5 4
-slotmove kde-base/jovie 4.6 4
-slotmove kde-base/juk 4.1 4
-slotmove kde-base/juk 4.2 4
-slotmove kde-base/juk 4.3 4
-slotmove kde-base/juk 4.4 4
-slotmove kde-base/juk 4.5 4
-slotmove kde-base/juk 4.6 4
-slotmove kde-base/kabcclient 4.2 4
-slotmove kde-base/kabcclient 4.3 4
-slotmove kde-base/kabcclient 4.4 4
-slotmove kde-base/kabcclient 4.5 4
-slotmove kde-base/kabcclient 4.6 4
-slotmove kde-base/kaccessible 4.6 4
-slotmove kde-base/kaddressbook 4.1 4
-slotmove kde-base/kaddressbook 4.2 4
-slotmove kde-base/kaddressbook 4.3 4
-slotmove kde-base/kaddressbook 4.4 4
-slotmove kde-base/kaddressbook 4.5 4
-slotmove kde-base/kaddressbook 4.6 4
-slotmove kde-base/kajongg 4.5 4
-slotmove kde-base/kajongg 4.6 4
-slotmove kde-base/kalarm 4.1 4
-slotmove kde-base/kalarm 4.2 4
-slotmove kde-base/kalarm 4.3 4
-slotmove kde-base/kalarm 4.4 4
-slotmove kde-base/kalarm 4.5 4
-slotmove kde-base/kalarm 4.6 4
-slotmove kde-base/kalgebra 4.1 4
-slotmove kde-base/kalgebra 4.2 4
-slotmove kde-base/kalgebra 4.3 4
-slotmove kde-base/kalgebra 4.4 4
-slotmove kde-base/kalgebra 4.5 4
-slotmove kde-base/kalgebra 4.6 4
-slotmove kde-base/kalzium 4.1 4
-slotmove kde-base/kalzium 4.2 4
-slotmove kde-base/kalzium 4.3 4
-slotmove kde-base/kalzium 4.4 4
-slotmove kde-base/kalzium 4.5 4
-slotmove kde-base/kalzium 4.6 4
-slotmove kde-base/kamera 4.1 4
-slotmove kde-base/kamera 4.2 4
-slotmove kde-base/kamera 4.3 4
-slotmove kde-base/kamera 4.4 4
-slotmove kde-base/kamera 4.5 4
-slotmove kde-base/kamera 4.6 4
-slotmove kde-base/kanagram 4.1 4
-slotmove kde-base/kanagram 4.2 4
-slotmove kde-base/kanagram 4.3 4
-slotmove kde-base/kanagram 4.4 4
-slotmove kde-base/kanagram 4.5 4
-slotmove kde-base/kanagram 4.6 4
-slotmove kde-base/kapman 4.2 4
-slotmove kde-base/kapman 4.3 4
-slotmove kde-base/kapman 4.4 4
-slotmove kde-base/kapman 4.5 4
-slotmove kde-base/kapman 4.6 4
-slotmove kde-base/kappfinder 4.1 4
-slotmove kde-base/kappfinder 4.2 4
-slotmove kde-base/kappfinder 4.3 4
-slotmove kde-base/kappfinder 4.4 4
-slotmove kde-base/kapptemplate 4.1 4
-slotmove kde-base/kapptemplate 4.2 4
-slotmove kde-base/kapptemplate 4.3 4
-slotmove kde-base/kapptemplate 4.4 4
-slotmove kde-base/kapptemplate 4.5 4
-slotmove kde-base/kapptemplate 4.6 4
-slotmove kde-base/kate 4.1 4
-slotmove kde-base/kate 4.2 4
-slotmove kde-base/kate 4.3 4
-slotmove kde-base/kate 4.4 4
-slotmove kde-base/kate 4.5 4
-slotmove kde-base/kate 4.6 4
-slotmove kde-base/katomic 4.1 4
-slotmove kde-base/katomic 4.2 4
-slotmove kde-base/katomic 4.3 4
-slotmove kde-base/katomic 4.4 4
-slotmove kde-base/katomic 4.5 4
-slotmove kde-base/katomic 4.6 4
-slotmove kde-base/kbattleship 4.1 4
-slotmove kde-base/kbattleship 4.2 4
-slotmove kde-base/kbattleship 4.3 4
-slotmove kde-base/kbattleship 4.4 4
-slotmove kde-base/kbattleship 4.5 4
-slotmove kde-base/kbattleship 4.6 4
-slotmove kde-base/kblackbox 4.1 4
-slotmove kde-base/kblackbox 4.2 4
-slotmove kde-base/kblackbox 4.3 4
-slotmove kde-base/kblackbox 4.4 4
-slotmove kde-base/kblackbox 4.5 4
-slotmove kde-base/kblackbox 4.6 4
-slotmove kde-base/kblocks 4.1 4
-slotmove kde-base/kblocks 4.2 4
-slotmove kde-base/kblocks 4.3 4
-slotmove kde-base/kblocks 4.4 4
-slotmove kde-base/kblocks 4.5 4
-slotmove kde-base/kblocks 4.6 4
-slotmove kde-base/kbounce 4.1 4
-slotmove kde-base/kbounce 4.2 4
-slotmove kde-base/kbounce 4.3 4
-slotmove kde-base/kbounce 4.4 4
-slotmove kde-base/kbounce 4.5 4
-slotmove kde-base/kbounce 4.6 4
-slotmove kde-base/kbreakout 4.1 4
-slotmove kde-base/kbreakout 4.2 4
-slotmove kde-base/kbreakout 4.3 4
-slotmove kde-base/kbreakout 4.4 4
-slotmove kde-base/kbreakout 4.5 4
-slotmove kde-base/kbreakout 4.6 4
-slotmove kde-base/kbruch 4.1 4
-slotmove kde-base/kbruch 4.2 4
-slotmove kde-base/kbruch 4.3 4
-slotmove kde-base/kbruch 4.4 4
-slotmove kde-base/kbruch 4.5 4
-slotmove kde-base/kbruch 4.6 4
-slotmove kde-base/kbugbuster 4.1 4
-slotmove kde-base/kbugbuster 4.2 4
-slotmove kde-base/kbugbuster 4.3 4
-slotmove kde-base/kbugbuster 4.4 4
-slotmove kde-base/kbugbuster 4.5 4
-slotmove kde-base/kcachegrind 4.1 4
-slotmove kde-base/kcachegrind 4.2 4
-slotmove kde-base/kcachegrind 4.3 4
-slotmove kde-base/kcachegrind 4.4 4
-slotmove kde-base/kcachegrind 4.5 4
-slotmove kde-base/kcachegrind 4.6 4
-slotmove kde-base/kcalc 4.1 4
-slotmove kde-base/kcalc 4.2 4
-slotmove kde-base/kcalc 4.3 4
-slotmove kde-base/kcalc 4.4 4
-slotmove kde-base/kcalc 4.5 4
-slotmove kde-base/kcalc 4.6 4
-slotmove kde-base/kcharselect 4.1 4
-slotmove kde-base/kcharselect 4.2 4
-slotmove kde-base/kcharselect 4.3 4
-slotmove kde-base/kcharselect 4.4 4
-slotmove kde-base/kcharselect 4.5 4
-slotmove kde-base/kcharselect 4.6 4
-slotmove kde-base/kcheckpass 4.1 4
-slotmove kde-base/kcheckpass 4.2 4
-slotmove kde-base/kcheckpass 4.3 4
-slotmove kde-base/kcheckpass 4.4 4
-slotmove kde-base/kcheckpass 4.5 4
-slotmove kde-base/kcheckpass 4.6 4
-slotmove kde-base/kcminit 4.1 4
-slotmove kde-base/kcminit 4.2 4
-slotmove kde-base/kcminit 4.3 4
-slotmove kde-base/kcminit 4.4 4
-slotmove kde-base/kcminit 4.5 4
-slotmove kde-base/kcminit 4.6 4
-slotmove kde-base/kcmshell 4.1 4
-slotmove kde-base/kcmshell 4.2 4
-slotmove kde-base/kcmshell 4.3 4
-slotmove kde-base/kcmshell 4.4 4
-slotmove kde-base/kcmshell 4.5 4
-slotmove kde-base/kcmshell 4.6 4
-slotmove kde-base/kcolorchooser 4.1 4
-slotmove kde-base/kcolorchooser 4.2 4
-slotmove kde-base/kcolorchooser 4.3 4
-slotmove kde-base/kcolorchooser 4.4 4
-slotmove kde-base/kcolorchooser 4.5 4
-slotmove kde-base/kcolorchooser 4.6 4
-slotmove kde-base/kcontrol 4.1 4
-slotmove kde-base/kcontrol 4.2 4
-slotmove kde-base/kcontrol 4.3 4
-slotmove kde-base/kcontrol 4.4 4
-slotmove kde-base/kcontrol 4.5 4
-slotmove kde-base/kcontrol 4.6 4
-slotmove kde-base/kcron 4.1 4
-slotmove kde-base/kcron 4.2 4
-slotmove kde-base/kcron 4.3 4
-slotmove kde-base/kcron 4.4 4
-slotmove kde-base/kcron 4.5 4
-slotmove kde-base/kcron 4.6 4
-slotmove kde-base/kdeaccessibility-colorschemes 4.1 4
-slotmove kde-base/kdeaccessibility-colorschemes 4.2 4
-slotmove kde-base/kdeaccessibility-colorschemes 4.3 4
-slotmove kde-base/kdeaccessibility-colorschemes 4.4 4
-slotmove kde-base/kdeaccessibility-colorschemes 4.5 4
-slotmove kde-base/kdeaccessibility-colorschemes 4.6 4
-slotmove kde-base/kdeaccessibility-iconthemes 4.1 4
-slotmove kde-base/kdeaccessibility-iconthemes 4.2 4
-slotmove kde-base/kdeaccessibility-iconthemes 4.3 4
-slotmove kde-base/kdeaccessibility-iconthemes 4.4 4
-slotmove kde-base/kdeaccessibility-iconthemes 4.5 4
-slotmove kde-base/kdeaccessibility-iconthemes 4.6 4
-slotmove kde-base/kdeaccessibility-meta 4.1 4
-slotmove kde-base/kdeaccessibility-meta 4.2 4
-slotmove kde-base/kdeaccessibility-meta 4.3 4
-slotmove kde-base/kdeaccessibility-meta 4.4 4
-slotmove kde-base/kdeaccessibility-meta 4.5 4
-slotmove kde-base/kdeaccessibility-meta 4.6 4
-slotmove kde-base/kdeaccounts-plugin 4.1 4
-slotmove kde-base/kdeaccounts-plugin 4.2 4
-slotmove kde-base/kdeaccounts-plugin 4.3 4
-slotmove kde-base/kdeaccounts-plugin 4.4 4
-slotmove kde-base/kdeaccounts-plugin 4.5 4
-slotmove kde-base/kdeaccounts-plugin 4.6 4
-slotmove kde-base/kdeadmin-meta 4.1 4
-slotmove kde-base/kdeadmin-meta 4.2 4
-slotmove kde-base/kdeadmin-meta 4.3 4
-slotmove kde-base/kdeadmin-meta 4.4 4
-slotmove kde-base/kdeadmin-meta 4.5 4
-slotmove kde-base/kdeadmin-meta 4.6 4
-slotmove kde-base/kdeartwork-colorschemes 4.1 4
-slotmove kde-base/kdeartwork-colorschemes 4.2 4
-slotmove kde-base/kdeartwork-colorschemes 4.3 4
-slotmove kde-base/kdeartwork-colorschemes 4.4 4
-slotmove kde-base/kdeartwork-colorschemes 4.5 4
-slotmove kde-base/kdeartwork-colorschemes 4.6 4
-slotmove kde-base/kdeartwork-desktopthemes 4.2 4
-slotmove kde-base/kdeartwork-desktopthemes 4.3 4
-slotmove kde-base/kdeartwork-desktopthemes 4.4 4
-slotmove kde-base/kdeartwork-desktopthemes 4.5 4
-slotmove kde-base/kdeartwork-desktopthemes 4.6 4
-slotmove kde-base/kdeartwork-emoticons 4.1 4
-slotmove kde-base/kdeartwork-emoticons 4.2 4
-slotmove kde-base/kdeartwork-emoticons 4.3 4
-slotmove kde-base/kdeartwork-emoticons 4.4 4
-slotmove kde-base/kdeartwork-emoticons 4.5 4
-slotmove kde-base/kdeartwork-emoticons 4.6 4
-slotmove kde-base/kdeartwork-icewm-themes 4.1 4
-slotmove kde-base/kdeartwork-iconthemes 4.1 4
-slotmove kde-base/kdeartwork-iconthemes 4.2 4
-slotmove kde-base/kdeartwork-iconthemes 4.3 4
-slotmove kde-base/kdeartwork-iconthemes 4.4 4
-slotmove kde-base/kdeartwork-iconthemes 4.5 4
-slotmove kde-base/kdeartwork-iconthemes 4.6 4
-slotmove kde-base/kdeartwork-kscreensaver 4.1 4
-slotmove kde-base/kdeartwork-kscreensaver 4.2 4
-slotmove kde-base/kdeartwork-kscreensaver 4.3 4
-slotmove kde-base/kdeartwork-kscreensaver 4.4 4
-slotmove kde-base/kdeartwork-kscreensaver 4.5 4
-slotmove kde-base/kdeartwork-kscreensaver 4.6 4
-slotmove kde-base/kdeartwork-kworldclock 4.1 4
-slotmove kde-base/kdeartwork-meta 4.1 4
-slotmove kde-base/kdeartwork-meta 4.2 4
-slotmove kde-base/kdeartwork-meta 4.3 4
-slotmove kde-base/kdeartwork-meta 4.4 4
-slotmove kde-base/kdeartwork-meta 4.5 4
-slotmove kde-base/kdeartwork-meta 4.6 4
-slotmove kde-base/kdeartwork-sounds 4.1 4
-slotmove kde-base/kdeartwork-sounds 4.2 4
-slotmove kde-base/kdeartwork-sounds 4.3 4
-slotmove kde-base/kdeartwork-sounds 4.4 4
-slotmove kde-base/kdeartwork-sounds 4.5 4
-slotmove kde-base/kdeartwork-sounds 4.6 4
-slotmove kde-base/kdeartwork-styles 4.1 4
-slotmove kde-base/kdeartwork-styles 4.2 4
-slotmove kde-base/kdeartwork-styles 4.3 4
-slotmove kde-base/kdeartwork-styles 4.4 4
-slotmove kde-base/kdeartwork-styles 4.5 4
-slotmove kde-base/kdeartwork-styles 4.6 4
-slotmove kde-base/kdeartwork-wallpapers 4.1 4
-slotmove kde-base/kdeartwork-wallpapers 4.2 4
-slotmove kde-base/kdeartwork-wallpapers 4.3 4
-slotmove kde-base/kdeartwork-wallpapers 4.4 4
-slotmove kde-base/kdeartwork-wallpapers 4.5 4
-slotmove kde-base/kdeartwork-wallpapers 4.6 4
-slotmove kde-base/kdeartwork-weatherwallpapers 4.3 4
-slotmove kde-base/kdeartwork-weatherwallpapers 4.4 4
-slotmove kde-base/kdeartwork-weatherwallpapers 4.5 4
-slotmove kde-base/kdeartwork-weatherwallpapers 4.6 4
-slotmove kde-base/kdebase-cursors 4.1 4
-slotmove kde-base/kdebase-cursors 4.2 4
-slotmove kde-base/kdebase-cursors 4.3 4
-slotmove kde-base/kdebase-cursors 4.4 4
-slotmove kde-base/kdebase-cursors 4.5 4
-slotmove kde-base/kdebase-cursors 4.6 4
-slotmove kde-base/kdebase-data 4.1 4
-slotmove kde-base/kdebase-data 4.2 4
-slotmove kde-base/kdebase-data 4.3 4
-slotmove kde-base/kdebase-data 4.4 4
-slotmove kde-base/kdebase-data 4.5 4
-slotmove kde-base/kdebase-data 4.6 4
-slotmove kde-base/kdebase-desktoptheme 4.2 4
-slotmove kde-base/kdebase-desktoptheme 4.3 4
-slotmove kde-base/kdebase-desktoptheme 4.4 4
-slotmove kde-base/kdebase-desktoptheme 4.5 4
-slotmove kde-base/kdebase-desktoptheme 4.6 4
-slotmove kde-base/kdebase-kioslaves 4.1 4
-slotmove kde-base/kdebase-kioslaves 4.2 4
-slotmove kde-base/kdebase-kioslaves 4.3 4
-slotmove kde-base/kdebase-kioslaves 4.4 4
-slotmove kde-base/kdebase-kioslaves 4.5 4
-slotmove kde-base/kdebase-kioslaves 4.6 4
-slotmove kde-base/kdebase-menu 4.3 4
-slotmove kde-base/kdebase-menu 4.4 4
-slotmove kde-base/kdebase-menu 4.5 4
-slotmove kde-base/kdebase-menu 4.6 4
-slotmove kde-base/kdebase-menu-icons 4.3 4
-slotmove kde-base/kdebase-menu-icons 4.4 4
-slotmove kde-base/kdebase-menu-icons 4.5 4
-slotmove kde-base/kdebase-menu-icons 4.6 4
-slotmove kde-base/kdebase-meta 4.1 4
-slotmove kde-base/kdebase-meta 4.2 4
-slotmove kde-base/kdebase-meta 4.3 4
-slotmove kde-base/kdebase-meta 4.4 4
-slotmove kde-base/kdebase-meta 4.5 4
-slotmove kde-base/kdebase-meta 4.6 4
-slotmove kde-base/kdebase-runtime-meta 4.3 4
-slotmove kde-base/kdebase-runtime-meta 4.4 4
-slotmove kde-base/kdebase-runtime-meta 4.5 4
-slotmove kde-base/kdebase-runtime-meta 4.6 4
-slotmove kde-base/kdebase-startkde 4.1 4
-slotmove kde-base/kdebase-startkde 4.2 4
-slotmove kde-base/kdebase-startkde 4.3 4
-slotmove kde-base/kdebase-startkde 4.4 4
-slotmove kde-base/kdebase-startkde 4.5 4
-slotmove kde-base/kdebase-startkde 4.6 4
-slotmove kde-base/kdebase-wallpapers 4.3 4
-slotmove kde-base/kdebase-wallpapers 4.4 4
-slotmove kde-base/kdebase-wallpapers 4.5 4
-slotmove kde-base/kdebase-wallpapers 4.6 4
-slotmove kde-base/kdebindings-csharp 4.3 4
-slotmove kde-base/kdebindings-csharp 4.4 4
-slotmove kde-base/kdebindings-csharp 4.5 4
-slotmove kde-base/kdebindings-csharp 4.6 4
-slotmove kde-base/kdebindings-meta 4.4 4
-slotmove kde-base/kdebindings-meta 4.5 4
-slotmove kde-base/kdebindings-meta 4.6 4
-slotmove kde-base/kdebindings-perl 4.5 4
-slotmove kde-base/kdebindings-perl 4.6 4
-slotmove kde-base/kdebindings-ruby 4.4 4
-slotmove kde-base/kdebindings-ruby 4.5 4
-slotmove kde-base/kdebindings-ruby 4.6 4
-slotmove kde-base/kdebugdialog 4.1 4
-slotmove kde-base/kdebugdialog 4.2 4
-slotmove kde-base/kdebugdialog 4.3 4
-slotmove kde-base/kdebugdialog 4.4 4
-slotmove kde-base/kdebugdialog 4.5 4
-slotmove kde-base/kdebugdialog 4.6 4
-slotmove kde-base/kdedglobalaccel 4.2 4
-slotmove kde-base/kdeedu-meta 4.1 4
-slotmove kde-base/kdeedu-meta 4.2 4
-slotmove kde-base/kdeedu-meta 4.3 4
-slotmove kde-base/kdeedu-meta 4.4 4
-slotmove kde-base/kdeedu-meta 4.5 4
-slotmove kde-base/kdeedu-meta 4.6 4
-slotmove kde-base/kde-env 4.2 4
-slotmove kde-base/kde-env 4.3 4
-slotmove kde-base/kde-env 4.4 4
-slotmove kde-base/kde-env 4.5 4
-slotmove kde-base/kde-env 4.6 4
-slotmove kde-base/kdegames-meta 4.1 4
-slotmove kde-base/kdegames-meta 4.2 4
-slotmove kde-base/kdegames-meta 4.3 4
-slotmove kde-base/kdegames-meta 4.4 4
-slotmove kde-base/kdegames-meta 4.5 4
-slotmove kde-base/kdegames-meta 4.6 4
-slotmove kde-base/kdegraphics-meta 4.1 4
-slotmove kde-base/kdegraphics-meta 4.2 4
-slotmove kde-base/kdegraphics-meta 4.3 4
-slotmove kde-base/kdegraphics-meta 4.4 4
-slotmove kde-base/kdegraphics-meta 4.5 4
-slotmove kde-base/kdegraphics-meta 4.6 4
-slotmove kde-base/kdegraphics-strigi-analyzer 4.1 4
-slotmove kde-base/kdegraphics-strigi-analyzer 4.2 4
-slotmove kde-base/kdegraphics-strigi-analyzer 4.3 4
-slotmove kde-base/kdegraphics-strigi-analyzer 4.4 4
-slotmove kde-base/kdegraphics-strigi-analyzer 4.5 4
-slotmove kde-base/kdegraphics-strigi-analyzer 4.6 4
-slotmove kde-base/kde-l10n 4.1 4
-slotmove kde-base/kde-l10n 4.2 4
-slotmove kde-base/kde-l10n 4.3 4
-slotmove kde-base/kde-l10n 4.4 4
-slotmove kde-base/kde-l10n 4.5 4
-slotmove kde-base/kde-l10n 4.6 4
-slotmove kde-base/kdelibs 4.1 4
-slotmove kde-base/kdelibs 4.2 4
-slotmove kde-base/kdelibs 4.3 4
-slotmove kde-base/kdelibs 4.4 4
-slotmove kde-base/kdelibs 4.5 4
-slotmove kde-base/kdelibs 4.6 4
-slotmove kde-base/kdelirc 4.3 4
-slotmove kde-base/kdelirc 4.4 4
-slotmove kde-base/kdemaildir 4.1 4
-slotmove kde-base/kdemaildir 4.2 4
-slotmove kde-base/kde-menu 4.1 4
-slotmove kde-base/kde-menu 4.2 4
-slotmove kde-base/kde-menu-icons 4.1 4
-slotmove kde-base/kde-menu-icons 4.2 4
-slotmove kde-base/kde-meta 4.1 4
-slotmove kde-base/kde-meta 4.2 4
-slotmove kde-base/kde-meta 4.3 4
-slotmove kde-base/kde-meta 4.4 4
-slotmove kde-base/kde-meta 4.5 4
-slotmove kde-base/kde-meta 4.6 4
-slotmove kde-base/kdemultimedia-kioslaves 4.1 4
-slotmove kde-base/kdemultimedia-kioslaves 4.2 4
-slotmove kde-base/kdemultimedia-kioslaves 4.3 4
-slotmove kde-base/kdemultimedia-kioslaves 4.4 4
-slotmove kde-base/kdemultimedia-kioslaves 4.5 4
-slotmove kde-base/kdemultimedia-kioslaves 4.6 4
-slotmove kde-base/kdemultimedia-meta 4.1 4
-slotmove kde-base/kdemultimedia-meta 4.2 4
-slotmove kde-base/kdemultimedia-meta 4.3 4
-slotmove kde-base/kdemultimedia-meta 4.4 4
-slotmove kde-base/kdemultimedia-meta 4.5 4
-slotmove kde-base/kdemultimedia-meta 4.6 4
-slotmove kde-base/kdenetwork-filesharing 4.1 4
-slotmove kde-base/kdenetwork-filesharing 4.2 4
-slotmove kde-base/kdenetwork-filesharing 4.3 4
-slotmove kde-base/kdenetwork-filesharing 4.4 4
-slotmove kde-base/kdenetwork-filesharing 4.5 4
-slotmove kde-base/kdenetwork-filesharing 4.6 4
-slotmove kde-base/kdenetwork-meta 4.1 4
-slotmove kde-base/kdenetwork-meta 4.2 4
-slotmove kde-base/kdenetwork-meta 4.3 4
-slotmove kde-base/kdenetwork-meta 4.4 4
-slotmove kde-base/kdenetwork-meta 4.5 4
-slotmove kde-base/kdenetwork-meta 4.6 4
-slotmove kde-base/kdepasswd 4.1 4
-slotmove kde-base/kdepasswd 4.2 4
-slotmove kde-base/kdepasswd 4.3 4
-slotmove kde-base/kdepasswd 4.4 4
-slotmove kde-base/kdepasswd 4.5 4
-slotmove kde-base/kdepasswd 4.6 4
-slotmove kde-base/kdepim-common-libs 4.5 4
-slotmove kde-base/kdepim-common-libs 4.6 4
-slotmove kde-base/kdepim-icons 4.1 4
-slotmove kde-base/kdepim-icons 4.2 4
-slotmove kde-base/kdepim-icons 4.3 4
-slotmove kde-base/kdepim-icons 4.4 4
-slotmove kde-base/kdepim-icons 4.5 4
-slotmove kde-base/kdepim-icons 4.6 4
-slotmove kde-base/kdepim-kresources 4.1 4
-slotmove kde-base/kdepim-kresources 4.2 4
-slotmove kde-base/kdepim-kresources 4.3 4
-slotmove kde-base/kdepim-kresources 4.4 4
-slotmove kde-base/kdepim-kresources 4.5 4
-slotmove kde-base/kdepim-kresources 4.6 4
-slotmove kde-base/kdepim-l10n 4.4 4
-slotmove kde-base/kdepimlibs 4.1 4
-slotmove kde-base/kdepimlibs 4.2 4
-slotmove kde-base/kdepimlibs 4.3 4
-slotmove kde-base/kdepimlibs 4.4 4
-slotmove kde-base/kdepimlibs 4.5 4
-slotmove kde-base/kdepimlibs 4.6 4
-slotmove kde-base/kdepim-meta 4.1 4
-slotmove kde-base/kdepim-meta 4.2 4
-slotmove kde-base/kdepim-meta 4.3 4
-slotmove kde-base/kdepim-meta 4.4 4
-slotmove kde-base/kdepim-meta 4.5 4
-slotmove kde-base/kdepim-meta 4.6 4
-slotmove kde-base/kdepim-runtime 4.4 4
-slotmove kde-base/kdepim-runtime 4.5 4
-slotmove kde-base/kdepim-runtime 4.6 4
-slotmove kde-base/kdepim-strigi-analyzer 4.1 4
-slotmove kde-base/kdepim-strigi-analyzer 4.2 4
-slotmove kde-base/kdepim-strigi-analyzer 4.3 4
-slotmove kde-base/kdepim-strigi-analyzer 4.4 4
-slotmove kde-base/kdepim-strigi-analyzer 4.5 4
-slotmove kde-base/kdepim-strigi-analyzer 4.6 4
-slotmove kde-base/kdepim-wizards 4.1 4
-slotmove kde-base/kdepim-wizards 4.2 4
-slotmove kde-base/kdepim-wizards 4.3 4
-slotmove kde-base/kdepim-wizards 4.4 4
-slotmove kde-base/kdepim-wizards 4.5 4
-slotmove kde-base/kdepim-wizards 4.6 4
-slotmove kde-base/kdeplasma-addons 4.1 4
-slotmove kde-base/kdeplasma-addons 4.2 4
-slotmove kde-base/kdeplasma-addons 4.3 4
-slotmove kde-base/kdeplasma-addons 4.4 4
-slotmove kde-base/kdeplasma-addons 4.5 4
-slotmove kde-base/kdeplasma-addons 4.6 4
-slotmove kde-base/kdesdk-kioslaves 4.1 4
-slotmove kde-base/kdesdk-kioslaves 4.2 4
-slotmove kde-base/kdesdk-kioslaves 4.3 4
-slotmove kde-base/kdesdk-kioslaves 4.4 4
-slotmove kde-base/kdesdk-kioslaves 4.5 4
-slotmove kde-base/kdesdk-kioslaves 4.6 4
-slotmove kde-base/kdesdk-meta 4.1 4
-slotmove kde-base/kdesdk-meta 4.2 4
-slotmove kde-base/kdesdk-meta 4.3 4
-slotmove kde-base/kdesdk-meta 4.4 4
-slotmove kde-base/kdesdk-meta 4.5 4
-slotmove kde-base/kdesdk-meta 4.6 4
-slotmove kde-base/kdesdk-misc 4.1 4
-slotmove kde-base/kdesdk-misc 4.2 4
-slotmove kde-base/kdesdk-misc 4.3 4
-slotmove kde-base/kdesdk-misc 4.4 4
-slotmove kde-base/kdesdk-misc 4.5 4
-slotmove kde-base/kdesdk-misc 4.6 4
-slotmove kde-base/kdesdk-scripts 4.1 4
-slotmove kde-base/kdesdk-scripts 4.2 4
-slotmove kde-base/kdesdk-scripts 4.3 4
-slotmove kde-base/kdesdk-scripts 4.4 4
-slotmove kde-base/kdesdk-scripts 4.5 4
-slotmove kde-base/kdesdk-scripts 4.6 4
-slotmove kde-base/kdesdk-strigi-analyzer 4.1 4
-slotmove kde-base/kdesdk-strigi-analyzer 4.2 4
-slotmove kde-base/kdesdk-strigi-analyzer 4.3 4
-slotmove kde-base/kdesdk-strigi-analyzer 4.4 4
-slotmove kde-base/kdesdk-strigi-analyzer 4.5 4
-slotmove kde-base/kdesdk-strigi-analyzer 4.6 4
-slotmove kde-base/kdessh 4.1 4
-slotmove kde-base/kdessh 4.2 4
-slotmove kde-base/kdessh 4.3 4
-slotmove kde-base/kdesu 4.1 4
-slotmove kde-base/kdesu 4.2 4
-slotmove kde-base/kdesu 4.3 4
-slotmove kde-base/kdesu 4.4 4
-slotmove kde-base/kdesu 4.5 4
-slotmove kde-base/kdesu 4.6 4
-slotmove kde-base/kdetoys-meta 4.1 4
-slotmove kde-base/kdetoys-meta 4.2 4
-slotmove kde-base/kdetoys-meta 4.3 4
-slotmove kde-base/kdetoys-meta 4.4 4
-slotmove kde-base/kdetoys-meta 4.5 4
-slotmove kde-base/kdetoys-meta 4.6 4
-slotmove kde-base/kdeutils-meta 4.1 4
-slotmove kde-base/kdeutils-meta 4.2 4
-slotmove kde-base/kdeutils-meta 4.3 4
-slotmove kde-base/kdeutils-meta 4.4 4
-slotmove kde-base/kdeutils-meta 4.5 4
-slotmove kde-base/kdeutils-meta 4.6 4
-slotmove kde-base/kde-wallpapers 4.1 4
-slotmove kde-base/kde-wallpapers 4.2 4
-slotmove kde-base/kdewebdev-meta 4.2 4
-slotmove kde-base/kdewebdev-meta 4.3 4
-slotmove kde-base/kdewebdev-meta 4.4 4
-slotmove kde-base/kdewebdev-meta 4.5 4
-slotmove kde-base/kdewebdev-meta 4.6 4
-slotmove kde-base/kdf 4.1 4
-slotmove kde-base/kdf 4.2 4
-slotmove kde-base/kdf 4.3 4
-slotmove kde-base/kdf 4.4 4
-slotmove kde-base/kdf 4.5 4
-slotmove kde-base/kdf 4.6 4
-slotmove kde-base/kdialog 4.1 4
-slotmove kde-base/kdialog 4.2 4
-slotmove kde-base/kdialog 4.3 4
-slotmove kde-base/kdialog 4.4 4
-slotmove kde-base/kdialog 4.5 4
-slotmove kde-base/kdialog 4.6 4
-slotmove kde-base/kdiamond 4.1 4
-slotmove kde-base/kdiamond 4.2 4
-slotmove kde-base/kdiamond 4.3 4
-slotmove kde-base/kdiamond 4.4 4
-slotmove kde-base/kdiamond 4.5 4
-slotmove kde-base/kdiamond 4.6 4
-slotmove kde-base/kdm 4.1 4
-slotmove kde-base/kdm 4.2 4
-slotmove kde-base/kdm 4.3 4
-slotmove kde-base/kdm 4.4 4
-slotmove kde-base/kdm 4.5 4
-slotmove kde-base/kdm 4.6 4
-slotmove kde-base/kdnssd 4.1 4
-slotmove kde-base/kdnssd 4.2 4
-slotmove kde-base/kdnssd 4.3 4
-slotmove kde-base/kdnssd 4.4 4
-slotmove kde-base/kdnssd 4.5 4
-slotmove kde-base/kdnssd 4.6 4
-slotmove kde-base/kdontchangethehostname 4.5 4
-slotmove kde-base/kdontchangethehostname 4.6 4
-slotmove kde-base/keditbookmarks 4.1 4
-slotmove kde-base/keditbookmarks 4.2 4
-slotmove kde-base/keditbookmarks 4.3 4
-slotmove kde-base/keditbookmarks 4.4 4
-slotmove kde-base/keditbookmarks 4.5 4
-slotmove kde-base/keditbookmarks 4.6 4
-slotmove kde-base/keditfiletype 4.3 4
-slotmove kde-base/keditfiletype 4.4 4
-slotmove kde-base/keditfiletype 4.5 4
-slotmove kde-base/keditfiletype 4.6 4
-slotmove kde-base/kephal 4.2 4
-slotmove kde-base/kephal 4.3 4
-slotmove kde-base/kephal 4.4 4
-slotmove kde-base/kephal 4.5 4
-slotmove kde-base/kephal 4.6 4
-slotmove kde-base/kfile 4.1 4
-slotmove kde-base/kfile 4.2 4
-slotmove kde-base/kfile 4.3 4
-slotmove kde-base/kfile 4.4 4
-slotmove kde-base/kfile 4.5 4
-slotmove kde-base/kfile 4.6 4
-slotmove kde-base/kfilereplace 4.1 4
-slotmove kde-base/kfilereplace 4.2 4
-slotmove kde-base/kfilereplace 4.3 4
-slotmove kde-base/kfilereplace 4.4 4
-slotmove kde-base/kfilereplace 4.5 4
-slotmove kde-base/kfilereplace 4.6 4
-slotmove kde-base/kfind 4.1 4
-slotmove kde-base/kfind 4.2 4
-slotmove kde-base/kfind 4.3 4
-slotmove kde-base/kfind 4.4 4
-slotmove kde-base/kfind 4.5 4
-slotmove kde-base/kfind 4.6 4
-slotmove kde-base/kfloppy 4.1 4
-slotmove kde-base/kfloppy 4.2 4
-slotmove kde-base/kfloppy 4.3 4
-slotmove kde-base/kfloppy 4.4 4
-slotmove kde-base/kfloppy 4.5 4
-slotmove kde-base/kfloppy 4.6 4
-slotmove kde-base/kfmclient 4.3 4
-slotmove kde-base/kfmclient 4.4 4
-slotmove kde-base/kfmclient 4.5 4
-slotmove kde-base/kfmclient 4.6 4
-slotmove kde-base/kfourinline 4.1 4
-slotmove kde-base/kfourinline 4.2 4
-slotmove kde-base/kfourinline 4.3 4
-slotmove kde-base/kfourinline 4.4 4
-slotmove kde-base/kfourinline 4.5 4
-slotmove kde-base/kfourinline 4.6 4
-slotmove kde-base/kgamma 4.1 4
-slotmove kde-base/kgamma 4.2 4
-slotmove kde-base/kgamma 4.3 4
-slotmove kde-base/kgamma 4.4 4
-slotmove kde-base/kgamma 4.5 4
-slotmove kde-base/kgamma 4.6 4
-slotmove kde-base/kgeography 4.1 4
-slotmove kde-base/kgeography 4.2 4
-slotmove kde-base/kgeography 4.3 4
-slotmove kde-base/kgeography 4.4 4
-slotmove kde-base/kgeography 4.5 4
-slotmove kde-base/kgeography 4.6 4
-slotmove kde-base/kget 4.1 4
-slotmove kde-base/kget 4.2 4
-slotmove kde-base/kget 4.3 4
-slotmove kde-base/kget 4.4 4
-slotmove kde-base/kget 4.5 4
-slotmove kde-base/kget 4.6 4
-slotmove kde-base/kglobalaccel 4.3 4
-slotmove kde-base/kglobalaccel 4.4 4
-slotmove kde-base/kglobalaccel 4.5 4
-slotmove kde-base/kglobalaccel 4.6 4
-slotmove kde-base/kgoldrunner 4.1 4
-slotmove kde-base/kgoldrunner 4.2 4
-slotmove kde-base/kgoldrunner 4.3 4
-slotmove kde-base/kgoldrunner 4.4 4
-slotmove kde-base/kgoldrunner 4.5 4
-slotmove kde-base/kgoldrunner 4.6 4
-slotmove kde-base/kgpg 4.1 4
-slotmove kde-base/kgpg 4.2 4
-slotmove kde-base/kgpg 4.3 4
-slotmove kde-base/kgpg 4.4 4
-slotmove kde-base/kgpg 4.5 4
-slotmove kde-base/kgpg 4.6 4
-slotmove kde-base/khangman 4.1 4
-slotmove kde-base/khangman 4.2 4
-slotmove kde-base/khangman 4.3 4
-slotmove kde-base/khangman 4.4 4
-slotmove kde-base/khangman 4.5 4
-slotmove kde-base/khangman 4.6 4
-slotmove kde-base/khelpcenter 4.1 4
-slotmove kde-base/khelpcenter 4.2 4
-slotmove kde-base/khelpcenter 4.3 4
-slotmove kde-base/khelpcenter 4.4 4
-slotmove kde-base/khelpcenter 4.5 4
-slotmove kde-base/khelpcenter 4.6 4
-slotmove kde-base/khotkeys 4.1 4
-slotmove kde-base/khotkeys 4.2 4
-slotmove kde-base/khotkeys 4.3 4
-slotmove kde-base/khotkeys 4.4 4
-slotmove kde-base/khotkeys 4.5 4
-slotmove kde-base/khotkeys 4.6 4
-slotmove kde-base/kiconfinder 4.1 4
-slotmove kde-base/kiconfinder 4.2 4
-slotmove kde-base/kiconfinder 4.3 4
-slotmove kde-base/kiconfinder 4.4 4
-slotmove kde-base/kiconfinder 4.5 4
-slotmove kde-base/kiconfinder 4.6 4
-slotmove kde-base/kig 4.1 4
-slotmove kde-base/kig 4.2 4
-slotmove kde-base/kig 4.3 4
-slotmove kde-base/kig 4.4 4
-slotmove kde-base/kig 4.5 4
-slotmove kde-base/kig 4.6 4
-slotmove kde-base/kigo 4.4 4
-slotmove kde-base/kigo 4.5 4
-slotmove kde-base/kigo 4.6 4
-slotmove kde-base/killbots 4.2 4
-slotmove kde-base/killbots 4.3 4
-slotmove kde-base/killbots 4.4 4
-slotmove kde-base/killbots 4.5 4
-slotmove kde-base/killbots 4.6 4
-slotmove kde-base/kimagemapeditor 4.1 4
-slotmove kde-base/kimagemapeditor 4.2 4
-slotmove kde-base/kimagemapeditor 4.3 4
-slotmove kde-base/kimagemapeditor 4.4 4
-slotmove kde-base/kimagemapeditor 4.5 4
-slotmove kde-base/kimagemapeditor 4.6 4
-slotmove kde-base/kinfocenter 4.1 4
-slotmove kde-base/kinfocenter 4.2 4
-slotmove kde-base/kinfocenter 4.3 4
-slotmove kde-base/kinfocenter 4.4 4
-slotmove kde-base/kinfocenter 4.5 4
-slotmove kde-base/kinfocenter 4.6 4
-slotmove kde-base/kioclient 4.1 4
-slotmove kde-base/kioclient 4.2 4
-slotmove kde-base/kioclient 4.3 4
-slotmove kde-base/kioclient 4.4 4
-slotmove kde-base/kioclient 4.5 4
-slotmove kde-base/kioclient 4.6 4
-slotmove kde-base/kiriki 4.1 4
-slotmove kde-base/kiriki 4.2 4
-slotmove kde-base/kiriki 4.3 4
-slotmove kde-base/kiriki 4.4 4
-slotmove kde-base/kiriki 4.5 4
-slotmove kde-base/kiriki 4.6 4
-slotmove kde-base/kitchensync 4.1 4
-slotmove kde-base/kiten 4.1 4
-slotmove kde-base/kiten 4.2 4
-slotmove kde-base/kiten 4.3 4
-slotmove kde-base/kiten 4.4 4
-slotmove kde-base/kiten 4.5 4
-slotmove kde-base/kiten 4.6 4
-slotmove kde-base/kjots 4.1 4
-slotmove kde-base/kjots 4.2 4
-slotmove kde-base/kjots 4.3 4
-slotmove kde-base/kjots 4.4 4
-slotmove kde-base/kjots 4.5 4
-slotmove kde-base/kjots 4.6 4
-slotmove kde-base/kjumpingcube 4.1 4
-slotmove kde-base/kjumpingcube 4.2 4
-slotmove kde-base/kjumpingcube 4.3 4
-slotmove kde-base/kjumpingcube 4.4 4
-slotmove kde-base/kjumpingcube 4.5 4
-slotmove kde-base/kjumpingcube 4.6 4
-slotmove kde-base/kleopatra 4.1 4
-slotmove kde-base/kleopatra 4.2 4
-slotmove kde-base/kleopatra 4.3 4
-slotmove kde-base/kleopatra 4.4 4
-slotmove kde-base/kleopatra 4.5 4
-slotmove kde-base/kleopatra 4.6 4
-slotmove kde-base/klettres 4.1 4
-slotmove kde-base/klettres 4.2 4
-slotmove kde-base/klettres 4.3 4
-slotmove kde-base/klettres 4.4 4
-slotmove kde-base/klettres 4.5 4
-slotmove kde-base/klettres 4.6 4
-slotmove kde-base/klickety 4.6 4
-slotmove kde-base/klines 4.1 4
-slotmove kde-base/klines 4.2 4
-slotmove kde-base/klines 4.3 4
-slotmove kde-base/klines 4.4 4
-slotmove kde-base/klines 4.5 4
-slotmove kde-base/klines 4.6 4
-slotmove kde-base/klinkstatus 4.1 4
-slotmove kde-base/klinkstatus 4.2 4
-slotmove kde-base/klinkstatus 4.3 4
-slotmove kde-base/klinkstatus 4.4 4
-slotmove kde-base/klinkstatus 4.5 4
-slotmove kde-base/klinkstatus 4.6 4
-slotmove kde-base/klipper 4.1 4
-slotmove kde-base/klipper 4.2 4
-slotmove kde-base/klipper 4.3 4
-slotmove kde-base/klipper 4.4 4
-slotmove kde-base/klipper 4.5 4
-slotmove kde-base/klipper 4.6 4
-slotmove kde-base/kmag 4.1 4
-slotmove kde-base/kmag 4.2 4
-slotmove kde-base/kmag 4.3 4
-slotmove kde-base/kmag 4.4 4
-slotmove kde-base/kmag 4.5 4
-slotmove kde-base/kmag 4.6 4
-slotmove kde-base/kmahjongg 4.1 4
-slotmove kde-base/kmahjongg 4.2 4
-slotmove kde-base/kmahjongg 4.3 4
-slotmove kde-base/kmahjongg 4.4 4
-slotmove kde-base/kmahjongg 4.5 4
-slotmove kde-base/kmahjongg 4.6 4
-slotmove kde-base/kmail 4.1 4
-slotmove kde-base/kmail 4.2 4
-slotmove kde-base/kmail 4.3 4
-slotmove kde-base/kmail 4.4 4
-slotmove kde-base/kmail 4.5 4
-slotmove kde-base/kmail 4.6 4
-slotmove kde-base/kmailcvt 4.1 4
-slotmove kde-base/kmailcvt 4.2 4
-slotmove kde-base/kmailcvt 4.3 4
-slotmove kde-base/kmenuedit 4.1 4
-slotmove kde-base/kmenuedit 4.2 4
-slotmove kde-base/kmenuedit 4.3 4
-slotmove kde-base/kmenuedit 4.4 4
-slotmove kde-base/kmenuedit 4.5 4
-slotmove kde-base/kmenuedit 4.6 4
-slotmove kde-base/kmimetypefinder 4.1 4
-slotmove kde-base/kmimetypefinder 4.2 4
-slotmove kde-base/kmimetypefinder 4.3 4
-slotmove kde-base/kmimetypefinder 4.4 4
-slotmove kde-base/kmimetypefinder 4.5 4
-slotmove kde-base/kmimetypefinder 4.6 4
-slotmove kde-base/kmines 4.1 4
-slotmove kde-base/kmines 4.2 4
-slotmove kde-base/kmines 4.3 4
-slotmove kde-base/kmines 4.4 4
-slotmove kde-base/kmines 4.5 4
-slotmove kde-base/kmines 4.6 4
-slotmove kde-base/kmix 4.1 4
-slotmove kde-base/kmix 4.2 4
-slotmove kde-base/kmix 4.3 4
-slotmove kde-base/kmix 4.4 4
-slotmove kde-base/kmix 4.5 4
-slotmove kde-base/kmix 4.6 4
-slotmove kde-base/kmousetool 4.1 4
-slotmove kde-base/kmousetool 4.2 4
-slotmove kde-base/kmousetool 4.3 4
-slotmove kde-base/kmousetool 4.4 4
-slotmove kde-base/kmousetool 4.5 4
-slotmove kde-base/kmousetool 4.6 4
-slotmove kde-base/kmouth 4.1 4
-slotmove kde-base/kmouth 4.2 4
-slotmove kde-base/kmouth 4.3 4
-slotmove kde-base/kmouth 4.4 4
-slotmove kde-base/kmouth 4.5 4
-slotmove kde-base/kmouth 4.6 4
-slotmove kde-base/kmplot 4.1 4
-slotmove kde-base/kmplot 4.2 4
-slotmove kde-base/kmplot 4.3 4
-slotmove kde-base/kmplot 4.4 4
-slotmove kde-base/kmplot 4.5 4
-slotmove kde-base/kmplot 4.6 4
-slotmove kde-base/knetattach 4.1 4
-slotmove kde-base/knetattach 4.2 4
-slotmove kde-base/knetattach 4.3 4
-slotmove kde-base/knetattach 4.4 4
-slotmove kde-base/knetattach 4.5 4
-slotmove kde-base/knetattach 4.6 4
-slotmove kde-base/knetwalk 4.1 4
-slotmove kde-base/knetwalk 4.2 4
-slotmove kde-base/knetwalk 4.3 4
-slotmove kde-base/knetwalk 4.4 4
-slotmove kde-base/knetwalk 4.5 4
-slotmove kde-base/knetwalk 4.6 4
-slotmove kde-base/knetworkconf 4.1 4
-slotmove kde-base/knetworkconf 4.2 4
-slotmove kde-base/knetworkconf 4.3 4
-slotmove kde-base/knetworkconf 4.4 4
-slotmove kde-base/knetworkconf 4.5 4
-slotmove kde-base/knewsticker 4.1 4
-slotmove kde-base/knewstuff 4.1 4
-slotmove kde-base/knewstuff 4.2 4
-slotmove kde-base/knewstuff 4.3 4
-slotmove kde-base/knewstuff 4.4 4
-slotmove kde-base/knewstuff 4.5 4
-slotmove kde-base/knewstuff 4.6 4
-slotmove kde-base/knode 4.1 4
-slotmove kde-base/knode 4.2 4
-slotmove kde-base/knode 4.3 4
-slotmove kde-base/knode 4.4 4
-slotmove kde-base/knode 4.5 4
-slotmove kde-base/knode 4.6 4
-slotmove kde-base/knotes 4.1 4
-slotmove kde-base/knotes 4.2 4
-slotmove kde-base/knotes 4.3 4
-slotmove kde-base/knotes 4.4 4
-slotmove kde-base/knotes 4.5 4
-slotmove kde-base/knotes 4.6 4
-slotmove kde-base/knotify 4.1 4
-slotmove kde-base/knotify 4.2 4
-slotmove kde-base/knotify 4.3 4
-slotmove kde-base/knotify 4.4 4
-slotmove kde-base/knotify 4.5 4
-slotmove kde-base/knotify 4.6 4
-slotmove kde-base/kode 4.1 4
-slotmove kde-base/kode 4.2 4
-slotmove kde-base/kolf 4.1 4
-slotmove kde-base/kolf 4.2 4
-slotmove kde-base/kolf 4.3 4
-slotmove kde-base/kolf 4.4 4
-slotmove kde-base/kolf 4.5 4
-slotmove kde-base/kolf 4.6 4
-slotmove kde-base/kollision 4.1 4
-slotmove kde-base/kollision 4.2 4
-slotmove kde-base/kollision 4.3 4
-slotmove kde-base/kollision 4.4 4
-slotmove kde-base/kollision 4.5 4
-slotmove kde-base/kollision 4.6 4
-slotmove kde-base/kolourpaint 4.1 4
-slotmove kde-base/kolourpaint 4.2 4
-slotmove kde-base/kolourpaint 4.3 4
-slotmove kde-base/kolourpaint 4.4 4
-slotmove kde-base/kolourpaint 4.5 4
-slotmove kde-base/kolourpaint 4.6 4
-slotmove kde-base/kommander 4.1 4
-slotmove kde-base/kommander 4.2 4
-slotmove kde-base/kommander 4.3 4
-slotmove kde-base/kommander 4.4 4
-slotmove kde-base/kommander 4.5 4
-slotmove kde-base/kommander 4.6 4
-slotmove kde-base/kompare 4.1 4
-slotmove kde-base/kompare 4.2 4
-slotmove kde-base/kompare 4.3 4
-slotmove kde-base/kompare 4.4 4
-slotmove kde-base/kompare 4.5 4
-slotmove kde-base/kompare 4.6 4
-slotmove kde-base/konq-plugins 4.1 4
-slotmove kde-base/konq-plugins 4.2 4
-slotmove kde-base/konqueror 4.1 4
-slotmove kde-base/konqueror 4.2 4
-slotmove kde-base/konqueror 4.3 4
-slotmove kde-base/konqueror 4.4 4
-slotmove kde-base/konqueror 4.5 4
-slotmove kde-base/konqueror 4.6 4
-slotmove kde-base/konquest 4.1 4
-slotmove kde-base/konquest 4.2 4
-slotmove kde-base/konquest 4.3 4
-slotmove kde-base/konquest 4.4 4
-slotmove kde-base/konquest 4.5 4
-slotmove kde-base/konquest 4.6 4
-slotmove kde-base/konsole 4.1 4
-slotmove kde-base/konsole 4.2 4
-slotmove kde-base/konsole 4.3 4
-slotmove kde-base/konsole 4.4 4
-slotmove kde-base/konsole 4.5 4
-slotmove kde-base/konsole 4.6 4
-slotmove kde-base/konsolekalendar 4.2 4
-slotmove kde-base/konsolekalendar 4.3 4
-slotmove kde-base/konsolekalendar 4.4 4
-slotmove kde-base/konsolekalendar 4.5 4
-slotmove kde-base/konsolekalendar 4.6 4
-slotmove kde-base/kontact 4.1 4
-slotmove kde-base/kontact 4.2 4
-slotmove kde-base/kontact 4.3 4
-slotmove kde-base/kontact 4.4 4
-slotmove kde-base/kontact 4.5 4
-slotmove kde-base/kontact 4.6 4
-slotmove kde-base/kontactinterfaces 4.1 4
-slotmove kde-base/kontactinterfaces 4.2 4
-slotmove kde-base/kontactinterfaces 4.3 4
-slotmove kde-base/kontact-specialdates 4.2 4
-slotmove kde-base/kontact-specialdates 4.3 4
-slotmove kde-base/kopete 4.1 4
-slotmove kde-base/kopete 4.2 4
-slotmove kde-base/kopete 4.3 4
-slotmove kde-base/kopete 4.4 4
-slotmove kde-base/kopete 4.5 4
-slotmove kde-base/kopete 4.6 4
-slotmove kde-base/korganizer 4.1 4
-slotmove kde-base/korganizer 4.2 4
-slotmove kde-base/korganizer 4.3 4
-slotmove kde-base/korganizer 4.4 4
-slotmove kde-base/korganizer 4.5 4
-slotmove kde-base/korganizer 4.6 4
-slotmove kde-base/kpasswdserver 4.1 4
-slotmove kde-base/kpasswdserver 4.2 4
-slotmove kde-base/kpasswdserver 4.3 4
-slotmove kde-base/kpasswdserver 4.4 4
-slotmove kde-base/kpasswdserver 4.5 4
-slotmove kde-base/kpasswdserver 4.6 4
-slotmove kde-base/kpat 4.1 4
-slotmove kde-base/kpat 4.2 4
-slotmove kde-base/kpat 4.3 4
-slotmove kde-base/kpat 4.4 4
-slotmove kde-base/kpat 4.5 4
-slotmove kde-base/kpat 4.6 4
-slotmove kde-base/kpercentage 4.1 4
-slotmove kde-base/kpilot 4.2 4
-slotmove kde-base/kpilot 4.3 4
-slotmove kde-base/kppp 4.1 4
-slotmove kde-base/kppp 4.2 4
-slotmove kde-base/kppp 4.3 4
-slotmove kde-base/kppp 4.4 4
-slotmove kde-base/kppp 4.5 4
-slotmove kde-base/kppp 4.6 4
-slotmove kde-base/kquitapp 4.1 4
-slotmove kde-base/kquitapp 4.2 4
-slotmove kde-base/kquitapp 4.3 4
-slotmove kde-base/kquitapp 4.4 4
-slotmove kde-base/kquitapp 4.5 4
-slotmove kde-base/kquitapp 4.6 4
-slotmove kde-base/krdc 4.1 4
-slotmove kde-base/krdc 4.2 4
-slotmove kde-base/krdc 4.3 4
-slotmove kde-base/krdc 4.4 4
-slotmove kde-base/krdc 4.5 4
-slotmove kde-base/krdc 4.6 4
-slotmove kde-base/kreadconfig 4.1 4
-slotmove kde-base/kreadconfig 4.2 4
-slotmove kde-base/kreadconfig 4.3 4
-slotmove kde-base/kreadconfig 4.4 4
-slotmove kde-base/kreadconfig 4.5 4
-slotmove kde-base/kreadconfig 4.6 4
-slotmove kde-base/kremotecontrol 4.5 4
-slotmove kde-base/kremotecontrol 4.6 4
-slotmove kde-base/kreversi 4.1 4
-slotmove kde-base/kreversi 4.2 4
-slotmove kde-base/kreversi 4.3 4
-slotmove kde-base/kreversi 4.4 4
-slotmove kde-base/kreversi 4.5 4
-slotmove kde-base/kreversi 4.6 4
-slotmove kde-base/krfb 4.1 4
-slotmove kde-base/krfb 4.2 4
-slotmove kde-base/krfb 4.3 4
-slotmove kde-base/krfb 4.4 4
-slotmove kde-base/krfb 4.5 4
-slotmove kde-base/krfb 4.6 4
-slotmove kde-base/krossjava 4.2 4
-slotmove kde-base/krossjava 4.3 4
-slotmove kde-base/krossjava 4.4 4
-slotmove kde-base/krossjava 4.5 4
-slotmove kde-base/krossjava 4.6 4
-slotmove kde-base/krosspython 4.1 4
-slotmove kde-base/krosspython 4.2 4
-slotmove kde-base/krosspython 4.3 4
-slotmove kde-base/krosspython 4.4 4
-slotmove kde-base/krosspython 4.5 4
-slotmove kde-base/krosspython 4.6 4
-slotmove kde-base/krossruby 4.2 4
-slotmove kde-base/krossruby 4.3 4
-slotmove kde-base/krossruby 4.4 4
-slotmove kde-base/kruler 4.1 4
-slotmove kde-base/kruler 4.2 4
-slotmove kde-base/kruler 4.3 4
-slotmove kde-base/kruler 4.4 4
-slotmove kde-base/kruler 4.5 4
-slotmove kde-base/kruler 4.6 4
-slotmove kde-base/krunner 4.1 4
-slotmove kde-base/krunner 4.2 4
-slotmove kde-base/krunner 4.3 4
-slotmove kde-base/krunner 4.4 4
-slotmove kde-base/krunner 4.5 4
-slotmove kde-base/krunner 4.6 4
-slotmove kde-base/ksame 4.1 4
-slotmove kde-base/ksame 4.2 4
-slotmove kde-base/ksame 4.3 4
-slotmove kde-base/ksame 4.4 4
-slotmove kde-base/ksame 4.5 4
-slotmove kde-base/ksaneplugin 4.2 4
-slotmove kde-base/ksaneplugin 4.3 4
-slotmove kde-base/ksaneplugin 4.4 4
-slotmove kde-base/ksaneplugin 4.5 4
-slotmove kde-base/ksaneplugin 4.6 4
-slotmove kde-base/kscd 4.1 4
-slotmove kde-base/kscd 4.2 4
-slotmove kde-base/kscd 4.3 4
-slotmove kde-base/kscd 4.4 4
-slotmove kde-base/kscd 4.5 4
-slotmove kde-base/kscd 4.6 4
-slotmove kde-base/kscreensaver 4.1 4
-slotmove kde-base/kscreensaver 4.2 4
-slotmove kde-base/kscreensaver 4.3 4
-slotmove kde-base/kscreensaver 4.4 4
-slotmove kde-base/kscreensaver 4.5 4
-slotmove kde-base/kscreensaver 4.6 4
-slotmove kde-base/kshisen 4.1 4
-slotmove kde-base/kshisen 4.2 4
-slotmove kde-base/kshisen 4.3 4
-slotmove kde-base/kshisen 4.4 4
-slotmove kde-base/kshisen 4.5 4
-slotmove kde-base/kshisen 4.6 4
-slotmove kde-base/ksirk 4.1 4
-slotmove kde-base/ksirk 4.2 4
-slotmove kde-base/ksirk 4.3 4
-slotmove kde-base/ksirk 4.4 4
-slotmove kde-base/ksirk 4.5 4
-slotmove kde-base/ksirk 4.6 4
-slotmove kde-base/ksmserver 4.1 4
-slotmove kde-base/ksmserver 4.2 4
-slotmove kde-base/ksmserver 4.3 4
-slotmove kde-base/ksmserver 4.4 4
-slotmove kde-base/ksmserver 4.5 4
-slotmove kde-base/ksmserver 4.6 4
-slotmove kde-base/ksnapshot 4.1 4
-slotmove kde-base/ksnapshot 4.2 4
-slotmove kde-base/ksnapshot 4.3 4
-slotmove kde-base/ksnapshot 4.4 4
-slotmove kde-base/ksnapshot 4.5 4
-slotmove kde-base/ksnapshot 4.6 4
-slotmove kde-base/kspaceduel 4.1 4
-slotmove kde-base/kspaceduel 4.2 4
-slotmove kde-base/kspaceduel 4.3 4
-slotmove kde-base/kspaceduel 4.4 4
-slotmove kde-base/kspaceduel 4.5 4
-slotmove kde-base/kspaceduel 4.6 4
-slotmove kde-base/ksplash 4.1 4
-slotmove kde-base/ksplash 4.2 4
-slotmove kde-base/ksplash 4.3 4
-slotmove kde-base/ksplash 4.4 4
-slotmove kde-base/ksplash 4.5 4
-slotmove kde-base/ksplash 4.6 4
-slotmove kde-base/ksquares 4.1 4
-slotmove kde-base/ksquares 4.2 4
-slotmove kde-base/ksquares 4.3 4
-slotmove kde-base/ksquares 4.4 4
-slotmove kde-base/ksquares 4.5 4
-slotmove kde-base/ksquares 4.6 4
-slotmove kde-base/kstars 4.1 4
-slotmove kde-base/kstars 4.2 4
-slotmove kde-base/kstars 4.3 4
-slotmove kde-base/kstars 4.4 4
-slotmove kde-base/kstars 4.5 4
-slotmove kde-base/kstars 4.6 4
-slotmove kde-base/kstart 4.1 4
-slotmove kde-base/kstart 4.2 4
-slotmove kde-base/kstart 4.3 4
-slotmove kde-base/kstart 4.4 4
-slotmove kde-base/kstart 4.5 4
-slotmove kde-base/kstart 4.6 4
-slotmove kde-base/kstartperf 4.1 4
-slotmove kde-base/kstartperf 4.2 4
-slotmove kde-base/kstartperf 4.3 4
-slotmove kde-base/kstartperf 4.4 4
-slotmove kde-base/kstartperf 4.5 4
-slotmove kde-base/kstartperf 4.6 4
-slotmove kde-base/kstartupconfig 4.1 4
-slotmove kde-base/kstartupconfig 4.2 4
-slotmove kde-base/kstartupconfig 4.3 4
-slotmove kde-base/kstartupconfig 4.4 4
-slotmove kde-base/kstartupconfig 4.5 4
-slotmove kde-base/kstartupconfig 4.6 4
-slotmove kde-base/kstyles 4.1 4
-slotmove kde-base/kstyles 4.2 4
-slotmove kde-base/kstyles 4.3 4
-slotmove kde-base/kstyles 4.4 4
-slotmove kde-base/kstyles 4.5 4
-slotmove kde-base/kstyles 4.6 4
-slotmove kde-base/ksudoku 4.1 4
-slotmove kde-base/ksudoku 4.2 4
-slotmove kde-base/ksudoku 4.3 4
-slotmove kde-base/ksudoku 4.4 4
-slotmove kde-base/ksudoku 4.5 4
-slotmove kde-base/ksudoku 4.6 4
-slotmove kde-base/ksysguard 4.1 4
-slotmove kde-base/ksysguard 4.2 4
-slotmove kde-base/ksysguard 4.3 4
-slotmove kde-base/ksysguard 4.4 4
-slotmove kde-base/ksysguard 4.5 4
-slotmove kde-base/ksysguard 4.6 4
-slotmove kde-base/ksystemlog 4.1 4
-slotmove kde-base/ksystemlog 4.2 4
-slotmove kde-base/ksystemlog 4.3 4
-slotmove kde-base/ksystemlog 4.4 4
-slotmove kde-base/ksystemlog 4.5 4
-slotmove kde-base/ksystemlog 4.6 4
-slotmove kde-base/ksystraycmd 4.1 4
-slotmove kde-base/ksystraycmd 4.2 4
-slotmove kde-base/ksystraycmd 4.3 4
-slotmove kde-base/ksystraycmd 4.4 4
-slotmove kde-base/ksystraycmd 4.5 4
-slotmove kde-base/ksystraycmd 4.6 4
-slotmove kde-base/kteatime 4.1 4
-slotmove kde-base/kteatime 4.2 4
-slotmove kde-base/kteatime 4.3 4
-slotmove kde-base/kteatime 4.4 4
-slotmove kde-base/kteatime 4.5 4
-slotmove kde-base/kteatime 4.6 4
-slotmove kde-base/ktimer 4.1 4
-slotmove kde-base/ktimer 4.2 4
-slotmove kde-base/ktimer 4.3 4
-slotmove kde-base/ktimer 4.4 4
-slotmove kde-base/ktimer 4.5 4
-slotmove kde-base/ktimer 4.6 4
-slotmove kde-base/ktimetracker 4.1 4
-slotmove kde-base/ktimetracker 4.2 4
-slotmove kde-base/ktimetracker 4.3 4
-slotmove kde-base/ktimetracker 4.4 4
-slotmove kde-base/ktimetracker 4.5 4
-slotmove kde-base/ktimetracker 4.6 4
-slotmove kde-base/ktimezoned 4.1 4
-slotmove kde-base/ktimezoned 4.2 4
-slotmove kde-base/ktimezoned 4.3 4
-slotmove kde-base/ktimezoned 4.4 4
-slotmove kde-base/ktimezoned 4.5 4
-slotmove kde-base/ktimezoned 4.6 4
-slotmove kde-base/ktnef 4.1 4
-slotmove kde-base/ktouch 4.1 4
-slotmove kde-base/ktouch 4.2 4
-slotmove kde-base/ktouch 4.3 4
-slotmove kde-base/ktouch 4.4 4
-slotmove kde-base/ktouch 4.5 4
-slotmove kde-base/ktouch 4.6 4
-slotmove kde-base/ktraderclient 4.1 4
-slotmove kde-base/ktraderclient 4.2 4
-slotmove kde-base/ktraderclient 4.3 4
-slotmove kde-base/ktraderclient 4.4 4
-slotmove kde-base/ktraderclient 4.5 4
-slotmove kde-base/ktraderclient 4.6 4
-slotmove kde-base/ktron 4.3 4
-slotmove kde-base/ktron 4.4 4
-slotmove kde-base/ktron 4.5 4
-slotmove kde-base/ktron 4.6 4
-slotmove kde-base/kttsd 4.1 4
-slotmove kde-base/kttsd 4.2 4
-slotmove kde-base/kttsd 4.3 4
-slotmove kde-base/kttsd 4.4 4
-slotmove kde-base/ktuberling 4.1 4
-slotmove kde-base/ktuberling 4.2 4
-slotmove kde-base/ktuberling 4.3 4
-slotmove kde-base/ktuberling 4.4 4
-slotmove kde-base/ktuberling 4.5 4
-slotmove kde-base/ktuberling 4.6 4
-slotmove kde-base/kturtle 4.1 4
-slotmove kde-base/kturtle 4.2 4
-slotmove kde-base/kturtle 4.3 4
-slotmove kde-base/kturtle 4.4 4
-slotmove kde-base/kturtle 4.5 4
-slotmove kde-base/kturtle 4.6 4
-slotmove kde-base/ktux 4.1 4
-slotmove kde-base/ktux 4.2 4
-slotmove kde-base/ktux 4.3 4
-slotmove kde-base/ktux 4.4 4
-slotmove kde-base/ktux 4.5 4
-slotmove kde-base/ktux 4.6 4
-slotmove kde-base/kubrick 4.1 4
-slotmove kde-base/kubrick 4.2 4
-slotmove kde-base/kubrick 4.3 4
-slotmove kde-base/kubrick 4.4 4
-slotmove kde-base/kubrick 4.5 4
-slotmove kde-base/kubrick 4.6 4
-slotmove kde-base/kuiserver 4.1 4
-slotmove kde-base/kuiserver 4.2 4
-slotmove kde-base/kuiserver 4.3 4
-slotmove kde-base/kuiserver 4.4 4
-slotmove kde-base/kuiserver 4.5 4
-slotmove kde-base/kuiserver 4.6 4
-slotmove kde-base/kuiviewer 4.1 4
-slotmove kde-base/kuiviewer 4.2 4
-slotmove kde-base/kuiviewer 4.3 4
-slotmove kde-base/kuiviewer 4.4 4
-slotmove kde-base/kuiviewer 4.5 4
-slotmove kde-base/kuiviewer 4.6 4
-slotmove kde-base/kurifilter-plugins 4.1 4
-slotmove kde-base/kurifilter-plugins 4.2 4
-slotmove kde-base/kurifilter-plugins 4.3 4
-slotmove kde-base/kurifilter-plugins 4.4 4
-slotmove kde-base/kurifilter-plugins 4.5 4
-slotmove kde-base/kurifilter-plugins 4.6 4
-slotmove kde-base/kuser 4.1 4
-slotmove kde-base/kuser 4.2 4
-slotmove kde-base/kuser 4.3 4
-slotmove kde-base/kuser 4.4 4
-slotmove kde-base/kuser 4.5 4
-slotmove kde-base/kuser 4.6 4
-slotmove kde-base/kvtml-data 4.3 4
-slotmove kde-base/kvtml-data 4.4 4
-slotmove kde-base/kvtml-data 4.5 4
-slotmove kde-base/kvtml-data 4.6 4
-slotmove kde-base/kwallet 4.1 4
-slotmove kde-base/kwallet 4.2 4
-slotmove kde-base/kwallet 4.3 4
-slotmove kde-base/kwallet 4.4 4
-slotmove kde-base/kwallet 4.5 4
-slotmove kde-base/kwallet 4.6 4
-slotmove kde-base/kwalletd 4.2 4
-slotmove kde-base/kwalletd 4.3 4
-slotmove kde-base/kwalletd 4.4 4
-slotmove kde-base/kwalletd 4.5 4
-slotmove kde-base/kwalletd 4.6 4
-slotmove kde-base/kweather 4.1 4
-slotmove kde-base/kweather 4.2 4
-slotmove kde-base/kweather 4.3 4
-slotmove kde-base/kweather 4.4 4
-slotmove kde-base/kwin 4.1 4
-slotmove kde-base/kwin 4.2 4
-slotmove kde-base/kwin 4.3 4
-slotmove kde-base/kwin 4.4 4
-slotmove kde-base/kwin 4.5 4
-slotmove kde-base/kwin 4.6 4
-slotmove kde-base/kwordquiz 4.1 4
-slotmove kde-base/kwordquiz 4.2 4
-slotmove kde-base/kwordquiz 4.3 4
-slotmove kde-base/kwordquiz 4.4 4
-slotmove kde-base/kwordquiz 4.5 4
-slotmove kde-base/kwordquiz 4.6 4
-slotmove kde-base/kwrite 4.1 4
-slotmove kde-base/kwrite 4.2 4
-slotmove kde-base/kwrite 4.3 4
-slotmove kde-base/kwrite 4.4 4
-slotmove kde-base/kwrite 4.5 4
-slotmove kde-base/kwrite 4.6 4
-slotmove kde-base/kwrited 4.2 4
-slotmove kde-base/kwrited 4.3 4
-slotmove kde-base/kwrited 4.4 4
-slotmove kde-base/kwrited 4.5 4
-slotmove kde-base/kwrited 4.6 4
-slotmove kde-base/kxsldbg 4.1 4
-slotmove kde-base/kxsldbg 4.2 4
-slotmove kde-base/kxsldbg 4.3 4
-slotmove kde-base/libkcddb 4.1 4
-slotmove kde-base/libkcddb 4.2 4
-slotmove kde-base/libkcddb 4.3 4
-slotmove kde-base/libkcddb 4.4 4
-slotmove kde-base/libkcddb 4.5 4
-slotmove kde-base/libkcddb 4.6 4
-slotmove kde-base/libkcompactdisc 4.1 4
-slotmove kde-base/libkcompactdisc 4.2 4
-slotmove kde-base/libkcompactdisc 4.3 4
-slotmove kde-base/libkcompactdisc 4.4 4
-slotmove kde-base/libkcompactdisc 4.5 4
-slotmove kde-base/libkcompactdisc 4.6 4
-slotmove kde-base/libkdcraw 4.1 4
-slotmove kde-base/libkdcraw 4.2 4
-slotmove kde-base/libkdcraw 4.3 4
-slotmove kde-base/libkdcraw 4.4 4
-slotmove kde-base/libkdcraw 4.5 4
-slotmove kde-base/libkdcraw 4.6 4
-slotmove kde-base/libkdeedu 4.1 4
-slotmove kde-base/libkdeedu 4.2 4
-slotmove kde-base/libkdeedu 4.3 4
-slotmove kde-base/libkdeedu 4.4 4
-slotmove kde-base/libkdeedu 4.5 4
-slotmove kde-base/libkdeedu 4.6 4
-slotmove kde-base/libkdegames 4.1 4
-slotmove kde-base/libkdegames 4.2 4
-slotmove kde-base/libkdegames 4.3 4
-slotmove kde-base/libkdegames 4.4 4
-slotmove kde-base/libkdegames 4.5 4
-slotmove kde-base/libkdegames 4.6 4
-slotmove kde-base/libkdepim 4.1 4
-slotmove kde-base/libkdepim 4.2 4
-slotmove kde-base/libkdepim 4.3 4
-slotmove kde-base/libkdepim 4.4 4
-slotmove kde-base/libkexiv2 4.1 4
-slotmove kde-base/libkexiv2 4.2 4
-slotmove kde-base/libkexiv2 4.3 4
-slotmove kde-base/libkexiv2 4.4 4
-slotmove kde-base/libkexiv2 4.5 4
-slotmove kde-base/libkexiv2 4.6 4
-slotmove kde-base/libkholidays 4.1 4
-slotmove kde-base/libkholidays 4.2 4
-slotmove kde-base/libkipi 4.1 4
-slotmove kde-base/libkipi 4.2 4
-slotmove kde-base/libkipi 4.3 4
-slotmove kde-base/libkipi 4.4 4
-slotmove kde-base/libkipi 4.5 4
-slotmove kde-base/libkipi 4.6 4
-slotmove kde-base/libkleo 4.1 4
-slotmove kde-base/libkleo 4.2 4
-slotmove kde-base/libkleo 4.3 4
-slotmove kde-base/libkleo 4.4 4
-slotmove kde-base/libkmahjongg 4.1 4
-slotmove kde-base/libkmahjongg 4.2 4
-slotmove kde-base/libkmahjongg 4.3 4
-slotmove kde-base/libkmahjongg 4.4 4
-slotmove kde-base/libkmahjongg 4.5 4
-slotmove kde-base/libkmahjongg 4.6 4
-slotmove kde-base/libknotificationitem 4.3 4
-slotmove kde-base/libkonq 4.1 4
-slotmove kde-base/libkonq 4.2 4
-slotmove kde-base/libkonq 4.3 4
-slotmove kde-base/libkonq 4.4 4
-slotmove kde-base/libkonq 4.5 4
-slotmove kde-base/libkonq 4.6 4
-slotmove kde-base/libkpgp 4.1 4
-slotmove kde-base/libkpgp 4.2 4
-slotmove kde-base/libkpgp 4.3 4
-slotmove kde-base/libkpgp 4.4 4
-slotmove kde-base/libksane 4.1 4
-slotmove kde-base/libksane 4.2 4
-slotmove kde-base/libksane 4.3 4
-slotmove kde-base/libksane 4.4 4
-slotmove kde-base/libksane 4.5 4
-slotmove kde-base/libksane 4.6 4
-slotmove kde-base/libksieve 4.1 4
-slotmove kde-base/libksieve 4.2 4
-slotmove kde-base/libksieve 4.3 4
-slotmove kde-base/libkworkspace 4.1 4
-slotmove kde-base/libkworkspace 4.2 4
-slotmove kde-base/libkworkspace 4.3 4
-slotmove kde-base/libkworkspace 4.4 4
-slotmove kde-base/libkworkspace 4.5 4
-slotmove kde-base/libkworkspace 4.6 4
-slotmove kde-base/liboxygenstyle 4.5 4
-slotmove kde-base/liboxygenstyle 4.6 4
-slotmove kde-base/libplasma 4.1 4
-slotmove kde-base/libplasmaclock 4.2 4
-slotmove kde-base/libplasmaclock 4.3 4
-slotmove kde-base/libplasmaclock 4.4 4
-slotmove kde-base/libplasmaclock 4.5 4
-slotmove kde-base/libplasmaclock 4.6 4
-slotmove kde-base/libplasmagenericshell 4.4 4
-slotmove kde-base/libplasmagenericshell 4.5 4
-slotmove kde-base/libplasmagenericshell 4.6 4
-slotmove kde-base/libtaskmanager 4.1 4
-slotmove kde-base/libtaskmanager 4.2 4
-slotmove kde-base/libtaskmanager 4.3 4
-slotmove kde-base/libtaskmanager 4.4 4
-slotmove kde-base/libtaskmanager 4.5 4
-slotmove kde-base/libtaskmanager 4.6 4
-slotmove kde-base/lilo-config 4.1 4
-slotmove kde-base/lilo-config 4.2 4
-slotmove kde-base/lilo-config 4.3 4
-slotmove kde-base/lilo-config 4.4 4
-slotmove kde-base/lokalize 4.1 4
-slotmove kde-base/lokalize 4.2 4
-slotmove kde-base/lokalize 4.3 4
-slotmove kde-base/lokalize 4.4 4
-slotmove kde-base/lokalize 4.5 4
-slotmove kde-base/lokalize 4.6 4
-slotmove kde-base/lskat 4.1 4
-slotmove kde-base/lskat 4.2 4
-slotmove kde-base/lskat 4.3 4
-slotmove kde-base/lskat 4.4 4
-slotmove kde-base/lskat 4.5 4
-slotmove kde-base/lskat 4.6 4
-slotmove kde-base/marble 4.1 4
-slotmove kde-base/marble 4.2 4
-slotmove kde-base/marble 4.3 4
-slotmove kde-base/marble 4.4 4
-slotmove kde-base/marble 4.5 4
-slotmove kde-base/marble 4.6 4
-slotmove kde-base/mimelib 4.1 4
-slotmove kde-base/mimelib 4.2 4
-slotmove kde-base/mimelib 4.3 4
-slotmove kde-base/mplayerthumbs 4.3 4
-slotmove kde-base/mplayerthumbs 4.4 4
-slotmove kde-base/mplayerthumbs 4.5 4
-slotmove kde-base/mplayerthumbs 4.6 4
-slotmove kde-base/nepomuk 4.1 4
-slotmove kde-base/nepomuk 4.2 4
-slotmove kde-base/nepomuk 4.3 4
-slotmove kde-base/nepomuk 4.4 4
-slotmove kde-base/nepomuk 4.5 4
-slotmove kde-base/nepomuk 4.6 4
-slotmove kde-base/nsplugins 4.1 4
-slotmove kde-base/nsplugins 4.2 4
-slotmove kde-base/nsplugins 4.3 4
-slotmove kde-base/nsplugins 4.4 4
-slotmove kde-base/nsplugins 4.5 4
-slotmove kde-base/nsplugins 4.6 4
-slotmove kde-base/okteta 4.1 4
-slotmove kde-base/okteta 4.2 4
-slotmove kde-base/okteta 4.3 4
-slotmove kde-base/okteta 4.4 4
-slotmove kde-base/okteta 4.5 4
-slotmove kde-base/okteta 4.6 4
-slotmove kde-base/okular 4.1 4
-slotmove kde-base/okular 4.2 4
-slotmove kde-base/okular 4.3 4
-slotmove kde-base/okular 4.4 4
-slotmove kde-base/okular 4.5 4
-slotmove kde-base/okular 4.6 4
-slotmove kde-base/oxygen-icons 4.3 4
-slotmove kde-base/oxygen-icons 4.4 4
-slotmove kde-base/oxygen-icons 4.5 4
-slotmove kde-base/oxygen-icons 4.6 4
-slotmove kde-base/palapeli 4.4 4
-slotmove kde-base/palapeli 4.5 4
-slotmove kde-base/palapeli 4.6 4
-slotmove kde-base/parley 4.1 4
-slotmove kde-base/parley 4.2 4
-slotmove kde-base/parley 4.3 4
-slotmove kde-base/parley 4.4 4
-slotmove kde-base/parley 4.5 4
-slotmove kde-base/parley 4.6 4
-slotmove kde-base/phonon-kde 4.2 4
-slotmove kde-base/phonon-kde 4.3 4
-slotmove kde-base/phonon-kde 4.4 4
-slotmove kde-base/phonon-kde 4.5 4
-slotmove kde-base/phonon-kde 4.6 4
-slotmove kde-base/phonon-xine 4.1 4
-slotmove kde-base/plasma-apps 4.1 4
-slotmove kde-base/plasma-apps 4.2 4
-slotmove kde-base/plasma-apps 4.3 4
-slotmove kde-base/plasma-apps 4.4 4
-slotmove kde-base/plasma-apps 4.5 4
-slotmove kde-base/plasma-apps 4.6 4
-slotmove kde-base/plasma-runtime 4.3 4
-slotmove kde-base/plasma-runtime 4.4 4
-slotmove kde-base/plasma-runtime 4.5 4
-slotmove kde-base/plasma-runtime 4.6 4
-slotmove kde-base/plasma-workspace 4.1 4
-slotmove kde-base/plasma-workspace 4.2 4
-slotmove kde-base/plasma-workspace 4.3 4
-slotmove kde-base/plasma-workspace 4.4 4
-slotmove kde-base/plasma-workspace 4.5 4
-slotmove kde-base/plasma-workspace 4.6 4
-slotmove kde-base/policykit-kde 4.3 4
-slotmove kde-base/policykit-kde 4.4 4
-slotmove kde-base/policykit-kde 4.5 4
-slotmove kde-base/powerdevil 4.2 4
-slotmove kde-base/powerdevil 4.3 4
-slotmove kde-base/powerdevil 4.4 4
-slotmove kde-base/powerdevil 4.5 4
-slotmove kde-base/powerdevil 4.6 4
-slotmove kde-base/printer-applet 4.2 4
-slotmove kde-base/printer-applet 4.3 4
-slotmove kde-base/printer-applet 4.4 4
-slotmove kde-base/printer-applet 4.5 4
-slotmove kde-base/printer-applet 4.6 4
-slotmove kde-base/pykde4 4.1 4
-slotmove kde-base/pykde4 4.2 4
-slotmove kde-base/pykde4 4.3 4
-slotmove kde-base/pykde4 4.4 4
-slotmove kde-base/pykde4 4.5 4
-slotmove kde-base/pykde4 4.6 4
-slotmove kde-base/qguiplatformplugin_kde 4.4 4
-slotmove kde-base/qguiplatformplugin_kde 4.5 4
-slotmove kde-base/qguiplatformplugin_kde 4.6 4
-slotmove kde-base/renamedlg-plugins 4.1 4
-slotmove kde-base/renamedlg-plugins 4.2 4
-slotmove kde-base/renamedlg-plugins 4.3 4
-slotmove kde-base/renamedlg-plugins 4.4 4
-slotmove kde-base/renamedlg-plugins 4.5 4
-slotmove kde-base/renamedlg-plugins 4.6 4
-slotmove kde-base/rocs 4.4 4
-slotmove kde-base/rocs 4.5 4
-slotmove kde-base/rocs 4.6 4
-slotmove kde-base/smoke 4.3 4
-slotmove kde-base/smoke 4.4 4
-slotmove kde-base/smoke 4.5 4
-slotmove kde-base/smoke 4.6 4
-slotmove kde-base/solid 4.1 4
-slotmove kde-base/solid 4.2 4
-slotmove kde-base/solid 4.3 4
-slotmove kde-base/solid 4.4 4
-slotmove kde-base/solid 4.5 4
-slotmove kde-base/solid 4.6 4
-slotmove kde-base/solidautoeject 4.3 4
-slotmove kde-base/solid-hardware 4.1 4
-slotmove kde-base/solid-hardware 4.2 4
-slotmove kde-base/solid-hardware 4.3 4
-slotmove kde-base/solid-runtime 4.4 4
-slotmove kde-base/solid-runtime 4.5 4
-slotmove kde-base/solid-runtime 4.6 4
-slotmove kde-base/soliduiserver 4.1 4
-slotmove kde-base/soliduiserver 4.2 4
-slotmove kde-base/soliduiserver 4.3 4
-slotmove kde-base/step 4.1 4
-slotmove kde-base/step 4.2 4
-slotmove kde-base/step 4.3 4
-slotmove kde-base/step 4.4 4
-slotmove kde-base/step 4.5 4
-slotmove kde-base/step 4.6 4
-slotmove kde-base/superkaramba 4.1 4
-slotmove kde-base/superkaramba 4.2 4
-slotmove kde-base/superkaramba 4.3 4
-slotmove kde-base/superkaramba 4.4 4
-slotmove kde-base/superkaramba 4.5 4
-slotmove kde-base/superkaramba 4.6 4
-slotmove kde-base/svgpart 4.1 4
-slotmove kde-base/svgpart 4.2 4
-slotmove kde-base/svgpart 4.3 4
-slotmove kde-base/svgpart 4.4 4
-slotmove kde-base/svgpart 4.5 4
-slotmove kde-base/svgpart 4.6 4
-slotmove kde-base/sweeper 4.1 4
-slotmove kde-base/sweeper 4.2 4
-slotmove kde-base/sweeper 4.3 4
-slotmove kde-base/sweeper 4.4 4
-slotmove kde-base/sweeper 4.5 4
-slotmove kde-base/sweeper 4.6 4
-slotmove kde-base/system-config-printer-kde 4.2 4
-slotmove kde-base/system-config-printer-kde 4.3 4
-slotmove kde-base/system-config-printer-kde 4.4 4
-slotmove kde-base/system-config-printer-kde 4.5 4
-slotmove kde-base/system-config-printer-kde 4.6 4
-slotmove kde-base/systemsettings 4.1 4
-slotmove kde-base/systemsettings 4.2 4
-slotmove kde-base/systemsettings 4.3 4
-slotmove kde-base/systemsettings 4.4 4
-slotmove kde-base/systemsettings 4.5 4
-slotmove kde-base/systemsettings 4.6 4
-slotmove kde-base/thumbnailers 4.3 4
-slotmove kde-base/thumbnailers 4.4 4
-slotmove kde-base/thumbnailers 4.5 4
-slotmove kde-base/thumbnailers 4.6 4
-slotmove kde-base/umbrello 4.1 4
-slotmove kde-base/umbrello 4.2 4
-slotmove kde-base/umbrello 4.3 4
-slotmove kde-base/umbrello 4.4 4
-slotmove kde-base/umbrello 4.5 4
-slotmove kde-base/umbrello 4.6 4
-slotmove net-analyzer/nagios-check_ipmi_sensor 1 0
-slotmove net-analyzer/nagios-check_ipmi_sensor 2 0
-move dev-ruby/fromcvs dev-vcs/fromcvs
-slotmove =dev-ruby/arel-2.0.4 0 2.0
-slotmove =dev-ruby/arel-2.1.1 0 2.1
-slotmove =dev-ruby/deprecated-2* 0 2
-slotmove =dev-ruby/deprecated-3* 0 3
diff --git a/profiles/updates/2Q-2012 b/profiles/updates/2Q-2012
deleted file mode 100644
index 20d4b9d..0000000
--- a/profiles/updates/2Q-2012
+++ /dev/null
@@ -1,24 +0,0 @@
-move xfce-extra/xfce4-appfinder xfce-base/xfce4-appfinder
-move dev-lisp/cl-asdf dev-lisp/asdf
-move dev-lisp/cl-asdf-binary-locations dev-lisp/asdf-binary-locations
-slotmove media-libs/libharu 2 0
-move sys-fs/bleachbit sys-apps/bleachbit
-move sys-infiniband/openib sys-infiniband/ofed
-move app-text/djview4 app-text/djview
-move app-text/focuswriter app-editors/focuswriter
-move app-mobilephone/jacksms-desktop app-mobilephone/freesmee
-move app-office/languagetool app-officeext/languagetool
-move dev-vcs/cola dev-vcs/git-cola
-move app-portage/eclean-kernel app-admin/eclean-kernel
-move kde-misc/kcm-gtk-config kde-misc/kde-gtk-config
-move x11-misc/see x11-misc/seetxt
-move dev-python/Whoosh dev-python/whoosh
-move dev-texlive/texlive-latex3 dev-texlive/texlive-latexrecommended
-move net-libs/axTLS net-libs/axtls
-move x11-misc/tudor-volumed media-sound/tudor-volumed
-move media-video/leechcraft-lmp media-sound/leechcraft-lmp
-move x11-themes/gtk-engines-nimbus x11-themes/nimbus
-move media-gfx/iscan-plugin-gt-s80 media-gfx/esci-interpreter-gt-s80
-move x11-libs/libPropList x11-libs/libproplist
-move dev-perl/Text-ParseWords perl-core/Text-ParseWords
-move net-fs/leechcraft-vrooby sys-fs/leechcraft-vrooby
diff --git a/profiles/updates/2Q-2013 b/profiles/updates/2Q-2013
deleted file mode 100644
index 7c2e69b..0000000
--- a/profiles/updates/2Q-2013
+++ /dev/null
@@ -1,20 +0,0 @@
-move kde-misc/print-manager kde-base/print-manager
-slotmove =dev-haskell/cairo-0.12* 0 2
-slotmove =dev-haskell/gio-0.12* 0 2
-slotmove =dev-haskell/glade-0.12* 0 2
-slotmove =dev-haskell/glib-0.12* 0 2
-slotmove =dev-haskell/gtk-0.12* 0 2
-slotmove =dev-haskell/gtk2hs-buildtools-0.12* 0 2
-slotmove =dev-haskell/pango-0.12* 0 2
-slotmove =media-sound/ardour-2.8* 0 2
-slotmove =net-libs/libgrss-0.5.0* 0 0.5
-move games-engines/gambatte games-emulation/gambatte
-move media-sound/alsa-firmware sys-firmware/alsa-firmware
-move sys-process/crtools sys-process/criu
-move kde-misc/libkfbapi net-libs/libkfbapi
-move app-text/wpd2odt app-text/writerperfect
-slotmove =dev-ruby/mocha-0.10* 0 0.10
-slotmove =dev-ruby/mocha-0.11* 0 0.11
-slotmove =dev-ruby/mocha-0.12* 0 0.12
-slotmove =dev-ruby/mocha-0.13* 0 0.13
-move dev-util/jedi dev-python/jedi
diff --git a/profiles/updates/2Q-2018 b/profiles/updates/2Q-2018
deleted file mode 100644
index e2da630..0000000
--- a/profiles/updates/2Q-2018
+++ /dev/null
@@ -1 +0,0 @@
-move sys-fs/sshfs-fuse net-fs/sshfs
diff --git a/profiles/updates/3Q-2008 b/profiles/updates/3Q-2008
deleted file mode 100644
index 40bd966..0000000
--- a/profiles/updates/3Q-2008
+++ /dev/null
@@ -1,14 +0,0 @@
-move xfce-extra/xfce4-icon-theme x11-themes/xfce4-icon-theme
-move xfce-extra/ristretto media-gfx/ristretto
-move xfce-extra/terminal x11-terms/terminal
-move xfce-extra/xfburn app-cdr/xfburn
-move xfce-extra/mousepad app-editors/mousepad
-move xfce-extra/xfwm4-themes x11-themes/xfwm4-themes
-move xfce-base/xfprint net-print/xfprint
-move xfce-base/orage app-office/orage
-move xfce-extra/notification-daemon-xfce x11-misc/notification-daemon-xfce
-move xfce-extra/xfkc x11-misc/xfkc
-move xfce-extra/xfce4-dev-tools dev-util/xfce4-dev-tools
-slotmove media-libs/portaudio 18 0
-move games-arcade/sdljump games-arcade/gnujump
-move media-fonts/liberation-fonts-ttf media-fonts/liberation-fonts
diff --git a/profiles/updates/3Q-2009 b/profiles/updates/3Q-2009
deleted file mode 100644
index 2b7f7e9..0000000
--- a/profiles/updates/3Q-2009
+++ /dev/null
@@ -1,54 +0,0 @@
-slotmove app-i18n/koffice-i18n 0 3.5
-slotmove >=media-sound/kwave-0.8.2 1 4
-slotmove >=media-sound/kid3-1.2-r2 0 4
-move x11-plugins/pidgin-msn-pecan x11-plugins/msn-pecan
-move sci-misc/gri sci-visualization/gri
-move x11-plugins/noscript www-plugins/noscript
-move dev-perl/parent perl-core/parent
-move dev-perl/Parse-CPAN-Meta perl-core/Parse-CPAN-Meta
-move net-libs/xyssl net-libs/polarssl
-move xfce-extra/thunar-svn xfce-extra/thunar-svn-plugin
-move xfce-extra/thunar-shares xfce-extra/thunar-shares-plugin
-move xfce-extra/xfce4-mpc xfce-extra/xfce4-mpc-plugin
-move xfce-extra/xfce4-xkb xfce-extra/xfce4-xkb-plugin
-move xfce-extra/xfce4-clipman xfce-extra/xfce4-clipman-plugin
-move xfce-extra/xfce4-wmdock xfce-extra/xfce4-wmdock-plugin
-move xfce-extra/exo xfce-base/exo
-move xfce-base/xfce4 xfce-base/xfce4-meta
-move xfce-extra/xfce4-radio xfce-extra/xfce4-radio-plugin
-move xfce-extra/xfce4-sensors xfce-extra/xfce4-sensors-plugin
-move xfce-extra/thunar-archive xfce-extra/thunar-archive-plugin
-move xfce-extra/xfce4-cpu-freq xfce-extra/xfce4-cpufreq-plugin
-move xfce-extra/xfce4-xfapplet xfce-extra/xfce4-xfapplet-plugin
-move xfce-extra/xfce4-smartbookmark xfce-extra/xfce4-smartbookmark-plugin
-move xfce-extra/xfce4-mount xfce-extra/xfce4-mount-plugin
-move xfce-extra/thunar-media-tags xfce-extra/thunar-media-tags-plugin
-move xfce-extra/xfce4-places xfce-extra/xfce4-places-plugin
-move xfce-extra/xfce4-netload xfce-extra/xfce4-netload-plugin
-move xfce-extra/xfce4-quicklauncher xfce-extra/xfce4-quicklauncher-plugin
-move xfce-extra/xfce4-eyes xfce-extra/xfce4-eyes-plugin
-move xfce-extra/xfce4-genmon xfce-extra/xfce4-genmon-plugin
-move xfce-extra/xfce4-battery xfce-extra/xfce4-battery-plugin
-move xfce-extra/xfce4-cellmodem xfce-extra/xfce4-cellmodem-plugin
-move xfce-extra/xfce4-notes xfce-extra/xfce4-notes-plugin
-move xfce-extra/xfce4-datetime xfce-extra/xfce4-datetime-plugin
-move xfce-extra/xfce4-fsguard xfce-extra/xfce4-fsguard-plugin
-move xfce-extra/xfce4-cpugraph xfce-extra/xfce4-cpugraph-plugin
-move xfce-extra/xfce4-time-out xfce-extra/xfce4-time-out-plugin
-move xfce-extra/xfce4-timer xfce-extra/xfce4-timer-plugin
-move xfce-extra/xfce4-systemload xfce-extra/xfce4-systemload-plugin
-move xfce-extra/xfce4-verve xfce-extra/xfce4-verve-plugin
-move xfce-extra/xfce4-diskperf xfce-extra/xfce4-diskperf-plugin
-move xfce-extra/xfce4-wavelan xfce-extra/xfce4-wavelan-plugin
-move xfce-extra/xfce4-mailwatch xfce-extra/xfce4-mailwatch-plugin
-move xfce-extra/xfce4-weather xfce-extra/xfce4-weather-plugin
-move xfce-extra/xfce4-modemlights xfce-extra/xfce4-modemlights-plugin
-slotmove >=media-plugins/kipi-plugins-0.3.0 2 4
-move net-mail/trojita mail-client/trojita
-move net-fs/glusterfs sys-cluster/glusterfs
-slotmove kde-misc/filelight 0 3.5
-move games-emulation/fceultra games-emulation/fceux
-move games-emulation/gfceu games-emulation/gfceux
-move xfce-extra/thunar-svn-plugin xfce-extra/thunar-vcs-plugin
-slotmove media-radio/qgrid 0 3.5
-move net-zope/zopeinterface net-zope/zope-interface
diff --git a/profiles/updates/3Q-2010 b/profiles/updates/3Q-2010
deleted file mode 100644
index dc98242..0000000
--- a/profiles/updates/3Q-2010
+++ /dev/null
@@ -1,12 +0,0 @@
-slotmove =net-libs/enet-1.3.0 0 1.3
-move media-sound/radiotray media-radio/radiotray
-slotmove =dev-haskell/parallel-1* 0 1
-move www-client/mozilla-firefox www-client/firefox
-slotmove kde-misc/plasma-widget-message-indicator 0 4
-slotmove kde-misc/skanlite 0 4
-move sys-apps/parted sys-block/parted
-slotmove =dev-lang/clojure-1.2.0 1.1 1.2
-move media-video/nvclock sys-power/nvclock
-move media-gfx/kst sci-visualization/kst
-slotmove =dev-lang/vala-0.9.5 0 0.10
-slotmove =dev-lang/vala-0.9.8 0 0.10
diff --git a/profiles/updates/3Q-2011 b/profiles/updates/3Q-2011
deleted file mode 100644
index 419ecf1..0000000
--- a/profiles/updates/3Q-2011
+++ /dev/null
@@ -1,26 +0,0 @@
-slotmove =dev-ruby/rack-mount-0.6.14 0 0.6
-slotmove =dev-ruby/rack-mount-0.7.3  0 0.7
-move sci-electronics/ng-spice-rework sci-electronics/ngspice
-move dev-php5/PEAR-PHP_Timer dev-php/php-timer
-move net-irc/irssi-svn net-irc/irssi
-move dev-php5/pecl-apc dev-php/pecl-apc
-slotmove =dev-ruby/rack-test-0.5.7 0 0.5
-slotmove =dev-ruby/rack-test-0.6.0 0 0.6
-move dev-lang/ekopath-bin dev-lang/ekopath
-move media-libs/libkmap media-libs/libkgeomap
-slotmove kde-misc/entropy-kioslaves 0 4
-move x11-libs/Xaw3d x11-libs/libXaw3d
-move media-libs/libwpg app-text/libwpg
-slotmove =kde-misc/steamcompanion-0.2.2 0 4
-move app-editors/gentoo-editor app-misc/editor-wrapper
-move dev-php5/pecl-memcache dev-php/pecl-memcache
-move kde-misc/smaragd x11-themes/smaragd
-slotmove >sys-boot/grub-1 0 2
-move dev-php5/suhosin dev-php/suhosin
-move dev-php5/PEAR-Text_Template dev-php/php-texttemplate
-move dev-php5/PHPonTrax dev-php/PHPonTrax
-move dev-php5/phpunit-mockobject dev-php/phpunit-mockobject
-move dev-php5/phpunit-selenium dev-php/phpunit-selenium
-move dev-php5/pecl-drizzle dev-php/pecl-drizzle
-move dev-php5/pecl-id3 dev-php/pecl-id3
-slotmove =net-wireless/iwl1000-ucode-128.50.3.1 0 3
diff --git a/profiles/updates/3Q-2012 b/profiles/updates/3Q-2012
deleted file mode 100644
index ebdadb5..0000000
--- a/profiles/updates/3Q-2012
+++ /dev/null
@@ -1,53 +0,0 @@
-slotmove kde-misc/colibri 0 4
-slotmove kde-misc/eventlist 0 4
-slotmove media-gfx/blender 2.60 0
-slotmove kde-misc/plasma-mpd-nowplaying 0 4
-slotmove kde-misc/kbstateapplet 0 4
-move net-voip/telepathy-sofiasip net-voip/telepathy-rakia
-slotmove kde-misc/kio-ftps 0 4
-slotmove kde-misc/kcollectd 0 4
-slotmove kde-misc/wicd-client-kde 0 4
-slotmove kde-misc/kanyremote 0 4
-slotmove kde-misc/semantik 0 4
-slotmove kde-misc/kio-upnp-ms 0 4
-move app-i18n/ibus-mozc app-i18n/mozc
-move sys-auth/nss-ldapd sys-auth/nss-pam-ldapd
-move sys-kernel/amd-ucode sys-firmware/amd-ucode
-move sys-apps/seabios sys-firmware/seabios
-move sys-apps/sgabios sys-firmware/sgabios
-move sys-apps/vgabios sys-firmware/vgabios
-move net-wireless/iwl1000-ucode sys-firmware/iwl1000-ucode
-move kde-misc/kdocker x11-misc/kdocker
-move net-misc/ferm net-firewall/ferm
-move sys-apps/whdd sys-block/whdd
-move dev-ruby/ruby-liquid dev-ruby/liquid
-move dev-ruby/sexp-processor dev-ruby/sexp_processor
-move dev-ruby/sqlite3-ruby dev-ruby/sqlite3
-move dev-ruby/ruby-zoom dev-ruby/zoom
-move dev-ruby/ruby-activeldap dev-ruby/activeldap
-move dev-ruby/ruby-fcgi dev-ruby/fcgi
-move dev-ruby/ruby-postgres dev-ruby/postgres
-move dev-ruby/ruby-inline dev-ruby/RubyInline
-move dev-ruby/ruby-ferret dev-ruby/ferret
-move net-wireless/iwl2030-ucode sys-firmware/iwl2030-ucode
-move net-wireless/iwl3945-ucode sys-firmware/iwl3945-ucode
-move net-wireless/iwl4965-ucode sys-firmware/iwl4965-ucode
-move net-wireless/iwl5000-ucode sys-firmware/iwl5000-ucode
-move net-wireless/iwl5150-ucode sys-firmware/iwl5150-ucode
-move net-wireless/iwl6000-ucode sys-firmware/iwl6000-ucode
-move net-wireless/iwl6005-ucode sys-firmware/iwl6005-ucode
-move net-wireless/iwl6030-ucode sys-firmware/iwl6030-ucode
-move net-wireless/iwl6050-ucode sys-firmware/iwl6050-ucode
-move net-analyzer/nagios-nsca net-analyzer/nsca
-move net-analyzer/nagios-nrpe net-analyzer/nrpe
-move dev-ruby/ruby-dbi dev-ruby/dbi
-move app-arch/TheUnarchiver app-arch/unar
-slotmove =media-libs/gst-plugins-bad-0.10* 0 0.10
-slotmove <media-libs/grilo-0.2 0 0.1
-slotmove <media-plugins/grilo-plugins-0.2 0 0.1
-slotmove app-doc/pms 2 0
-slotmove app-doc/pms 3 0
-slotmove app-doc/pms 4 0
-slotmove app-doc/pms 5 0
-move app-misc/lolcat games-misc/lolcat
-slotmove =dev-ruby/trollop-2.0 0 2
diff --git a/profiles/updates/3Q-2013 b/profiles/updates/3Q-2013
deleted file mode 100644
index a9873e7..0000000
--- a/profiles/updates/3Q-2013
+++ /dev/null
@@ -1,12 +0,0 @@
-move app-emacs/gentoo-syntax app-emacs/ebuild-mode
-move app-xemacs/gentoo-syntax app-xemacs/ebuild-mode
-move dev-ml/zero dev-ml/core_kernel
-slotmove =dev-ruby/builder-3.2.2 3.1 3.2
-move dev-python/twisted dev-python/twisted-core
-slotmove =dev-ruby/minitest-5.0.6 0 5
-move sys-cluster/quantum sys-cluster/neutron
-move sci-libs/scikits_statsmodels dev-python/statsmodels
-slotmove =dev-python/pydns-2.3.4 0 2
-move sys-devel/systemd-sdk sys-devel/systemd-m4
-move dev-python/quantumclient dev-python/neutronclient
-slotmove =net-libs/libecap-0.2.0 2 0.2
diff --git a/profiles/updates/4Q-2008 b/profiles/updates/4Q-2008
deleted file mode 100644
index 11cf6ca..0000000
--- a/profiles/updates/4Q-2008
+++ /dev/null
@@ -1,27 +0,0 @@
-move media-tv/pvr-firmware media-tv/ivtv-firmware
-move x11-drivers/xf86-video-i810 x11-drivers/xf86-video-intel
-slotmove dev-db/myodbc 0 3.51
-move x11-themes/lxappearance lxde-base/lxappearance
-move dev-scheme/drscheme dev-scheme/plt-scheme
-move dev-perl/Archive-Tar perl-core/Archive-Tar
-move dev-perl/Class-ISA perl-core/Class-ISA
-move dev-perl/Compress-Raw-Zlib perl-core/Compress-Raw-Zlib
-move dev-perl/Compress-Zlib perl-core/Compress-Zlib
-move dev-perl/Digest-SHA perl-core/Digest-SHA
-move dev-perl/ExtUtils-CBuilder perl-core/ExtUtils-CBuilder
-move dev-perl/extutils-parsexs perl-core/ExtUtils-ParseXS
-move dev-perl/IO-Compress-Base perl-core/IO-Compress-Base
-move dev-perl/IO-Compress-Zlib perl-core/IO-Compress-Zlib
-move dev-perl/IO-Zlib perl-core/IO-Zlib
-move dev-perl/Locale-Maketext-Simple perl-core/Locale-Maketext-Simple
-move dev-perl/Math-BigInt-FastCalc perl-core/Math-BigInt-FastCalc
-move dev-perl/module-build perl-core/Module-Build
-move dev-perl/Module-Pluggable perl-core/Module-Pluggable
-move dev-perl/Pod-Escapes perl-core/Pod-Escapes
-move dev-perl/Pod-Simple perl-core/Pod-Simple
-move dev-perl/Term-ANSIColor perl-core/Term-ANSIColor
-move dev-perl/Time-Piece perl-core/Time-Piece
-move dev-perl/version perl-core/version
-slotmove app-doc/elisp-manual 0 21
-move net-misc/gtk2-ssh-askpass net-misc/ssh-askpass-fullscreen
-slotmove =x11-themes/metacity-themes-1.1 1 0
diff --git a/profiles/updates/4Q-2009 b/profiles/updates/4Q-2009
deleted file mode 100644
index 1e11ced..0000000
--- a/profiles/updates/4Q-2009
+++ /dev/null
@@ -1,24 +0,0 @@
-move net-im/twinkle net-voip/twinkle
-slotmove >=net-misc/kvpnc-0.9.1 1 4
-slotmove <net-misc/kvpnc-0.9.1 0 3.5
-move net-zope/zcbuildout net-zope/zc-buildout
-move app-admin/realpath app-misc/realpath
-slotmove kde-misc/ksystemlog 0 3.5
-slotmove kde-misc/rsibreak 0 3.5
-move sci-biology/dialign-t sci-biology/dialign-tx
-move games-emulation/dosbox-cvs games-emulation/dosbox
-move media-sound/kenvy24gui media-sound/kenvy24
-move dev-perl/File-Path perl-core/File-Path
-move x11-themes/auroare x11-themes/aurorae
-slotmove =app-text/kchmviewer-3.1_p2-r1 3.5 0
-move app-misc/git app-misc/gnuit
-move dev-util/android-sdk dev-util/android-sdk-update-manager
-slotmove dev-embedded/scratchbox2 2 0
-move app-emulation/kvm app-emulation/qemu-kvm
-move www-plugins/mozilla-weave www-plugins/weave
-move dev-ruby/mislav-will_paginate dev-ruby/will_paginate
-slotmove net-im/choqok 0 4
-move x11-plugins/compiz-fusion-plugins-main x11-plugins/compiz-fusion-main
-move x11-plugins/compiz-fusion-plugins-extra x11-plugins/compiz-fusion-extra
-move x11-plugins/compiz-fusion-plugins-unsupported x11-plugins/compiz-fusion-unsupported
-move app-editors/emacs-cvs app-editors/emacs-vcs
diff --git a/profiles/updates/4Q-2010 b/profiles/updates/4Q-2010
deleted file mode 100644
index e4f86cc..0000000
--- a/profiles/updates/4Q-2010
+++ /dev/null
@@ -1,28 +0,0 @@
-slotmove gnome-base/gnome-desktop 0 2
-slotmove =media-libs/libchamplain-0.8.0 0.6 0.8
-move kde-misc/dikt app-dicts/dikt
-move app-admin/squid-cronolog app-admin/fifo-cronolog
-move sci-chemistry/msms sci-chemistry/msms-bin
-move games-misc/fortune-mod-prolinux games-misc/fortune-mod-flashrider
-slotmove sys-libs/libchipcard 2 0
-move xfce-base/tumbler xfce-extra/tumbler
-move dev-libs/luaevent-prosody dev-lua/luaevent-prosody
-move dev-libs/luaexpat dev-lua/luaexpat
-move dev-libs/luasec dev-lua/luasec
-move dev-libs/luasocket dev-lua/luasocket
-move dev-lang/luarocks dev-lua/luarocks
-move dev-libs/luafilesystem dev-lua/luafilesystem
-move dev-util/luadoc dev-lua/luadoc
-move dev-lang/toluapp dev-lua/toluapp
-move media-gfx/gimp-lqr-plugin media-plugins/gimp-lqr
-move x11-libs/evas media-libs/evas
-move x11-libs/ecore dev-libs/ecore
-move x11-libs/e_dbus dev-libs/e_dbus
-move app-admin/patchelf dev-util/patchelf
-slotmove dev-python/beautifulsoup 3.0 python-2
-slotmove dev-python/beautifulsoup 3.1 python-3
-slotmove =media-libs/clutter-gtk-0.10* 1.0 0.10
-move net-dns/shelldap net-nds/shelldap
-move app-dicts/goldendict app-text/goldendict
-slotmove net-libs/webkit-gtk 0 2
-slotmove net-p2p/kmldonkey 2 4
diff --git a/profiles/updates/4Q-2011 b/profiles/updates/4Q-2011
deleted file mode 100644
index 12f9075..0000000
--- a/profiles/updates/4Q-2011
+++ /dev/null
@@ -1,109 +0,0 @@
-move app-text/libtextcat app-text/libexttextcat
-move dev-texlive/texlive-psutils dev-texlive/texlive-fontutils
-move dev-texlive/texlive-langukenglish dev-texlive/texlive-langenglish
-move dev-texlive/texlive-langarab dev-texlive/texlive-langarabic
-move dev-php5/pecl-ssh2 dev-php/pecl-ssh2
-slotmove <app-text/gtkspell-2.90 0 2
-slotmove <dev-libs/libnl-2 0 1.1
-slotmove >=dev-libs/libnl-2 0 3
-move dev-php5/pecl-timezonedb dev-php/pecl-timezonedb
-move kde-misc/knetworkmanager kde-misc/networkmanagement
-move dev-java/icedtea6-bin dev-java/icedtea-bin
-slotmove =dev-java/icedtea-bin-1* 0 6
-move app-text/notmuch net-mail/notmuch
-move dev-util/gtest dev-cpp/gtest
-move net-misc/get-flash-videos media-video/get_flash_videos
-move net-voip/telepathy-connection-managers net-im/telepathy-connection-managers
-move x11-misc/remind app-misc/remind
-move x11-misc/bubblemon x11-plugins/bubblemon
-move app-misc/dsgui app-misc/datovka
-move dev-php5/pecl-gearman dev-php/pecl-gearman
-move dev-php5/ezc-Archive dev-php/ezc-Archive
-move dev-php5/ezc-Authentication dev-php/ezc-Authentication
-move dev-php5/ezc-AuthenticationDatabaseTiein dev-php/ezc-AuthenticationDatabaseTiein
-move dev-php5/ezc-Base dev-php/ezc-Base
-move dev-php5/ezc-Cache dev-php/ezc-Cache
-move dev-php5/ezc-Configuration dev-php/ezc-Configuration
-move dev-php5/ezc-ConsoleTools dev-php/ezc-ConsoleTools
-move dev-php5/ezc-Database dev-php/ezc-Database
-move dev-php5/ezc-DatabaseSchema dev-php/ezc-DatabaseSchema
-move dev-php5/ezc-Debug dev-php/ezc-Debug
-move dev-php5/ezc-Document dev-php/ezc-Document
-move dev-php5/ezc-EventLog dev-php/ezc-EventLog
-move dev-php5/ezc-EventLogDatabaseTiein dev-php/ezc-EventLogDatabaseTiein
-move dev-php5/ezc-Execution dev-php/ezc-Execution
-move dev-php5/ezc-eZcomponents dev-php/ezc-eZcomponents
-move dev-php5/ezc-Feed dev-php/ezc-Feed
-move dev-php5/ezc-File dev-php/ezc-File
-move dev-php5/ezc-Graph dev-php/ezc-Graph
-move dev-php5/ezc-GraphDatabaseTiein dev-php/ezc-GraphDatabaseTiein
-move dev-php5/ezc-ImageAnalysis dev-php/ezc-ImageAnalysis
-move dev-php5/ezc-ImageConversion dev-php/ezc-ImageConversion
-move dev-php5/ezc-Mail dev-php/ezc-Mail
-move dev-php5/ezc-MvcAuthenticationTiein dev-php/ezc-MvcAuthenticationTiein
-move dev-php5/ezc-MvcFeedTiein dev-php/ezc-MvcFeedTiein
-move dev-php5/ezc-MvcMailTiein dev-php/ezc-MvcMailTiein
-move dev-php5/ezc-MvcTemplateTiein dev-php/ezc-MvcTemplateTiein
-move dev-php5/ezc-MvcTools dev-php/ezc-MvcTools
-move dev-php5/ezc-PersistentObject dev-php/ezc-PersistentObject
-move dev-php5/ezc-PersistentObjectDatabaseSchemaTiein dev-php/ezc-PersistentObjectDatabaseSchemaTiein
-move dev-php5/ezc-PhpGenerator dev-php/ezc-PhpGenerator
-move dev-php5/ezc-Search dev-php/ezc-Search
-move dev-php5/ezc-SignalSlot dev-php/ezc-SignalSlot
-move dev-php5/ezc-SystemInformation dev-php/ezc-SystemInformation
-move dev-php5/ezc-Template dev-php/ezc-Template
-move dev-php5/ezc-TemplateTranslationTiein dev-php/ezc-TemplateTranslationTiein
-move dev-php5/ezc-Translation dev-php/ezc-Translation
-move dev-php5/ezc-TranslationCacheTiein dev-php/ezc-TranslationCacheTiein
-move dev-php5/ezc-Tree dev-php/ezc-Tree
-move dev-php5/ezc-TreeDatabaseTiein dev-php/ezc-TreeDatabaseTiein
-move dev-php5/ezc-TreePersistentObjectTiein dev-php/ezc-TreePersistentObjectTiein
-move dev-php5/ezc-Url dev-php/ezc-Url
-move dev-php5/ezc-UserInput dev-php/ezc-UserInput
-move dev-php5/ezc-Webdav dev-php/ezc-Webdav
-move dev-php5/ezc-Workflow dev-php/ezc-Workflow
-move dev-php5/ezc-WorkflowDatabaseTiein dev-php/ezc-WorkflowDatabaseTiein
-move dev-php5/ezc-WorkflowEventLogTiein dev-php/ezc-WorkflowEventLogTiein
-move dev-php5/ezc-WorkflowSignalSlotTiein dev-php/ezc-WorkflowSignalSlotTiein
-move dev-php5/ffmpeg-php dev-php/ffmpeg-php
-move dev-php5/libvirt-php dev-php/libvirt-php
-move dev-php5/pecl-bbcode dev-php/pecl-bbcode
-move dev-php5/pecl-cairo dev-php/pecl-cairo
-move dev-php5/pecl-crack dev-php/pecl-crack
-move dev-php5/pecl-dbx dev-php/pecl-dbx
-move dev-php5/pecl-dio dev-php/pecl-dio
-move dev-php5/pecl-enchant dev-php/pecl-enchant
-move dev-php5/pecl-fileinfo dev-php/pecl-fileinfo
-move dev-php5/pecl-geoip dev-php/pecl-geoip
-move dev-php5/pecl-gnupg dev-php/pecl-gnupg
-move dev-php5/pecl-haru dev-php/pecl-haru
-move dev-php5/pecl-htscanner dev-php/pecl-htscanner
-move dev-php5/pecl-http dev-php/pecl-http
-move dev-php5/pecl-idn dev-php/pecl-idn
-move dev-php5/pecl-imagick dev-php/pecl-imagick
-move dev-php5/pecl-lzf dev-php/pecl-lzf
-move dev-php5/pecl-mailparse dev-php/pecl-mailparse
-move dev-php5/pecl-mcve dev-php/pecl-mcve
-move dev-php5/pecl-memcached dev-php/pecl-memcached
-move dev-php5/pecl-mogilefs dev-php/pecl-mogilefs
-move dev-php5/pecl-mongo dev-php/pecl-mongo
-move dev-php5/pecl-pam dev-php/pecl-pam
-move dev-php5/pecl-ps dev-php/pecl-ps
-move dev-php5/pecl-radius dev-php/pecl-radius
-move dev-php5/pecl-sca_sdo dev-php/pecl-sca_sdo
-move dev-php5/pecl-svn dev-php/pecl-svn
-move dev-php5/pecl-syck dev-php/pecl-syck
-move dev-php5/pecl-translit dev-php/pecl-translit
-move dev-php5/pecl-uploadprogress dev-php/pecl-uploadprogress
-move dev-php5/pecl-uuid dev-php/pecl-uuid
-move dev-php5/pecl-xdiff dev-php/pecl-xdiff
-move dev-php5/pecl-yaml dev-php/pecl-yaml
-move dev-php5/pecl-yaz dev-php/pecl-yaz
-move dev-php5/phpdbg dev-php/phpdbg
-move dev-php5/php-gtk dev-php/php-gtk
-move dev-php5/propel dev-php/propel
-move dev-php5/propel-generator dev-php/propel-generator
-move dev-php5/propel-runtime dev-php/propel-runtime
-move dev-php5/SabreAMF dev-php/SabreAMF
-move dev-php5/Savant3 dev-php/Savant3
-move dev-php5/Savant3-Plugin-Form dev-php/Savant3-Plugin-Form
diff --git a/profiles/updates/4Q-2012 b/profiles/updates/4Q-2012
deleted file mode 100644
index 8904f36..0000000
--- a/profiles/updates/4Q-2012
+++ /dev/null
@@ -1,61 +0,0 @@
-move sci-geosciences/gpxviewer sci-geosciences/gpx-viewer
-move app-text/yudit app-editors/yudit
-move app-emulation/qemu-kvm app-emulation/qemu
-move media-libs/libmediawiki net-libs/libmediawiki
-move media-fonts/source-sans-pro media-fonts/source-pro
-move media-fonts/source-code-pro media-fonts/source-pro
-move x11-wm/razorqt razorqt-base/razorqt-meta
-move x11-misc/lightdm-razorqt-greeter razorqt-base/razorqt-lightdm-greeter
-move x11-libs/openmotif x11-libs/motif
-move app-doc/openmotif-manual app-doc/motif-reference-manual
-slotmove dev-libs/boost 1.36 0
-slotmove dev-libs/boost 1.37 0
-slotmove dev-libs/boost 1.38 0
-slotmove dev-libs/boost 1.39 0
-slotmove dev-libs/boost 1.40 0
-slotmove dev-libs/boost 1.41 0
-slotmove dev-libs/boost 1.42 0
-slotmove dev-libs/boost 1.43 0
-slotmove dev-libs/boost 1.44 0
-slotmove dev-libs/boost 1.45 0
-slotmove dev-libs/boost 1.46 0
-slotmove dev-libs/boost 1.47 0
-slotmove dev-libs/boost 1.48 0
-slotmove dev-libs/boost 1.49 0
-slotmove dev-libs/boost 1.50 0
-slotmove dev-libs/boost 1.51 0
-slotmove dev-util/boost-build 1.36 0
-slotmove dev-util/boost-build 1.37 0
-slotmove dev-util/boost-build 1.38 0
-slotmove dev-util/boost-build 1.39 0
-slotmove dev-util/boost-build 1.40 0
-slotmove dev-util/boost-build 1.41 0
-slotmove dev-util/boost-build 1.42 0
-slotmove dev-util/boost-build 1.43 0
-slotmove dev-util/boost-build 1.44 0
-slotmove dev-util/boost-build 1.45 0
-slotmove dev-util/boost-build 1.46 0
-slotmove dev-util/boost-build 1.47 0
-slotmove dev-util/boost-build 1.48 0
-slotmove dev-util/boost-build 1.49 0
-slotmove dev-util/boost-build 1.50 0
-slotmove dev-util/boost-build 1.51 0
-slotmove net-im/emesene 2 0
-move sci-chemistry/mmtk sci-libs/mmtk
-move app-office/texmakerx app-office/texstudio
-slotmove =media-libs/gst-rtsp-server-0.10* 0 0.10
-move games-board/jrisk games-board/domination
-move x11-libs/elementary media-libs/elementary
-move x11-misc/pnmixer media-sound/pnmixer
-move app-portage/pyGPG dev-python/pyGPG
-move mail-client/claws-mail-tnef_parse mail-client/claws-mail-tnef-parse
-move mail-client/claws-mail-spam_report mail-client/claws-mail-spam-report
-move x11-libs/vdpau-video x11-libs/libva-vdpau-driver
-move app-editors/XML-XSH app-editors/XML-XSH2
-slotmove <net-libs/farstream-0.1.90 0 0.1
-move dev-ruby/ruby-bsearch dev-ruby/bsearch
-move net-misc/ptunnel net-proxy/pingtunnel
-move media-sound/leechcraft-lemon net-misc/leechcraft-lemon
-move dev-haskell/hsql-sqlite dev-haskell/hsql-sqlite3
-slotmove dev-ruby/builder 3.1.4 3.1
-move x11-terms/terminal x11-terms/xfce4-terminal
diff --git a/profiles/updates/4Q-2013 b/profiles/updates/4Q-2013
deleted file mode 100644
index b7cd04a..0000000
--- a/profiles/updates/4Q-2013
+++ /dev/null
@@ -1 +0,0 @@
-move x11-themes/qtcurve-qt4 x11-themes/qtcurve
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
deleted file mode 100644
index 74c4925..0000000
--- a/sci-visualization/gnuplot/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST gnuplot-4.6.3.tar.gz 4973116 SHA256 df5ffafa25fb32b3ecc0206a520f6bca8680e6dcc961efd30df34c0a1b7ea7f5 SHA512 8bb7af550c0847e65e041bd5bb6dc8cd3cee1e43a5306a7f9af0b5c82067bbe24a7f19c93914c88e4f08f2eee509773964e574e415710bbf99501e0cd3dad7e7 WHIRLPOOL 0566a93ad6af7813c8ebcbde00cb305cd037250959e25e43d93c7bb6313552851d59b70a5d02eae18449d1e18591e2e91ebdf9aac71d443f985fbb77493572f5
-DIST gnuplot.info-4.6.2.tar.xz 182168 SHA256 73307153e8f525cce04d8c2c09ef28e422f21cd216d019f7aef8dbe71b6cc1bd SHA512 805e11933addefde41a15287e96bff9f4e307bbffbabe4bf1a9c49663a688702d9e738750d4ca6db475c9c09c0b6a14589b7e18392161610709e8864c626d4ff WHIRLPOOL bc16e1b6a798e214516aba413b3843045b0489038943dec6511722fed1eba772ba1067a8cdcada216afa903de5744c0722fa9f856a74d8f8e68fa27016704e53
diff --git a/sci-visualization/gnuplot/files/gnuplot-4.4.4-tikz.patch b/sci-visualization/gnuplot/files/gnuplot-4.4.4-tikz.patch
deleted file mode 100644
index 174fdd1..0000000
--- a/sci-visualization/gnuplot/files/gnuplot-4.4.4-tikz.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/396251
-http://sourceforge.net/tracker/?func=detail&aid=3441899&group_id=2055&atid=102055
-
---- gnuplot-4.4.4-orig/term/lua/gnuplot-tikz.lua
-+++ gnuplot-4.4.4/term/lua/gnuplot-tikz.lua
-@@ -251,6 +251,7 @@
-   gp.write(string.format("\\begin{tikzpicture}[gnuplot%s]\n",global_opt))
-   gp.write(string.format("%%%% generated with GNUPLOT %sp%s (%s; terminal rev. %s, script rev. %s)\n%%%% %s\n",
-       term.gp_version, term.gp_patchlevel,
-+      _VERSION,
-       string.sub(term.lua_term_revision,7,-3),
-       pgf.REVISION,os.date()))
-   if font ~= "" then
diff --git a/sci-visualization/gnuplot/files/gnuplot-4.6.2-gdversion.patch b/sci-visualization/gnuplot/files/gnuplot-4.6.2-gdversion.patch
deleted file mode 100644
index a10e1cc..0000000
--- a/sci-visualization/gnuplot/files/gnuplot-4.6.2-gdversion.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Gnuplot supports using fontconfig in gd terminals. There was a bug in
-gd-2.0.35 that prevented this from working; therefore the mechanism
-was disabled by testing the GD version. Gentoo has backported the fix
-to media-libs/gd-2.0.35-r3 so our test can be different.
-
-Patch by Bernardo Costa <bernardofpc@gmail.com>.
-Gentoo specific, not to be submitted upstream.
-https://bugs.gentoo.org/462996
-https://bugs.gentoo.org/363367
-
---- gnuplot-4.6.2-orig/term/gd.trm
-+++ gnuplot-4.6.2/term/gd.trm
-@@ -149,7 +149,7 @@
- /* Before version 2.0.36, the libgd function gdFTUseFontConfig() didn't */
- /* do what we need.  Test for earlier versions and ignore it.           */
- #ifdef GD_MAJOR_VERSION
--#  if (GD_MINOR_VERSION > 0  ||  GD_RELEASE_VERSION > 35)
-+#  if (GD_MINOR_VERSION > 0  ||  GD_RELEASE_VERSION >= 35)
- #    define gdUseFontConfig(x) gdFTUseFontConfig(x)
- #  endif
- #endif
diff --git a/sci-visualization/gnuplot/files/gnuplot-4.6.3-eldoc.patch b/sci-visualization/gnuplot/files/gnuplot-4.6.3-eldoc.patch
deleted file mode 100644
index ad8395e..0000000
--- a/sci-visualization/gnuplot/files/gnuplot-4.6.3-eldoc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.gentoo.org/459172
-
---- gnuplot-4.6.3-orig/docs/Makefile.in
-+++ gnuplot-4.6.3/docs/Makefile.in
-@@ -398,9 +398,9 @@
- 	@if test "$(EMACS)" != no; then \
- 	   test "$(top_srcdir)" = "$(top_builddir)" || echo "COPYING GNUPLOT.DOC" ; \
- 	   test "$(top_srcdir)" = "$(top_builddir)" || cp $(srcdir)/gnuplot.doc . ; \
--	   $(EMACS) -batch -l $(srcdir)/doc2texi.el -f d2t-doc-to-texi ; \
-+	   $(EMACS) -batch -q -no-site-file -l $(srcdir)/doc2texi.el -f d2t-doc-to-texi ; \
- 	   echo "Compiling gnuplot-eldoc.el" ; \
--	   $(EMACS) -batch --eval='(byte-compile-file "gnuplot-eldoc.el")' ; \
-+	   $(EMACS) -batch -q -no-site-file -f batch-byte-compile gnuplot-eldoc.el ; \
- 	else \
- 	   echo "No emacs found - cannot create texinfo file" ; \
- 	fi
diff --git a/sci-visualization/gnuplot/gnuplot-4.6.3.ebuild b/sci-visualization/gnuplot/gnuplot-4.6.3.ebuild
deleted file mode 100644
index dc23b33..0000000
--- a/sci-visualization/gnuplot/gnuplot-4.6.3.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6.3.ebuild,v 1.12 2013/09/26 17:29:53 ago Exp $
-
-EAPI=5
-
-inherit elisp-common eutils flag-o-matic multilib readme.gentoo toolchain-funcs wxwidgets
-
-DESCRIPTION="Command-line driven interactive plotting program"
-HOMEPAGE="http://www.gnuplot.info/"
-
-if [[ -z ${PV%%*9999} ]]; then
-	inherit autotools cvs
-	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
-	ECVS_MODULE="gnuplot"
-	ECVS_BRANCH="branch-4-6-stable"
-	ECVS_USER="anonymous"
-	ECVS_CVS_OPTIONS="-dP"
-	MY_P="${PN}"
-	SRC_URI=""
-else
-	MY_P="${P/_/.}"
-	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz
-		mirror://gentoo/${PN}.info-4.6.2.tar.xz"
-fi
-
-LICENSE="gnuplot GPL-2 bitmap? ( free-noncomm )"
-SLOT="0"
-KEYWORDS="*"
-IUSE="aqua bitmap cairo doc emacs examples +gd ggi latex lua plotutils qt4 readline svga thin-splines wxwidgets X xemacs"
-
-RDEPEND="
-	cairo? (
-		x11-libs/cairo
-		x11-libs/pango )
-	emacs? ( virtual/emacs )
-	!emacs? ( xemacs? (
-		app-editors/xemacs
-		app-xemacs/xemacs-base ) )
-	gd? ( >=media-libs/gd-2.0.35-r3[png] )
-	ggi? ( media-libs/libggi )
-	latex? (
-		virtual/latex-base
-		lua? (
-			dev-tex/pgf
-			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
-	lua? ( dev-lang/lua )
-	plotutils? ( media-libs/plotutils )
-	qt4? ( >=dev-qt/qtcore-4.5:4
-		>=dev-qt/qtgui-4.5:4
-		>=dev-qt/qtsvg-4.5:4 )
-	readline? ( sys-libs/readline )
-	svga? ( media-libs/svgalib )
-	wxwidgets? (
-		x11-libs/wxGTK:2.8[X]
-		x11-libs/cairo
-		x11-libs/pango
-		x11-libs/gtk+:2 )
-	X? ( x11-libs/libXaw )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-		app-text/ghostscript-gpl )
-	!emacs? ( xemacs? ( app-xemacs/texinfo ) )"
-
-if [[ -z ${PV%%*9999} ]]; then
-	# The live ebuild always needs an Emacs for building of gnuplot.texi
-	DEPEND="${DEPEND}
-	|| ( virtual/emacs app-xemacs/texinfo )"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-GP_VERSION="${PV%.*}"
-E_SITEFILE="lisp/50${PN}-gentoo.el"
-TEXMF="${EPREFIX}/usr/share/texmf-site"
-
-src_prepare() {
-	if [[ -n ${PV%%*9999} ]]; then
-		epatch "${FILESDIR}/${PN}-4.6.3-eldoc.patch"
-		epatch "${FILESDIR}/${PN}-4.6.2-gdversion.patch" #462996
-		mv "${WORKDIR}"/gnuplot-4.6.2/docs/gnuplot.info docs || die
-		touch docs/gnuplot.info || die #464092#c12 and #466758
-	else
-		local dir
-		for dir in config demo m4 term tutorial; do
-			emake -C "$dir" -f Makefile.am.in Makefile.am
-		done
-		eautoreconf
-	fi
-
-	# Add special version identification as required by provision 2
-	# of the gnuplot license
-	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
-
-	# hacky workaround
-	# Please hack the buildsystem if you like
-	if use prefix && use qt4; then
-		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
-	fi
-
-	DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
-		for details. You can use the "pdfcairo" terminal for PDF output.'
-	use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
-	use svga && DOC_CONTENTS+='\n\nIn order to enable ordinary users to use
-		SVGA console graphics, gnuplot needs to be set up as setuid root.
-		Please note that this is usually considered to be a security hazard.
-		As root, manually "chmod u+s /usr/bin/gnuplot".'
-	use gd && DOC_CONTENTS+='\n\nFor font support in png/jpeg/gif output,
-		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
-		environment variables. See the FAQ file in /usr/share/doc/${PF}/
-		for more information.'
-
-	# Make sure we don't mix build & host flags.
-	sed -i \
-		-e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \
-		-e 's:@CFLAGS@:$(BUILD_CFLAGS):' \
-		-e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \
-		docs/Makefile.in || die
-}
-
-src_configure() {
-	if ! use latex; then
-		sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
-	fi
-
-	if use wxwidgets; then
-		WX_GTK_VER="2.8"
-		need-wxwidgets unicode
-	fi
-
-	tc-export CC CXX			#453174
-	tc-export_build_env BUILD_CC
-	export CC_FOR_BUILD=${BUILD_CC}
-
-	local emacs lispdir
-	if use emacs; then
-		emacs=emacs
-		lispdir="${EPREFIX}${SITELISP}/${PN}"
-		use xemacs \
-			&& ewarn "USE flag \"xemacs\" ignored (superseded by \"emacs\")"
-	elif use xemacs; then
-		emacs=xemacs
-		lispdir="${EPREFIX}/usr/lib/xemacs/site-packages/${PN}"
-	else
-		emacs=no
-		lispdir=""
-		if [[ -z ${PV%%*9999} ]]; then
-			# Live ebuild needs an Emacs to build gnuplot.texi
-			if has_version virtual/emacs; then emacs=emacs
-			elif has_version app-xemacs/texinfo; then emacs=xemacs; fi
-			# for emacs != no gnuplot will install lisp files in 
-			# ${lispdir}/ which will / for emtpy lispdir
-			lispdir="${T}"
-		fi
-	fi
-
-	econf \
-		--without-pdf \
-		--with-texdir="${TEXMF}/tex/latex/${PN}" \
-		--with-readline=$(usex readline gnu builtin) \
-		--with-lispdir="${lispdir}" \
-		--with$([[ -z ${lispdir} ]] && echo out)-lisp-files \
-		$(use_with bitmap bitmap-terminals) \
-		$(use_with cairo) \
-		$(use_with doc tutorial) \
-		$(use_with gd) \
-		"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
-		"$(use_with ggi xmi "${EPREFIX}/usr/$(get_libdir)")" \
-		$(use_with lua) \
-		"$(use_with plotutils plot "${EPREFIX}/usr/$(get_libdir)")" \
-		$(use_with svga linux-vga) \
-		$(use_with X x) \
-		--enable-stats \
-		$(use_enable qt4 qt) \
-		$(use_enable thin-splines) \
-		$(use_enable wxwidgets) \
-		DIST_CONTACT="http://bugs.gentoo.org/" \
-		EMACS="${emacs}"
-}
-
-src_compile() {
-	# Prevent access violations, see bug 201871
-	VARTEXFONTS="${T}/fonts"
-
-	# We believe that the following line is no longer needed.
-	# In case of problems file a bug report at bugs.gentoo.org.
-	#addwrite /dev/svga:/dev/mouse:/dev/tts/0
-
-	emake all info
-
-	if use doc; then
-		# Avoid sandbox violation in epstopdf/ghostscript
-		addpredict /var/cache/fontconfig
-		emake -C docs pdf
-		emake -C tutorial pdf
-		use emacs || use xemacs && emake -C lisp pdf
-	fi
-}
-
-src_install () {
-	emake -j1 DESTDIR="${D}" install
-
-	if use emacs; then
-		# Gentoo Emacs site-lisp configuration
-		echo "(add-to-list 'load-path \"@SITELISP@\")" > ${E_SITEFILE}
-		sed '/^;; move/,+3 d' lisp/dotemacs >> ${E_SITEFILE} || die
-		elisp-site-file-install ${E_SITEFILE} || die
-	fi
-
-	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README*
-	newdoc term/PostScript/README README-ps
-	newdoc term/js/README README-js
-	use lua && newdoc term/lua/README README-lua
-	readme.gentoo_create_doc
-
-	if use examples; then
-		# Demo files
-		insinto /usr/share/${PN}/${GP_VERSION}
-		doins -r demo
-		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
-		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
-	fi
-
-	if use doc; then
-		# Manual, tutorial, FAQ
-		dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf
-		# Documentation for making PostScript files
-		docinto psdoc
-		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
-	fi
-
-	if use emacs || use xemacs; then
-		docinto emacs
-		dodoc lisp/ChangeLog lisp/README
-		use doc && dodoc lisp/gpelcard.pdf
-	fi
-}
-
-src_test() {
-	GNUTERM="unknown" default_src_test
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	use latex && texmf-update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use latex && texmf-update
-}
diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml
deleted file mode 100644
index 206d84d..0000000
--- a/sci-visualization/gnuplot/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci</herd>
-  <maintainer>
-    <email>ulm@gentoo.org</email>
-    <name>Ulrich Müller</name>
-  </maintainer>
-  <maintainer>
-    <email>ottxor@gentoo.org</email>
-    <name>Christoph Junghans</name>
-  </maintainer>
-  <longdescription>
-  Gnuplot is a command-driven interactive function plotting program.
-  It can be used to plot functions and data points in both two- and
-  three-dimensional plots in many different formats. It is designed
-  primarily for the visual display of scientific data.
-</longdescription>
-  <use>
-    <flag name="gd">Add support for <pkg>media-libs/gd</pkg>.
-    Needed for GIF, JPEG, and PNG image output.</flag>
-    <flag name="thin-splines">Enable thin plate splines</flag>
-    <flag name="bitmap">Enable dot-matrix printers and pbm terminal</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">gnuplot</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 229526b..1dc062f 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1 +1 @@
-DIST busybox-1.29.3.tar.bz2 2305384 BLAKE2B dffb26be6d21faf87c7443f233468ec88430a5e4176855c8eb32303eb3e457c63bb7bfa55b59f9fd9da573dceb1cb44815149e90c6d67f2f5e3595fab9eb4ef5 SHA512 bf90e24b4564071e0ac2785e2ee4ec4ea0e229a1ff330bb38befe7a27c5a529e7b0657354ce731473814325a27a0c181ab922e0a0a89d5023ba08a6d80472297
+DIST busybox-1.32.1.tar.bz2 2444679 BLAKE2B b0258345d40628d8c12b4cc5c3efdb318cfb469e029242942cdad22aeec5142963291a746fbac450b43a4a1f2f7e9204442456691fa98f18eeaa58c70d714caf SHA512 3a33e99adaf7cbd51dcbeb31b5361123bf61ac040c0a032656c654ddb69c4074af75fb4335ba63f283067f61a22d7d7cbca8e1ed265c9522982c453ce48ea2fd
diff --git a/sys-apps/busybox/busybox-1.29.3.ebuild b/sys-apps/busybox/busybox-1.29.3.ebuild
deleted file mode 100644
index 15c608f..0000000
--- a/sys-apps/busybox/busybox-1.29.3.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-
-EAPI=6
-
-inherit flag-o-matic savedconfig toolchain-funcs
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="https://www.busybox.net/"
-if [[ ${PV} == "9999" ]] ; then
-	MY_P=${P}
-	EGIT_REPO_URI="https://git.busybox.net/busybox"
-	inherit git-r3
-else
-	MY_P=${PN}-${PV/_/-}
-	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="*"
-fi
-
-LICENSE="GPL-2" # GPL-2 only
-SLOT="0"
-IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd"
-REQUIRED_USE="pam? ( !static )"
-RESTRICT="test"
-
-COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
-	pam? ( sys-libs/pam )"
-DEPEND="${COMMON_DEPEND}
-	static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
-	>=sys-kernel/linux-headers-2.6.39"
-RDEPEND="${COMMON_DEPEND}
-	mdev? ( !<sys-apps/openrc-0.13 )"
-
-S=${WORKDIR}/${MY_P}
-
-busybox_config_option() {
-	local flag=$1 ; shift
-	if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then
-		busybox_config_option $(usex ${flag} y n) "$@"
-		return
-	fi
-	local expr
-	while [[ $# -gt 0 ]] ; do
-		case ${flag} in
-		y) expr="s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" ;;
-		n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;;
-		*) expr="s:.*\<CONFIG_$1\>.*:CONFIG_$1=${flag}:g" ;;
-		esac
-		sed -i -e "${expr}" .config || die
-		einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find CONFIG_$1 ...")"
-		shift
-	done
-}
-
-busybox_config_enabled() {
-	local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
-	case ${val} in
-	"") return 1 ;;
-	y)  return 0 ;;
-	*)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
-	esac
-}
-
-# patches go here!
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.26.2-bb.patch
-	# "${FILESDIR}"/${P}-*.patch
-)
-
-src_prepare() {
-	default
-	unset KBUILD_OUTPUT #88088
-	append-flags -fno-strict-aliasing #310413
-	use ppc64 && append-flags -mminimal-toc #130943
-
-	cp "${FILESDIR}"/ginit.c init/ || die
-
-	# flag cleanup
-	sed -i -r \
-		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
-		Makefile.flags || die
-	#sed -i '/bbsh/s:^//::' include/applets.h
-	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
-	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
-	sed -i \
-		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
-		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
-		Makefile || die
-	sed -i \
-		-e 's:-static-libgcc::' \
-		Makefile.flags || die
-}
-
-src_configure() {
-	# check for a busybox config before making one of our own.
-	# if one exist lets return and use it.
-
-	restore_config .config
-	if [ -f .config ]; then
-		yes "" | emake -j1 -s oldconfig >/dev/null
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	# setup the config file
-	emake -j1 -s allyesconfig >/dev/null
-	# nommu forces a bunch of things off which we want on #387555
-	busybox_config_option n NOMMU
-	sed -i '/^#/d' .config
-	yes "" | emake -j1 -s oldconfig >/dev/null
-
-	# now turn off stuff we really don't want
-	busybox_config_option n DMALLOC
-	busybox_config_option n FEATURE_2_4_MODULES #607548
-	busybox_config_option n FEATURE_SUID_CONFIG
-	busybox_config_option n BUILD_AT_ONCE
-	busybox_config_option n BUILD_LIBBUSYBOX
-	busybox_config_option n FEATURE_CLEAN_UP
-	busybox_config_option n MONOTONIC_SYSCALL
-	busybox_config_option n USE_PORTABLE_CODE
-	busybox_config_option n WERROR
-	# triming the BSS size may be dangerous
-	busybox_config_option n FEATURE_USE_BSS_TAIL
-
-	# These cause trouble with musl.
-	if use elibc_musl; then
-		busybox_config_option n FEATURE_UTMP
-		busybox_config_option n EXTRA_COMPAT
-		busybox_config_option n FEATURE_VI_REGEX_SEARCH
-	fi
-
-	# If these are not set and we are using a uclibc/busybox setup
-	# all calls to system() will fail.
-	busybox_config_option y ASH
-	busybox_config_option y SH_IS_ASH
-	busybox_config_option n HUSH
-	busybox_config_option n SH_IS_HUSH
-
-	busybox_config_option '"/run"' PID_FILE_PATH
-	busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH
-
-	# disable ipv6 applets
-	if ! use ipv6; then
-		busybox_config_option n FEATURE_IPV6
-		busybox_config_option n TRACEROUTE6
-		busybox_config_option n PING6
-		busybox_config_option n UDHCPC6
-	fi
-
-	busybox_config_option pam PAM
-	busybox_config_option static STATIC
-	busybox_config_option syslog {K,SYS}LOGD LOGGER
-	busybox_config_option systemd FEATURE_SYSTEMD
-	busybox_config_option math FEATURE_AWK_LIBM
-
-	# disable features that uClibc doesn't (yet?) provide.
-	if use elibc_uclibc; then
-		busybox_config_option n FEATURE_SYNC_FANCY #567598
-		busybox_config_option n NSENTER
-	fi
-
-	# all the debug options are compiler related, so punt them
-	busybox_config_option n DEBUG_SANITIZE
-	busybox_config_option n DEBUG
-	busybox_config_option y NO_DEBUG_LIB
-	busybox_config_option n DMALLOC
-	busybox_config_option n EFENCE
-	busybox_config_option $(usex debug y n) TFTP_DEBUG
-
-	busybox_config_option selinux SELINUX
-
-	# this opt only controls mounting with <linux-2.6.23
-	busybox_config_option n FEATURE_MOUNT_NFS
-
-	# default a bunch of uncommon options to off
-	local opt
-	for opt in \
-		ADD_SHELL \
-		BEEP BOOTCHARTD \
-		CRONTAB \
-		DC DEVFSD DNSD DPKG{,_DEB} \
-		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
-		FEATURE_DEVFS \
-		HOSTID HUSH \
-		INETD INOTIFYD IPCALC \
-		LOCALE_SUPPORT LOGNAME LPD \
-		MAKEMIME MKFS_MINIX MSH \
-		OD \
-		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
-		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
-		TASKSET TCPSVD \
-		RPM RPM2CPIO \
-		UDPSVD UUDECODE UUENCODE
-	do
-		busybox_config_option n ${opt}
-	done
-
-	emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
-	unset KBUILD_OUTPUT #88088
-	export SKIP_STRIP=y
-
-	emake V=1 busybox
-}
-
-src_install() {
-	unset KBUILD_OUTPUT #88088
-	save_config .config
-
-	into /
-	dodir /bin
-	if use sep-usr ; then
-		# install /ginit to take care of mounting stuff
-		exeinto /
-		newexe busybox_unstripped ginit
-		dosym /ginit /bin/bb
-		dosym bb /bin/busybox
-	else
-		newbin busybox_unstripped busybox
-		dosym busybox /bin/bb
-	fi
-	if use mdev ; then
-		dodir /$(get_libdir)/mdev/
-		use make-symlinks || dosym /bin/bb /sbin/mdev
-		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
-		exeinto /$(get_libdir)/mdev/
-		doexe "${FILESDIR}"/mdev/*
-
-		newinitd "${FILESDIR}"/mdev.initd mdev
-	fi
-	if use livecd ; then
-		dosym busybox /bin/vi
-	fi
-
-	# add busybox daemon's, bug #444718
-	if busybox_config_enabled FEATURE_NTPD_SERVER; then
-		newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
-		newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
-	fi
-	if busybox_config_enabled SYSLOGD; then
-		newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
-		newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
-	fi
-	if busybox_config_enabled KLOGD; then
-		newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
-		newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
-	fi
-	if busybox_config_enabled WATCHDOG; then
-		newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
-		newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
-	fi
-	if busybox_config_enabled UDHCPC; then
-		local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
-		exeinto "${path%/*}"
-		newexe examples/udhcp/simple.script "${path##*/}"
-	fi
-	if busybox_config_enabled UDHCPD; then
-		insinto /etc
-		doins examples/udhcp/udhcpd.conf
-	fi
-
-	# bundle up the symlink files for use later
-	emake DESTDIR="${ED}" install
-	rm _install/bin/busybox
-	# for compatibility, provide /usr/bin/env
-	mkdir -p _install/usr/bin
-	ln -s /bin/env _install/usr/bin/env
-	tar cf busybox-links.tar -C _install . || : #;die
-	insinto /usr/share/${PN}
-	use make-symlinks && doins busybox-links.tar
-
-	dodoc AUTHORS README TODO
-
-	cd docs
-	docinto txt
-	dodoc *.txt
-	docinto pod
-	dodoc *.pod
-	docinto html
-	dodoc *.html
-
-	cd ../examples
-	docinto examples
-	dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
-	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
-		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
-		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
-		ewarn "If you are creating a binary only and not merging this is probably ok."
-		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
-		die "silly options will destroy your system"
-	fi
-
-	if use make-symlinks ; then
-		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
-	fi
-}
-
-pkg_postinst() {
-	savedconfig_pkg_postinst
-
-	if use make-symlinks ; then
-		cd "${T}" || die
-		mkdir _install
-		tar xf busybox-links.tar -C _install || die
-		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
-	fi
-
-	if use sep-usr ; then
-		elog "In order to use the sep-usr support, you have to update your"
-		elog "kernel command line.  Add the option:"
-		elog "     init=/ginit"
-		elog "To launch a different init than /sbin/init, use:"
-		elog "     init=/ginit /sbin/yourinit"
-		elog "To get a rescue shell, you may boot with:"
-		elog "     init=/ginit bb"
-	fi
-}
diff --git a/sys-apps/busybox/busybox-1.32.1.ebuild b/sys-apps/busybox/busybox-1.32.1.ebuild
new file mode 100644
index 0000000..14fbb9b
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.32.1.ebuild
@@ -0,0 +1,337 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
+
+EAPI=7
+
+inherit flag-o-matic savedconfig toolchain-funcs
+
+DESCRIPTION="Utilities for rescue and embedded systems"
+HOMEPAGE="https://www.busybox.net/"
+if [[ ${PV} == "9999" ]] ; then
+	MY_P=${P}
+	EGIT_REPO_URI="https://git.busybox.net/busybox"
+	inherit git-r3
+else
+	MY_P=${PN}-${PV/_/-}
+	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
+	KEYWORDS="*"
+fi
+
+LICENSE="GPL-2" # GPL-2 only
+SLOT="0"
+IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd"
+REQUIRED_USE="pam? ( !static )"
+RESTRICT="test"
+
+COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
+	pam? ( sys-libs/pam )
+	virtual/libcrypt:="
+DEPEND="${COMMON_DEPEND}
+	static? (
+		virtual/libcrypt[static-libs]
+		selinux? ( sys-libs/libselinux[static-libs(+)] )
+	)
+	>=sys-kernel/linux-headers-2.6.39"
+RDEPEND="${COMMON_DEPEND}
+	mdev? ( !<sys-apps/openrc-0.13 )"
+
+S="${WORKDIR}/${MY_P}"
+
+busybox_config_option() {
+	local flag=$1 ; shift
+	if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then
+		busybox_config_option $(usex ${flag} y n) "$@"
+		return
+	fi
+	local expr
+	while [[ $# -gt 0 ]] ; do
+		case ${flag} in
+		y) expr="s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" ;;
+		n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;;
+		*) expr="s:.*\<CONFIG_$1\>.*:CONFIG_$1=${flag}:g" ;;
+		esac
+		sed -i -e "${expr}" .config || die
+		einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find CONFIG_$1 ...")"
+		shift
+	done
+}
+
+busybox_config_enabled() {
+	local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
+	case ${val} in
+	"") return 1 ;;
+	y)  return 0 ;;
+	*)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
+	esac
+}
+
+# patches go here!
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.26.2-bb.patch
+	# "${FILESDIR}"/${P}-*.patch
+)
+
+src_prepare() {
+	default
+	unset KBUILD_OUTPUT #88088
+	append-flags -fno-strict-aliasing #310413
+	use ppc64 && append-flags -mminimal-toc #130943
+
+	cp "${FILESDIR}"/ginit.c init/ || die
+
+	# flag cleanup
+	sed -i -r \
+		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
+		Makefile.flags || die
+	#sed -i '/bbsh/s:^//::' include/applets.h
+	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
+	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
+	sed -i \
+		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
+		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
+		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
+		Makefile || die
+	sed -i \
+		-e 's:-static-libgcc::' \
+		Makefile.flags || die
+}
+
+src_configure() {
+	# check for a busybox config before making one of our own.
+	# if one exist lets return and use it.
+
+	restore_config .config
+	if [ -f .config ]; then
+		yes "" | emake -j1 -s oldconfig >/dev/null
+		return 0
+	else
+		ewarn "Could not locate user configfile, so we will save a default one"
+	fi
+
+	# setup the config file
+	emake -j1 -s allyesconfig >/dev/null
+	# nommu forces a bunch of things off which we want on #387555
+	busybox_config_option n NOMMU
+	sed -i '/^#/d' .config
+	yes "" | emake -j1 -s oldconfig >/dev/null
+
+	# now turn off stuff we really don't want
+	busybox_config_option n DMALLOC
+	busybox_config_option n FEATURE_2_4_MODULES #607548
+	busybox_config_option n FEATURE_SUID_CONFIG
+	busybox_config_option n BUILD_AT_ONCE
+	busybox_config_option n BUILD_LIBBUSYBOX
+	busybox_config_option n FEATURE_CLEAN_UP
+	busybox_config_option n MONOTONIC_SYSCALL
+	busybox_config_option n USE_PORTABLE_CODE
+	busybox_config_option n WERROR
+	# triming the BSS size may be dangerous
+	busybox_config_option n FEATURE_USE_BSS_TAIL
+
+	# These cause trouble with musl.
+	if use elibc_musl; then
+		busybox_config_option n FEATURE_UTMP
+		busybox_config_option n EXTRA_COMPAT
+		busybox_config_option n FEATURE_VI_REGEX_SEARCH
+	fi
+
+	# If these are not set and we are using a uclibc/busybox setup
+	# all calls to system() will fail.
+	busybox_config_option y ASH
+	busybox_config_option y SH_IS_ASH
+	busybox_config_option n HUSH
+	busybox_config_option n SH_IS_HUSH
+
+	busybox_config_option '"/run"' PID_FILE_PATH
+	busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH
+
+	# disable ipv6 applets
+	if ! use ipv6; then
+		busybox_config_option n FEATURE_IPV6
+		busybox_config_option n TRACEROUTE6
+		busybox_config_option n PING6
+		busybox_config_option n UDHCPC6
+	fi
+
+	busybox_config_option pam PAM
+	busybox_config_option static STATIC
+	busybox_config_option syslog {K,SYS}LOGD LOGGER
+	busybox_config_option systemd FEATURE_SYSTEMD
+	busybox_config_option math FEATURE_AWK_LIBM
+
+	# disable features that uClibc doesn't (yet?) provide.
+	if use elibc_uclibc; then
+		busybox_config_option n FEATURE_SYNC_FANCY #567598
+		busybox_config_option n NSENTER
+	fi
+
+	# all the debug options are compiler related, so punt them
+	busybox_config_option n DEBUG_SANITIZE
+	busybox_config_option n DEBUG
+	busybox_config_option y NO_DEBUG_LIB
+	busybox_config_option n DMALLOC
+	busybox_config_option n EFENCE
+	busybox_config_option $(usex debug y n) TFTP_DEBUG
+
+	busybox_config_option selinux SELINUX
+
+	# this opt only controls mounting with <linux-2.6.23
+	busybox_config_option n FEATURE_MOUNT_NFS
+
+	# glibc-2.26 and later does not ship RPC implientation
+	busybox_config_option n FEATURE_HAVE_RPC
+	busybox_config_option n FEATURE_INETD_RPC
+
+	# default a bunch of uncommon options to off
+	local opt
+	for opt in \
+		ADD_SHELL \
+		BEEP BOOTCHARTD \
+		CRONTAB \
+		DC DEVFSD DNSD DPKG{,_DEB} \
+		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
+		FEATURE_DEVFS \
+		HOSTID HUSH \
+		INETD INOTIFYD IPCALC \
+		LOCALE_SUPPORT LOGNAME LPD \
+		MAKEMIME MKFS_MINIX MSH \
+		OD \
+		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
+		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
+		TASKSET TCPSVD \
+		RPM RPM2CPIO \
+		UDPSVD UUDECODE UUENCODE
+	do
+		busybox_config_option n ${opt}
+	done
+
+	emake -j1 oldconfig > /dev/null
+}
+
+src_compile() {
+	unset KBUILD_OUTPUT #88088
+	export SKIP_STRIP=y
+
+	emake V=1 busybox
+}
+
+src_install() {
+	unset KBUILD_OUTPUT #88088
+	save_config .config
+
+	into /
+	dodir /bin
+	if use sep-usr ; then
+		# install /ginit to take care of mounting stuff
+		exeinto /
+		newexe busybox_unstripped ginit
+		dosym /ginit /bin/bb
+		dosym bb /bin/busybox
+	else
+		newbin busybox_unstripped busybox
+		dosym busybox /bin/bb
+	fi
+	if use mdev ; then
+		dodir /$(get_libdir)/mdev/
+		use make-symlinks || dosym /bin/bb /sbin/mdev
+		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
+
+		exeinto /$(get_libdir)/mdev/
+		doexe "${FILESDIR}"/mdev/*
+
+		newinitd "${FILESDIR}"/mdev.initd mdev
+	fi
+	if use livecd ; then
+		dosym busybox /bin/vi
+	fi
+
+	# add busybox daemon's, bug #444718
+	if busybox_config_enabled FEATURE_NTPD_SERVER; then
+		newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
+		newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
+	fi
+	if busybox_config_enabled SYSLOGD; then
+		newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
+		newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
+	fi
+	if busybox_config_enabled KLOGD; then
+		newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
+		newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
+	fi
+	if busybox_config_enabled WATCHDOG; then
+		newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
+		newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
+	fi
+	if busybox_config_enabled UDHCPC; then
+		local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
+		exeinto "${path%/*}"
+		newexe examples/udhcp/simple.script "${path##*/}"
+	fi
+	if busybox_config_enabled UDHCPD; then
+		insinto /etc
+		doins examples/udhcp/udhcpd.conf
+	fi
+
+	# bundle up the symlink files for use later
+	emake DESTDIR="${ED}" install
+	rm _install/bin/busybox
+	# for compatibility, provide /usr/bin/env
+	mkdir -p _install/usr/bin
+	ln -s /bin/env _install/usr/bin/env
+	tar cf busybox-links.tar -C _install . || : #;die
+	insinto /usr/share/${PN}
+	use make-symlinks && doins busybox-links.tar
+
+	dodoc AUTHORS README TODO
+
+	cd docs
+	docinto txt
+	dodoc *.txt
+	docinto pod
+	dodoc *.pod
+	docinto html
+	dodoc *.html
+
+	cd ../examples
+	docinto examples
+	dodoc inittab depmod.pl *.conf *.script undeb unrpm
+}
+
+pkg_preinst() {
+	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then
+		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
+		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
+		ewarn "If you are creating a binary only and not merging this is probably ok."
+		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
+		die "silly options will destroy your system"
+	fi
+
+	if use make-symlinks ; then
+		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
+	fi
+}
+
+pkg_postinst() {
+	savedconfig_pkg_postinst
+
+	if use make-symlinks ; then
+		cd "${T}" || die
+		mkdir _install
+		tar xf busybox-links.tar -C _install || die
+		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
+	fi
+
+	if use sep-usr ; then
+		elog "In order to use the sep-usr support, you have to update your"
+		elog "kernel command line.  Add the option:"
+		elog "     init=/ginit"
+		elog "To launch a different init than /sbin/init, use:"
+		elog "     init=/ginit /sbin/yourinit"
+		elog "To get a rescue shell, you may boot with:"
+		elog "     init=/ginit bb"
+	fi
+}
diff --git a/sys-apps/busybox/files/busybox-1.31.1-glibc-2.31.patch b/sys-apps/busybox/files/busybox-1.31.1-glibc-2.31.patch
new file mode 100644
index 0000000..1cef320
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.31.1-glibc-2.31.patch
@@ -0,0 +1,65 @@
+diff --git a/coreutils/date.c b/coreutils/date.c
+index 3414d38ae..4ade6abb4 100644
+--- a/coreutils/date.c
++++ b/coreutils/date.c
+@@ -279,6 +279,9 @@ int date_main(int argc UNUSED_PARAM, char **argv)
+ 		time(&ts.tv_sec);
+ #endif
+ 	}
++#if !ENABLE_FEATURE_DATE_NANO
++	ts.tv_nsec = 0;
++#endif
+ 	localtime_r(&ts.tv_sec, &tm_time);
+ 
+ 	/* If date string is given, update tm_time, and maybe set date */
+@@ -301,9 +304,10 @@ int date_main(int argc UNUSED_PARAM, char **argv)
+ 		if (date_str[0] != '@')
+ 			tm_time.tm_isdst = -1;
+ 		ts.tv_sec = validate_tm_time(date_str, &tm_time);
++		ts.tv_nsec = 0;
+ 
+ 		/* if setting time, set it */
+-		if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) {
++		if ((opt & OPT_SET) && clock_settime(CLOCK_REALTIME, &ts) < 0) {
+ 			bb_perror_msg("can't set date");
+ 		}
+ 	}
+diff --git a/libbb/missing_syscalls.c b/libbb/missing_syscalls.c
+index 87cf59b3d..dc40d9155 100644
+--- a/libbb/missing_syscalls.c
++++ b/libbb/missing_syscalls.c
+@@ -15,14 +15,6 @@ pid_t getsid(pid_t pid)
+ 	return syscall(__NR_getsid, pid);
+ }
+ 
+-int stime(const time_t *t)
+-{
+-	struct timeval tv;
+-	tv.tv_sec = *t;
+-	tv.tv_usec = 0;
+-	return settimeofday(&tv, NULL);
+-}
+-
+ int sethostname(const char *name, size_t len)
+ {
+ 	return syscall(__NR_sethostname, name, len);
+diff --git a/util-linux/rdate.c b/util-linux/rdate.c
+index 70f829e7f..878375d78 100644
+--- a/util-linux/rdate.c
++++ b/util-linux/rdate.c
+@@ -95,9 +95,13 @@ int rdate_main(int argc UNUSED_PARAM, char **argv)
+ 	if (!(flags & 2)) { /* no -p (-s may be present) */
+ 		if (time(NULL) == remote_time)
+ 			bb_error_msg("current time matches remote time");
+-		else
+-			if (stime(&remote_time) < 0)
++		else {
++			struct timespec ts;
++			ts.tv_sec = remote_time;
++			ts.tv_nsec = 0;
++			if (clock_settime(CLOCK_REALTIME, &ts) < 0)
+ 				bb_perror_msg_and_die("can't set time of day");
++		}
+ 	}
+ 
+ 	if (flags != 1) /* not lone -s */
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 4ce3373..3df4cec 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -1,3 +1,3 @@
-DIST coreutils-8.25-man.tar.xz 43420 SHA256 2ee31c3a6d2276f49c5515375d4a0c1047580da6ac10536898e0f0de81707f29 SHA512 412afc9909d30618ab9daba51c965c0fd22420c32f6c5a7e32ba32d957a92e8a65b977bccaba4b76c55d435a57065dc6103ff11c5fa31d02f117c13a2b09f75e WHIRLPOOL f2a9458d71cfbf6227ece5b688adb34653dacda0dfbcfd5332a36e33cda58b081d9b37c4ec910c92feba485e8e182f52327f4860f1ff5e0b0b7ae2f9b82045ee
-DIST coreutils-8.25-patches-1.1.tar.xz 7196 SHA256 68e116eb70a69e94458197cde81165c9902bec0c6661be31f6fffb84ba8d809c SHA512 19326ab7dd8d4515f7239133772f715aac4e722a1e28f4b0f19d8d629abe54a2309fa7c469797dc0f9e88991906883a891622c791ef940b9a5af6608d2e9110e WHIRLPOOL e7931e16e267b817a86f11b9e01d82dfac8144dbabd91d5cea036c819303895bd852809f374a76b6e4e474b559505d6fc907ddcb113ca1915b76d880e291bc76
-DIST coreutils-8.25.tar.xz 5725008 SHA256 31e67c057a5b32a582f26408c789e11c2e8d676593324849dcf5779296cdce87 SHA512 571f95d44987d373081ed4c6ac82155ad3dcd95621d7b1a7163597e80ecbbafef2cd74b2ef594587a443a1a4355083879f898a286bb0230c48112d43d076ccd6 WHIRLPOOL e871e177ffaf96bfdd9e668eb9a09df9fd952ff095796cffd1ac2b8b3943c9c2ae79c31890fa02b5ed2609b6c6c84b64d2292454b043d62260a9560d2f7b9457
+DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454
+DIST coreutils-8.31.tar.xz 5410140 BLAKE2B e3ae6be8edbe9df9164b4c9ac8bf14dc23b147fa665f20669e18ac4c6e45ba839dc0dc99e05670eb006d22133475a4a717a5f40b00ebaedfd6e1fbab887674d5 SHA512 ef8941dae845bbf5ae5838bc49e44554a766302930601aada6fa594e8088f0fbad74e481ee392ff89633e68b99e4da3f761fcb5d31ee3b233d540fe2a2d4e1af
+DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
diff --git a/sys-apps/coreutils/coreutils-8.25.ebuild b/sys-apps/coreutils/coreutils-8.25.ebuild
deleted file mode 100644
index f470c61..0000000
--- a/sys-apps/coreutils/coreutils-8.25.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# To generate the man pages, unpack the upstream tarball and run:
-# ./configure --enable-install-program=arch,coreutils,hostname,kill
-# make
-# cd ..
-# tar cf - coreutils-*/man/*.[0-9] | xz > coreutils-<ver>-man.tar.xz
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-PATCH_VER="1.1"
-DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
-HOMEPAGE="https://www.gnu.org/software/coreutils/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz
-	https://dev.gentoo.org/~vapier/dist/${P}-patches-${PATCH_VER}.tar.xz
-	mirror://gentoo/${P}-man.tar.xz
-	https://dev.gentoo.org/~vapier/dist/${P}-man.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="*"
-IUSE="acl caps gmp hostname kill multicall nls selinux static userland_BSD vanilla xattr"
-
-LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
-	caps? ( sys-libs/libcap )
-	gmp? ( dev-libs/gmp[static-libs] )
-	xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
-	selinux? ( sys-libs/libselinux )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	app-arch/xz-utils"
-RDEPEND+="
-	hostname? ( !sys-apps/net-tools[hostname] )
-	kill? (
-		!sys-apps/util-linux[kill]
-		!sys-process/procps[kill]
-	)
-	!app-misc/realpath
-	!<sys-apps/util-linux-2.13
-	!sys-apps/stat
-	!net-mail/base64
-	!sys-apps/mktemp
-	!<app-forensics/tct-1.18-r1
-	!<net-fs/netatalk-2.0.3-r4"
-
-src_prepare() {
-	if ! use vanilla ; then
-		use_if_iuse unicode || rm -f "${WORKDIR}"/patch/000_all_coreutils-i18n.patch
-		EPATCH_SUFFIX="patch" \
-		PATCHDIR="${WORKDIR}/patch" \
-		EPATCH_EXCLUDE="001_all_coreutils-gen-progress-bar.patch" \
-		epatch
-	fi
-
-	# Since we've patched many .c files, the make process will try to
-	# re-build the manpages by running `./bin --help`.  When doing a
-	# cross-compile, we can't do that since 'bin' isn't a native bin.
-	# Also, it's not like we changed the usage on any of these things,
-	# so let's just update the timestamps and skip the help2man step.
-	set -- man/*.x
-	touch ${@/%x/1}
-
-	# Avoid perl dep for compiled in dircolors default #348642
-	if ! has_version dev-lang/perl ; then
-		touch src/dircolors.h
-		touch ${@/%x/1}
-	fi
-}
-
-src_configure() {
-	local myconf=''
-	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
-		export fu_cv_sys_stat_statfs2_bsize=yes #311569
-		export gl_cv_func_realpath_works=yes #416629
-	fi
-
-	export gl_cv_func_mknod_works=yes #409919
-	use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821
-	use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782
-	use userland_BSD && myconf="${myconf} -program-prefix=g --program-transform-name=s/stat/nustat/"
-	# kill/uptime - procps
-	# groups/su   - shadow
-	# hostname    - net-tools
-	econf \
-		--with-packager="Gentoo" \
-		--with-packager-version="${PVR} (p${PATCH_VER:-0})" \
-		--with-packager-bug-reports="https://bugs.gentoo.org/" \
-		--enable-install-program="arch,$(usev hostname),$(usev kill)" \
-		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime" \
-		--enable-largefile \
-		$(use caps || echo --disable-libcap) \
-		$(use_enable nls) \
-		$(use_enable acl) \
-		$(use_enable multicall single-binary) \
-		$(use_enable xattr) \
-		$(use_with gmp) \
-		${myconf}
-}
-
-src_test() {
-	# Non-root tests will fail if the full path isn't
-	# accessible to non-root users
-	chmod -R go-w "${WORKDIR}"
-	chmod a+rx "${WORKDIR}"
-
-	# coreutils tests like to do `mount` and such with temp dirs
-	# so make sure /etc/mtab is writable #265725
-	# make sure /dev/loop* can be mounted #269758
-	mkdir -p "${T}"/mount-wrappers
-	mkwrap() {
-		local w ww
-		for w in "$@" ; do
-			ww="${T}/mount-wrappers/${w}"
-			cat <<-EOF > "${ww}"
-				#!${EPREFIX}/bin/sh
-				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P $w) "\$@"
-			EOF
-			chmod a+rx "${ww}"
-		done
-	}
-	mkwrap mount umount
-
-	addwrite /dev/full
-	#export RUN_EXPENSIVE_TESTS="yes"
-	#export FETISH_GROUPS="portage wheel"
-	env PATH="${T}/mount-wrappers:${PATH}" \
-	emake -j1 -k check
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	newins src/dircolors.hin DIR_COLORS
-
-	if [[ ${USERLAND} == "GNU" ]] ; then
-		cd "${ED}"/usr/bin
-		dodir /bin
-		# move critical binaries into /bin (required by FHS)
-		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
-		           mkdir mknod mv pwd rm rmdir stty sync true uname"
-		mv ${fhs} ../../bin/ || die "could not move fhs bins"
-		if use kill; then
-			mv kill ../../bin/ || die
-		fi
-		# move critical binaries into /bin (common scripts)
-		local com="basename chroot cut dir dirname du env expr head mkfifo
-		           mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
-		mv ${com} ../../bin/ || die "could not move common bins"
-		# create a symlink for uname in /usr/bin/ since autotools require it
-		local x
-		for x in ${com} uname ; do
-			dosym /bin/${x} /usr/bin/${x}
-		done
-	else
-		# For now, drop the man pages, collides with the ones of the system.
-		rm -rf "${ED}"/usr/share/man
-	fi
-
-}
-
-pkg_postinst() {
-	ewarn "Make sure you run 'hash -r' in your active shells."
-	ewarn "You should also re-source your shell settings for LS_COLORS"
-	ewarn "  changes, such as: source /etc/profile"
-
-	# Help out users using experimental filesystems
-	if grep -qs btrfs "${EROOT}"/etc/fstab /proc/mounts ; then
-		case $(uname -r) in
-		2.6.[12][0-9]|2.6.3[0-7]*)
-			ewarn "You are running a system with a buggy btrfs driver."
-			ewarn "Please upgrade your kernel to avoid silent corruption."
-			ewarn "See: https://bugs.gentoo.org/353907"
-			;;
-		esac
-	fi
-}
diff --git a/sys-apps/coreutils/coreutils-8.32-r1.ebuild b/sys-apps/coreutils/coreutils-8.32-r1.ebuild
new file mode 100644
index 0000000..3ad2699
--- /dev/null
+++ b/sys-apps/coreutils/coreutils-8.32-r1.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit eutils flag-o-matic python-any-r1 toolchain-funcs
+
+PATCH="${PN}-8.30-patches-01"
+DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
+HOMEPAGE="https://www.gnu.org/software/coreutils/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+	!vanilla? (
+		mirror://gentoo/${PATCH}.tar.xz
+		https://dev.gentoo.org/~polynomial-c/dist/${PATCH}.tar.xz
+	)
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="*"
+IUSE="acl caps gmp hostname kill multicall nls selinux static test vanilla xattr"
+RESTRICT="!test? ( test )"
+
+LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
+	caps? ( sys-libs/libcap )
+	gmp? ( dev-libs/gmp:=[static-libs] )
+	xattr? ( sys-apps/attr[static-libs] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
+	selinux? ( sys-libs/libselinux )
+	nls? ( virtual/libintl )"
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+"
+BDEPEND="
+	app-arch/xz-utils
+	test? (
+		dev-lang/perl
+		dev-perl/Expect
+		dev-util/strace
+		${PYTHON_DEPS}
+	)
+"
+RDEPEND+="
+	hostname? ( !sys-apps/net-tools[hostname] )
+	kill? (
+		!sys-apps/util-linux[kill]
+		!sys-process/procps[kill]
+	)
+	!app-misc/realpath
+	!<sys-apps/util-linux-2.13
+	!<sys-apps/sandbox-2.10-r4
+	!sys-apps/stat
+	!net-mail/base64
+	!sys-apps/mktemp
+	!<app-forensics/tct-1.18-r1
+	!<net-fs/netatalk-2.0.3-r4"
+
+pkg_setup() {
+	if use test ; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/coreutils-8.32-ls-restore-8.31-behavior.patch
+	)
+
+	if ! use vanilla ; then
+		PATCHES+=( "${WORKDIR}"/patch )
+		PATCHES+=( "${FILESDIR}"/${PN}-8.32-sandbox-env-test.patch )
+	fi
+
+	default
+
+	# Since we've patched many .c files, the make process will try to
+	# re-build the manpages by running `./bin --help`.  When doing a
+	# cross-compile, we can't do that since 'bin' isn't a native bin.
+	# Also, it's not like we changed the usage on any of these things,
+	# so let's just update the timestamps and skip the help2man step.
+	set -- man/*.x
+	touch ${@/%x/1}
+
+	# Avoid perl dep for compiled in dircolors default #348642
+	if ! has_version dev-lang/perl ; then
+		touch src/dircolors.h
+		touch ${@/%x/1}
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--with-packager="Gentoo"
+		--with-packager-version="${PVR} (p${PATCH_VER:-0})"
+		--with-packager-bug-reports="https://bugs.gentoo.org/"
+		--enable-install-program="arch,$(usev hostname),$(usev kill)"
+		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
+		--enable-largefile
+		$(usex caps '' --disable-libcap)
+		$(use_enable nls)
+		$(use_enable acl)
+		$(use_enable multicall single-binary)
+		$(use_enable xattr)
+		$(use_with gmp)
+	)
+	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
+		export fu_cv_sys_stat_statfs2_bsize=yes #311569
+		export gl_cv_func_realpath_works=yes #416629
+	fi
+
+	export gl_cv_func_mknod_works=yes #409919
+	use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821
+	use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782
+	# kill/uptime - procps
+	# groups/su   - shadow
+	# hostname    - net-tools
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	# Known to fail with FEATURES=usersandbox (bug #439574):
+	#   -  tests/du/long-from-unreadable.sh} (bug #413621)
+	#   -  tests/rm/deep-2.sh (bug #413621)
+	#   -  tests/dd/no-allocate.sh (bug #629660)
+	if has usersandbox ${FEATURES} ; then
+		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+	fi
+
+	# Non-root tests will fail if the full path isn't
+	# accessible to non-root users
+	chmod -R go-w "${WORKDIR}"
+	chmod a+rx "${WORKDIR}"
+
+	# coreutils tests like to do `mount` and such with temp dirs
+	# so make sure /etc/mtab is writable #265725
+	# make sure /dev/loop* can be mounted #269758
+	mkdir -p "${T}"/mount-wrappers || die
+	mkwrap() {
+		local w ww
+		for w in "${@}" ; do
+			ww="${T}/mount-wrappers/${w}"
+			cat <<-EOF > "${ww}"
+				#!${EPREFIX}/bin/sh
+				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@"
+			EOF
+			chmod a+rx "${ww}"
+		done
+	}
+	mkwrap mount umount
+
+	addwrite /dev/full
+	#export RUN_EXPENSIVE_TESTS="yes"
+	#export FETISH_GROUPS="portage wheel"
+	env PATH="${T}/mount-wrappers:${PATH}" \
+	emake -j1 -k check
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	newins src/dircolors.hin DIR_COLORS
+
+	if [[ ${USERLAND} == "GNU" ]]; then
+		cd "${ED}"/usr/bin || die
+		dodir /bin
+		# move critical binaries into /bin (required by FHS)
+		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
+			mkdir mknod mv pwd rm rmdir stty sync true uname"
+		mv ${fhs} ../../bin/ || die "could not move fhs bins"
+		if use hostname; then
+			mv hostname ../../bin/ || die
+		fi
+		if use kill; then
+			mv kill ../../bin/ || die
+		fi
+		# move critical binaries into /bin (common scripts)
+		# Why are these required for booting?
+		local com="basename chroot cut dir dirname du env expr head mkfifo
+			mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
+		mv ${com} ../../bin/ || die "could not move common bins"
+		# create a symlink for uname in /usr/bin/ since autotools require it
+		# Other than uname, we need to figure out why we are
+		# creating symlinks for these in /usr/bin instead of leaving
+		# the files there in the first place.
+		local x
+		for x in ${com} uname ; do
+			dosym ../../bin/${x} /usr/bin/${x}
+		done
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Make sure you run 'hash -r' in your active shells."
+	ewarn "You should also re-source your shell settings for LS_COLORS"
+	ewarn "	 changes, such as: source /etc/profile"
+}
diff --git a/sys-apps/coreutils/files/coreutils-8.32-ls-restore-8.31-behavior.patch b/sys-apps/coreutils/files/coreutils-8.32-ls-restore-8.31-behavior.patch
new file mode 100644
index 0000000..62a35cd
--- /dev/null
+++ b/sys-apps/coreutils/files/coreutils-8.32-ls-restore-8.31-behavior.patch
@@ -0,0 +1,94 @@
+From 10fcb97bd728f09d4a027eddf8ad2900f0819b0a Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Thu, 5 Mar 2020 17:25:29 -0800
+Subject: ls: restore 8.31 behavior on removed directories
+
+* src/ls.c: Do not include <sys/sycall.h>
+(print_dir): Don't worry about whether the directory is removed.
+* tests/ls/removed-directory.sh: Adjust to match new (i.e., old)
+behavior.
+ 
+diff --git a/src/ls.c b/src/ls.c
+index 24b983287..4acf5f44d 100644
+--- a/src/ls.c
++++ b/src/ls.c
+@@ -49,10 +49,6 @@
+ # include <sys/ptem.h>
+ #endif
+ 
+-#ifdef __linux__
+-# include <sys/syscall.h>
+-#endif
+-
+ #include <stdio.h>
+ #include <assert.h>
+ #include <setjmp.h>
+@@ -2896,7 +2892,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
+   struct dirent *next;
+   uintmax_t total_blocks = 0;
+   static bool first = true;
+-  bool found_any_entries = false;
+ 
+   errno = 0;
+   dirp = opendir (name);
+@@ -2972,7 +2967,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
+       next = readdir (dirp);
+       if (next)
+         {
+-          found_any_entries = true;
+           if (! file_ignored (next->d_name))
+             {
+               enum filetype type = unknown;
+@@ -3018,22 +3012,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
+           if (errno != EOVERFLOW)
+             break;
+         }
+-#ifdef __linux__
+-      else if (! found_any_entries)
+-        {
+-          /* If readdir finds no directory entries at all, not even "." or
+-             "..", then double check that the directory exists.  */
+-          if (syscall (SYS_getdents, dirfd (dirp), NULL, 0) == -1
+-              && errno != EINVAL)
+-            {
+-              /* We exclude EINVAL as that pertains to buffer handling,
+-                 and we've passed NULL as the buffer for simplicity.
+-                 ENOENT is returned if appropriate before buffer handling.  */
+-              file_failure (command_line_arg, _("reading directory %s"), name);
+-            }
+-          break;
+-        }
+-#endif
+       else
+         break;
+ 
+diff --git a/tests/ls/removed-directory.sh b/tests/ls/removed-directory.sh
+index e8c835dab..fe8f929a1 100755
+--- a/tests/ls/removed-directory.sh
++++ b/tests/ls/removed-directory.sh
+@@ -26,20 +26,14 @@ case $host_triplet in
+   *) skip_ 'non linux kernel' ;;
+ esac
+ 
+-LS_FAILURE=2
+-
+-cat <<\EOF >exp-err || framework_failure_
+-ls: reading directory '.': No such file or directory
+-EOF
+-
+ cwd=$(pwd)
+ mkdir d || framework_failure_
+ cd d || framework_failure_
+ rmdir ../d || framework_failure_
+ 
+-returns_ $LS_FAILURE ls >../out 2>../err || fail=1
++ls >../out 2>../err || fail=1
+ cd "$cwd" || framework_failure_
+ compare /dev/null out || fail=1
+-compare exp-err err || fail=1
++compare /dev/null err || fail=1
+ 
+ Exit $fail
+-- 
+cgit v1.2.1
+
diff --git a/sys-apps/coreutils/files/coreutils-8.32-sandbox-env-test.patch b/sys-apps/coreutils/files/coreutils-8.32-sandbox-env-test.patch
new file mode 100644
index 0000000..40b1554
--- /dev/null
+++ b/sys-apps/coreutils/files/coreutils-8.32-sandbox-env-test.patch
@@ -0,0 +1,64 @@
+Skip tests known to fail when running under Gentoo sandbox.
+
+--- a/tests/du/long-from-unreadable.sh
++++ b/tests/du/long-from-unreadable.sh
+@@ -29,6 +29,9 @@
+ # unnecessarily to using FTS_NOCHDIR mode in this corner case.
+ 
+ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
++# Avoid #413621 until #548250 is resolved
++test -n "$SANDBOX_ACTIVE" && skip_ "Gentoo: Test known bad under sandbox (#413621)"
++
+ print_ver_ du
+ 
+ require_perl_
+--- a/tests/ls/removed-directory.sh
++++ b/tests/ls/removed-directory.sh
+@@ -19,6 +19,9 @@
+ # along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ 
+ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
++# Avoid #413621 until #548250 is resolved
++test -n "$SANDBOX_ACTIVE" && skip_ "Gentoo: Test known bad under sandbox (#413621)"
++
+ print_ver_ ls
+ 
+ case $host_triplet in
+--- a/tests/ls/stat-free-symlinks.sh
++++ b/tests/ls/stat-free-symlinks.sh
+@@ -17,6 +17,9 @@
+ # along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ 
+ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
++# Avoid #413621 until #548250 is resolved
++test -n "$SANDBOX_ACTIVE" && skip_ "Gentoo: Test known bad under sandbox (#413621)"
++
+ print_ver_ ls
+ require_strace_ stat
+ 
+--- a/tests/misc/env-S.pl
++++ b/tests/misc/env-S.pl
+@@ -30,6 +30,11 @@ $env = $1;
+ # Turn off localization of executable's output.
+ @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
+ 
++# Skip if sandbox is enabled
++if ($ENV{SANDBOX_ACTIVE}) {
++     CuSkip::skip "Gentoo: Test known bad under sandbox (#675802)\n";
++}
++
+ my @Tests =
+     (
+      # Test combination of -S and regular arguments
+--- a/tests/rm/deep-2.sh
++++ b/tests/rm/deep-2.sh
+@@ -17,6 +17,9 @@
+ # along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ 
+ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
++# Avoid #413621 until #548250 is resolved
++test -n "$SANDBOX_ACTIVE" && skip_ "Gentoo: Test known bad under sandbox (#413621)"
++
+ print_ver_ rm
+ require_perl_
+ 
diff --git a/sys-apps/coreutils/metadata.xml b/sys-apps/coreutils/metadata.xml
index 02d1ba7..4e46af0 100644
--- a/sys-apps/coreutils/metadata.xml
+++ b/sys-apps/coreutils/metadata.xml
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
-<upstream>
-  <remote-id type="cpe">cpe:/a:gnu:coreutils</remote-id>
-</upstream>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<longdescription>Standard GNU file utilities (chmod, cp, dd, dir, ls, ...), text utilities (sort, tr, head, wc, ...), and shell utilities (whoami, who, ...)
+</longdescription>
 <use>
-  <flag name='multicall'>Build all tools into a single `coreutils` program akin to busybox to save space</flag>
+	<flag name="caps">Add Linux capabilities support in output of file utilities (ls, dir, ...) via <pkg>sys-libs/libcap</pkg></flag>
+	<flag name="hostname">Build the hostname program</flag>
+	<flag name="kill">Build the kill program</flag>
+	<flag name="multicall">Build all tools into a single `coreutils` program akin to busybox to save space</flag>
+	<flag name="split-usr">Enable this if /bin and /usr/bin are separate directories</flag>
 </use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnu:coreutils</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-apps/fbset/Manifest b/sys-apps/fbset/Manifest
deleted file mode 100644
index 30f3e5d..0000000
--- a/sys-apps/fbset/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fbset-2.1.tar.gz 27721 RMD160 4517560fd79d98ad71c94550eeefb1041ca56352 SHA1 141c42769818a08f1370a60dc3a809d87530db78 SHA256 40ff4ab0247b75138a0887ed40f81c1a6184f340b77126c16d074b1075b41c20
diff --git a/sys-apps/fbset/fbset-2.1.ebuild b/sys-apps/fbset/fbset-2.1.ebuild
deleted file mode 100644
index 7d79910..0000000
--- a/sys-apps/fbset/fbset-2.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fbset/fbset-2.1.ebuild,v 1.35 2012/07/10 08:50:50 flameeyes Exp $
-
-inherit toolchain-funcs flag-o-matic eutils
-
-DESCRIPTION="A utility to set the framebuffer videomode"
-HOMEPAGE="http://users.telenet.be/geertu/Linux/fbdev/"
-SRC_URI="http://users.telenet.be/geertu/Linux/fbdev/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE="static"
-
-DEPEND="sys-devel/bison
-	sys-devel/flex"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-build.patch"
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	tc-export CC
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin fbset modeline2fb || die "dobin failed"
-	doman *.[58]
-	dodoc etc/fb.modes.* INSTALL
-}
diff --git a/sys-apps/fbset/files/fbset-2.1-build.patch b/sys-apps/fbset/files/fbset-2.1-build.patch
deleted file mode 100644
index 94a323b..0000000
--- a/sys-apps/fbset/files/fbset-2.1-build.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: fbset-2.1/Makefile
-===================================================================
---- fbset-2.1.orig/Makefile
-+++ fbset-2.1/Makefile
-@@ -2,7 +2,6 @@
- # Linux Frame Buffer Device Configuration
- #
- 
--CC =		gcc -Wall -O2 -I.
- BISON =		bison -d
- FLEX =		flex
- INSTALL =	install
-@@ -20,6 +19,8 @@ lex.yy.o:	lex.yy.c fbset.h modes.tab.h
- lex.yy.c:	modes.l
- 		$(FLEX) modes.l
- 
-+modes.tab.h:    modes.tab.c
-+
- modes.tab.c:	modes.y
- 		$(BISON) modes.y
- 
diff --git a/sys-apps/fbset/metadata.xml b/sys-apps/fbset/metadata.xml
deleted file mode 100644
index 96a2d58..0000000
--- a/sys-apps/fbset/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-</pkgmetadata>
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index ee6aefa..ccf46e4 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -1 +1 @@
-DIST hdparm-9.52.tar.gz 140737 BLAKE2B 0614bfb0844f088b533951c4636bf92879c4ff7e9bb4d150965e936eaa2a4e0ffd350689fc359757a2f9e80a6c93cd111a25b8e2824737e01b4deb6e543b2868 SHA512 7c37d1381c1dd2d46762a8cdcaba2015b0b051ee7bd135dbcf6346def51b085cc2f9ecd7e1ebdc67e12ab4b765df548d4757b3700ed6e7514c2b13ed40661c59
+DIST hdparm-9.58.tar.gz 138845 BLAKE2B 29e2697afaedcfbb1d7dea2238f9477afd932d553166437abbf068b8b3f3a5445a0b8542714d8a15e3c64f42a794c2603fe626ed936b4dbdeb8e4fe63afc5f46 SHA512 42fb70f494aae4cc205ca68c3e883e1f4fc33e8ced1914e280e9f3faa7233d3f839e59178ec09ddb9d32e9d2bca122ce324645ecb5ac73defa284030ac7d3cea
diff --git a/sys-apps/hdparm/files/hdparm-9.48-sysmacros.patch b/sys-apps/hdparm/files/hdparm-9.48-sysmacros.patch
deleted file mode 100644
index 98a08c7..0000000
--- a/sys-apps/hdparm/files/hdparm-9.48-sysmacros.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/580052
-https://sourceforge.net/p/hdparm/patches/44/
-
---- a/geom.c
-+++ b/geom.c
-@@ -15,6 +15,7 @@
- #include <errno.h>
- #include <dirent.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/ioctl.h>
- #include <linux/types.h>
- #include <linux/fs.h>
---- a/sysfs.c
-+++ b/sysfs.c
-@@ -15,6 +15,7 @@
- #include <dirent.h>
- #include <limits.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <linux/types.h>
- 
- #include "hdparm.h"
diff --git a/sys-apps/hdparm/hdparm-9.52.ebuild b/sys-apps/hdparm/hdparm-9.52.ebuild
deleted file mode 100644
index bea1815..0000000
--- a/sys-apps/hdparm/hdparm-9.52.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic eutils
-
-DESCRIPTION="Utility to change hard drive performance parameters"
-HOMEPAGE="https://sourceforge.net/projects/hdparm/"
-SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
-
-LICENSE="BSD GPL-2" # GPL-2 only
-SLOT="0"
-KEYWORDS="*"
-IUSE="static"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.48-sysmacros.patch #580052
-	"${FILESDIR}"/${PN}-9.51-build.patch
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	use static && append-ldflags -static
-}
-
-src_configure() {
-	tc-export CC
-	export STRIP=:
-}
-
-src_install() {
-	into /
-	dosbin hdparm contrib/idectl
-
-	newinitd "${FILESDIR}"/hdparm-init-8 hdparm
-	newconfd "${FILESDIR}"/hdparm-conf.d.3 hdparm
-
-	doman hdparm.8
-	dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig
-	docinto wiper
-	dodoc wiper/{README.txt,wiper.sh}
-	docompress -x /usr/share/doc/${PF}/wiper/wiper.sh
-}
diff --git a/sys-apps/hdparm/hdparm-9.58.ebuild b/sys-apps/hdparm/hdparm-9.58.ebuild
new file mode 100644
index 0000000..27aadfc
--- /dev/null
+++ b/sys-apps/hdparm/hdparm-9.58.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Utility to change hard drive performance parameters"
+HOMEPAGE="https://sourceforge.net/projects/hdparm/"
+SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
+
+LICENSE="BSD GPL-2" # GPL-2 only
+SLOT="0"
+KEYWORDS="*"
+IUSE="static"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.51-build.patch
+)
+
+src_prepare() {
+	default
+	use static && append-ldflags -static
+}
+
+src_configure() {
+	tc-export CC
+	export STRIP=:
+}
+
+src_install() {
+	into /
+	dosbin hdparm contrib/idectl
+
+	newinitd "${FILESDIR}"/hdparm-init-8 hdparm
+	newconfd "${FILESDIR}"/hdparm-conf.d.3 hdparm
+
+	doman hdparm.8
+	dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig
+	docinto wiper
+	dodoc wiper/{README.txt,wiper.sh}
+	docompress -x /usr/share/doc/${PF}/wiper/wiper.sh
+}
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 33ed8fe..0a460b0 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1 +1,2 @@
-DIST less-487.tar.gz 318488 SHA256 f3dc8455cb0b2b66e0c6b816c00197a71bf6d1787078adeee0bcf2aea4b12706 SHA512 d31274fdada570fbc6706d7c52637d1accbd18ce947ec062e10b1624c251a8533c6638bc3a1d89d3c70a0c7b9c6d45740598bec9003f281d64c587b1f829125a WHIRLPOOL e1a6c5dc2ea17e57226083f022d3c39b8a9d17428b7aa15385138680e78fa1ee22800e216a40fe5aa0ca38ca4c0025792a2839031faabdf8f9384dec3c750f74
+DIST less-581.2.tar.gz 349230 BLAKE2B 3f9d3c94f3d9eae5ecd033c5f16a575bd3a179ca335b0318e097a916c6713379cafbe6c57459e86866e890a432fb02be9102726b35c46d9bdd07ca1b35f83058 SHA512 b1189396c798d7cb8655175f31b1af6163dcf8e8d7a72531161cc8396e72e0cf5858ce7b39173be603f9f16eda498f2805cf42c2b92ec6970fd9d2b603fb7b92
+DIST less-586.tar.gz 351861 BLAKE2B fa3d4eadc740d751daf5303867c2ecf411663b64177e14544bdb30aa1b19c1414020b53e27a1a0666cc1922781a11c44ff1bac0adee4e784edf4ca82913596a4 SHA512 14579e1c682e0c30d614e85cdd969c007ecb613930376a46c0c5614e02c596ea0d0ab50211ed28095206ea70698fd1ccf6762888dfa149773d7b515cf3b2ca7c
diff --git a/sys-apps/less/files/README.Gentoo b/sys-apps/less/files/README.Gentoo
deleted file mode 100644
index dca8328..0000000
--- a/sys-apps/less/files/README.Gentoo
+++ /dev/null
@@ -1,22 +0,0 @@
-This version of less comes with some Gentoo enhancements:
-	- default lesspipe.sh script to "view" files
-	- colorization support
-
-To see what file types are supported, just read the /usr/bin/lesspipe.sh
-script (it's just a plain text bash script).
-
-Colorization support is disabled by default.  To enable it, export the
-LESSCOLOR variable to "yes":
-	$ export LESSCOLOR=yes
-
-We also provide a colorization script, 'code2color', that is used by
-default.  If you wish to use another script, simply export the LESSCOLORIZER
-variable to name of the script:
-	$ export LESSCOLORIZER=some-other-script
-
-If you want to use the code2color script and the default color schemes are
-not acceptable, you can develop your own schemes and save them in one of
-the following places:
-	/etc/code2color
-	~/.code2color
-	CODE2COLOR_CONFIG env var
diff --git a/sys-apps/less/files/lesspipe-r1.sh b/sys-apps/less/files/lesspipe-r1.sh
new file mode 100644
index 0000000..9dcfea1
--- /dev/null
+++ b/sys-apps/less/files/lesspipe-r1.sh
@@ -0,0 +1,287 @@
+#!/bin/bash
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Preprocessor for 'less'. Used when this environment variable is set:
+# LESSOPEN="|lesspipe %s"
+
+# TODO: handle compressed files better
+
+[[ -n ${LESSDEBUG+set} ]] && set -x
+
+trap 'exit 0' PIPE
+
+guesscompress() {
+	case "$1" in
+		*.gz|*.z)   echo "gunzip -c" ;;
+		*.bz2|*.bz) echo "bunzip2 -c" ;;
+		*.lz)       echo "lzip -dc" ;;
+		*.lzma)     echo "unlzma -c" ;;
+		*.lzo)      echo "lzop -dc" ;;
+		*.xz)       echo "xzdec" ;;
+		*.zst)      echo "zstdcat" ;;
+		*)          echo "cat" ;;
+	esac
+}
+
+lesspipe_file() {
+	local out=$(file -L -- "$1")
+	local suffix
+	case ${out} in
+		*" 7-zip archive"*) suffix="7z";;
+		*" ar archive"*)    suffix="a";;
+		*" CAB-Installer"*) suffix="cab";;
+		*" cpio archive"*)  suffix="cpio";;
+		*" ELF "*)          suffix="elf";;
+		*" LHa"*archive*)   suffix="lha";;
+		*" troff "*)        suffix="man";;
+		*" script text"*)   suffix="sh";;
+		*" shared object"*) suffix="so";;
+		*" tar archive"*)   suffix="tar";;
+		*" Zip archive"*)   suffix="zip";;
+		*": data")          hexdump -C -- "$1"; return 0;;
+		*)                  return 1;;
+	esac
+	lesspipe "$1" ".${suffix}"
+	return 0
+}
+
+lesspipe() {
+	local match=$2
+	[[ -z ${match} ]] && match=$1
+
+	local DECOMPRESSOR=$(guesscompress "${match}")
+
+	# User filters
+	if [[ -x ~/.lessfilter ]] ; then
+		~/.lessfilter "$1" && exit 0
+	fi
+
+	local ignore
+	for ignore in ${LESSIGNORE} ; do
+		[[ ${match} == *.${ignore} ]] && exit 0
+	done
+
+	# Handle non-regular file types.
+	if [[ -d $1 ]] ; then
+		ls -alF -- "$1"
+		return
+	elif [[ ! -f $1 ]] ; then
+		# Only return if the stat passes.  This is needed to handle pseudo
+		# arguments like URIs.
+		stat -- "$1" && return
+	fi
+
+	case "${match}" in
+
+	### Doc files ###
+	*.[0-9n]|*.man|\
+	*.[0-9n].bz2|*.man.bz2|\
+	*.[0-9n].gz|*.man.gz|\
+	*.[0-9n].lzma|*.man.lzma|\
+	*.[0-9n].xz|*.man.xz|\
+	*.[0-9n].zst|*.man.zst|\
+	*.[0-9][a-z].gz|*.[0-9][a-z].gz)
+		local out=$(${DECOMPRESSOR} -- "$1" | file -)
+		case ${out} in
+			*troff*)
+				# Need to make sure we pass path to man or it will try
+				# to locate "$1" in the man search paths
+				if [[ $1 == /* ]] ; then
+					man -- "$1"
+				else
+					man -- "./$1"
+				fi
+				;;
+			*text*)
+				${DECOMPRESSOR} -- "$1"
+				;;
+			*)
+				# We could have matched a library (libc.so.6), so let
+				# `file` figure out what the hell this thing is
+				lesspipe_file "$1"
+				;;
+		esac
+		;;
+	*.dvi)      dvi2tty "$1" ;;
+	*.ps)       ps2ascii "$1" || pstotext "$1" ;;
+	*.pdf)      pdftotext "$1" - || ps2ascii "$1" || pstotext "$1" ;;
+	*.doc)      antiword "$1" || catdoc "$1" ;;
+	*.rtf)      unrtf --nopict --text "$1" ;;
+	*.conf|*.txt|*.log) ;; # force less to work on these directly #150256
+	*.json)     python -mjson.tool "$1" ;;
+
+	### URLs ###
+	ftp://*|http://*|https://|*.htm|*.html)
+		for b in elinks links2 links lynx ; do
+			${b} -dump "$1" && exit 0
+		done
+		html2text -style pretty "$1"
+		;;
+
+	### Tar files ###
+	*.tar|\
+	*.tar.bz2|*.tar.bz|*.tar.gz|*.tar.z|*.tar.zst|\
+	*.tar.lz|*.tar.tlz|\
+	*.tar.lzma|*.tar.xz)
+		${DECOMPRESSOR} -- "$1" | tar tvvf -;;
+	*.tbz2|*.tbz|*.tgz|*.tlz|*.txz)
+		lesspipe "$1" "$1.tar.${1##*.t}" ;;
+
+	### Misc archives ###
+	*.bz2|\
+	*.gz|*.z|\
+	*.zst|\
+	*.lz|\
+	*.lzma|*.xz)  ${DECOMPRESSOR} -- "$1" ;;
+	*.rpm)        rpm -qpivl --changelog -- "$1" || rpm2tar -O "$1" | tar tvvf -;;
+	*.cpi|*.cpio) cpio -itv < "$1" ;;
+	*.ace)        unace l "$1" ;;
+	*.arc)        arc v "$1" ;;
+	*.arj)        arj l -- "$1" || unarj l "$1" ;;
+	*.cab)        cabextract -l -- "$1" ;;
+	*.lha|*.lzh)  lha v "$1" ;;
+	*.zoo)        zoo -list "$1" || unzoo -l "$1" ;;
+	*.7z|*.exe)   7z l -- "$1" || 7za l -- "$1" || 7zr l -- "$1" ;;
+	*.a)          ar tv "$1" ;;
+	*.elf)        readelf -a -W -- "$1" ;;
+	*.so)         readelf -h -d -s -W -- "$1" ;;
+	*.mo|*.gmo)   msgunfmt -- "$1" ;;
+
+	*.rar|.r[0-9][0-9])  unrar l -- "$1" ;;
+
+	*.jar|*.war|*.ear|*.xpi|*.zip)
+		unzip -v "$1" || miniunzip -l "$1" || miniunz -l "$1" || zipinfo -v "$1"
+		;;
+
+	*.deb|*.udeb)
+		if type -P dpkg > /dev/null ; then
+			dpkg --info "$1"
+			dpkg --contents "$1"
+		else
+			ar tv "$1"
+			ar p "$1" data.tar.gz | tar tzvvf -
+		fi
+		;;
+
+	### Filesystems ###
+	*.squashfs)   unsquashfs -s "$1" && unsquashfs -ll "$1" ;;
+
+	### Media ###
+	*.bmp|*.gif|*.jpeg|*.jpg|*.ico|*.pcd|*.pcx|*.png|*.ppm|*.tga|*.tiff|*.tif|*.webp)
+		identify -verbose -- "$1" || file -L -- "$1"
+		;;
+	*.asf|*.avi|*.flv|*.mkv|*.mov|*.mp4|*.mpeg|*.mpg|*.qt|*.ram|*.rm|*.webm|*.wmv)
+		midentify "$1" || file -L -- "$1"
+		;;
+	*.mp3)        mp3info "$1" || id3info "$1" ;;
+	*.ogg)        ogginfo "$1" ;;
+	*.flac)       metaflac --list "$1" ;;
+	*.torrent)    torrentinfo "$1" || torrentinfo-console "$1" || ctorrent -x "$1" ;;
+	*.bin|*.cue|*.raw)
+		# not all .bin/.raw files are cd images #285507
+		# fall back to lesspipe_file if .cue doesn't exist, or if
+		# cd-info failed to parse things sanely
+		[[ -e ${1%.*}.cue ]] \
+			&& cd-info --no-header --no-device-info "$1" \
+			|| lesspipe_file "$1"
+		;;
+	*.iso)
+		iso_info=$(isoinfo -d -i "$1")
+		echo "${iso_info}"
+		# Joliet output overrides Rock Ridge, so prefer the better Rock
+		case ${iso_info} in
+			*$'\n'"Rock Ridge"*) iso_opts="-R";;
+			*$'\n'"Joliet"*)     iso_opts="-J";;
+			*)                   iso_opts="";;
+		esac
+		isoinfo -l ${iso_opts} -i "$1"
+		;;
+
+	### Encryption stuff ###
+	*.crl) openssl crl -hash -text -noout -in "$1" ;;
+	*.csr) openssl req -text -noout -in "$1" ;;
+	*.crt|*.pem) openssl x509 -hash -text -noout -in "$1" ;;
+
+# May not be such a good idea :)
+#	### Device nodes ###
+#	/dev/[hs]d[a-z]*)
+#		fdisk -l "${1:0:8}"
+#		[[ $1 == *hd* ]] && hdparm -I "${1:0:8}"
+#		;;
+
+	### Everything else ###
+	*)
+		case $(( recur++ )) in
+			# Maybe we didn't match due to case issues ...
+			0) lesspipe "$1" "$(echo "$1" | LC_ALL=C tr '[:upper:]' '[:lower:]')" ;;
+
+			# Maybe we didn't match because the file is named weird ...
+			1) lesspipe_file "$1" ;;
+		esac
+
+		# So no matches from above ... finally fall back to an external
+		# coloring package.  No matching here so we don't have to worry
+		# about keeping in sync with random packages.  Any coloring tool
+		# you use should not output errors about unsupported files to
+		# stdout.  If it does, it's your problem.
+
+		# Allow people to flip color off if they dont want it
+		case ${LESSCOLOR} in
+			always)                   LESSCOLOR=2;;
+			[yY][eE][sS]|[yY]|1|true) LESSCOLOR=1;;
+			[nN][oO]|[nN]|0|false)    LESSCOLOR=0;;
+			*)                        LESSCOLOR=0;; # default to no color #188835
+		esac
+		if [[ ${LESSCOLOR} != "0" ]] && [[ -n ${LESSCOLORIZER=code2color} ]] ; then
+			# 2: Only colorize if user forces it ...
+			# 1: ... or we know less will handle raw codes -- this will
+			#    not detect -seiRM, so set LESSCOLORIZER yourself
+			if [[ ${LESSCOLOR} == "2" ]] || [[ " ${LESS} " == *" -"[rR]" "* ]] ; then
+				LESSQUIET=true ${LESSCOLORIZER} "$1"
+			fi
+		fi
+
+		# Nothing left to do but let less deal
+		exit 0
+		;;
+	esac
+}
+
+if [[ $# -eq 0 ]] ; then
+	echo "Usage: lesspipe <file>"
+elif [[ $1 == "-V" || $1 == "--version" ]] ; then
+	cat <<-EOF
+		lesspipe (git)
+		Copyright 1999-2019 Gentoo Authors
+		Mike Frysinger <vapier@gentoo.org>
+		     (with plenty of ideas stolen from other projects/distros)
+
+	EOF
+	less -V
+elif [[ $1 == "-h" || $1 == "--help" ]] ; then
+	cat <<-EOF
+		lesspipe: preprocess files before sending them to less
+
+		Usage: lesspipe <file>
+
+		lesspipe specific settings:
+		  LESSCOLOR env     - toggle colorizing of output (no/yes/always; default: no)
+		  LESSCOLORIZER env - program used to colorize output (default: code2color)
+		  LESSIGNORE        - list of extensions to ignore (don't do anything fancy)
+
+		You can create per-user filters as well by creating the executable file:
+		  ~/.lessfilter
+		One argument is passed to it: the file to display.  The script should exit 0
+		to indicate it handled the file, or non-zero to tell lesspipe to handle it.
+
+		To use lesspipe, simply add to your environment:
+		  export LESSOPEN="|lesspipe %s"
+
+		Run 'less --help' or 'man less' for more info.
+	EOF
+else
+	recur=0
+	[[ -z ${LESSDEBUG+set} ]] && exec 2>/dev/null
+	lesspipe "$1"
+fi
diff --git a/sys-apps/less/files/lesspipe.sh b/sys-apps/less/files/lesspipe.sh
deleted file mode 100755
index abd9349..0000000
--- a/sys-apps/less/files/lesspipe.sh
+++ /dev/null
@@ -1,281 +0,0 @@
-#!/bin/bash
-#
-# Preprocessor for 'less'. Used when this environment variable is set:
-# LESSOPEN="|lesspipe %s"
-
-# TODO: handle compressed files better
-
-[[ -n ${LESSDEBUG} ]] && set -x
-
-trap 'exit 0' PIPE
-
-guesscompress() {
-	case "$1" in
-		*.gz|*.z)   echo "gunzip -c" ;;
-		*.bz2|*.bz) echo "bunzip2 -c" ;;
-		*.lz)       echo "lzip -dc" ;;
-		*.lzma)     echo "unlzma -c" ;;
-		*.lzo)      echo "lzop -dc" ;;
-		*.xz)       echo "xzdec" ;;
-		*)          echo "cat" ;;
-	esac
-}
-
-lesspipe_file() {
-	local out=$(file -L -- "$1")
-	local suffix
-	case ${out} in
-		*" 7-zip archive"*) suffix="7z";;
-		*" ar archive"*)    suffix="a";;
-		*" CAB-Installer"*) suffix="cab";;
-		*" cpio archive"*)  suffix="cpio";;
-		*" ELF "*)          suffix="elf";;
-		*" LHa"*archive*)   suffix="lha";;
-		*" troff "*)        suffix="man";;
-		*" script text"*)   suffix="sh";;
-		*" shared object"*) suffix="so";;
-		*" tar archive"*)   suffix="tar";;
-		*" Zip archive"*)   suffix="zip";;
-		*": data")          hexdump -C -- "$1"; return 0;;
-		*)                  return 1;;
-	esac
-	lesspipe "$1" ".${suffix}"
-	return 0
-}
-
-lesspipe() {
-	local match=$2
-	[[ -z ${match} ]] && match=$1
-
-	local DECOMPRESSOR=$(guesscompress "${match}")
-
-	# User filters
-	if [[ -x ~/.lessfilter ]] ; then
-		~/.lessfilter "$1" && exit 0
-	fi
-
-	local ignore
-	for ignore in ${LESSIGNORE} ; do
-		[[ ${match} == *.${ignore} ]] && exit 0
-	done
-
-	# Handle non-regular file types.
-	if [[ -d $1 ]] ; then
-		ls -alF -- "$1"
-		return
-	elif [[ ! -f $1 ]] ; then
-		stat "$1"
-		return
-	fi
-
-	case "${match}" in
-
-	### Doc files ###
-	*.[0-9n]|*.man|\
-	*.[0-9n].bz2|*.man.bz2|\
-	*.[0-9n].gz|*.man.gz|\
-	*.[0-9n].lzma|*.man.lzma|\
-	*.[0-9n].xz|*.man.xz|\
-	*.[0-9][a-z].gz|*.[0-9][a-z].gz)
-		local out=$(${DECOMPRESSOR} -- "$1" | file -)
-		case ${out} in
-			*troff*)
-				# Need to make sure we pass path to man or it will try
-				# to locate "$1" in the man search paths
-				if [[ $1 == /* ]] ; then
-					man -- "$1"
-				else
-					man -- "./$1"
-				fi
-				;;
-			*text*)
-				${DECOMPRESSOR} -- "$1"
-				;;
-			*)
-				# We could have matched a library (libc.so.6), so let
-				# `file` figure out what the hell this thing is
-				lesspipe_file "$1"
-				;;
-		esac
-		;;
-	*.dvi)      dvi2tty "$1" ;;
-	*.ps)       ps2ascii "$1" || pstotext "$1" ;;
-	*.pdf)      pdftotext "$1" - || ps2ascii "$1" || pstotext "$1" ;;
-	*.doc)      antiword "$1" || catdoc "$1" ;;
-	*.rtf)      unrtf --nopict --text "$1" ;;
-	*.conf|*.txt|*.log) ;; # force less to work on these directly #150256
-
-	### URLs ###
-	ftp://*|http://*|*.htm|*.html)
-		for b in links2 links lynx ; do
-			${b} -dump "$1" && exit 0
-		done
-		html2text -style pretty "$1"
-		;;
-
-	### Tar files ###
-	*.tar|\
-	*.tar.bz2|*.tar.bz|*.tar.gz|*.tar.z|\
-	*.tar.lz|*.tar.tlz|\
-	*.tar.lzma|*.tar.xz)
-		${DECOMPRESSOR} -- "$1" | tar tvvf -;;
-	*.tbz2|*.tbz|*.tgz|*.tlz|*.txz)
-		lesspipe "$1" "$1".tar.${1##*.t} ;;
-
-	### Misc archives ###
-	*.bz2|\
-	*.gz|*.z|\
-	*.lz|\
-	*.lzma|*.xz)  ${DECOMPRESSOR} -- "$1" ;;
-	*.rpm)        rpm -qpivl --changelog -- "$1" || rpm2tar -O "$1" | tar tvvf -;;
-	*.cpi|*.cpio) cpio -itv < "$1" ;;
-	*.ace)        unace l "$1" ;;
-	*.arc)        arc v "$1" ;;
-	*.arj)        unarj l -- "$1" ;;
-	*.cab)        cabextract -l -- "$1" ;;
-	*.lha|*.lzh)  lha v "$1" ;;
-	*.zoo)        zoo -list "$1" || unzoo -l "$1" ;;
-	*.7z|*.exe)   7z l -- "$1" || 7za l -- "$1" || 7zr l -- "$1" ;;
-	*.a)          ar tv "$1" ;;
-	*.elf)        readelf -a -W -- "$1" ;;
-	*.so)         readelf -h -d -s -W -- "$1" ;;
-	*.mo|*.gmo)   msgunfmt -- "$1" ;;
-
-	*.rar|.r[0-9][0-9])  unrar l -- "$1" ;;
-
-	*.jar|*.war|*.ear|*.xpi|*.zip)
-		unzip -v "$1" || miniunzip -l "$1" || miniunz -l "$1" || zipinfo -v "$1"
-		;;
-
-	*.deb|*.udeb)
-		if type -P dpkg > /dev/null ; then
-			dpkg --info "$1"
-			dpkg --contents "$1"
-		else
-			ar tv "$1"
-			ar p "$1" data.tar.gz | tar tzvvf -
-		fi
-		;;
-
-	### Filesystems ###
-	*.squashfs)   unsquashfs -s "$1" && unsquashfs -ll "$1" ;;
-
-	### Media ###
-	*.bmp|*.gif|*.jpeg|*.jpg|*.ico|*.pcd|*.pcx|*.png|*.ppm|*.tga|*.tiff|*.tif|*.webp)
-		identify -verbose -- "$1" || file -L -- "$1"
-		;;
-	*.asf|*.avi|*.mov|*.mp4|*.mpeg|*.mpg|*.qt|*.ram|*.rm|*.webm|*.wmv)
-		midentify "$1" || file -L -- "$1"
-		;;
-	*.mp3)        mp3info "$1" || id3info "$1" ;;
-	*.ogg)        ogginfo "$1" ;;
-	*.flac)       metaflac --list "$1" ;;
-	*.torrent)    torrentinfo "$1" || torrentinfo-console "$1" || ctorrent -x "$1" ;;
-	*.bin|*.cue|*.raw)
-		# not all .bin/.raw files are cd images #285507
-		# fall back to lesspipe_file if .cue doesn't exist, or if
-		# cd-info failed to parse things sanely
-		[[ -e ${1%.*}.cue ]] \
-			&& cd-info --no-header --no-device-info "$1" \
-			|| lesspipe_file "$1"
-		;;
-	*.iso)
-		iso_info=$(isoinfo -d -i "$1")
-		echo "${iso_info}"
-		# Joliet output overrides Rock Ridge, so prefer the better Rock
-		case ${iso_info} in
-			*$'\n'"Rock Ridge"*) iso_opts="-R";;
-			*$'\n'"Joliet"*)     iso_opts="-J";;
-			*)                   iso_opts="";;
-		esac
-		isoinfo -l ${iso_opts} -i "$1"
-		;;
-
-	### Encryption stuff ###
-	*.crl) openssl crl -hash -text -noout -in "$1" ;;
-	*.csr) openssl req -text -noout -in "$1" ;;
-	*.crt|*.pem) openssl x509 -hash -text -noout -in "$1" ;;
-
-# May not be such a good idea :)
-#	### Device nodes ###
-#	/dev/[hs]d[a-z]*)
-#		fdisk -l "${1:0:8}"
-#		[[ $1 == *hd* ]] && hdparm -I "${1:0:8}"
-#		;;
-
-	### Everything else ###
-	*)
-		case $(( recur++ )) in
-			# Maybe we didn't match due to case issues ...
-			0) lesspipe "$1" "$(echo $1 | LC_ALL=C tr '[:upper:]' '[:lower:]')" ;;
-
-			# Maybe we didn't match because the file is named weird ...
-			1) lesspipe_file "$1" ;;
-		esac
-
-		# So no matches from above ... finally fall back to an external
-		# coloring package.  No matching here so we don't have to worry
-		# about keeping in sync with random packages.  Any coloring tool
-		# you use should not output errors about unsupported files to
-		# stdout.  If it does, it's your problem.
-
-		# Allow people to flip color off if they dont want it
-		case ${LESSCOLOR} in
-			always)                   LESSCOLOR=2;;
-			[yY][eE][sS]|[yY]|1|true) LESSCOLOR=1;;
-			[nN][oO]|[nN]|0|false)    LESSCOLOR=0;;
-			*)                        LESSCOLOR=0;; # default to no color #188835
-		esac
-		if [[ ${LESSCOLOR} != "0" ]] && [[ -n ${LESSCOLORIZER=code2color} ]] ; then
-			# 2: Only colorize if user forces it ...
-			# 1: ... or we know less will handle raw codes -- this will
-			#    not detect -seiRM, so set LESSCOLORIZER yourself
-			if [[ ${LESSCOLOR} == "2" ]] || [[ " ${LESS} " == *" -"[rR]" "* ]] ; then
-				LESSQUIET=true ${LESSCOLORIZER} "$1"
-			fi
-		fi
-
-		# Nothing left to do but let less deal
-		exit 0
-		;;
-	esac
-}
-
-if [[ -z $1 ]] ; then
-	echo "Usage: lesspipe <file>"
-elif [[ $1 == "-V" || $1 == "--version" ]] ; then
-	cat <<-EOF
-		lesspipe (git)
-		Copyright 2001-2016 Gentoo Foundation
-		Mike Frysinger <vapier@gentoo.org>
-		     (with plenty of ideas stolen from other projects/distros)
-
-	EOF
-	less -V
-elif [[ $1 == "-h" || $1 == "--help" ]] ; then
-	cat <<-EOF
-		lesspipe: preprocess files before sending them to less
-
-		Usage: lesspipe <file>
-
-		lesspipe specific settings:
-		  LESSCOLOR env     - toggle colorizing of output (no/yes/always; default: no)
-		  LESSCOLORIZER env - program used to colorize output (default: code2color)
-		  LESSIGNORE        - list of extensions to ignore (don't do anything fancy)
-
-		You can create per-user filters as well by creating the executable file:
-		  ~/.lessfilter
-		One argument is passed to it: the file to display.  The script should exit 0
-		to indicate it handled the file, or non-zero to tell lesspipe to handle it.
-
-		To use lesspipe, simply add to your environment:
-		  export LESSOPEN="|lesspipe %s"
-
-		Run 'less --help' or 'man less' for more info.
-	EOF
-else
-	recur=0
-	[[ -n ${LESSDEBUG} ]] \
-		&& lesspipe "$1" \
-		|| lesspipe "$1" 2> /dev/null
-fi
diff --git a/sys-apps/less/less-487.ebuild b/sys-apps/less/less-487.ebuild
deleted file mode 100644
index 3e33109..0000000
--- a/sys-apps/less/less-487.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Excellent text file viewer"
-HOMEPAGE="http://www.greenwoodsoftware.com/less/"
-SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
-
-LICENSE="|| ( GPL-3 BSD-2 )"
-SLOT="0"
-KEYWORDS="*"
-IUSE="pcre unicode"
-
-DEPEND=">=app-misc/editor-wrapper-3
-	>=sys-libs/ncurses-5.2:0=
-	pcre? ( dev-libs/libpcre )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	chmod a+x configure || die
-}
-
-src_configure() {
-	export ac_cv_lib_ncursesw_initscr=$(usex unicode)
-	export ac_cv_lib_ncurses_initscr=$(usex !unicode)
-	econf \
-		--with-regex=$(usex pcre pcre posix) \
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-}
-
-src_install() {
-	default
-
-	newbin "${FILESDIR}"/lesspipe.sh lesspipe
-	newenvd "${FILESDIR}"/less.envd 70less
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-483-r1" ; then
-		elog "The lesspipe.sh symlink has been dropped.  If you are still setting"
-		elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'."
-		elog "Colorization support has been dropped.  If you want that, check out"
-		elog "the new app-text/lesspipe package."
-	fi
-}
diff --git a/sys-apps/less/less-581.2.ebuild b/sys-apps/less/less-581.2.ebuild
new file mode 100644
index 0000000..ee17e9a
--- /dev/null
+++ b/sys-apps/less/less-581.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Excellent text file viewer"
+HOMEPAGE="http://www.greenwoodsoftware.com/less/"
+SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
+
+LICENSE="|| ( GPL-3 BSD-2 )"
+SLOT="0"
+KEYWORDS="*"
+IUSE="pcre unicode"
+
+DEPEND=">=app-misc/editor-wrapper-3
+	>=sys-libs/ncurses-5.2:0=
+	pcre? ( dev-libs/libpcre2 )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	export ac_cv_lib_ncursesw_initscr=$(usex unicode)
+	export ac_cv_lib_ncurses_initscr=$(usex !unicode)
+	local myeconfargs=(
+		--with-regex=$(usex pcre pcre2 posix)
+		--with-editor="${EPREFIX}"/usr/libexec/editor
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	newbin "${FILESDIR}"/lesspipe-r1.sh lesspipe
+	newenvd "${FILESDIR}"/less.envd 70less
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-483-r1" ; then
+		elog "The lesspipe.sh symlink has been dropped.  If you are still setting"
+		elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'."
+		elog "Colorization support has been dropped.  If you want that, check out"
+		elog "the new app-text/lesspipe package."
+	fi
+}
diff --git a/sys-apps/less/metadata.xml b/sys-apps/less/metadata.xml
index 48988ed..9cfb1af 100644
--- a/sys-apps/less/metadata.xml
+++ b/sys-apps/less/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<upstream>
-	<remote-id type="cpe">cpe:/a:gnu:less</upstream>
-</upstream>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gnu:less</remote-id>
+		<remote-id type="github">gwsw/less</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
deleted file mode 100644
index c88af4e..0000000
--- a/sys-apps/sandbox/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sandbox-2.11.tar.xz 423492 SHA256 a1cb203f95057176ca0c5b53b8b9dafd41d1b64a6cf5039a9e1fb4a51b17f237 SHA512 0aa6c773c109749180442d1a46d1b957dea0c30f893e4be1ac0b410e1aad48fdd2972ec591aa2da3a0c74b32d2b7bd51b7c2263bd7b26f8a34bb762d8a48ea0b WHIRLPOOL a2222cc778f2181473cf23b46a62257e5f3857edebb457dcf230f02da0d153e38a28f78a20dee67c9e564c10239d8bd6982a6e894de666f6eff4550f7ad8cdee
diff --git a/sys-apps/sandbox/files/09sandbox b/sys-apps/sandbox/files/09sandbox
deleted file mode 100644
index 9181eb0..0000000
--- a/sys-apps/sandbox/files/09sandbox
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PROTECT_MASK="/etc/sandbox.d"
diff --git a/sys-apps/sandbox/files/sandbox-2.11-exec-hash.patch b/sys-apps/sandbox/files/sandbox-2.11-exec-hash.patch
deleted file mode 100644
index 8a4cd9b..0000000
--- a/sys-apps/sandbox/files/sandbox-2.11-exec-hash.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From e11815bb7f0656f39e122073e0e3284ec7f5d021 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 29 Mar 2016 23:35:44 -0400
-Subject: [PATCH] libsandbox: fix symtab walking with some ELFs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The strtab assumption works if there is no SysV hash table.
-Add logic to handle that scenario.
-
-URL: https://bugs.gentoo.org/578524
-Reported-by: Toralf Förster <toralf.foerster@gmx.de>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- libsandbox/wrapper-funcs/__wrapper_exec.c | 30 +++++++++++++++++-------------
- 1 file changed, 17 insertions(+), 13 deletions(-)
-
-diff --git a/libsandbox/wrapper-funcs/__wrapper_exec.c b/libsandbox/wrapper-funcs/__wrapper_exec.c
-index f7f51ab..d372366 100644
---- a/libsandbox/wrapper-funcs/__wrapper_exec.c
-+++ b/libsandbox/wrapper-funcs/__wrapper_exec.c
-@@ -83,10 +83,10 @@ static bool sb_check_exec(const char *filename, char *const argv[])
- ({ \
- 	Elf##n##_Ehdr *ehdr = (void *)elf; \
- 	Elf##n##_Phdr *phdr = (void *)(elf + ehdr->e_phoff); \
--	Elf##n##_Addr vaddr, filesz, vsym = 0, vstr = 0; \
--	Elf##n##_Off offset, symoff = 0, stroff = 0; \
-+	Elf##n##_Addr vaddr, filesz, vsym = 0, vstr = 0, vhash = 0; \
-+	Elf##n##_Off offset, symoff = 0, stroff = 0, hashoff = 0; \
- 	Elf##n##_Dyn *dyn; \
--	Elf##n##_Sym *sym; \
-+	Elf##n##_Sym *sym, *symend; \
- 	uint##n##_t ent_size = 0, str_size = 0; \
- 	bool dynamic = false; \
- 	size_t i; \
-@@ -106,6 +106,7 @@ static bool sb_check_exec(const char *filename, char *const argv[])
- 				case DT_SYMENT: ent_size = dyn->d_un.d_val; break; \
- 				case DT_STRTAB: vstr = dyn->d_un.d_val; break; \
- 				case DT_STRSZ:  str_size = dyn->d_un.d_val; break; \
-+				case DT_HASH:   vhash = dyn->d_un.d_val; break; \
- 				} \
- 				++dyn; \
- 			} \
-@@ -123,6 +124,8 @@ static bool sb_check_exec(const char *filename, char *const argv[])
- 				symoff = offset + (vsym - vaddr); \
- 			if (vstr >= vaddr && vstr < vaddr + filesz) \
- 				stroff = offset + (vstr - vaddr); \
-+			if (vhash >= vaddr && vhash < vaddr + filesz) \
-+				hashoff = offset + (vhash - vaddr); \
- 		} \
- 		\
- 		/* Finally walk the symbol table.  This should generally be fast as \
-@@ -130,18 +133,20 @@ static bool sb_check_exec(const char *filename, char *const argv[])
- 		 * out there do not export any symbols at all. \
- 		 */ \
- 		if (symoff && stroff) { \
--			sym = (void *)(elf + symoff); \
-+			/* Hash entries are always 32-bits. */ \
-+			uint32_t *hashes = (void *)(elf + hashoff); \
- 			/* Nowhere is the # of symbols recorded, or the size of the symbol \
--			 * table.  Instead, we do what glibc does: assume that the string \
--			 * table always follows the symbol table.  This seems like a poor \
--			 * assumption to make, but glibc has gotten by this long.  We could \
--			 * rely on DT_HASH and walking all the buckets to find the largest \
--			 * symbol index, but that's also a bit hacky. \
-+			 * table.  Instead, we do what glibc does: use the sysv hash table \
-+			 * if it exists, else assume that the string table always directly \
-+			 * follows the symbol table.  This seems like a poor assumption to \
-+			 * make, but glibc has gotten by this long. \
- 			 * \
- 			 * We don't sanity check the ranges here as you aren't executing \
- 			 * corrupt programs in the sandbox. \
- 			 */ \
--			for (i = 0; i < (vstr - vsym) / ent_size; ++i) { \
-+			sym = (void *)(elf + symoff); \
-+			symend = vhash ? (sym + hashes[1]) : (void *)(elf + stroff); \
-+			while (sym < symend) { \
- 				char *symname = (void *)(elf + stroff + sym->st_name); \
- 				if (ELF##n##_ST_VISIBILITY(sym->st_other) == STV_DEFAULT && \
- 				    sym->st_shndx != SHN_UNDEF && sym->st_shndx < SHN_LORESERVE && \
-@@ -149,9 +154,8 @@ static bool sb_check_exec(const char *filename, char *const argv[])
- 				    /* Minor optimization to avoid strcmp. */ \
- 				    symname[0] == '_' && symname[1] == '_') { \
- 					/* Blacklist internal C library symbols. */ \
--					size_t j; \
--					for (j = 0; j < ARRAY_SIZE(libc_alloc_syms); ++j) \
--						if (!strcmp(symname, libc_alloc_syms[j])) { \
-+					for (i = 0; i < ARRAY_SIZE(libc_alloc_syms); ++i) \
-+						if (!strcmp(symname, libc_alloc_syms[i])) { \
- 							run_in_process = false; \
- 							goto use_trace; \
- 						} \
--- 
-2.7.4
-
diff --git a/sys-apps/sandbox/files/sandbox-2.11-execvpe.patch b/sys-apps/sandbox/files/sandbox-2.11-execvpe.patch
deleted file mode 100644
index 7e8130b..0000000
--- a/sys-apps/sandbox/files/sandbox-2.11-execvpe.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 31a135d261a9bc1d65b1fa484345a858bab84db8 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Wed, 30 Mar 2016 01:17:21 -0400
-Subject: [PATCH] libsandbox: whitelist execvpe
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-URL: https://bugs.gentoo.org/578516
-Reported-by: Toralf Förster <toralf.foerster@gmx.de>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- libsandbox/libsandbox.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libsandbox/libsandbox.c b/libsandbox/libsandbox.c
-index cbe1aa1..e809308 100644
---- a/libsandbox/libsandbox.c
-+++ b/libsandbox/libsandbox.c
-@@ -710,6 +710,7 @@ static int check_access(sbcontext_t *sbcontext, int sb_nr, const char *func,
- 	     sb_nr == SB_NR_EXECV     ||
- 	     sb_nr == SB_NR_EXECVP    ||
- 	     sb_nr == SB_NR_EXECVE    ||
-+	     sb_nr == SB_NR_EXECVPE   ||
- 	     sb_nr == SB_NR_FEXECVE))
- 	{
- 		retval = check_prefixes(sbcontext->read_prefixes,
--- 
-2.7.4
-
diff --git a/sys-apps/sandbox/metadata.xml b/sys-apps/sandbox/metadata.xml
deleted file mode 100644
index ebbf830..0000000
--- a/sys-apps/sandbox/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-
-<!-- portage lacks a herd.  correct this when we have one. -->
-
-<maintainer type="project">
-  <email>sandbox@gentoo.org</email>
-  <description>Sandbox Maintainers</description>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-apps/sandbox/sandbox-2.11-r2.ebuild b/sys-apps/sandbox/sandbox-2.11-r2.ebuild
deleted file mode 100644
index a811409..0000000
--- a/sys-apps/sandbox/sandbox-2.11-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-#
-# don't monkey with this ebuild unless contacting portage devs.
-# period.
-#
-
-EAPI="5"
-
-inherit eutils flag-o-matic multilib-minimal multiprocessing pax-utils
-
-DESCRIPTION="sandbox'd LD_PRELOAD hack"
-HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-DEPEND="app-arch/xz-utils
-	>=app-misc/pax-utils-0.1.19" #265376
-RDEPEND=""
-
-has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice"
-
-sandbox_death_notice() {
-	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
-	ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-execvpe.patch #578516
-	epatch "${FILESDIR}"/${P}-exec-hash.patch #578524
-	epatch_user
-}
-
-multilib_src_configure() {
-	filter-lfs-flags #90228
-
-	local myconf=()
-	host-is-pax && myconf+=( --disable-pch ) #301299 #425524 #572092
-
-	ECONF_SOURCE="${S}" \
-	econf "${myconf[@]}"
-}
-
-multilib_src_test() {
-	# Default sandbox build will run with --jobs set to # cpus.
-	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
-}
-
-multilib_src_install_all() {
-	doenvd "${FILESDIR}"/09sandbox
-
-	keepdir /var/log/sandbox
-	fowners root:portage /var/log/sandbox
-	fperms 0770 /var/log/sandbox
-
-	cd "${S}"
-	dodoc AUTHORS ChangeLog* NEWS README
-}
-
-pkg_preinst() {
-	chown root:portage "${ED}"/var/log/sandbox
-	chmod 0770 "${ED}"/var/log/sandbox
-
-	if [[ ${REPLACING_VERSIONS} == 1.* ]] ; then
-		local old=$(find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*')
-		if [[ -n ${old} ]] ; then
-			elog "Removing old sandbox libraries for you:"
-			find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -print -delete
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} == 1.* ]] ; then
-		chmod 0755 "${EROOT}"/etc/sandbox.d #265376
-	fi
-}
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index 23b0ec9..526fe00 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -1 +1 @@
-DIST sed-4.7.tar.xz 1298316 BLAKE2B 752bc2e942b6f041710c6811518147c5fa4b143b33ae842ec1f142ec914bfaf4d7e8a94a2b1a5b345789944e5426f7946997f2ccbc43ee5034351a95ce3a677e SHA512 e0be5db4cdf8226b34aaa9071bc5ae0eafde1c52227cee3512eea7fe2520d6c5cebf15266aa5c4adffbb51bf125c140a15644e28d57759893c12823ea9bbf4fb
+DIST sed-4.8.tar.xz 1348048 BLAKE2B 62f6b6500cc9a20a35cafc2b09b12bb7da67fa0afb0b1b26153babc0023424b3126f44d29eba14c25fc4490996c90738b191c9440c66da6c120bbb9bc6f6df65 SHA512 7de25d9bc2981c63321c2223f3fbcab61d7b0df4fcf7d4394b72400b91993e1288d8bf53948ed5fffcf5a98c75265726a68ad4fb98e1d571bf768603a108c1c8
diff --git a/sys-apps/sed/sed-4.7.ebuild b/sys-apps/sed/sed-4.7.ebuild
deleted file mode 100644
index de6afce..0000000
--- a/sys-apps/sed/sed-4.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Super-useful stream editor"
-HOMEPAGE="http://sed.sourceforge.net/"
-SRC_URI="mirror://gnu/sed/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="*"
-IUSE="acl nls selinux static"
-
-RDEPEND="
-	!static? (
-		acl? ( virtual/acl )
-		nls? ( virtual/libintl )
-		selinux? ( sys-libs/libselinux )
-	)
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	static? (
-		acl? ( virtual/acl[static-libs(+)] )
-		nls? ( virtual/libintl[static-libs(+)] )
-		selinux? ( sys-libs/libselinux[static-libs(+)] )
-	)
-"
-
-src_configure() {
-	local myconf=()
-	if use userland_GNU; then
-		myconf+=( --exec-prefix="${EPREFIX}" )
-	else
-		myconf+=( --program-prefix=g )
-	fi
-
-	export ac_cv_search_setfilecon=$(usex selinux -lselinux)
-	export ac_cv_header_selinux_{context,selinux}_h=$(usex selinux)
-	use static && append-ldflags -static
-	myconf+=(
-		$(use_enable acl)
-		$(use_enable nls)
-	)
-	econf "${myconf[@]}"
-}
diff --git a/sys-apps/sed/sed-4.8.ebuild b/sys-apps/sed/sed-4.8.ebuild
new file mode 100644
index 0000000..385a7a0
--- /dev/null
+++ b/sys-apps/sed/sed-4.8.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Super-useful stream editor"
+HOMEPAGE="http://sed.sourceforge.net/"
+SRC_URI="mirror://gnu/sed/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="*"
+IUSE="acl nls selinux static"
+
+RDEPEND="
+	!static? (
+		acl? ( virtual/acl )
+		nls? ( virtual/libintl )
+		selinux? ( sys-libs/libselinux )
+	)
+"
+DEPEND="${RDEPEND}
+	static? (
+		acl? ( virtual/acl[static-libs(+)] )
+		nls? ( virtual/libintl[static-libs(+)] )
+		selinux? ( sys-libs/libselinux[static-libs(+)] )
+	)
+"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+src_configure() {
+	local myconf=()
+	if use userland_GNU; then
+		myconf+=( --exec-prefix="${EPREFIX}" )
+	else
+		myconf+=( --program-prefix=g )
+	fi
+
+	use static && append-ldflags -static
+	myconf+=(
+		$(use_enable acl)
+		$(use_enable nls)
+		$(use_with selinux)
+	)
+	econf "${myconf[@]}"
+}
diff --git a/sys-apps/systemd-tmpfiles/OWNERS b/sys-apps/systemd-tmpfiles/OWNERS
new file mode 100644
index 0000000..b5e1a87
--- /dev/null
+++ b/sys-apps/systemd-tmpfiles/OWNERS
@@ -0,0 +1,2 @@
+include chromiumos/platform2:/init/OWNERS
+allenwebb@google.com
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246-r2.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246-r2.ebuild
new file mode 120000
index 0000000..d1f3011
--- /dev/null
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246-r2.ebuild
@@ -0,0 +1 @@
+systemd-tmpfiles-246-r1.ebuild
\ No newline at end of file
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
new file mode 100644
index 0000000..347c2df
--- /dev/null
+++ b/sys-apps/usbutils/Manifest
@@ -0,0 +1 @@
+DIST usbutils-013.tar.xz 98056 BLAKE2B d6e7925e180ba90f27ca12f13ed985f34e51b230ec08188c91bf39bb8e64baa319aa63d473318e1a4cb21b53808e8610f837ea0bb85657072f1c70107d037873 SHA512 eb1751e5b82f7a1bdffc667662cebee6fd42f466e59d4eb4c98f0d3723d740305377da1df1ba5831402fddbbd1697bbfa2abd22d9ed175e2dee55d6d007e9e54
diff --git a/sys-apps/usbutils/OWNERS b/sys-apps/usbutils/OWNERS
new file mode 100644
index 0000000..6734523
--- /dev/null
+++ b/sys-apps/usbutils/OWNERS
@@ -0,0 +1 @@
+vpalatin@chromium.org
diff --git a/sys-apps/usbutils/metadata.xml b/sys-apps/usbutils/metadata.xml
new file mode 100644
index 0000000..56c1244
--- /dev/null
+++ b/sys-apps/usbutils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+</pkgmetadata>
diff --git a/sys-apps/usbutils/usbutils-013.ebuild b/sys-apps/usbutils/usbutils-013.ebuild
new file mode 100644
index 0000000..3d46d47
--- /dev/null
+++ b/sys-apps/usbutils/usbutils-013.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="USB enumeration utilities"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/usb/usbutils/
+	https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/"
+SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="*"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="virtual/libusb:1=
+	virtual/libudev:="
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig"
+RDEPEND="${DEPEND}
+	sys-apps/hwids
+	python? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+	use python && python_fix_shebang lsusb.py.in
+}
+
+src_configure() {
+	local myeconfargs=(
+		--datarootdir="${EPREFIX}/usr/share"
+		--datadir="${EPREFIX}/usr/share/misc"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	newdoc usbhid-dump/NEWS NEWS.usbhid-dump
+
+	use python || rm -f "${ED}"/usr/bin/lsusb.py
+}
diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
deleted file mode 100644
index c4c5335..0000000
--- a/sys-auth/consolekit/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST ConsoleKit-0.4.4.tar.bz2 424699 RMD160 e9a37d8c71a9c8d09646be5d105ed9ecf45e9b5a SHA1 163ee0e6308b94dd4712cc64d5a34e8c9007d5d4 SHA256 f0c00969fb6fe7d628071f0f43ac0d411982a5e798d7dc31747caa772c9716ae
-DIST ConsoleKit-0.4.5.tar.bz2 425423 RMD160 2eba158e321778a4c17bf765d0106d214b93fe53 SHA1 6f090c1ce0d459dd6904854532554323755bdeca SHA256 43e0780c53078e125efcec3f847e484dc3533e49b408ce6a0ab1b223686b9c38
diff --git a/sys-auth/consolekit/consolekit-0.4.4.ebuild b/sys-auth/consolekit/consolekit-0.4.4.ebuild
deleted file mode 100644
index 1dc65c7..0000000
--- a/sys-auth/consolekit/consolekit-0.4.4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.4.ebuild,v 1.8 2011/04/23 16:58:35 ssuominen Exp $
-
-EAPI=3
-inherit autotools eutils linux-info multilib pam
-
-MY_PN=ConsoleKit
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Framework for defining and tracking users, login sessions and seats."
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit"
-SRC_URI="http://www.freedesktop.org/software/${MY_PN}/dist/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE="debug doc kernel_linux pam policykit test"
-
-RDEPEND=">=dev-libs/dbus-glib-0.88
-	>=dev-libs/glib-2.20:2
-	sys-libs/zlib
-	x11-libs/libX11
-	pam? ( virtual/pam )
-	policykit? ( >=sys-auth/polkit-0.96-r1 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-libs/libxslt
-	doc? ( app-text/xmlto )
-	test? ( app-text/docbook-xml-dtd:4.1.2 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	# This is required to get login-session-id string with pam_ck_connector.so
-	if use pam && use kernel_linux; then
-		CONFIG_CHECK="~AUDITSYSCALL"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.2.10-cleanup_console_tags.patch \
-		"${FILESDIR}"/${PN}-0.4.0-polkit-automagic.patch \
-		"${FILESDIR}"/${PN}-0.4.0-multilib.patch \
-		"${FILESDIR}"/${PN}-0.4.1-shutdown-reboot-without-policies.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		XMLTO_FLAGS="--skip-validation" \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_enable pam pam-module) \
-		$(use_enable doc docbook-docs) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
-		--with-pam-module-dir=$(getpam_mod_dir)
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install || die
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README TODO
-
-	newinitd "${FILESDIR}"/${PN}-0.1.rc consolekit
-
-	keepdir /usr/$(get_libdir)/ConsoleKit/run-session.d
-	keepdir /etc/ConsoleKit/run-session.d
-	keepdir /var/run/ConsoleKit
-	keepdir /var/log/ConsoleKit
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}"/90-consolekit-3 90-consolekit || die
-
-	exeinto /usr/$(get_libdir)/ConsoleKit/run-session.d
-	doexe "${FILESDIR}"/pam-foreground-compat.ck || die
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_postinst() {
-	ewarn "You need to restart ConsoleKit to get the new features."
-	ewarn "This can be done with /etc/init.d/consolekit restart"
-	ewarn "but make sure you do this and then restart your session"
-	ewarn "otherwise you will get access denied for certain actions"
-}
diff --git a/sys-auth/consolekit/consolekit-0.4.5.ebuild b/sys-auth/consolekit/consolekit-0.4.5.ebuild
deleted file mode 100644
index d28c3d8..0000000
--- a/sys-auth/consolekit/consolekit-0.4.5.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.5.ebuild,v 1.1 2011/05/15 07:14:20 ssuominen Exp $
-
-EAPI=4
-inherit autotools eutils linux-info multilib pam systemd
-
-MY_PN=ConsoleKit
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Framework for defining and tracking users, login sessions and seats."
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit"
-SRC_URI="http://www.freedesktop.org/software/${MY_PN}/dist/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE="debug doc kernel_linux pam policykit test"
-
-RDEPEND=">=dev-libs/dbus-glib-0.88
-	>=dev-libs/glib-2.20:2
-	sys-libs/zlib
-	x11-libs/libX11
-	pam? ( virtual/pam )
-	policykit? ( >=sys-auth/polkit-0.101-r1 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-libs/libxslt
-	doc? ( app-text/xmlto )
-	test? ( app-text/docbook-xml-dtd:4.1.2 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	# This is required to get login-session-id string with pam_ck_connector.so
-	if use pam && use kernel_linux; then
-		CONFIG_CHECK="~AUDITSYSCALL"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.2.10-cleanup_console_tags.patch \
-		"${FILESDIR}"/${PN}-0.4.0-polkit-automagic.patch \
-		"${FILESDIR}"/${PN}-0.4.0-multilib.patch \
-		"${FILESDIR}"/${PN}-0.4.1-shutdown-reboot-without-policies.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		XMLTO_FLAGS="--skip-validation" \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_enable pam pam-module) \
-		$(use_enable doc docbook-docs) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
-		--with-pam-module-dir=$(getpam_mod_dir) \
-		"$(systemd_with_unitdir)"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README TODO
-
-	newinitd "${FILESDIR}"/${PN}-0.1.rc consolekit
-
-	keepdir /usr/$(get_libdir)/ConsoleKit/run-session.d
-	keepdir /etc/ConsoleKit/run-session.d
-	keepdir /var/run/ConsoleKit
-	keepdir /var/log/ConsoleKit
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}"/90-consolekit-3 90-consolekit
-
-	exeinto /usr/$(get_libdir)/ConsoleKit/run-session.d
-	doexe "${FILESDIR}"/pam-foreground-compat.ck
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_postinst() {
-	ewarn "You need to restart ConsoleKit to get the new features."
-	ewarn "This can be done with /etc/init.d/consolekit restart"
-	ewarn "but make sure you do this and then restart your session"
-	ewarn "otherwise you will get access denied for certain actions"
-}
diff --git a/sys-auth/consolekit/files/90-consolekit-3 b/sys-auth/consolekit/files/90-consolekit-3
deleted file mode 100644
index 358fc24..0000000
--- a/sys-auth/consolekit/files/90-consolekit-3
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- sh -*-
-# Xsession.d script for ck-launch-session.
-#
-#
-# This file is sourced by Xsession(5), not executed.
-
-CK_LAUNCH_SESSION=/usr/bin/ck-launch-session
-
-is_on_console() {
-	session=$(dbus-send --system --dest=org.freedesktop.ConsoleKit \
-		--type=method_call --print-reply --reply-timeout=2000 \
-		/org/freedesktop/ConsoleKit/Manager \
-		org.freedesktop.ConsoleKit.Manager.GetCurrentSession \
-		| grep path | awk '{print $3}' | sed s/\"//g)
-	x11_display=$(dbus-send --system --dest=org.freedesktop.ConsoleKit \
-		--type=method_call --print-reply --reply-timeout=2000 \
-		$session org.freedesktop.ConsoleKit.Session.GetX11Display \
-		| grep string | awk '{print $2}' | sed s/\"//g)
-
-	if [ -z "$x11_display" ] ; then
-		return 0
-	else
-		return 1
-	fi
-}
-
-# gdm already creates a CK session for us, so do not run the expensive D-Bus
-# calls if we have $GDMSESSION
-if [ -z "$GDMSESSION" ] && [ -x "$CK_LAUNCH_SESSION" ] && \
- ( [ -z "$XDG_SESSION_COOKIE" ] || is_on_console ) ; then
-    command="$CK_LAUNCH_SESSION $command"
-fi
diff --git a/sys-auth/consolekit/files/consolekit-0.1.rc b/sys-auth/consolekit/files/consolekit-0.1.rc
deleted file mode 100644
index d469b46..0000000
--- a/sys-auth/consolekit/files/consolekit-0.1.rc
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/files/consolekit-0.1.rc,v 1.2 2009/09/12 19:46:19 nirbheek Exp $
-
-depend() {
-	need dbus
-	use logger
-}
-
-start() {
-	ebegin "Starting ConsoleKit daemon"
-
-	start-stop-daemon --start -q \
-		--pidfile /var/run/ConsoleKit/pid \
-		--exec /usr/sbin/console-kit-daemon -- 
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ConsoleKit daemon"
-	start-stop-daemon --stop -q --pidfile /var/run/ConsoleKit/pid 
-	eend $?
-}
diff --git a/sys-auth/consolekit/files/consolekit-0.2.10-cleanup_console_tags.patch b/sys-auth/consolekit/files/consolekit-0.2.10-cleanup_console_tags.patch
deleted file mode 100644
index 4dbd625..0000000
--- a/sys-auth/consolekit/files/consolekit-0.2.10-cleanup_console_tags.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-# Clean up at_console compat files, bug #257761
-# http://patches.ubuntu.com/by-release/extracted/ubuntu/c/consolekit/0.2.10-1ubuntu9/
---- a/src/main.c	2008-07-25 03:19:34.000000000 +0200
-+++ b/src/main.c	2008-07-26 00:25:13.000000000 +0200
-@@ -149,6 +149,43 @@
-         unlink (CONSOLE_KIT_PID_FILE);
- }
- 
-+#define CONSOLE_TAGS_DIR "/var/run/console"
-+
-+static void
-+delete_console_tags (void)
-+{
-+	GDir *dir;
-+	GError *error = NULL;
-+	const gchar *name;
-+
-+	g_debug ("Cleaning up %s", CONSOLE_TAGS_DIR);
-+
-+	dir = g_dir_open (CONSOLE_TAGS_DIR, 0, &error);
-+	if (dir == NULL) {
-+		g_debug ("Couldn't open directory %s: %s", CONSOLE_TAGS_DIR,
-+		           error->message);
-+		g_error_free (error);
-+		return;
-+	}
-+	while ((name = g_dir_read_name (dir)) != NULL) {
-+		gchar *file;
-+		file = g_build_filename (CONSOLE_TAGS_DIR, name, NULL);
-+
-+		g_debug ("Removing tag file: %s", file);
-+		if (unlink (file) == -1) {
-+			g_warning ("Couldn't delete tag file: %s", file);
-+		}
-+		g_free (file);
-+	}
-+}
-+
-+static void
-+cleanup (void)
-+{
-+	delete_console_tags ();
-+	delete_pid ();
-+}
-+
- /* copied from nautilus */
- static int debug_log_pipes[2];
- 
-@@ -229,7 +266,7 @@
-                 snprintf (pid, sizeof (pid), "%lu\n", (long unsigned) getpid ());
-                 written = write (pf, pid, strlen (pid));
-                 close (pf);
--                g_atexit (delete_pid);
-+                g_atexit (cleanup);
-         } else {
-                 g_warning ("Unable to write pid file %s: %s",
-                            CONSOLE_KIT_PID_FILE,
-@@ -312,6 +349,8 @@
- 
-         g_debug ("initializing console-kit-daemon %s", VERSION);
- 
-+	delete_console_tags ();
-+
-         create_pid_file ();
- 
-         manager = ck_manager_new ();
diff --git a/sys-auth/consolekit/files/consolekit-0.4.0-multilib.patch b/sys-auth/consolekit/files/consolekit-0.4.0-multilib.patch
deleted file mode 100644
index b898353..0000000
--- a/sys-auth/consolekit/files/consolekit-0.4.0-multilib.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From c4ba8b276bf95faf2f643e42988709ed6cb0b2f0 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 18 Oct 2009 23:30:36 +0200
-Subject: [PATCH] respect multilib
-
----
- src/Makefile.am           |    4 ++--
- src/ck-manager.c          |    4 ++--
- src/ck-seat.c             |    2 +-
- src/ck-session.c          |    2 +-
- tools/freebsd/Makefile.am |    2 +-
- tools/linux/Makefile.am   |    2 +-
- tools/solaris/Makefile.am |    2 +-
- 7 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 6ab05c8..d6fb810 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -204,8 +204,8 @@ MAINTAINERCLEANFILES =			\
- 
- install-data-local:
- 	-mkdir -p $(DESTDIR)$(sysconfdir)/ConsoleKit/run-session.d
--	-mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d
-+	-mkdir -p $(DESTDIR)$(libdir)/ConsoleKit/run-session.d
- 	-mkdir -p $(DESTDIR)$(sysconfdir)/ConsoleKit/run-seat.d
--	-mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
-+	-mkdir -p $(DESTDIR)$(libdir)/ConsoleKit/run-seat.d
- 	-mkdir -p $(DESTDIR)$(localstatedir)/run/ConsoleKit
- 	-mkdir -p $(DESTDIR)$(localstatedir)/log/ConsoleKit
-diff --git a/src/ck-manager.c b/src/ck-manager.c
-index 99693a3..e65e25b 100644
---- a/src/ck-manager.c
-+++ b/src/ck-manager.c
-@@ -1083,7 +1083,7 @@ do_restart (CkManager             *manager,
-         log_system_restart_event (manager);
- 
-         error = NULL;
--        res = g_spawn_command_line_async (PREFIX "/lib/ConsoleKit/scripts/ck-system-restart",
-+        res = g_spawn_command_line_async (LIBDIR "/ConsoleKit/scripts/ck-system-restart",
-                                           &error);
-         if (! res) {
-                 GError *new_error;
-@@ -1164,7 +1164,7 @@ do_stop (CkManager             *manager,
-         log_system_stop_event (manager);
- 
-         error = NULL;
--        res = g_spawn_command_line_async (PREFIX "/lib/ConsoleKit/scripts/ck-system-stop",
-+        res = g_spawn_command_line_async (LIBDIR "/ConsoleKit/scripts/ck-system-stop",
-                                           &error);
-         if (! res) {
-                 GError *new_error;
-diff --git a/src/ck-seat.c b/src/ck-seat.c
-index af7db59..d089f29 100644
---- a/src/ck-seat.c
-+++ b/src/ck-seat.c
-@@ -1278,7 +1278,7 @@ ck_seat_run_programs (CkSeat    *seat,
-         g_assert(n <= G_N_ELEMENTS(extra_env));
- 
-         ck_run_programs (SYSCONFDIR "/ConsoleKit/run-seat.d", action, extra_env);
--        ck_run_programs (PREFIX "/lib/ConsoleKit/run-seat.d", action, extra_env);
-+        ck_run_programs (LIBDIR "/ConsoleKit/run-seat.d", action, extra_env);
- 
-         for (n = 0; extra_env[n] != NULL; n++) {
-                 g_free (extra_env[n]);
-diff --git a/src/ck-session.c b/src/ck-session.c
-index d8db9dd..c2fc320 100644
---- a/src/ck-session.c
-+++ b/src/ck-session.c
-@@ -1287,7 +1287,7 @@ ck_session_run_programs (CkSession  *session,
-         g_assert(n <= G_N_ELEMENTS(extra_env));
- 
-         ck_run_programs (SYSCONFDIR "/ConsoleKit/run-session.d", action, extra_env);
--        ck_run_programs (PREFIX "/lib/ConsoleKit/run-session.d", action, extra_env);
-+        ck_run_programs (LIBDIR "/ConsoleKit/run-session.d", action, extra_env);
- 
-         for (n = 0; extra_env[n] != NULL; n++) {
-                 g_free (extra_env[n]);
-diff --git a/tools/freebsd/Makefile.am b/tools/freebsd/Makefile.am
-index f668722..d25930e 100644
---- a/tools/freebsd/Makefile.am
-+++ b/tools/freebsd/Makefile.am
-@@ -6,7 +6,7 @@ NULL =
- SUBDIRS = \
- 	$(NULL)
- 
--scriptdir = $(prefix)/lib/ConsoleKit/scripts
-+scriptdir = $(libdir)/ConsoleKit/scripts
- script_SCRIPTS =			\
- 	ck-system-stop			\
- 	ck-system-restart		\
-diff --git a/tools/linux/Makefile.am b/tools/linux/Makefile.am
-index 5a95942..51196c0 100644
---- a/tools/linux/Makefile.am
-+++ b/tools/linux/Makefile.am
-@@ -6,7 +6,7 @@ NULL =
- SUBDIRS = \
- 	$(NULL)
- 
--scriptdir = $(prefix)/lib/ConsoleKit/scripts
-+scriptdir = $(libdir)/ConsoleKit/scripts
- script_SCRIPTS =			\
- 	ck-system-stop	\
- 	ck-system-restart		\
-diff --git a/tools/solaris/Makefile.am b/tools/solaris/Makefile.am
-index f668722..d25930e 100644
---- a/tools/solaris/Makefile.am
-+++ b/tools/solaris/Makefile.am
-@@ -6,7 +6,7 @@ NULL =
- SUBDIRS = \
- 	$(NULL)
- 
--scriptdir = $(prefix)/lib/ConsoleKit/scripts
-+scriptdir = $(libdir)/ConsoleKit/scripts
- script_SCRIPTS =			\
- 	ck-system-stop			\
- 	ck-system-restart		\
--- 
-1.6.5.rc1
-
diff --git a/sys-auth/consolekit/files/consolekit-0.4.0-polkit-automagic.patch b/sys-auth/consolekit/files/consolekit-0.4.0-polkit-automagic.patch
deleted file mode 100644
index d068ca2..0000000
--- a/sys-auth/consolekit/files/consolekit-0.4.0-polkit-automagic.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Automagic polkit
-
----
---- configure.ac
-+++ configure.ac
-@@ -55,10 +55,21 @@
-   gthread-2.0 >= $GLIB_REQUIRED_VERSION
- )
- 
--PKG_CHECK_MODULES(POLKIT,
--  polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
--  have_polkit=yes,
--  have_polkit=no)
-+AC_ARG_ENABLE([polkit],
-+  AC_HELP_STRING([--enable-polkit], [Enable PolicyKit support (default auto)]),
-+  enable_polkit=$enableval,
-+  enable_polkit=auto)
-+
-+if test "x$enable_polkit" != "xno"; then
-+  PKG_CHECK_MODULES(POLKIT,
-+    polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
-+    have_polkit=yes,
-+    have_polkit=no)
-+  if test "x$enable_polkit"  = "xyes" -a "x$have_polkit" = "xno"; then
-+    AC_MSG_ERROR([PolicyKit support explicitly requested but dependencies not found])
-+  fi
-+fi
-+
- if test "x$have_polkit" = "xyes" ; then
-        AC_DEFINE(HAVE_POLKIT, [], [Define if we have polkit])
- fi
diff --git a/sys-auth/consolekit/files/consolekit-0.4.1-shutdown-reboot-without-policies.patch b/sys-auth/consolekit/files/consolekit-0.4.1-shutdown-reboot-without-policies.patch
deleted file mode 100644
index 3183f11..0000000
--- a/sys-auth/consolekit/files/consolekit-0.4.1-shutdown-reboot-without-policies.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Romain Perier <mrpouet@gentoo.org>
-Date: Sat, 24 Oct 2009 18:43:43 +0200
-Subject: [PATCH] Be able to shutdown or reboot even without polkit or RBAC supports
-
-Ck does NOTHING at the origin if its built without polkit or RBAC supports, except
-display a warning using g_warning() (which does not make sense).
-The trick is to to call do_stop()/do_restart() in the #else directive :)
-
----
- src/ck-manager.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/ck-manager.c b/src/ck-manager.c
-index 99693a3..181df0d 100644
---- a/src/ck-manager.c
-+++ b/src/ck-manager.c
-@@ -1129,6 +1129,7 @@ ck_manager_restart (CkManager             *manager,
-         check_rbac_permissions (manager, context, do_restart);
- #else
-         g_warning ("Compiled without PolicyKit or RBAC support!");
-+        do_restart(manager, context);
- #endif
- 
-         return TRUE;
-@@ -1200,6 +1201,7 @@ ck_manager_stop (CkManager             *manager,
-         check_rbac_permissions (manager, context, do_stop);
- #else
-         g_warning ("Compiled without PolicyKit or RBAC support!");
-+        do_stop(manager, context);
- #endif
- 
-         return TRUE;
--- 
-1.6.5.1
-
diff --git a/sys-auth/consolekit/files/pam-foreground-compat.ck b/sys-auth/consolekit/files/pam-foreground-compat.ck
deleted file mode 100644
index 0697ca8..0000000
--- a/sys-auth/consolekit/files/pam-foreground-compat.ck
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-TAGDIR=/var/run/console
-
-[ -n "$CK_SESSION_USER_UID" ] || exit 1
-
-TAGFILE="$TAGDIR/`getent passwd $CK_SESSION_USER_UID | cut -f 1 -d:`"
-
-if [ "$1" = "session_added" ]; then
-	mkdir -p "$TAGDIR"
-	echo "$CK_SESSION_ID" >> "$TAGFILE"
-fi
-
-if [ "$1" = "session_removed" ] && [ -e "$TAGFILE" ]; then
-	sed -i "\%^$CK_SESSION_ID\$%d" "$TAGFILE"
-	[ -s "$TAGFILE" ] || rm -f "$TAGFILE"
-fi
-
diff --git a/sys-auth/consolekit/metadata.xml b/sys-auth/consolekit/metadata.xml
deleted file mode 100644
index 0271f0b..0000000
--- a/sys-auth/consolekit/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>freedesktop</herd>
-<use>
-	<flag name="policykit">
-	Use the PolicyKit framework (<pkg>sys-auth/polkit</pkg>) to get
-	authorization for suspend/shutdown.
-	</flag>
-</use>
-</pkgmetadata>
diff --git a/sys-auth/nss-mdns/Manifest b/sys-auth/nss-mdns/Manifest
deleted file mode 100644
index 0c7b6ef..0000000
--- a/sys-auth/nss-mdns/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nss-mdns-0.13.tar.gz 380261 SHA256 cb25a022cbdcb9ef9c7f0f50b3fa56f22bcb47ea7bf8602fd5c00e16302aa779 SHA512 f1b379111fb758323179ea3e447d754e934308940b11a8402dfb6033264940d831266d15ae1ee0badfecd5cdc7f589b42e4363dfc058f5e62026017d97eb0a3b WHIRLPOOL 3dc7914919b1ccec0815e60dc5b7724ea9d1798c8063edabf29f81d51485f3d3a27be12f2cc7de950b2f898ffcf8310ed96e20e0bdefcfbf7547e9fee7122034
diff --git a/sys-auth/nss-mdns/files/mdns.allow b/sys-auth/nss-mdns/files/mdns.allow
deleted file mode 100644
index 80b49b0..0000000
--- a/sys-auth/nss-mdns/files/mdns.allow
+++ /dev/null
@@ -1,3 +0,0 @@
-# mdns.allow:
-.local.
-.local
diff --git a/sys-auth/nss-mdns/metadata.xml b/sys-auth/nss-mdns/metadata.xml
deleted file mode 100644
index a409ede..0000000
--- a/sys-auth/nss-mdns/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>amynka@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<use>
-		<flag name="search-domains">Honour search domains from
-		/etc/resolv.conf (see bug #201948 for possible side effects)</flag>
-	</use>
-	<longdescription lang="en">
-		Name service switch module for multicast dns.
-	</longdescription>
-	<longdescription lang="ja">
-		マルチキャスト DNS 向けネーム・サービス・スイッチのモジュールです。
-	</longdescription>
-	<upstream>
-		<remote-id type="github">lathiat/nss-mdns</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sys-auth/nss-mdns/nss-mdns-0.13.ebuild b/sys-auth/nss-mdns/nss-mdns-0.13.ebuild
deleted file mode 100644
index 8fe21b4..0000000
--- a/sys-auth/nss-mdns/nss-mdns-0.13.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib-minimal
-
-DESCRIPTION="Name Service Switch module for Multicast DNS"
-HOMEPAGE="https://github.com/lathiat/nss-mdns"
-SRC_URI="https://github.com/lathiat/nss-mdns/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE="test"
-
-RDEPEND=">=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( >=dev-libs/check-0.11[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	local myconf=(
-		# $(localstatedir)/run/... is used to locate avahi-daemon socket
-		--localstatedir=/var
-	)
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_install_all() {
-	dodoc *.md
-
-	insinto /etc
-	doins "${FILESDIR}"/mdns.allow
-}
-
-pkg_postinst() {
-	ewarn "You have to modify your name service switch look up file to enable"
-	ewarn "multicast DNS lookups.  If you wish to resolve only IPv6 addresses"
-	ewarn "use mdns6.  For IPv4 addresses only, use mdns4.  To resolve both"
-	ewarn "use mdns.  Keep in mind that mdns will be slower if there are no"
-	ewarn "IPv6 addresses published via mDNS on the network.  There are also"
-	ewarn "minimal (mdns?_minimal) libraries which only lookup .local hosts"
-	ewarn "and 169.254.x.x addresses."
-	ewarn
-	ewarn "Add the appropriate mdns into the hosts line in /etc/nsswitch.conf."
-	ewarn "An example line looks like:"
-	ewarn "hosts:	files mdns4_minimal [NOTFOUND=return] dns mdns4"
-	ewarn
-	ewarn "If you want to perform mDNS lookups for domains other than the ones"
-	ewarn "ending in .local, add them to /etc/mdns.allow."
-}
diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index 0da495b..10c5556 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -1 +1 @@
-DIST syslinux-6.03.tar.xz 6855224 SHA256 26d3986d2bea109d5dc0e4f8c4822a459276cf021125e8c9f23c3cca5d8c850e SHA512 dd2b2916962b9e93bc1e714182e3ca2a727a229b8afabe913050bcfdd43ee2af51ee3acf79121d8c20caf434583efaa7f3196871e0e07c04d82191323a50fe31 WHIRLPOOL c3abf6dd84610f2265ce94ce0991e200e3f7fcf2cf2926d46c389c7235544e959ee52aef4a510258b861da2233fd38696d3164a7d0e75f0060a18cc13f23b546
+DIST syslinux-6.04-pre1.tar.xz 5283272 BLAKE2B 800e5977ed13b26a1756c33d8625e850631b642e26a86e3328196ddd998596693c3a26db0ada4c0ba78a4ba692a1cc01886b6eb693d877ddafcfb325ecdeb639 SHA512 7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98
diff --git a/sys-boot/syslinux/files/syslinux-6.04_pre1-fcommon.patch b/sys-boot/syslinux/files/syslinux-6.04_pre1-fcommon.patch
new file mode 100644
index 0000000..7d061db
--- /dev/null
+++ b/sys-boot/syslinux/files/syslinux-6.04_pre1-fcommon.patch
@@ -0,0 +1,54 @@
+https://bugs.gentoo.org/705730
+
+gcc-10 enabled f-no-common by default. Broke syslinux linking.
+--- a/mk/com32.mk
++++ b/mk/com32.mk
+@@ -47,6 +47,7 @@ GCCOPT += $(call gcc_ok,-falign-functions=0,-malign-functions=0)
+ GCCOPT += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0)
+ GCCOPT += $(call gcc_ok,-falign-labels=0,-malign-labels=0)
+ GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0)
++GCCOPT += $(call gcc_ok,-fcommon)
+ 
+ ifeq ($(FWCLASS),EFI)
+ GCCOPT += -mno-red-zone
+--- a/mk/elf.mk
++++ b/mk/elf.mk
+@@ -42,6 +42,7 @@ GCCOPT += $(call gcc_ok,-falign-functions=0,-malign-functions=0)
+ GCCOPT += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0)
+ GCCOPT += $(call gcc_ok,-falign-labels=0,-malign-labels=0)
+ GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0)
++GCCOPT += $(call gcc_ok,-fcommon)
+ 
+ com32 = $(topdir)/com32
+ core = $(topdir)/core
+--- a/mk/embedded.mk
++++ b/mk/embedded.mk
+@@ -51,6 +51,7 @@ GCCOPT    += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0)
+ GCCOPT    += $(call gcc_ok,-falign-labels=0,-malign-labels=0)
+ GCCOPT    += $(call gcc_ok,-falign-loops=0,-malign-loops=0)
+ GCCOPT    += $(call gcc_ok,-fvisibility=hidden)
++GCCOPT    += $(call gcc_ok,-fcommon)
+ 
+ LIBGCC    := $(shell $(CC) $(GCCOPT) --print-libgcc)
+ 
+--- a/mk/lib.mk
++++ b/mk/lib.mk
+@@ -28,6 +28,7 @@ GCCOPT += $(call gcc_ok,-falign-functions=0,-malign-functions=0)
+ GCCOPT += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0)
+ GCCOPT += $(call gcc_ok,-falign-labels=0,-malign-labels=0)
+ GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0)
++GCCOPT += $(call gcc_ok,-fcommon)
+ 
+ INCLUDE	= -I$(SRC)
+ STRIP	= strip --strip-all -R .comment -R .note
+--- a/mk/efi.mk
++++ b/mk/efi.mk
+@@ -7,7 +7,7 @@ core = $(topdir)/core
+ # Set up architecture specifics; for cross compilation, set ARCH as apt
+ # gnuefi sets up architecture specifics in ia32 or x86_64 sub directories
+ # set up the LIBDIR and EFIINC for building for the appropriate architecture
+-GCCOPT := $(call gcc_ok,-fno-stack-protector,)
++GCCOPT := $(call gcc_ok,-fno-stack-protector,) $(call gcc_ok,-fcommon)
+ EFIINC = $(objdir)/include/efi
+ LIBDIR  = $(objdir)/lib
+ 
diff --git a/sys-boot/syslinux/files/syslinux-6.04_pre1-singleloadsegment.patch b/sys-boot/syslinux/files/syslinux-6.04_pre1-singleloadsegment.patch
new file mode 100644
index 0000000..db9b7d0
--- /dev/null
+++ b/sys-boot/syslinux/files/syslinux-6.04_pre1-singleloadsegment.patch
@@ -0,0 +1,304 @@
+Author: Lukas Schwaighofer <lukas@schwaighofer.name>
+Description: Force the linker to put all sections into a single PT_LOAD
+ segment. This is required when using binutils >= 2.31 which writes two PT_LOAD
+ segments by default. This is not supported by the wrapper.c script used to
+ convert the shared object into an elf binary.
+Forwarded: https://www.syslinux.org/archives/2018-August/026167.html
+
+---
+ efi/i386/syslinux.ld   | 37 +++++++++++++++++++++----------------
+ efi/x86_64/syslinux.ld | 37 +++++++++++++++++++++----------------
+ 2 files changed, 42 insertions(+), 32 deletions(-)
+
+diff --git a/efi/i386/syslinux.ld b/efi/i386/syslinux.ld
+index bab3fc7..5b4589d 100644
+--- a/efi/i386/syslinux.ld
++++ b/efi/i386/syslinux.ld
+@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
+ OUTPUT_ARCH(i386)
+ ENTRY(_start)
+ 
++PHDRS
++{
++	all PT_LOAD ;
++}
++
+ SECTIONS
+ {
+ 	. = 0;
+@@ -31,7 +36,7 @@ SECTIONS
+ 		*(.text)
+ 		*(.text.*)
+ 		__text_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(16);
+ 
+@@ -40,7 +45,7 @@ SECTIONS
+ 		*(.rodata)
+ 		*(.rodata.*)
+ 		__rodata_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -49,14 +54,14 @@ SECTIONS
+ 		KEEP (*(SORT(.ctors.*)))
+ 		KEEP (*(.ctors))
+ 		__ctors_end = .;
+-	}
++	} :all
+ 
+ 	.dtors : {
+ 		__dtors_start = .;
+ 		KEEP (*(SORT(.dtors.*)))
+ 		KEEP (*(.dtors))
+ 		__dtors_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4096);
+ 	.rel : {
+@@ -64,7 +69,7 @@ SECTIONS
+ 		*(.rel.data)
+ 		*(.rel.data.*)
+ 		*(.rel.ctors)
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -72,14 +77,14 @@ SECTIONS
+ 		__gnu_hash_start = .;
+ 		*(.gnu.hash)
+ 		__gnu_hash_end = .;
+-	}
++	} :all
+ 
+ 
+ 	.dynsym : {
+ 		__dynsym_start = .;
+ 		*(.dynsym)
+ 		__dynsym_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -87,7 +92,7 @@ SECTIONS
+ 		__dynstr_start = .;
+ 		*(.dynstr)
+ 		__dynstr_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -104,7 +109,7 @@ SECTIONS
+ 		KEEP (*(.got.plt))
+ 		KEEP (*(.got))
+ 		__got_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -112,7 +117,7 @@ SECTIONS
+ 		__dynamic_start = .;
+ 		*(.dynamic)
+ 		__dynamic_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(16);
+ 
+@@ -122,19 +127,19 @@ SECTIONS
+ 		*(.data.*)
+ 		*(.lowmem)
+ 		__data_end = .;
+-	}
++	} :all
+ 
+ 	.reloc : {
+ 		*(.reloc)
+-	}
++	} :all
+ 
+ 	.symtab : {
+ 		*(.symtab)
+-	}
++	} :all
+ 
+ 	.strtab : {
+ 		*(.strtab)
+-	}
++	} :all
+ 
+ 	.bss (NOLOAD) : {
+ 		/* the EFI loader doesn't seem to like a .bss section,
+@@ -148,7 +153,7 @@ SECTIONS
+ 		__bss_end = .;
+ 		*(.sbss)
+ 		*(.scommon)
+-	}
++	} :all
+ 	__bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start);
+ 	__bss_dwords = (__bss_len + 3) >> 2;
+ 
+@@ -161,7 +166,7 @@ SECTIONS
+ 		*(.hugebss)
+ 		*(.hugebss.*)
+ 		__hugebss_end = .;
+-	}
++	} :all
+ 
+ 	_end = .;
+ 
+diff --git a/efi/x86_64/syslinux.ld b/efi/x86_64/syslinux.ld
+index 450641c..cad28a8 100644
+--- a/efi/x86_64/syslinux.ld
++++ b/efi/x86_64/syslinux.ld
+@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")
+ OUTPUT_ARCH(i386:x86-64)
+ ENTRY(_start)
+ 
++PHDRS
++{
++	all PT_LOAD ;
++}
++
+ SECTIONS
+ {
+ 	. = 0;
+@@ -31,7 +36,7 @@ SECTIONS
+ 		*(.text)
+ 		*(.text.*)
+ 		__text_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(16);
+ 
+@@ -40,7 +45,7 @@ SECTIONS
+ 		*(.rodata)
+ 		*(.rodata.*)
+ 		__rodata_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -49,14 +54,14 @@ SECTIONS
+ 		KEEP (*(SORT(.ctors.*)))
+ 		KEEP (*(.ctors))
+ 		__ctors_end = .;
+-	}
++	} :all
+ 
+ 	.dtors : {
+ 		__dtors_start = .;
+ 		KEEP (*(SORT(.dtors.*)))
+ 		KEEP (*(.dtors))
+ 		__dtors_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4096);
+ 	.rel : {
+@@ -64,7 +69,7 @@ SECTIONS
+ 		*(.rel.data)
+ 		*(.rel.data.*)
+ 		*(.rel.ctors)
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -72,14 +77,14 @@ SECTIONS
+ 		__gnu_hash_start = .;
+ 		*(.gnu.hash)
+ 		__gnu_hash_end = .;
+-	}
++	} :all
+ 
+ 
+ 	.dynsym : {
+ 		__dynsym_start = .;
+ 		*(.dynsym)
+ 		__dynsym_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -87,7 +92,7 @@ SECTIONS
+ 		__dynstr_start = .;
+ 		*(.dynstr)
+ 		__dynstr_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -104,7 +109,7 @@ SECTIONS
+ 		KEEP (*(.got.plt))
+ 		KEEP (*(.got))
+ 		__got_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -112,7 +117,7 @@ SECTIONS
+ 		__dynamic_start = .;
+ 		*(.dynamic)
+ 		__dynamic_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(16);
+ 
+@@ -122,19 +127,19 @@ SECTIONS
+ 		*(.data.*)
+ 		*(.lowmem)
+ 		__data_end = .;
+-	}
++	} :all
+ 
+ 	.reloc : {
+ 		*(.reloc)
+-	}
++	} :all
+ 
+ 	.symtab : {
+ 		*(.symtab)
+-	}
++	} :all
+ 
+ 	.strtab : {
+ 		*(.strtab)
+-	}
++	} :all
+ 
+ 	.bss (NOLOAD) : {
+ 		/* the EFI loader doesn't seem to like a .bss section,
+@@ -148,7 +153,7 @@ SECTIONS
+ 		__bss_end = .;
+ 		*(.sbss)
+ 		*(.scommon)
+-	}
++	} :all
+ 	__bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start);
+ 	__bss_dwords = (__bss_len + 3) >> 2;
+ 
+@@ -161,7 +166,7 @@ SECTIONS
+ 		*(.hugebss)
+ 		*(.hugebss.*)
+ 		__hugebss_end = .;
+-	}
++	} :all
+ 
+ 	_end = .;
+ 
diff --git a/sys-boot/syslinux/syslinux-6.03.ebuild b/sys-boot/syslinux/syslinux-6.03.ebuild
deleted file mode 100644
index 6554003..0000000
--- a/sys-boot/syslinux/syslinux-6.03.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
-HOMEPAGE="http://www.syslinux.org/"
-# Final releases in 6.xx/$PV.tar.* (literal "xx")
-# Testing releases in Testing/$PV/$PV.tar.*
-SRC_URI_DIR=${PV:0:1}.xx
-SRC_URI_TESTING=Testing/${PV:0:4}
-[[ ${PV/_alpha} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
-[[ ${PV/_beta} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
-[[ ${PV/_pre} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
-[[ ${PV/_rc} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
-SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE="custom-cflags"
-
-RDEPEND="sys-fs/mtools
-		dev-perl/Crypt-PasswdMD5
-		dev-perl/Digest-SHA1"
-DEPEND="${RDEPEND}
-	dev-lang/nasm
-	>=sys-boot/gnu-efi-3.0u
-	virtual/os-headers"
-
-S=${WORKDIR}/${P/_/-}
-
-# This ebuild is a departure from the old way of rebuilding everything in syslinux
-# This departure is necessary since hpa doesn't support the rebuilding of anything other
-# than the installers.
-
-# These are executables which come precompiled and are run by the boot loader
-QA_PREBUILT="usr/share/${PN}/*.c32"
-
-# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
-
-src_prepare() {
-	rm -f gethostip #bug 137081
-
-	epatch "${FILESDIR}"/${PN}-6.03-sysmacros.patch #579928
-
-	# Don't prestrip or override user LDFLAGS, bug #305783
-	local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
-		sample/Makefile utils/Makefile"
-	sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed"
-
-	if use custom-cflags; then
-		sed -i ${SYSLINUX_MAKEFILES} \
-			-e 's|-g -Os||g' \
-			-e 's|-Os||g' \
-			-e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \
-			|| die "sed custom-cflags failed"
-	else
-		QA_FLAGS_IGNORED="
-			/sbin/extlinux
-			/usr/bin/memdiskfind
-			/usr/bin/gethostip
-			/usr/bin/isohybrid
-			/usr/bin/syslinux
-			"
-	fi
-	case ${ARCH} in
-		amd64)	loaderarch="efi64" ;;
-		x86)	loaderarch="efi32" ;;
-		*)	ewarn "Unsupported architecture, building installers only." ;;
-	esac
-
-	# building with ld.gold causes problems, bug #563364
-	if tc-ld-is-gold; then
-		ewarn "Building syslinux with the gold linker may cause problems, see bug #563364"
-		if [[ -z "${I_KNOW_WHAT_I_AM_DOING}" ]]; then
-			tc-ld-disable-gold
-			ewarn "set I_KNOW_WHAT_I_AM_DOING=1 to override this."
-		else
-			ewarn "Continuing anyway as requested."
-		fi
-	fi
-}
-
-src_compile() {
-	# build system abuses the LDFLAGS variable to pass arguments to ld
-	unset LDFLAGS
-	if [[ ! -z ${loaderarch} ]]; then
-		emake CC="$(tc-getCC)" LD="$(tc-getLD)" ${loaderarch}
-	fi
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" ${loaderarch} installer
-}
-
-src_install() {
-	# parallel install fails sometimes
-	einfo "loaderarch=${loaderarch}"
-	emake -j1 LD="$(tc-getLD)" INSTALLROOT="${D}" MANDIR=/usr/share/man bios ${loaderarch} install
-	dodoc README NEWS doc/*.txt
-}
-
-pkg_postinst() {
-	# print warning for users upgrading from the previous stable version
-	if has 4.07 ${REPLACING_VERSIONS}; then
-		ewarn "syslinux now uses dynamically linked ELF executables. Before you reboot,"
-		ewarn "ensure that needed dependencies are fulfilled. For example, run from your"
-		ewarn "syslinux directory:"
-		ewarn
-		ewarn "LD_LIBRARY_PATH=\".\" ldd menu.c32"
-	fi
-}
diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r3.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r3.ebuild
new file mode 100644
index 0000000..f54dc8e
--- /dev/null
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r3.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
+HOMEPAGE="https://www.syslinux.org/"
+# Final releases in 6.xx/$PV.tar.* (literal "xx")
+# Testing releases in Testing/$PV/$PV.tar.*
+SRC_URI_DIR=${PV:0:1}.xx
+SRC_URI_TESTING=Testing/${PV:0:4}
+[[ ${PV/_alpha} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
+[[ ${PV/_beta} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
+[[ ${PV/_pre} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
+[[ ${PV/_rc} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
+SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE="custom-cflags"
+
+RDEPEND="sys-fs/mtools
+	dev-perl/Crypt-PasswdMD5
+	dev-perl/Digest-SHA1"
+DEPEND="${RDEPEND}
+	dev-lang/nasm
+	sys-apps/util-linux:=
+	>=sys-boot/gnu-efi-3.0u
+	virtual/os-headers"
+
+S=${WORKDIR}/${P/_/-}
+
+# This ebuild is a departure from the old way of rebuilding everything in syslinux
+# This departure is necessary since hpa doesn't support the rebuilding of anything other
+# than the installers.
+
+# These are executables which come precompiled and are run by the boot loader
+QA_PREBUILT="usr/share/${PN}/*.c32"
+
+# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.03-sysmacros.patch #579928
+	"${FILESDIR}"/${P}-singleloadsegment.patch #662678
+	"${FILESDIR}"/${P}-fcommon.patch #705730
+)
+
+src_prepare() {
+	default
+
+	rm -f gethostip #bug 137081
+
+	# Don't prestrip or override user LDFLAGS, bug #305783
+	local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
+		sample/Makefile utils/Makefile"
+	sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed"
+
+	if use custom-cflags; then
+		sed -i ${SYSLINUX_MAKEFILES} \
+			-e 's|-g -Os||g' \
+			-e 's|-Os||g' \
+			-e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \
+			|| die "sed custom-cflags failed"
+	else
+		QA_FLAGS_IGNORED="
+			/sbin/extlinux
+			/usr/bin/memdiskfind
+			/usr/bin/gethostip
+			/usr/bin/isohybrid
+			/usr/bin/syslinux
+			"
+	fi
+	case ${ARCH} in
+		amd64)	loaderarch="efi64" ;;
+		x86)	loaderarch="efi32" ;;
+		*)	ewarn "Unsupported architecture, building installers only." ;;
+	esac
+
+	# building with ld.gold causes problems, bug #563364
+	if tc-ld-is-gold; then
+		ewarn "Building syslinux with the gold linker may cause problems, see bug #563364"
+		if [[ -z "${I_KNOW_WHAT_I_AM_DOING}" ]]; then
+			tc-ld-disable-gold
+			ewarn "set I_KNOW_WHAT_I_AM_DOING=1 to override this."
+		else
+			ewarn "Continuing anyway as requested."
+		fi
+	fi
+
+	tc-export AR CC LD OBJCOPY RANLIB
+}
+
+_emake() {
+	emake \
+		AR="${AR}" \
+		CC="${CC}" \
+		LD="${LD}" \
+		OBJCOPY="${OBJCOPY}" \
+		RANLIB="${RANLIB}" \
+		"$@"
+}
+
+src_compile() {
+	# build system abuses the LDFLAGS variable to pass arguments to ld
+	unset LDFLAGS
+	if [[ ! -z ${loaderarch} ]]; then
+		_emake ${loaderarch}
+	fi
+	_emake ${loaderarch} installer
+}
+
+src_install() {
+	# parallel install fails sometimes
+	einfo "loaderarch=${loaderarch}"
+	_emake -j1 INSTALLROOT="${D}" MANDIR=/usr/share/man bios ${loaderarch} install
+	dodoc README NEWS doc/*.txt
+}
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index d565784..67e2907 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -1,2 +1,7 @@
-DIST bison-3.0.4-patchset.tar.xz 8216 SHA256 0b6fe6283a0971c55af06b96d42a1e63a24c8396f593557ce3175e50750109ab SHA512 87b62c5848360fee5b566c664c378ff08bb81d2b6c07b0d385ebd4dfd6b1a687af1da96ed43ca120695877cfc5e30a149ef35424c7a332e9223179dab6665d0b WHIRLPOOL 7b50339161605760c58e3d1d5f66cca7c6afdf7eeaf935063d62bb4fc669afec2e9013f26ec1587ffcc26b44064e531c4b3e89bb79717dfb5c498653f82183c0
-DIST bison-3.0.4.tar.xz 1973796 SHA256 a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1 SHA512 bbdc23e7772e49da1c7c47e66d4e4efbfbfe9b21dbc59bf3ad9a6e573eecac6c9f52c7f11a64be9897e8deb99ef7ba015164aa8232aa391b901dd7db03632412 WHIRLPOOL 41da7b0aa18bf61f621d59d372dc2ca9e116f6fa0d5c8891b51a01dda6d9393005c76773dbefbadeb30884bb328379197d2026809d62d49d8e2022b9b49da244
+DIST bison-3.6.3-patches-01.tar.xz 10316 BLAKE2B a99e12e69334371316e5841f8c86ed716a9fed108800a33099e99f8fe432374259bf5477188d054b6d474bc905f821939691fc97f0c891d17a79968466f0c7e3 SHA512 5c97a183232ad31f231580193ed1853aba18010703b0c22105eaf6834241c9828d180eaafbc5d1da751b2d45a7e8195493e10ca2321b35680b2b3cd4ec39e3ca
+DIST bison-3.6.4.tar.xz 2472456 BLAKE2B d2efe7ff1a349efe5a8c79eb69aa296dbc7eb9fde549afc91986460f27976e033dd793e904dda2f919f11e011ff6c458805288dff4939dcd1ee20e2b316cb9e6 SHA512 041cd87f4ca6b012031719a49aa81e62d3c0817c6364289732e6a3cb9a0762498760e0f2ce84c03ca9e9b74eb74bdffd1b8b86d2b4a6e4a0d8c8a4b864b672dc
+DIST bison-3.7.3-patches-01.tar.xz 11336 BLAKE2B 2648dacd99c64c366946dad34f9e5fd838b43257df47bf74e3a3b63b03099152b4884d9b1c5943ee5c47afb090369278874c5f2b40dfa69b3abfa4eaa556843f SHA512 a53d541a550cc45f6c677fb6fa830640b64ba2c9a4ab4e6aef1f52ecd5fa38501e2391707d66c2958dd7a139dfba74ae5734e80d15360a3aa544fdea8ecf5500
+DIST bison-3.7.3.tar.xz 2613028 BLAKE2B a6f1063fb9441ae9102b29dc2786b7eb7104f7f13288d537080c26e7982e63f7a954abf1903f2a79a88578d88e9f3c30da8dcf12b7d6c89de0b60943186332c7 SHA512 34fe630749dc015f15a830ad13742c4b0b9163143a11e987c16954bee0451e819ec2fa7b43bd34c867e5ce72c758eb9070348d1d581c9435b9531a99caa46eed
+DIST bison-3.7.5.tar.xz 2622228 BLAKE2B 4787af645197bfbc4c0439e98bbc98030a726ca185ec3375b2fe7f49aeee6517e2155e242a9829f93de931cf3217a7a3ede520fa1d562b25e2d34915677c1747 SHA512 98cdfaf114b8f8eb0927b29fe999dc9629336333d85bd2f87c4c558125500c44ee6fbfff453e3121c7e9e239a632f8c72e08c39be7dfb045361d35ec59d31811
+DIST bison-3.7.6-patches-01.tar.xz 10600 BLAKE2B c7907a327c2bbb82a2e575a864e71400f91cd4349a84f95b187ecaadefc1bfd595a91bce6c8c47e42423cace9cf78a4041fde3fdc489a4824aa3c10ca73be7cb SHA512 8f2ddee79b9678b9fd9a7a34f26d44f7c4472d0fc55c9fef8b418d27949b6a27309b7aa5ac3f4a5ad27c90ad7d92d824ffe767c77b0ed81de6b2897c91cd7560
+DIST bison-3.7.6.tar.xz 2627180 BLAKE2B 2f1015b517e46ff0870378b4d0dd489c8c737f31b2b69146bd7fbbae1e3adcdff0e4837cfdf1d238e8660ecc2b310ce87ec8940ed4989278b3df6cbb2d464e54 SHA512 6c1c9b825fbd2c94b8903f03a7e68e6832599f7bbd8d3c49864537c11b038c45a15de02fd36128d662af314334c83515bbc132df84e9acc6c651e98649c65bad
diff --git a/sys-devel/bison/bison-3.0.4-r1.ebuild b/sys-devel/bison/bison-3.0.4-r1.ebuild
deleted file mode 100644
index a8a18ff..0000000
--- a/sys-devel/bison/bison-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="A general-purpose (yacc-compatible) parser generator"
-HOMEPAGE="https://www.gnu.org/software/bison/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE="examples nls static test"
-
-RDEPEND=">=sys-devel/m4-1.4.16"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	examples? ( dev-lang/perl )
-	nls? ( sys-devel/gettext )
-	test? ( dev-lang/perl )"
-
-DOCS=( AUTHORS ChangeLog-2012 NEWS README THANKS TODO ) # ChangeLog-1998 PACKAGING README-alpha README-release
-
-src_prepare() {
-	epatch "${WORKDIR}"/${P}-patchset/${P}-optional-perl.patch #538300
-	epatch "${WORKDIR}"/${P}-patchset/${P}-darwin17-printf-n.patch #632500
-	epatch "${WORKDIR}"/${P}-patchset/${P}-fix-tests-gcc-7.patch #638308
-	# The makefiles make the man page depend on the configure script
-	# which we patched above.  Touch it to prevent regeneration.
-	touch doc/bison.1 #548778 #538300#9
-	# Avoid regenerating the info page when the timezone is diff. #574492
-	sed -i '2iexport TZ=UTC' build-aux/mdate-sh || die
-	# ugly workaround to avoid maintainer mode (see #647410 and #648012)
-	printf '#!/bin/sh\nexit 0\n' > build-aux/missing || die
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	# We don't need perl unless we run tests.
-	use test || export ac_cv_path_PERL=true
-	econf \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		$(use_enable examples) \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-
-	# This one is installed by dev-util/yacc
-	mv "${ED}"/usr/bin/yacc{,.bison} || die
-	mv "${ED}"/usr/share/man/man1/yacc{,.bison}.1 || die
-
-	# We do not need liby.a
-	rm -r "${ED}"/usr/lib* || die
-
-	# Move to documentation directory and leave compressing for EAPI>=4
-	mv "${ED}"/usr/share/${PN}/README "${ED}"/usr/share/doc/${PF}/README.data
-}
-
-pkg_postinst() {
-	local f="${EROOT}/usr/bin/yacc"
-	if [[ ! -e ${f} ]] ; then
-		ln -s yacc.bison "${f}"
-	fi
-}
-
-pkg_postrm() {
-	# clean up the dead symlink when we get unmerged #377469
-	local f="${EROOT}/usr/bin/yacc"
-	if [[ -L ${f} && ! -e ${f} ]] ; then
-		rm -f "${f}"
-	fi
-}
diff --git a/sys-devel/bison/bison-3.7.3.ebuild b/sys-devel/bison/bison-3.7.3.ebuild
new file mode 100644
index 0000000..97d89fa
--- /dev/null
+++ b/sys-devel/bison/bison-3.7.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+PATCH_TAR="${PN}-3.7.3-patches-01.tar.xz"
+
+DESCRIPTION="A general-purpose (yacc-compatible) parser generator"
+HOMEPAGE="https://www.gnu.org/software/bison/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+	https://dev.gentoo.org/~whissi/dist/bison/${PATCH_TAR}
+	https://dev.gentoo.org/~polynomial-c/dist/bison/${PATCH_TAR}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="*"
+IUSE="examples nls static test"
+RESTRICT="!test? ( test )"
+
+# gettext _IS_ required in RDEPEND because >=bison-3.7 links against
+# libtextstyle.so!!! (see bug #740754)
+DEPEND="
+	>=sys-devel/m4-1.4.16
+	>=sys-devel/gettext-0.21
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/flex
+	examples? ( dev-lang/perl )
+	test? ( dev-lang/perl )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) # ChangeLog-2012 ChangeLog-1998 PACKAGING README-alpha README-release
+
+src_prepare() {
+	# Record date to avoid 'config.status --recheck' & regen of 'tests/package.m4'
+	touch -r configure.ac old.configure.ac || die
+	touch -r configure old.configure || die
+
+	eapply "${WORKDIR}"/patches
+	default
+
+	# Restore date after patching
+	touch -r old.configure.ac configure.ac || die
+	touch -r old.configure configure || die
+
+	# The makefiles make the man page depend on the configure script
+	# which we patched above.  Touch it to prevent regeneration.
+	touch doc/bison.1 || die #548778 #538300#9
+
+	# Avoid regenerating the info page when the timezone is diff. #574492
+	sed -i '2iexport TZ=UTC' build-aux/mdate-sh || die
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	local myeconfargs=(
+		$(use_enable examples)
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# This one is installed by dev-util/yacc
+	mv "${ED}"/usr/bin/yacc{,.bison} || die
+	mv "${ED}"/usr/share/man/man1/yacc{,.bison}.1 || die
+
+	# We do not need liby.a
+	rm -r "${ED}"/usr/lib* || die
+}
+
+pkg_postinst() {
+	local f="${EROOT}/usr/bin/yacc"
+	if [[ ! -e ${f} ]] ; then
+		ln -s yacc.bison "${f}"
+	fi
+}
+
+pkg_postrm() {
+	# clean up the dead symlink when we get unmerged #377469
+	local f="${EROOT}/usr/bin/yacc"
+	if [[ -L ${f} && ! -e ${f} ]] ; then
+		rm -f "${f}"
+	fi
+}
diff --git a/sys-devel/bison/metadata.xml b/sys-devel/bison/metadata.xml
index 96a2d58..56c1244 100644
--- a/sys-devel/bison/metadata.xml
+++ b/sys-devel/bison/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index 4f7f691..b703cf9 100644
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -1 +1 @@
-DIST m4-1.4.16.tar.xz 1005264 SHA256 d5b5d51cf8f5b18f3bac39bc2f6b1e61f34d400136ae1a87d075e26a38028d5d SHA512 1123671ab3e0b1b13a4a08035e792a93af0d7d0a5b9027982fe7b5104488a0746906068a0f4774c1f1bc2648ba1bc74d690836e90ff9391464278e4ccbc7edf0 WHIRLPOOL 0438098dab71f6a66c2b18aed2941ef9a2152a8061c2f9903373a1348b261354429806c2bd313f55c7aaa612fe4c2f7628a1fff3c80819565df2a3b664485c23
+DIST m4-1.4.18.tar.xz 1207688 BLAKE2B debfaa4d25af6f583e2cd703e77b73775790f48f34e878eddd820c6b244a065c69495473ce5067be1f20ca07b2d6af9f90cffd33e12c18fd719c0d234eb5462a SHA512 06f583efc3855cd8477d8347544f4ae5153a3e50aea74d21968afa7214784ea3ddfc02d0a2b11324120d76a19f2e804d20de11a456b5da929eb6ae469519b174
diff --git a/sys-devel/m4/files/m4-1.4.16-fix-test-readlink.patch b/sys-devel/m4/files/m4-1.4.16-fix-test-readlink.patch
deleted file mode 100644
index bb887c4..0000000
--- a/sys-devel/m4/files/m4-1.4.16-fix-test-readlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tests/test-readlink.h
-+++ tests/test-readlink.h
-@@ -38,7 +38,7 @@
-   ASSERT (errno == ENOENT);
-   errno = 0;
-   ASSERT (func ("", buf, sizeof buf) == -1);
--  ASSERT (errno == ENOENT);
-+  ASSERT (errno == ENOENT || errno == EINVAL);
-   errno = 0;
-   ASSERT (func (".", buf, sizeof buf) == -1);
-   ASSERT (errno == EINVAL);
diff --git a/sys-devel/m4/files/m4-1.4.16-no-gets.patch b/sys-devel/m4/files/m4-1.4.16-no-gets.patch
deleted file mode 100644
index bb8069b..0000000
--- a/sys-devel/m4/files/m4-1.4.16-no-gets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/424978
-
-hack until m4 pulls a newer gnulib version
-
-From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Thu, 29 Mar 2012 13:30:41 -0600
-Subject: [PATCH] stdio: don't assume gets any more
-
-Gnulib intentionally does not have a gets module, and now that C11
-and glibc have dropped it, we should be more proactive about warning
-any user on a platform that still has a declaration of this dangerous
-interface.
-
---- a/lib/stdio.in.h
-+++ b/lib/stdio.in.h
-@@ -125,7 +125,6 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/sys-devel/m4/files/m4-1.4.17-posix_spawn.patch b/sys-devel/m4/files/m4-1.4.17-posix_spawn.patch
new file mode 100644
index 0000000..5954cc3
--- /dev/null
+++ b/sys-devel/m4/files/m4-1.4.17-posix_spawn.patch
@@ -0,0 +1,111 @@
+This fixes the search for posix_spawn() to use AC_SEARCH_LIBS which
+is needed for uClibc which puts the function in librt [1].  The fix
+is in gnulib commit d6eab2e [2], but we can't just apply that patch
+and autoreconf because that means we must depend on autotools.eclass
+and this leads to a circular dependency.  So we have to patch
+configure directlly.
+
+[1] https://bugs.gentoo.org/show_bug.cgi?id=580688
+[2] http://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=d6eab2e70fc5ccc82a73e5c988b76a229e4cd3d5
+[3] https://bugs.gentoo.org/show_bug.cgi?id=581086
+
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+
+diff -Naur m4-1.4.17.orig/configure m4-1.4.17/configure
+--- m4-1.4.17.orig/configure	2013-09-22 06:38:28.000000000 +0000
++++ m4-1.4.17/configure	2016-04-25 22:27:12.774118561 +0000
+@@ -808,6 +808,7 @@
+ GNULIB_SIGNAL_H_SIGPIPE
+ GNULIB_RAISE
+ GNULIB_PTHREAD_SIGMASK
++LIB_POSIX_SPAWN
+ REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN
+ REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2
+ REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE
+@@ -3590,7 +3591,6 @@
+ as_fn_append ac_func_list " mkstemp"
+ as_fn_append ac_func_list " nl_langinfo"
+ as_fn_append ac_func_list " pipe2"
+-as_fn_append ac_func_list " posix_spawn"
+ gl_printf_safe=yes
+ as_fn_append ac_func_list " isblank"
+ as_fn_append ac_func_list " iswctype"
+@@ -15877,8 +15881,78 @@
+ 
+ 
+ 
++  LIB_POSIX_SPAWN=
++
++  gl_saved_libs=$LIBS
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing posix_spawn" >&5
++$as_echo_n "checking for library containing posix_spawn... " >&6; }
++if ${ac_cv_search_posix_spawn+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char posix_spawn ();
++int
++main ()
++{
++return posix_spawn ();
++  ;
++  return 0;
++}
++_ACEOF
++for ac_lib in '' rt; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_search_posix_spawn=$ac_res
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext
++  if ${ac_cv_search_posix_spawn+:} false; then :
++  break
++fi
++done
++if ${ac_cv_search_posix_spawn+:} false; then :
++
++else
++  ac_cv_search_posix_spawn=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_posix_spawn" >&5
++$as_echo "$ac_cv_search_posix_spawn" >&6; }
++ac_res=$ac_cv_search_posix_spawn
++if test "$ac_res" != no; then :
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++  test "$ac_cv_search_posix_spawn" = "none required" ||
++                    LIB_POSIX_SPAWN=$ac_cv_search_posix_spawn
++fi
++
++    for ac_func in posix_spawn
++do :
++  ac_fn_c_check_func "$LINENO" "posix_spawn" "ac_cv_func_posix_spawn"
++if test "x$ac_cv_func_posix_spawn" = xyes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_POSIX_SPAWN 1
++_ACEOF
+ 
++fi
++done
+ 
++  LIBS=$gl_saved_libs
+ 
+   if test $ac_cv_func_posix_spawn != yes; then
+     HAVE_POSIX_SPAWN=0
diff --git a/sys-devel/m4/files/m4-1.4.18-darwin17-printf-n.patch b/sys-devel/m4/files/m4-1.4.18-darwin17-printf-n.patch
new file mode 100644
index 0000000..1c77ed7
--- /dev/null
+++ b/sys-devel/m4/files/m4-1.4.18-darwin17-printf-n.patch
@@ -0,0 +1,30 @@
+http://lists.gnu.org/archive/html/bug-gnulib/2017-07/txtmumXtpD69v.txt
+
+extract of only the relevant hunk to avoid irrelevant conflicts
+
+From c41f233c4c38e84023a16339782ee306f03e7f59 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <address@hidden>
+Date: Fri, 7 Jul 2017 14:10:20 -0700
+Subject: [PATCH] vasnprintf: port to macOS 10.13
+
+Problem reported by comex in:
+http://lists.gnu.org/archive/html/bug-gnulib/2017-07/msg00056.html
+* lib/vasnprintf.c (VASNPRINTF): Don’t use %n on macOS.
+
+diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
+index 9c2af0e..fecaf27 100644
+--- a/lib/vasnprintf.c
++++ b/lib/vasnprintf.c
+@@ -4869,7 +4869,11 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
+ #endif
+                   *fbp = dp->conversion;
+ #if USE_SNPRINTF
+-# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
++# if ! (((__GLIBC__ > 2                                                 \
++          || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3))                  \
++         && !defined __UCLIBC__)                                        \
++        || (defined __APPLE__ && defined __MACH__)                      \
++        || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
+                 fbp[1] = '%';
+                 fbp[2] = 'n';
+                 fbp[3] = '\0';
diff --git a/sys-devel/m4/files/m4-1.4.18-glibc228.patch b/sys-devel/m4/files/m4-1.4.18-glibc228.patch
new file mode 100644
index 0000000..6b5593b
--- /dev/null
+++ b/sys-devel/m4/files/m4-1.4.18-glibc228.patch
@@ -0,0 +1,310 @@
+Fix build failure on glibc-2.28:
+    fseeko.c: In function 'rpl_fseeko':
+    fseeko.c:110:4: error: #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib."
+       #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib."
+
+Patch by milan hodoscek.
+
+https://bugs.gentoo.org/663924
+--- a/old/stdio-impl.h
++++ b/lib/stdio-impl.h
+@@ -1,5 +1,5 @@
+ /* Implementation details of FILE streams.
+-   Copyright (C) 2007-2008, 2010-2016 Free Software Foundation, Inc.
++   Copyright (C) 2007-2008, 2010-2018 Free Software Foundation, Inc.
+ 
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -12,12 +12,18 @@
+    GNU General Public License for more details.
+ 
+    You should have received a copy of the GNU General Public License
+-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+ 
+ /* Many stdio implementations have the same logic and therefore can share
+    the same implementation of stdio extension API, except that some fields
+    have different naming conventions, or their access requires some casts.  */
+ 
++/* Glibc 2.28 made _IO_IN_BACKUP private.  For now, work around this
++   problem by defining it ourselves.  FIXME: Do not rely on glibc
++   internals.  */
++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
++# define _IO_IN_BACKUP 0x100
++#endif
+ 
+ /* BSD stdio derived implementations.  */
+ 
+@@ -29,10 +35,10 @@
+ #include <errno.h>                             /* For detecting Plan9.  */
+ 
+ #if defined __sferror || defined __DragonFly__ || defined __ANDROID__
+-  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
++  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+ 
+ # if defined __DragonFly__          /* DragonFly */
+-  /* See <http://www.dragonflybsd.org/cvsweb/src/lib/libc/stdio/priv_stdio.h?rev=HEAD&content-type=text/x-cvsweb-markup>.  */
++  /* See <https://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/lib/libc/stdio/priv_stdio.h>.  */
+ #  define fp_ ((struct { struct __FILE_public pub; \
+                          struct { unsigned char *_base; int _size; } _bf; \
+                          void *cookie; \
+@@ -49,30 +55,84 @@
+                          fpos_t _offset; \
+                          /* More fields, not relevant here.  */ \
+                        } *) fp)
+-  /* See <http://www.dragonflybsd.org/cvsweb/src/include/stdio.h?rev=HEAD&content-type=text/x-cvsweb-markup>.  */
++  /* See <https://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/include/stdio.h>.  */
+ #  define _p pub._p
+ #  define _flags pub._flags
+ #  define _r pub._r
+ #  define _w pub._w
++# elif defined __ANDROID__ /* Android */
++  /* Up to this commit from 2015-10-12
++     <https://android.googlesource.com/platform/bionic.git/+/f0141dfab10a4b332769d52fa76631a64741297a>
++     the innards of FILE were public, and fp_ub could be defined like for OpenBSD,
++     see <https://android.googlesource.com/platform/bionic.git/+/e78392637d5086384a5631ddfdfa8d7ec8326ee3/libc/stdio/fileext.h>
++     and <https://android.googlesource.com/platform/bionic.git/+/e78392637d5086384a5631ddfdfa8d7ec8326ee3/libc/stdio/local.h>.
++     After this commit, the innards of FILE are hidden.  */
++#  define fp_ ((struct { unsigned char *_p; \
++                         int _r; \
++                         int _w; \
++                         int _flags; \
++                         int _file; \
++                         struct { unsigned char *_base; size_t _size; } _bf; \
++                         int _lbfsize; \
++                         void *_cookie; \
++                         void *_close; \
++                         void *_read; \
++                         void *_seek; \
++                         void *_write; \
++                         struct { unsigned char *_base; size_t _size; } _ext; \
++                         unsigned char *_up; \
++                         int _ur; \
++                         unsigned char _ubuf[3]; \
++                         unsigned char _nbuf[1]; \
++                         struct { unsigned char *_base; size_t _size; } _lb; \
++                         int _blksize; \
++                         fpos_t _offset; \
++                         /* More fields, not relevant here.  */ \
++                       } *) fp)
+ # else
+ #  define fp_ fp
+ # endif
+ 
+-# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __ANDROID__ /* NetBSD >= 1.5ZA, OpenBSD, Android */
++# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __minix /* NetBSD >= 1.5ZA, OpenBSD, Minix 3 */
+   /* See <http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup>
+-     and <http://www.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup> */
++     and <https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup>
++     and <https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/master/lib/libc/stdio/fileext.h> */
+   struct __sfileext
+     {
+       struct  __sbuf _ub; /* ungetc buffer */
+       /* More fields, not relevant here.  */
+     };
+ #  define fp_ub ((struct __sfileext *) fp->_ext._base)->_ub
+-# else                                         /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin, Android */
++# elif defined __ANDROID__                     /* Android */
++  struct __sfileext
++    {
++      struct { unsigned char *_base; size_t _size; } _ub; /* ungetc buffer */
++      /* More fields, not relevant here.  */
++    };
++#  define fp_ub ((struct __sfileext *) fp_->_ext._base)->_ub
++# else                                         /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin */
+ #  define fp_ub fp_->_ub
+ # endif
+ 
+ # define HASUB(fp) (fp_ub._base != NULL)
+ 
++# if defined __ANDROID__ /* Android */
++  /* Needed after this commit from 2016-01-25
++     <https://android.googlesource.com/platform/bionic.git/+/e70e0e9267d069bf56a5078c99307e08a7280de7> */
++#  ifndef __SEOF
++#   define __SLBF 1
++#   define __SNBF 2
++#   define __SRD 4
++#   define __SWR 8
++#   define __SRW 0x10
++#   define __SEOF 0x20
++#   define __SERR 0x40
++#  endif
++#  ifndef __SOFF
++#   define __SOFF 0x1000
++#  endif
++# endif
++
+ #endif
+ 
+ 
+@@ -81,7 +141,7 @@
+ #ifdef __TANDEM                     /* NonStop Kernel */
+ # ifndef _IOERR
+ /* These values were determined by the program 'stdioext-flags' at
+-   <http://lists.gnu.org/archive/html/bug-gnulib/2010-12/msg00165.html>.  */
++   <https://lists.gnu.org/r/bug-gnulib/2010-12/msg00165.html>.  */
+ #  define _IOERR   0x40
+ #  define _IOREAD  0x80
+ #  define _IOWRT    0x4
+@@ -99,6 +159,8 @@
+                          int _file; \
+                          unsigned int _flag; \
+                        } *) fp)
++# elif defined __VMS                /* OpenVMS */
++#  define fp_ ((struct _iobuf *) fp)
+ # else
+ #  define fp_ fp
+ # endif
+@@ -110,7 +172,7 @@
+ #  define _flag __flag
+ # endif
+ 
+-#elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__  /* newer Windows with MSVC */
++#elif defined _WIN32 && ! defined __CYGWIN__  /* newer Windows with MSVC */
+ 
+ /* <stdio.h> does not define the innards of FILE any more.  */
+ # define WINDOWS_OPAQUE_FILE
+@@ -130,7 +192,7 @@ struct _gl_real_FILE
+ # define fp_ ((struct _gl_real_FILE *) fp)
+ 
+ /* These values were determined by a program similar to the one at
+-   <http://lists.gnu.org/archive/html/bug-gnulib/2010-12/msg00165.html>.  */
++   <https://lists.gnu.org/r/bug-gnulib/2010-12/msg00165.html>.  */
+ # define _IOREAD   0x1
+ # define _IOWRT    0x2
+ # define _IORW     0x4
+--- a/old/fseeko.c
++++ b/lib/fseeko.c
+@@ -1,5 +1,5 @@
+ /* An fseeko() function that, together with fflush(), is POSIX compliant.
+-   Copyright (C) 2007-2016 Free Software Foundation, Inc.
++   Copyright (C) 2007-2018 Free Software Foundation, Inc.
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -12,7 +12,7 @@
+    GNU General Public License for more details.
+ 
+    You should have received a copy of the GNU General Public License along
+-   with this program; if not, see <http://www.gnu.org/licenses/>.  */
++   with this program; if not, see <https://www.gnu.org/licenses/>.  */
+ 
+ #include <config.h>
+ 
+@@ -33,9 +33,9 @@ fseeko (FILE *fp, off_t offset, int whence)
+ #endif
+ #if _GL_WINDOWS_64_BIT_OFF_T
+ # undef fseeko
+-# if HAVE__FSEEKI64 /* msvc, mingw64 */
++# if HAVE__FSEEKI64 && HAVE_DECL__FSEEKI64 /* msvc, mingw since msvcrt8.0, mingw64 */
+ #  define fseeko _fseeki64
+-# else /* mingw */
++# else /* mingw before msvcrt8.0 */
+ #  define fseeko fseeko64
+ # endif
+ #endif
+@@ -47,12 +47,13 @@ fseeko (FILE *fp, off_t offset, int whence)
+ #endif
+ 
+   /* These tests are based on fpurge.c.  */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++  /* GNU libc, BeOS, Haiku, Linux libc5 */
+   if (fp->_IO_read_end == fp->_IO_read_ptr
+       && fp->_IO_write_ptr == fp->_IO_write_base
+       && fp->_IO_save_base == NULL)
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+-  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
++  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+ # if defined __SL64 && defined __SCLE /* Cygwin */
+   if ((fp->_flags & __SL64) == 0)
+     {
+@@ -80,7 +81,7 @@ fseeko (FILE *fp, off_t offset, int whence)
+ #elif defined __minix               /* Minix */
+   if (fp_->_ptr == fp_->_buf
+       && (fp_->_ptr == NULL || fp_->_count == 0))
+-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel */
++#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */
+   if (fp_->_ptr == fp_->_base
+       && (fp_->_ptr == NULL || fp_->_cnt == 0))
+ #elif defined __UCLIBC__            /* uClibc */
+@@ -117,18 +118,19 @@ fseeko (FILE *fp, off_t offset, int whence)
+       if (pos == -1)
+         {
+ #if defined __sferror || defined __DragonFly__ || defined __ANDROID__
+-          /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
++          /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+           fp_->_flags &= ~__SOFF;
+ #endif
+           return -1;
+         }
+ 
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++      /* GNU libc, BeOS, Haiku, Linux libc5 */
+       fp->_flags &= ~_IO_EOF_SEEN;
+       fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+-      /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
+-# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000)
++      /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
++# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000) || defined __minix
+       /* fp_->_offset is typed as an integer.  */
+       fp_->_offset = pos;
+ # else
+@@ -150,7 +152,7 @@ fseeko (FILE *fp, off_t offset, int whence)
+       fp_->_flags &= ~__SEOF;
+ #elif defined __EMX__               /* emx+gcc */
+       fp->_flags &= ~_IOEOF;
+-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel */
++#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */
+       fp_->_flag &= ~_IOEOF;
+ #elif defined __MINT__              /* Atari FreeMiNT */
+       fp->__offset = pos;
+--- a/old/freadahead.c
++++ b/lib/freadahead.c
+@@ -1,5 +1,5 @@
+ /* Retrieve information about a FILE stream.
+-   Copyright (C) 2007-2016 Free Software Foundation, Inc.
++   Copyright (C) 2007-2018 Free Software Foundation, Inc.
+ 
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -12,7 +12,7 @@
+    GNU General Public License for more details.
+ 
+    You should have received a copy of the GNU General Public License
+-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+ 
+ #include <config.h>
+ 
+@@ -22,17 +22,26 @@
+ #include <stdlib.h>
+ #include "stdio-impl.h"
+ 
++#if defined __DragonFly__
++/* Defined in libc, but not declared in <stdio.h>.  */
++extern size_t __sreadahead (FILE *);
++#endif
++
++/* This file is not used on systems that have the __freadahead function,
++   namely musl libc.  */
++
+ size_t
+ freadahead (FILE *fp)
+ {
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++  /* GNU libc, BeOS, Haiku, Linux libc5 */
+   if (fp->_IO_write_ptr > fp->_IO_write_base)
+     return 0;
+   return (fp->_IO_read_end - fp->_IO_read_ptr)
+          + (fp->_flags & _IO_IN_BACKUP ? fp->_IO_save_end - fp->_IO_save_base :
+             0);
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+-  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
++  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+   if ((fp_->_flags & __SWR) != 0 || fp_->_r < 0)
+     return 0;
+ # if defined __DragonFly__
diff --git a/sys-devel/m4/m4-1.4.16.ebuild b/sys-devel/m4/m4-1.4.16.ebuild
deleted file mode 100644
index f41e6ff..0000000
--- a/sys-devel/m4/m4-1.4.16.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.16.ebuild,v 1.13 2013/02/18 01:07:35 zmedico Exp $
-
-EAPI="3"
-
-inherit eutils
-
-DESCRIPTION="GNU macro processor"
-HOMEPAGE="http://www.gnu.org/software/m4/m4.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="*"
-IUSE="examples"
-
-# remember: cannot dep on autoconf since it needs us
-DEPEND="app-arch/xz-utils"
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-test-readlink.patch #376639
-	epatch "${FILESDIR}"/${P}-no-gets.patch #424978
-}
-
-src_configure() {
-	# Disable automagic dependency over libsigsegv; see bug #278026
-	export ac_cv_libsigsegv=no
-
-	local myconf=""
-	[[ ${USERLAND} != "GNU" ]] && myconf="--program-prefix=g"
-	econf --enable-changeword ${myconf}
-}
-
-src_test() {
-	[[ -d /none ]] && die "m4 tests will fail with /none/" #244396
-	emake check || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	# autoconf-2.60 for instance, first checks gm4, then m4.  If we don't have
-	# gm4, it might find gm4 from outside the prefix on for instance Darwin
-	use prefix && dosym /usr/bin/m4 /usr/bin/gm4
-	dodoc BACKLOG ChangeLog NEWS README* THANKS TODO
-	if use examples ; then
-		docinto examples
-		dodoc examples/*
-		rm -f "${ED}"/usr/share/doc/${PF}/examples/Makefile*
-	fi
-}
diff --git a/sys-devel/m4/m4-1.4.18-r1.ebuild b/sys-devel/m4/m4-1.4.18-r1.ebuild
new file mode 100644
index 0000000..ee0a5a4
--- /dev/null
+++ b/sys-devel/m4/m4-1.4.18-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="GNU macro processor"
+HOMEPAGE="https://www.gnu.org/software/m4/m4.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="*"
+IUSE="examples"
+
+# remember: cannot dep on autoconf since it needs us
+DEPEND="app-arch/xz-utils"
+RDEPEND=""
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-darwin17-printf-n.patch
+	eapply "${FILESDIR}"/${P}-glibc228.patch #663924
+	default
+}
+
+src_configure() {
+	# Disable automagic dependency over libsigsegv; see bug #278026
+	export ac_cv_libsigsegv=no
+
+	local myconf=""
+	[[ ${USERLAND} != "GNU" ]] && myconf="--program-prefix=g"
+	econf --enable-changeword ${myconf}
+}
+
+src_test() {
+	[[ -d /none ]] && die "m4 tests will fail with /none/" #244396
+	emake check
+}
+
+src_install() {
+	default
+	# autoconf-2.60 for instance, first checks gm4, then m4.  If we don't have
+	# gm4, it might find gm4 from outside the prefix on for instance Darwin
+	use prefix && dosym m4 /usr/bin/gm4
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/
+		rm -f "${ED}"/usr/share/doc/${PF}/examples/Makefile*
+	fi
+}
diff --git a/sys-devel/m4/metadata.xml b/sys-devel/m4/metadata.xml
index 96a2d58..56c1244 100644
--- a/sys-devel/m4/metadata.xml
+++ b/sys-devel/m4/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-firmware/seabios/Manifest b/sys-firmware/seabios/Manifest
index c0824e5..0381c39 100644
--- a/sys-firmware/seabios/Manifest
+++ b/sys-firmware/seabios/Manifest
@@ -1,2 +1,4 @@
-DIST seabios-1.11.0-bin.tar.xz 158552 SHA256 d8cc0c4be6e95030ebb9286000b595fc3bad0b6d5ed84eb0f9818550e92e464c SHA512 03a1523dc99dbf6e353e7844a4f12020d88bf8d5cbfd187007663ab1b02447b02694f27ee93aa46a18a5ab161f13b1ffe62f2d0f678cd86975a3d53295a6eb1e WHIRLPOOL 15dbc5fd87157f7e7ab33227c02f279ef8987d8c4f63c1f1ccd2afa6237247bad592347d58d09d63e266ea3a4c34503dc7baa43b263f97b2876c8a547c680b2f
-DIST seabios-1.11.0.tar.gz 607746 SHA256 622b432ebb8a3b0b13b8accd6d4a196a7eb3af11f243815e5f7d75d9ceb99bf7 SHA512 cae79c720bfbba3321777bbc6d5bde432fe56e2ba8f1be8acfebbde0bd453a58e889f5fa24db6055dca0a3a56d35b907761723ea35ef248c5f812129d0a27b77 WHIRLPOOL 569fa854402fe8e121baa390c9c04b46019f3a38b4116d11c0f13ae8a1e8811dc5cd40ee25ac46f056f6c6ef396e3ca37b8a1ed105e23ab6ae32a32a045dd711
+DIST seabios-1.12.0-bin.tar.xz 162492 BLAKE2B 9a5a349226ed7efbed328493dc057e232203b251677a23f1f09c133743ff0ca6b05270c9d27460be1d8897888fe23ff7bdfa122023fa8ddb23af03d5b9b6f8dd SHA512 f7a0395d621245093bb9a278d95ecc3d4e8d23f620058cd4fddaf885c8b86256f6258f3fd8173c1d24c03306f44d180e768bf8005ee123bc4b699b9f0ca371be
+DIST seabios-1.12.0.tar.gz 613542 BLAKE2B f145c2db716996bfa9e5c014086ccfaa8ae96ebc158f34303b122b7bf209408c567665d8691364df8d8e886f63e0e72a3f3cd319dfa86ef581023201b5d94e53 SHA512 e52c5363e5bb37b5286e55545aa06bd126218f9d0e3a06ac2e189de68fe3de3256c11ca1bb13357a9c384d7e3af6284083ff3aa587688b5de04ef11b97bdfa27
+DIST seabios-1.14.0-bin.tar.xz 170160 BLAKE2B 1ab471ce0c6e27633ec42a66e3069496be84de713baab5de4f297821bd0da26404f7f70abc82e223ec5aa317a878889ae92b019988c72d24f77e7dcc5865f916 SHA512 7964e9bb7dff4fd6593f5d6d64efc4b1460750461b86635dbe5255d2086d619f51711d7a35e4dc20e556f705091c0950afabeddcd2e8876f05ce14f9ca73ed71
+DIST seabios-1.14.0.tar.gz 628985 BLAKE2B cc1126925dab1551a655680d20d06ebf28c12c386500d1ee4df9e1a99403b4c5bc6a66c2cc5ef58b4c3d6d7226f35007506a6a1855c2cf2742469dcb7aba05bb SHA512 215c42f59425f8abd062be7b11fc0e39c977cee5001a2381551b0f851ac337d0dd53c065267e6dee0e710ffd700fa635f9007b89da8dfce0f47122c984ee8146
diff --git a/sys-firmware/seabios/files/README b/sys-firmware/seabios/files/README
new file mode 100644
index 0000000..a7aed6d
--- /dev/null
+++ b/sys-firmware/seabios/files/README
@@ -0,0 +1,2 @@
+The configuration files config.vga-xxx are based on the variants found in
+the qemu/roms/ tree.
diff --git a/sys-firmware/seabios/files/seabios/README b/sys-firmware/seabios/files/seabios/README
deleted file mode 100644
index 7030949..0000000
--- a/sys-firmware/seabios/files/seabios/README
+++ /dev/null
@@ -1 +0,0 @@
-The config.vga-xxx files come from the qemu/roms/ tree.
diff --git a/sys-firmware/seabios/files/seavgabios/README b/sys-firmware/seabios/files/seavgabios/README
deleted file mode 100644
index 7030949..0000000
--- a/sys-firmware/seabios/files/seavgabios/README
+++ /dev/null
@@ -1 +0,0 @@
-The config.vga-xxx files come from the qemu/roms/ tree.
diff --git a/sys-firmware/seabios/metadata.xml b/sys-firmware/seabios/metadata.xml
index 0d64e0a..4235b1b 100644
--- a/sys-firmware/seabios/metadata.xml
+++ b/sys-firmware/seabios/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>cardoe@gentoo.org</email>
-		<name>Doug Goldstein</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
diff --git a/sys-firmware/seabios/seabios-1.11.0.ebuild b/sys-firmware/seabios/seabios-1.11.0.ebuild
deleted file mode 100644
index 6030925..0000000
--- a/sys-firmware/seabios/seabios-1.11.0.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit eutils toolchain-funcs python-any-r1
-
-# SeaBIOS maintainers sometimes don't release stable tarballs or stable
-# binaries to generate the stable tarball the following is necessary:
-# git clone git://git.seabios.org/seabios.git && cd seabios
-# git archive --output seabios-${PV}.tar.gz --prefix seabios-${PV}/ rel-${PV}
-
-if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then
-	EGIT_REPO_URI="git://git.seabios.org/seabios.git"
-	inherit git-r3
-else
-	KEYWORDS="*"
-
-	# Binary versions taken from fedora:
-	# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
-	#   seabios-bin-1.10.2-1.fc27.noarch.rpm
-	#   seavgabios-bin-1.10.2-1.fc27.noarch.rpm
-	SRC_URI="
-		!binary? ( https://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz )
-		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )"
-fi
-
-DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
-HOMEPAGE="https://www.seabios.org/"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-IUSE="+binary debug +seavgabios"
-
-REQUIRED_USE="debug? ( !binary )
-	!amd64? ( !x86? ( binary ) )"
-
-# The amd64/x86 check is needed to workaround #570892.
-SOURCE_DEPEND="
-	>=sys-power/iasl-20060912
-	${PYTHON_DEPS}"
-DEPEND="
-	!binary? (
-		amd64? ( ${SOURCE_DEPEND} )
-		x86? ( ${SOURCE_DEPEND} )
-	)"
-RDEPEND=""
-
-pkg_pretend() {
-	if ! use binary; then
-		ewarn "You have decided to compile your own SeaBIOS. This is not"
-		ewarn "supported by upstream unless you use their recommended"
-		ewarn "toolchain (which you are not)."
-		elog
-		ewarn "If you are intending to use this build with QEMU, realize"
-		ewarn "you will not receive any support if you have compiled your"
-		ewarn "own SeaBIOS. Virtual machines subtly fail based on changes"
-		ewarn "in SeaBIOS."
-	fi
-}
-
-pkg_setup() {
-	use binary || python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	# This simplifies the logic between binary & source builds.
-	mkdir -p "${S}"
-}
-
-src_configure() {
-	use binary && return
-
-	tc-ld-disable-gold #438058
-
-	if use debug ; then
-		echo "CONFIG_DEBUG_LEVEL=8" >.config
-	fi
-	_emake config
-}
-
-_emake() {
-	LANG=C \
-	emake V=1 \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		AR="$(tc-getAR)" \
-		OBJCOPY="$(tc-getOBJCOPY)" \
-		RANLIB="$(tc-getRANLIB)" \
-		OBJDUMP="$(tc-getOBJDUMP)" \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		VERSION="Gentoo/${EGIT_COMMIT:-${PVR}}" \
-		"$@"
-}
-
-src_compile() {
-	use binary && return
-
-	cp "${FILESDIR}/seabios/config.seabios-256k" .config || die
-	_emake oldnoconfig
-	_emake out/bios.bin
-	mv out/bios.bin ../bios-256k.bin || die
-
-	if use seavgabios ; then
-		local config t targets=(
-			cirrus
-			isavga
-			qxl
-			stdvga
-			virtio
-			vmware
-		)
-		for t in "${targets[@]}" ; do
-			emake clean distclean
-			cp "${FILESDIR}/seavgabios/config.vga-${t}" .config || die
-			_emake oldnoconfig
-			_emake out/vgabios.bin
-			cp out/vgabios.bin ../vgabios-${t}.bin || die
-		done
-	fi
-}
-
-src_install() {
-
-	insinto /usr/share/seabios
-	use binary && doins ../bios.bin
-	doins ../bios-256k.bin
-
-	if use seavgabios ; then
-		insinto /usr/share/seavgabios
-		doins ../vgabios*.bin
-	fi
-}
diff --git a/sys-firmware/seabios/seabios-1.14.0.ebuild b/sys-firmware/seabios/seabios-1.14.0.ebuild
new file mode 100644
index 0000000..78fb1cf
--- /dev/null
+++ b/sys-firmware/seabios/seabios-1.14.0.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6..8} )
+
+inherit toolchain-funcs python-any-r1
+
+# SeaBIOS maintainers sometimes don't release stable tarballs or stable
+# binaries to generate the stable tarball the following is necessary:
+# git clone git://git.seabios.org/seabios.git && cd seabios
+# git archive --output seabios-${PV}.tar.gz --prefix seabios-${PV}/ rel-${PV}
+
+if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then
+	EGIT_REPO_URI="git://git.seabios.org/seabios.git"
+	inherit git-r3
+else
+	KEYWORDS="*"
+
+	SRC_URI="
+		!binary? ( https://www.seabios.org/downloads/${P}.tar.gz )
+		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )"
+fi
+
+DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
+HOMEPAGE="https://www.seabios.org/"
+
+LICENSE="LGPL-3 GPL-3"
+SLOT="0"
+IUSE="+binary debug +seavgabios"
+
+REQUIRED_USE="debug? ( !binary )"
+
+SOURCE_DEPEND="
+	>=sys-power/iasl-20060912
+	${PYTHON_DEPS}"
+DEPEND="
+	!binary? (
+		${SOURCE_DEPEND}
+	)"
+RDEPEND=""
+
+choose_target_chost() {
+	if [[ -n "${CC}" ]]; then
+		${CC} -dumpmachine
+		return
+	fi
+
+	if use amd64 || use x86; then
+		# Use the native compiler
+		echo "${CHOST}"
+		return
+	fi
+
+	local i
+	for i in x86_64 i686 i586 i486 i386 ; do
+		i=${i}-pc-linux-gnu
+		type -P ${i}-gcc > /dev/null && echo ${i} && return
+	done
+}
+
+pkg_pretend() {
+	if ! use binary; then
+		ewarn "You have decided to compile your own SeaBIOS. This is not"
+		ewarn "supported by upstream unless you use their recommended"
+		ewarn "toolchain (which you are not)."
+		elog
+		ewarn "If you are intending to use this build with QEMU, realize"
+		ewarn "you will not receive any support if you have compiled your"
+		ewarn "own SeaBIOS. Virtual machines subtly fail based on changes"
+		ewarn "in SeaBIOS."
+		if [[ -z "$(choose_target_chost)" ]]; then
+			elog
+			eerror "Before you can compile ${PN}[-binary], you need to install a x86 cross-compiler"
+			eerror "Run the following commands:"
+			eerror "  emerge crossdev"
+			eerror "  crossdev --stable -t x86_64-pc-linux-gnu"
+			die "cross-compiler is needed"
+		fi
+	fi
+}
+
+pkg_setup() {
+	use binary || python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	# This simplifies the logic between binary & source builds.
+	mkdir -p "${S}"
+}
+
+src_prepare() {
+	default
+
+	# Ensure precompiled iasl files are never used
+	find "${WORKDIR}" -name '*.hex' -delete || die
+}
+
+src_configure() {
+	use binary && return
+
+	tc-ld-disable-gold #438058
+
+	if use debug ; then
+		echo "CONFIG_DEBUG_LEVEL=8" >.config
+	fi
+	_emake config
+}
+
+_emake() {
+	LANG=C \
+	emake V=1 \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		AR="$(tc-getAR)" \
+		AS="$(tc-getAS)" \
+		OBJCOPY="$(tc-getOBJCOPY)" \
+		RANLIB="$(tc-getRANLIB)" \
+		OBJDUMP="$(tc-getOBJDUMP)" \
+		HOST_CC="$(tc-getBUILD_CC)" \
+		VERSION="Gentoo/${EGIT_COMMIT:-${PVR}}" \
+		"$@"
+}
+
+src_compile() {
+	use binary && return
+
+	local TARGET_CHOST=$(choose_target_chost)
+
+	cp "${FILESDIR}/seabios/config.seabios-256k" .config || die
+	_emake oldnoconfig
+	CHOST="${TARGET_CHOST}" _emake iasl
+	CHOST="${TARGET_CHOST}" _emake out/bios.bin
+	mv out/bios.bin ../bios-256k.bin || die
+
+	if use seavgabios ; then
+		local config t targets=(
+			cirrus
+			isavga
+			qxl
+			stdvga
+			virtio
+			vmware
+		)
+		for t in "${targets[@]}" ; do
+			emake clean distclean
+			cp "${FILESDIR}/seavgabios/config.vga-${t}" .config || die
+			_emake oldnoconfig
+			CHOST="${TARGET_CHOST}" _emake out/vgabios.bin
+			cp out/vgabios.bin ../vgabios-${t}.bin || die
+		done
+	fi
+}
+
+src_install() {
+	insinto /usr/share/seabios
+	doins ../bios-256k.bin
+
+	if use seavgabios ; then
+		insinto /usr/share/seavgabios
+		doins ../vgabios*.bin
+	fi
+}
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 9961a25..96ff3e3 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1 +1 @@
-DIST cryptsetup-2.3.2.tar.xz 11037076 BLAKE2B b0f8a1a274e6b95b12aa7172dbdd41e512aea2c87a98d62b8b4d4cbb898b2d4b82e250368e385c4d4acc8e77046ea4b4f7be730750587569572c4b9490815bc1 SHA512 c5eb41751ca64ff906187f40805705570c261816b014dfcdbf2777f42e53668e32966197092a2235b8f6a7a4e7f9c3f301d82f17c45cfbcff96b9818631d7e5f
+DIST cryptsetup-2.3.4.tar.xz 11114004 BLAKE2B 680e6eeb594737aeb8330b0ac8638e94941bdcc56fc3441b6f1bc4f3d209d768096e23a7f840dc1012f9e63fae0fdbc0e72d735d89e92a621cec88ea59560f19 SHA512 db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
deleted file mode 100644
index 24a96ee..0000000
--- a/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info libtool
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
-SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/12" # libcryptsetup.so version
-[[ ${PV} != *_rc* ]] && \
-KEYWORDS="*"
-CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
-# we don't support nss since it doesn't allow cryptsetup to be built statically
-# and it's missing ripemd160 support so it can't provide full backward compatibility
-IUSE="${CRYPTO_BACKENDS} +argon2 libressl luks1_default nls pwquality reencrypt static static-libs +udev urandom"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-	libressl? ( openssl )
-	static? ( !gcrypt )" #496612
-
-LIB_DEPEND="
-	dev-libs/json-c:=[static-libs(+)]
-	dev-libs/libgpg-error[static-libs(+)]
-	dev-libs/popt[static-libs(+)]
-	>=sys-apps/util-linux-2.31-r1[static-libs(+)]
-	argon2? ( app-crypt/argon2:=[static-libs(+)] )
-	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-	openssl? (
-		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-	)
-	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-	sys-fs/lvm2[static-libs(+)]
-	udev? ( virtual/libudev[static-libs(-)] )"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# !static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-	${LIB_DEPEND//\[static-libs\([+-]\)\]}"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
-
-pkg_pretend() {
-	if ! use luks1_default ; then
-		ewarn "WARNING! WARNING! WARNING!"
-		ewarn "You have chosen LUKS2 as your default format."
-		ewarn "This can break LUKS1 backwards compatibility."
-		ewarn "Enable \"luks1_default\" USE flag if you need backwards compatibility."
-	fi
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-}
-
-src_prepare() {
-	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	if use kernel ; then
-		ewarn "Note that kernel backend is very slow for this type of operation"
-		ewarn "and is provided mainly for embedded systems wanting to avoid"
-		ewarn "userspace crypto libraries."
-	fi
-
-	local myeconfargs=(
-		--disable-internal-argon2
-		--enable-shared
-		--sbindir=/sbin
-		# for later use
-		--with-default-luks-format=LUKS$(usex luks1_default 1 2)
-		--with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d"
-		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
-		$(use_enable argon2 libargon2)
-		$(use_enable nls)
-		$(use_enable pwquality)
-		$(use_enable reencrypt cryptsetup-reencrypt)
-		$(use_enable static static-cryptsetup)
-		$(use_enable static-libs static)
-		$(use_enable udev)
-		$(use_enable !urandom dev-random)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	if [[ ! -e /dev/mapper/control ]] ; then
-		ewarn "No /dev/mapper/control found -- skipping tests"
-		return 0
-	fi
-
-	local p
-	for p in /dev/mapper /dev/loop* ; do
-		addwrite ${p}
-	done
-
-	default
-}
-
-src_install() {
-	default
-
-	if use static ; then
-		mv "${ED}"/sbin/cryptsetup{.static,} || die
-		mv "${ED}"/sbin/veritysetup{.static,} || die
-		if use reencrypt ; then
-			mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die
-		fi
-	fi
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	dodoc docs/v*ReleaseNotes
-
-	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
-	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
new file mode 100644
index 0000000..94b8eb1
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info libtool
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
+SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/12" # libcryptsetup.so version
+[[ ${PV} != *_rc* ]] && \
+KEYWORDS="*"
+CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
+# we don't support nss since it doesn't allow cryptsetup to be built statically
+# and it's missing ripemd160 support so it can't provide full backward compatibility
+IUSE="${CRYPTO_BACKENDS} +argon2 libressl nls pwquality reencrypt static static-libs +udev urandom"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+	libressl? ( openssl )
+	static? ( !gcrypt )" #496612
+
+LIB_DEPEND="
+	dev-libs/json-c:=[static-libs(+)]
+	dev-libs/libgpg-error[static-libs(+)]
+	dev-libs/popt[static-libs(+)]
+	>=sys-apps/util-linux-2.31-r1[static-libs(+)]
+	argon2? ( app-crypt/argon2:=[static-libs(+)] )
+	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+	openssl? (
+		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	)
+	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+	sys-fs/lvm2[static-libs(+)]
+	udev? ( virtual/libudev[static-libs(-)] )"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. #414665
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+	${LIB_DEPEND//\[static-libs\([+-]\)\]}"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
+
+pkg_setup() {
+	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
+	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
+	local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
+	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
+	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
+	check_extra_config
+}
+
+src_prepare() {
+	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	if use kernel ; then
+		ewarn "Note that kernel backend is very slow for this type of operation"
+		ewarn "and is provided mainly for embedded systems wanting to avoid"
+		ewarn "userspace crypto libraries."
+	fi
+
+	local myeconfargs=(
+		--disable-internal-argon2
+		--enable-shared
+		--sbindir=/sbin
+		# for later use
+		--with-default-luks-format=LUKS2
+		--with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d"
+		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
+		$(use_enable argon2 libargon2)
+		$(use_enable nls)
+		$(use_enable pwquality)
+		$(use_enable reencrypt cryptsetup-reencrypt)
+		$(use_enable static static-cryptsetup)
+		$(use_enable static-libs static)
+		$(use_enable udev)
+		$(use_enable !urandom dev-random)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if [[ ! -e /dev/mapper/control ]] ; then
+		ewarn "No /dev/mapper/control found -- skipping tests"
+		return 0
+	fi
+
+	local p
+	for p in /dev/mapper /dev/loop* ; do
+		addwrite ${p}
+	done
+
+	default
+}
+
+src_install() {
+	default
+
+	if use static ; then
+		mv "${ED}"/sbin/cryptsetup{.static,} || die
+		mv "${ED}"/sbin/veritysetup{.static,} || die
+		if use reencrypt ; then
+			mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die
+		fi
+	fi
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	dodoc docs/v*ReleaseNotes
+
+	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
+	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
+}
diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest
index 1a06fe8..4372c89 100644
--- a/sys-fs/dosfstools/Manifest
+++ b/sys-fs/dosfstools/Manifest
@@ -1 +1,2 @@
-DIST dosfstools-4.1.tar.xz 172936 SHA256 e6b2aca70ccc3fe3687365009dd94a2e18e82b688ed4e260e04b7412471cc173 SHA512 e7a8aab34255d15e6865a7b031971352af1255134fab83389673bcc3cbd6ba255241bd2429070aeb4b927f8d7d73ccf1aeafe94566b133e88e7586897c317b78 WHIRLPOOL 6504926aab2d38b03ac70af06d969c1e9576fa6604939e57182d5e3acc692651080e5b5f5af8b2f9a1c27392a0c26a89da7ab02ad0f530dd38399d5a6393d115
+DIST dosfstools-4.1.tar.xz 172936 BLAKE2B d8ef617d9dbdc21318c4f43e2fd6dca1d3452ab46253b055d8fef09aa693bcf63ef58076a49f305bb21de87298bae5be6b626065dfcbd90935af68709e2c3c6a SHA512 e7a8aab34255d15e6865a7b031971352af1255134fab83389673bcc3cbd6ba255241bd2429070aeb4b927f8d7d73ccf1aeafe94566b133e88e7586897c317b78
+DIST dosfstools-4.2.tar.gz 320917 BLAKE2B c55c7592aa80f1fe39e838c83e147ad7141ddd0f72c9c000ba7708ecb7287c3a92b4b52f72c8d0d1171b0f9609dfb7861bbbe475c5cbd7011151c93c2b1d3d0d SHA512 3cc0808edb4432428df8a67da4bb314fd1f27adc4a05754c1a492091741a7b6875ebd9f6a509cc4c5ad85643fc40395b6e0cadee548b25cc439cc9b725980156
diff --git a/sys-fs/dosfstools/dosfstools-4.1.ebuild b/sys-fs/dosfstools/dosfstools-4.1.ebuild
deleted file mode 100644
index 6d49eaa..0000000
--- a/sys-fs/dosfstools/dosfstools-4.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat"
-HOMEPAGE="https://github.com/dosfstools/dosfstools"
-SRC_URI="https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="*"
-IUSE="compat test +udev"
-
-CDEPEND="udev? ( virtual/libudev )"
-DEPEND="${CDEPEND}
-	test? ( app-editors/vim-core )
-	udev? ( virtual/pkgconfig )"
-RDEPEND="${CDEPEND}"
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable compat compat-symlinks) \
-		$(use_with udev)
-}
-
-src_install() {
-	default
-	if ! use compat; then
-		# Keep fsck -t vfat and mkfs -t vfat working, bug 584980.
-		dosym fsck.fat /usr/sbin/fsck.vfat
-		dosym mkfs.fat /usr/sbin/mkfs.vfat
-	fi
-}
diff --git a/sys-fs/dosfstools/dosfstools-4.2.ebuild b/sys-fs/dosfstools/dosfstools-4.2.ebuild
new file mode 100644
index 0000000..dc44d2e
--- /dev/null
+++ b/sys-fs/dosfstools/dosfstools-4.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat"
+HOMEPAGE="https://github.com/dosfstools/dosfstools"
+SRC_URI="https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="*"
+IUSE="compat +iconv test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? ( app-editors/vim-core )
+	iconv? ( virtual/libiconv )
+"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable compat compat-symlinks)
+		$(use_with iconv)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	if ! use compat ; then
+		# Keep fsck -t vfat and mkfs -t vfat working, bug 584980.
+		dosym fsck.fat /usr/sbin/fsck.vfat
+		dosym mkfs.fat /usr/sbin/mkfs.vfat
+	fi
+}
diff --git a/sys-fs/dosfstools/files/dosfstools-4.0-udevlibs.patch b/sys-fs/dosfstools/files/dosfstools-4.0-udevlibs.patch
deleted file mode 100644
index 2320477..0000000
--- a/sys-fs/dosfstools/files/dosfstools-4.0-udevlibs.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7538785afd751de509cd00740adf57fc6d730e33 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Tue, 10 May 2016 09:47:57 +0200
-Subject: [PATCH] Don't link to udev via LDFLAGS. There's LDADD for such a
- task.
-
-See also:
-https://www.gnu.org/software/automake/manual/html_node/Linking.html
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- src/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 3d22ba7..a15e6e7 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -34,12 +34,12 @@ mkfs_common_sources = device_info.c device_info.h \
- mkfs_fat_SOURCES  = mkfs.fat.c msdos_fs.h $(mkfs_common_sources)
- mkfs_fat_CPPFLAGS = -I$(srcdir)/blkdev
- mkfs_fat_CFLAGS   = $(AM_CFLAGS) $(UDEV_CFLAGS)
--mkfs_fat_LDFLAGS  = $(UDEV_LIBS)
-+mkfs_fat_LDADD    = $(UDEV_LIBS)
- 
- testdevinfo_SOURCES  = testdevinfo.c $(mkfs_common_sources)
- testdevinfo_CPPFLAGS = -I$(srcdir)/blkdev
- testdevinfo_CFLAGS   = $(AM_CFLAGS) $(UDEV_CFLAGS)
--testdevinfo_LDFLAGS  = $(UDEV_LIBS)
-+testdevinfo_LDADD    = $(UDEV_LIBS)
- 
- 
- if COMPAT_SYMLINKS
--- 
-2.8.2
-
diff --git a/sys-fs/dosfstools/metadata.xml b/sys-fs/dosfstools/metadata.xml
index c4e6a70..85825b4 100644
--- a/sys-fs/dosfstools/metadata.xml
+++ b/sys-fs/dosfstools/metadata.xml
@@ -6,12 +6,10 @@
 	<name>Gentoo Base System</name>
 </maintainer>
 <upstream>
+	<remote-id type="cpe">cpe:/a:dosfstools_project:dosfstools</remote-id>
 	<remote-id type="github">dosfstools/dosfstools</remote-id>
 </upstream>
 <use>
 	<flag name="compat">Install symlinks for legacy names of the tools</flag>
 </use>
-<upstream>
-	<remote-id type="cpe">cpe:/a:dosfstools_project:dosfstools</remote-id>
-</upstream>
 </pkgmetadata>
diff --git a/sys-fs/fuse-exfat/Manifest b/sys-fs/fuse-exfat/Manifest
deleted file mode 100644
index e5b775c..0000000
--- a/sys-fs/fuse-exfat/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fuse-exfat-1.3.0.tar.gz 161278 BLAKE2B 864eed57d5ae70eac03464899ac7c63f5d55254b61b69064592bb7ae04f6c164b8113c568946103c407867c1b53511bf2b88bd6b25cf75aa3a1a9a2a7d4f12ae SHA512 90d2b89322590199012b035b88ae01559f1824172793d9e7845603940e2807e788c687e4958f1ef76678bd214bb03671b91fd2537901b6d6acf2e8c525a3f1f3
diff --git a/sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild b/sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild
deleted file mode 100644
index 99bd10c..0000000
--- a/sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="exFAT filesystem FUSE module"
-HOMEPAGE="https://github.com/relan/exfat"
-SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz"
-
-# COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+"
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="*"
-
-RDEPEND="sys-fs/fuse:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	dosym mount.exfat-fuse.8 /usr/share/man/man8/mount.exfat.8
-}
diff --git a/sys-fs/fuse-exfat/metadata.xml b/sys-fs/fuse-exfat/metadata.xml
deleted file mode 100644
index 2b2d336..0000000
--- a/sys-fs/fuse-exfat/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>floppym@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<upstream>
-	<remote-id type="google-code">exfat</remote-id>
-	<remote-id type="github">relan/exfat</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/sys-fs/lvm2/lvm2-2.02.187-r3.ebuild b/sys-fs/lvm2/lvm2-2.02.187-r3.ebuild
new file mode 120000
index 0000000..a29ec5c
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.187-r3.ebuild
@@ -0,0 +1 @@
+lvm2-2.02.187-r2.ebuild
\ No newline at end of file
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index e2fb4a0..37eec81 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -1,2 +1,8 @@
-DIST binutils-2.34-patches-4.tar.xz 95232 BLAKE2B 0a355120ecaf447d863f6d0837028061968166c9024da36212ce7d172ee2060e4027be1fca0089e38ab9073b5332307ff1dc05b868603bd2aa0ec8e88af7cd0a SHA512 e593edbeddaf97ef23fa8eb25c5714c7f2dd2500d11422bd9dba42e119884fe71593adc98862f74c7d391ceb298556ed049eee3c504733c634faef236045876b
+DIST binutils-2.34-patches-6.tar.xz 103028 BLAKE2B d0e866d0941d2b550c7d7f23530c6ee393fa13b4f2f27832f07790989476f11d1beddb5ad5a9be5c65c1d4dff9d4598d21adcb00c1d0490f69a99127f4527447 SHA512 e05ed8886acb5cb95a3e97c5bc0564215f7d44b604610f5c4545997fd9625d6de909c37063127e819926cd1548a48d3529dd3e82e98ee6a5dbaced028c57355d
 DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d SHA512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd
+DIST binutils-2.35.1-patches-2.tar.xz 72236 BLAKE2B 584cb3edbda28c69171ed64e941535f992150d86f25201cadd07b63daaa36bf76b07dc0aa8a4837da17d1672feb47a7b15f83efdeec5409e695965a10142147a SHA512 b704ebe82c4402f058f9c96991a89256a6b369d28f844bf020ed2c77766894d9a2ca0596cd609de7b389fa8cd52bfab674b6deb10ea2096e50aa57921be2083e
+DIST binutils-2.35.1.tar.xz 22031720 BLAKE2B d3468da90b75e9b5fa7fbd64d3fdb0a4bc445e4cb7da5ae058f73a1e9d948b3e9438bc9f1b5b351db369b76a25960c9c1f58f828fd2c7646f555de45fa3c052b SHA512 94ff72708403413b70b247f3af4099ebaa882b6659249869f1ed9941a0f1912e313f08357d470f9fd2359e7f5e5b0eb86285e5eaf883fa8187789d6b1bd304eb
+DIST binutils-2.35.2-patches-1.tar.xz 11836 BLAKE2B 0141349c9618992d1ab1e0309f7ed8fbc43b60a58be1dfed05eae8a8fee857241d9e112ae673da6fc9778767675f536ece818cb85567367bb1c8f87a0693623f SHA512 35de5f227c745c5fb800784fe657b2a6216faf43e2498e8481e7b0dc79b0d2f86b3b6a10b896e060319a77a51c61d2e1b7a951ae962b3a6ef8c1a2a261d9bb6c
+DIST binutils-2.35.2.tar.xz 22056908 BLAKE2B 9c392e0db2b482442f9476f30bd80cf2796321cbf7be79cf21af7bef167b6074c4ae009dcf9b438d2f2f4a23381c935176b2cfa85de1a526ab46e0fd844a7ca5 SHA512 9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348
+DIST binutils-2.36.1-patches-1.tar.xz 11392 BLAKE2B 8112dda3f000d29952cbf58101f842ca519054bf9de6e22908881fe4d46cc1ea9a26db74ab00c64aedd3746eb058c19a978b8dc025ad8de07b6365c70a1803b2 SHA512 c6f5645b09d0c149f2eef8e992ff7181716dfb961f1155207a1349168f2d2fb76857cc224c27b4d764cfbc4ddec0630ef8c0a91d7bac489896f28de64651b367
+DIST binutils-2.36.1.tar.xz 22772248 BLAKE2B 03fbfbedd6dba2beaa836b1ed254eddd7a54a163d3061fd93edd2b9591cae24ba049b26658c524b5ccecc2f22d431dfa168218d2531aa356945c994fbbe896fa SHA512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9
diff --git a/sys-libs/binutils-libs/binutils-libs-2.34-r1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.34-r1.ebuild
deleted file mode 100644
index 71a77a2..0000000
--- a/sys-libs/binutils-libs/binutils-libs-2.34-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PATCH_VER=4
-PATCH_DEV=dilfridge
-
-inherit eutils libtool toolchain-funcs multilib-minimal
-
-MY_PN="binutils"
-MY_P="${MY_PN}-${PV}"
-PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-PATCH_DEV=${PATCH_DEV:-slyfox}
-
-DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages"
-HOMEPAGE="https://sourceware.org/binutils/"
-SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_PN}-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0/${PV}"
-IUSE="64-bit-bfd multitarget nls static-libs"
-KEYWORDS="*"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
-# Need a newer binutils-config that'll reset include/lib symlinks for us.
-RDEPEND="${DEPEND}
-	>=sys-devel/binutils-config-5
-"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/bfd.h
-)
-
-src_prepare() {
-	if [[ ! -z ${PATCH_VER} ]] ; then
-		# Use upstream patch to enable development mode
-		rm -v "${WORKDIR}/patch"/0000-Gentoo-Git-is-development.patch || die
-
-		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
-		eapply "${WORKDIR}/patch"/*.patch
-	fi
-
-	# Fix cross-compile relinking issue, bug #626402
-	elibtoolize
-
-	default
-}
-
-pkgversion() {
-	printf "Gentoo ${PVR}"
-	[[ -n ${PATCHVER} ]] && printf " p${PATCHVER}"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.24) make this an explicit option. #497268
-		--enable-install-libiberty
-		--disable-werror
-		--with-bugurl="https://bugs.gentoo.org/"
-		--with-pkgversion="$(pkgversion)"
-		$(use_enable static-libs static)
-		# The binutils eclass enables this flag for all bi-arch builds,
-		# but other tools often don't care about that support.  Put it
-		# beyond a flag if people really want it, but otherwise leave
-		# it disabled as it can slow things down on 32bit arches. #438522
-		$(use_enable 64-bit-bfd)
-		# This only disables building in the zlib subdir.
-		# For binutils itself, it'll use the system version. #591516
-		--without-zlib
-		--with-system-zlib
-		# We only care about the libs, so disable programs. #528088
-		--disable-{binutils,etc,ld,gas,gold,gprof}
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-		# We pull in all USE-flags that change ABI in an incompatible
-		# way. #666100
-		# USE=multitarget change size of global arrays
-		# USE=64-bit-bfd changes data structures of exported API
-		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)-$(usex 64-bit-bfd 64 def)
-	)
-
-	# mips can't do hash-style=gnu ...
-	if [[ $(tc-arch) != mips ]] ; then
-		myconf+=( --enable-default-hash-style=gnu )
-	fi
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	use nls \
-		&& myconf+=( --without-included-gettext ) \
-		|| myconf+=( --disable-nls )
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-
-	# Prevent makeinfo from running as we don't build docs here.
-	# bug #622652
-	sed -i \
-		-e '/^MAKEINFO/s:=.*:= true:' \
-		Makefile || die
-}
-
-multilib_src_install() {
-	default
-	# Provide libiberty.h directly.
-	dosym libiberty/libiberty.h /usr/include/libiberty.h
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-}
diff --git a/sys-libs/binutils-libs/binutils-libs-2.35.2.ebuild b/sys-libs/binutils-libs/binutils-libs-2.35.2.ebuild
new file mode 100644
index 0000000..328eb45
--- /dev/null
+++ b/sys-libs/binutils-libs/binutils-libs-2.35.2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PATCH_VER=1
+PATCH_DEV=dilfridge
+
+inherit eutils libtool toolchain-funcs multilib-minimal
+
+MY_PN="binutils"
+MY_P="${MY_PN}-${PV}"
+PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
+PATCH_DEV=${PATCH_DEV:-slyfox}
+
+DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages"
+HOMEPAGE="https://sourceware.org/binutils/"
+SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_PN}-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0/${PV}"
+IUSE="64-bit-bfd cet multitarget nls static-libs"
+KEYWORDS="*"
+
+BDEPEND="nls? ( sys-devel/gettext )"
+DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
+# Need a newer binutils-config that'll reset include/lib symlinks for us.
+RDEPEND="${DEPEND}
+	>=sys-devel/binutils-config-5
+"
+
+PATCHES=("${FILESDIR}"/${PN}-2.35.1-cet.patch)
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/bfd.h
+)
+
+src_prepare() {
+	if [[ ! -z ${PATCH_VER} ]] ; then
+		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
+		eapply "${WORKDIR}/patch"/*.patch
+	fi
+
+	# Fix cross-compile relinking issue, bug #626402
+	elibtoolize
+
+	default
+}
+
+pkgversion() {
+	printf "Gentoo ${PVR}"
+	[[ -n ${PATCHVER} ]] && printf " p${PATCHVER}"
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-obsolete
+		--enable-shared
+		--enable-threads
+		# Newer versions (>=2.24) make this an explicit option. #497268
+		--enable-install-libiberty
+		--disable-werror
+		--with-bugurl="https://bugs.gentoo.org/"
+		--with-pkgversion="$(pkgversion)"
+		$(use_enable static-libs static)
+		# The binutils eclass enables this flag for all bi-arch builds,
+		# but other tools often don't care about that support.  Put it
+		# beyond a flag if people really want it, but otherwise leave
+		# it disabled as it can slow things down on 32bit arches. #438522
+		$(use_enable 64-bit-bfd)
+		# This only disables building in the zlib subdir.
+		# For binutils itself, it'll use the system version. #591516
+		--without-zlib
+		--with-system-zlib
+		# We only care about the libs, so disable programs. #528088
+		--disable-{binutils,etc,ld,gas,gold,gprof}
+		# Disable modules that are in a combined binutils/gdb tree. #490566
+		--disable-{gdb,libdecnumber,readline,sim}
+		# Strip out broken static link flags.
+		# https://gcc.gnu.org/PR56750
+		--without-stage1-ldflags
+		# We pull in all USE-flags that change ABI in an incompatible
+		# way. #666100
+		# USE=multitarget change size of global arrays
+		# USE=64-bit-bfd changes data structures of exported API
+		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)-$(usex 64-bit-bfd 64 def)
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
+
+		# Allow user to opt into CET for host libraries.
+		# Ideally we would like automagic-or-disabled here.
+		# But the check does not quite work on i686: bug #760926.
+		$(use_enable cet)
+	)
+
+	# mips can't do hash-style=gnu ...
+	if [[ $(tc-arch) != mips ]] ; then
+		myconf+=( --enable-default-hash-style=gnu )
+	fi
+
+	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
+
+	use nls \
+		&& myconf+=( --without-included-gettext ) \
+		|| myconf+=( --disable-nls )
+
+	if [[ ${CHOST} == *-darwin* ]] && use nls ; then
+		# fix underlinking in opcodes
+		sed -i -e 's/@SHARED_LDFLAGS@/@SHARED_LDFLAGS@ -lintl/' \
+			"${S}"/opcodes/Makefile.in || die
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+
+	# Prevent makeinfo from running as we don't build docs here.
+	# bug #622652
+	sed -i \
+		-e '/^MAKEINFO/s:=.*:= true:' \
+		Makefile || die
+}
+
+multilib_src_install() {
+	default
+	# Provide libiberty.h directly.
+	dosym libiberty/libiberty.h /usr/include/libiberty.h
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED}"/usr -name '*.la' -delete
+}
diff --git a/sys-libs/binutils-libs/files/binutils-libs-2.35.1-cet.patch b/sys-libs/binutils-libs/files/binutils-libs-2.35.1-cet.patch
new file mode 100644
index 0000000..7477ff9
--- /dev/null
+++ b/sys-libs/binutils-libs/files/binutils-libs-2.35.1-cet.patch
@@ -0,0 +1,103 @@
+https://bugs.gentoo.org/771765
+https://sourceware.org/PR27397
+
+On i586-like CPUs endbr32 added by -Wl,-z,ibt,-z,shstk
+generates crashing binaries and causes ./configure failure.
+
+From 847e4b3207f97762dc641db8d3b188081c3370c3 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Fri, 12 Feb 2021 16:30:23 -0800
+Subject: [PATCH] GCC_CET_HOST_FLAGS: Check if host supports multi-byte NOPs
+
+---
+ config/cet.m4       | 19 ++++++++++++++++---
+ libiberty/configure | 29 +++++++++++++++++++++++++++++
+ 2 files changed, 45 insertions(+), 3 deletions(-)
+
+diff --git a/config/cet.m4 b/config/cet.m4
+index c67fb4f35b6..7718be1afe8 100644
+--- a/config/cet.m4
++++ b/config/cet.m4
+@@ -130,6 +130,18 @@ fi
+ if test x$may_have_cet = xyes; then
+   if test x$cross_compiling = xno; then
+     AC_TRY_RUN([
++int
++main ()
++{
++  asm ("endbr32");
++  return 0;
++}
++    ],
++    [have_multi_byte_nop=yes],
++    [have_multi_byte_nop=no])
++    have_cet=no
++    if test x$have_multi_byte_nop = xyes; then
++      AC_TRY_RUN([
+ static void
+ foo (void)
+ {
+@@ -155,9 +167,10 @@ main ()
+   bar ();
+   return 0;
+ }
+-    ],
+-    [have_cet=no],
+-    [have_cet=yes])
++      ],
++      [have_cet=no],
++      [have_cet=yes])
++    fi
+     if test x$enable_cet = xno -a x$have_cet = xyes; then
+       AC_MSG_ERROR([Intel CET must be enabled on Intel CET enabled host])
+     fi
+diff --git a/libiberty/configure b/libiberty/configure
+index 160b8c9e8b1..29a690d44fc 100755
+--- a/libiberty/configure
++++ b/libiberty/configure
+@@ -5539,6 +5539,34 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++int
++main ()
++{
++  asm ("endbr32");
++  return 0;
++}
++
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++  have_multi_byte_nop=yes
++else
++  have_multi_byte_nop=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
++
++    have_cet=no
++    if test x$have_multi_byte_nop = xyes; then
++      if test "$cross_compiling" = yes; then :
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "cannot run test program while cross compiling
++See \`config.log' for more details" "$LINENO" 5; }
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
+ static void
+ foo (void)
+ {
+@@ -5575,6 +5603,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+   conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+ 
++    fi
+     if test x$enable_cet = xno -a x$have_cet = xyes; then
+       as_fn_error $? "Intel CET must be enabled on Intel CET enabled host" "$LINENO" 5
+     fi
+-- 
+2.29.2
+
diff --git a/sys-libs/binutils-libs/metadata.xml b/sys-libs/binutils-libs/metadata.xml
index 80f41ea..f1528f8 100644
--- a/sys-libs/binutils-libs/metadata.xml
+++ b/sys-libs/binutils-libs/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>toolchain@gentoo.org</email>
-	<name>Gentoo Toolchain Project</name>
-</maintainer>
-<use>
-	<flag name="64-bit-bfd">Support 64-bit targets even on 32-bit hosts (is ignored on 64-bit hosts)</flag>
-	<flag name="multitarget">Enable all possible targets in libbfd</flag>
-</use>
-<upstream>
-	<remote-id type="cpe">cpe:/a:gnu:binutils</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
+	<use>
+		<flag name="cet">Enable Intel Control-flow Enforcement Technology.</flag>
+		<flag name="64-bit-bfd">Support 64-bit targets even on 32-bit hosts (is ignored on 64-bit hosts)</flag>
+		<flag name="multitarget">Enable all possible targets in libbfd</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gnu:binutils</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
deleted file mode 100644
index b1e94cc..0000000
--- a/sys-libs/ldb/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ldb-2.0.12.tar.gz 1680114 BLAKE2B 44d7b8f9ff0c1d2adc59378b9da814fb280043c8bbf5ea59920a23448db5abdd53b69c93002e2d621268610ee202377a35676ecf6bd6601d2a2ef9269e71dd6c SHA512 9f26dadee16c50844b28edf03a05ad11067bfb7678cc3e8baf278709a813498a620db3dad463bfe54adb6a44cb5b551cf1224bc30316be5fc8d29ef17295bdd8
diff --git a/sys-libs/ldb/files/ldb-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch b/sys-libs/ldb/files/ldb-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
deleted file mode 100644
index c45b13f..0000000
--- a/sys-libs/ldb/files/ldb-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/wscript	2017-07-05 15:35:52.178964698 -0400
-+++ b/wscript	2017-07-05 15:49:20.137977649 -0400
-@@ -208,6 +208,14 @@
-         ldb_headers = ('include/ldb.h include/ldb_errors.h '
-                        'include/ldb_module.h include/ldb_handlers.h')
- 
-+        # we're not currently linking against the ldap libs, but ldb.pc.in
-+        # has @LDAP_LIBS@
-+        bld.env.LDAP_LIBS = ''
-+
-+        if not 'PACKAGE_VERSION' in bld.env:
-+            bld.env.PACKAGE_VERSION = VERSION
-+            bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
-+
-         bld.SAMBA_LIBRARY('ldb',
-                           COMMON_SRC + ' ' + LDB_MAP_SRC,
-                           deps='tevent LIBLDB_MAIN replace',
diff --git a/sys-libs/ldb/files/ldb-1.5.2-optional_packages.patch b/sys-libs/ldb/files/ldb-1.5.2-optional_packages.patch
deleted file mode 100644
index bdceeb3..0000000
--- a/sys-libs/ldb/files/ldb-1.5.2-optional_packages.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- ldb-1.5.2/wscript
-+++ ldb-1.5.2/wscript
-@@ -33,6 +33,10 @@
-     opt.RECURSE('lib/tevent')
-     opt.RECURSE('lib/replace')
-     opt.load('python') # options for disabling pyc or pyo compilation
-+    if opt.IN_LAUNCH_DIR():
-+        opt.add_option('--disable-ldap',
-+        help=("disable ldap support"),
-+        action="store_true", dest='disable_ldap', default=False)
- 
-     opt.add_option('--without-ldb-lmdb',
-                    help='disable new LMDB backend for LDB',
-@@ -40,6 +44,10 @@
- 
- 
- def configure(conf):
-+    conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
-+
-+    conf.env.disable_ldap = getattr(Options.options, 'disable_ldap', False)
-+
-     conf.RECURSE('lib/tdb')
-     conf.RECURSE('lib/tevent')
- 
-@@ -157,9 +165,12 @@
-     if conf.env.standalone_ldb:
-         conf.CHECK_XSLTPROC_MANPAGES()
- 
--        # we need this for the ldap backend
--        if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
--            conf.env.ENABLE_LDAP_BACKEND = True
-+        if not conf.env.disable_ldap:
-+    	    # we need this for the ldap backend
-+            if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
-+                conf.env.ENABLE_LDAP_BACKEND = True
-+        else:
-+            conf.env.ENABLE_LDAP_BACKEND = False
- 
-         # we don't want any libraries or modules to rely on runtime
-         # resolution of symbols
diff --git a/sys-libs/ldb/ldb-2.0.12.ebuild b/sys-libs/ldb/ldb-2.0.12.ebuild
deleted file mode 100644
index e957a3a..0000000
--- a/sys-libs/ldb/ldb-2.0.12.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit python-single-r1 waf-utils multilib-minimal eutils
-
-DESCRIPTION="An LDAP-like embedded database"
-HOMEPAGE="https://ldb.samba.org"
-SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="*"
-IUSE="doc +ldap +lmdb python test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.2.0[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.2[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.10.0[python(+)?,${MULTILIB_USEDEP}]
-	ldap? ( net-nds/openldap )
-	lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-"
-
-DEPEND="dev-libs/libxslt
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	${RDEPEND}
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( python )"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.2-optional_packages.patch
-	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(usex ldap '' --disable-ldap)
-		$(usex lmdb '' --without-ldb-lmdb)
-		--disable-rpath
-		--disable-rpath-install --bundled-libraries=NONE
-		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba
-		--builtin-libraries=NONE
-	)
-	if ! multilib_is_native_abi; then
-		myconf+=( --disable-python )
-	else
-		use python || myconf+=( --disable-python )
-	fi
-	waf-utils_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-	multilib_is_native_abi && use doc && doxygen Doxyfile
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		WAF_MAKE=1 \
-		PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \
-		LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \
-		waf test || die
-	fi
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	if multilib_is_native_abi && use doc; then
-		doman  apidocs/man/man3/*.3
-		docinto html
-		dodoc -r apidocs/html/*
-	fi
-}
-
-pkg_postinst() {
-	if has_version sys-auth/sssd; then
-		ewarn "You have sssd installed. It is known to break after ldb upgrades,"
-		ewarn "so please try to rebuild it before reporting bugs."
-		ewarn "See https://bugs.gentoo.org/404281"
-	fi
-}
diff --git a/sys-libs/ldb/metadata.xml b/sys-libs/ldb/metadata.xml
deleted file mode 100644
index 5970784..0000000
--- a/sys-libs/ldb/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>samba@gentoo.org</email>
-		<name>Samba</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="cpe">cpe:/a:samba:samba</remote-id>
-	</upstream>
-	<use>
-		<flag name="doc">Builds documentation</flag>
-		<flag name="ldap">Enable LDAP support</flag>
-		<flag name="lmdb">Enable LMDB backend</flag>
-		<flag name="python">Enable Python support</flag>
-	</use>
-</pkgmetadata>
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
new file mode 100644
index 0000000..0ab0bca
--- /dev/null
+++ b/sys-libs/libxcrypt/Manifest
@@ -0,0 +1,3 @@
+DIST libxcrypt-4.4.16.tar.gz 480694 BLAKE2B 0e93c2ff45a8148f82a80a67fb732a3ef42e87505d19258023f91d3352a382483204e77e2704e7a0de15f4f1e38a326d0867506a5580faf8c81857270588a4a3 SHA512 e1d3b1262c6be7c6c8847b8c4eb8191d9e5e482798be6f1186876c72f3d8c737124378ec45a38aa464f556e10a557b96f855bd371f03c3611eada27904bf6781
+DIST libxcrypt-4.4.17.tar.gz 519096 BLAKE2B 12cbe3d1f235baddd8d2ec8159f2a7514e75c2f91cf0db18ef909ec11c38ac19efebecec647a90cafb27c7ebc7e940da448ca8f3edd1c49e5cb9cc4407d5198c SHA512 94aaba6ccf9b6d1a32f9a571ee32261cecd393d5b8d8c6f18d740dc7bb29ac0fbd381124e7f0d84882559bb634208c08151b3dc05c9138fa0a229c4ba20fb6f7
+DIST libxcrypt-4.4.19.tar.gz 534269 BLAKE2B 22c27fe2bfe32a7752f7be495a072c774a5a9ab9a7616fb80ff05afae4d9ff1ecfd1a04b4bd7c850df46f60aa5850225684464cf65d2a145302f128285ac8a9b SHA512 f5bd2598b5d0de47f3d805bbd4a045439e456d361a39e8725c40e2e1f32cf392bdc20b51840528f53cec052dff98be1a009fcd70b92e288584bedf06ef94b816
diff --git a/sys-libs/libxcrypt/OWNERS b/sys-libs/libxcrypt/OWNERS
new file mode 100644
index 0000000..31243ec
--- /dev/null
+++ b/sys-libs/libxcrypt/OWNERS
@@ -0,0 +1 @@
+include chromiumos/third_party/toolchain-utils:/OWNERS.toolchain
diff --git a/sys-libs/libxcrypt/files/libxcrypt-4.4.12-multibuild.patch b/sys-libs/libxcrypt/files/libxcrypt-4.4.12-multibuild.patch
new file mode 100644
index 0000000..8062130
--- /dev/null
+++ b/sys-libs/libxcrypt/files/libxcrypt-4.4.12-multibuild.patch
@@ -0,0 +1,25 @@
+diff --git a/Makefile.am b/Makefile.am
+index 26db1c1..597c3f4 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -84,11 +84,7 @@ noinst_HEADERS = \
+ 	test/des-cases.h \
+ 	test/ka-table.inc
+ 
+-if ENABLE_XCRYPT_COMPAT_FILES
+ nodist_include_HEADERS += xcrypt.h
+-else
+-nodist_noinst_HEADERS += xcrypt.h
+-endif
+ 
+ noinst_PROGRAMS = \
+ 	lib/gen-des-tables
+@@ -137,7 +133,7 @@ uninstall_hook_targets = \
+ 	uninstall-hook-pkgconfig
+ install-data-hook-pkgconfig:
+ 	cd $(DESTDIR)$(pkgconfigdir) && \
+-		$(LN_S) libxcrypt.pc libcrypt.pc
++		$(LN_S) -f libxcrypt.pc libcrypt.pc
+ uninstall-hook-pkgconfig:
+ 	-rm -f $(DESTDIR)$(pkgconfigdir)/libcrypt.pc
+ 
diff --git a/sys-libs/libxcrypt/files/libxcrypt-4.4.12-pythonver.patch b/sys-libs/libxcrypt/files/libxcrypt-4.4.12-pythonver.patch
new file mode 100644
index 0000000..048a8eb
--- /dev/null
+++ b/sys-libs/libxcrypt/files/libxcrypt-4.4.12-pythonver.patch
@@ -0,0 +1,17 @@
+diff --git a/configure.ac b/configure.ac
+index 1e74bb1..4249fb5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -241,11 +241,7 @@ ENABLE_KA_TABLE_GEN="no"
+ # This way we just need one call to AC_PATH_PROGS to likely get a
+ # suitable version of Python.  The version check afterwards is for
+ # the case just a generic 'python3' or 'python' executable was found.
+-PYTHON_CANDIDATE_VERSIONS="python3 python"
+-
+-for ver in `seq 6 1 10`; do
+-  PYTHON_CANDIDATE_VERSIONS="python3.$ver $PYTHON_CANDIDATE_VERSIONS"
+-done
++PYTHON_CANDIDATE_VERSIONS="${EPYTHON}"
+ 
+ AC_PATH_PROGS([PYTHON], [$PYTHON_CANDIDATE_VERSIONS], [])
+ 
diff --git a/sys-libs/libxcrypt/files/libxcrypt-4.4.19-multibuild.patch b/sys-libs/libxcrypt/files/libxcrypt-4.4.19-multibuild.patch
new file mode 100644
index 0000000..5b3958e
--- /dev/null
+++ b/sys-libs/libxcrypt/files/libxcrypt-4.4.19-multibuild.patch
@@ -0,0 +1,14 @@
+diff --git a/Makefile.am b/Makefile.am
+index d0cca1d..4a5d4a1 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -86,9 +86,7 @@ noinst_HEADERS = \
+ 	test/des-cases.h \
+ 	test/ka-table.inc
+ 
+-if ENABLE_XCRYPT_COMPAT_FILES
+ nodist_include_HEADERS += xcrypt.h
+-endif
+ 
+ noinst_PROGRAMS = \
+ 	lib/gen-des-tables
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.16.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.16.ebuild
new file mode 100644
index 0000000..51a11f6
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.16.ebuild
@@ -0,0 +1,164 @@
+# Copyright 2004-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit autotools multibuild python-any-r1 multilib-minimal
+
+DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others"
+SRC_URI="https://github.com/besser82/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/besser82/libxcrypt"
+
+LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
+SLOT="0/1"
+KEYWORDS="*"
+IUSE="+compat split-usr +static-libs system test"
+
+DEPEND="system? (
+		elibc_glibc? ( sys-libs/glibc[-crypt(+)] )
+		!sys-libs/musl
+	)"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-apps/findutils
+	test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="split-usr? ( system )"
+
+PATCHES=(
+	"${FILESDIR}/libxcrypt-4.4.12-pythonver.patch"
+	"${FILESDIR}/libxcrypt-4.4.12-multibuild.patch"
+)
+
+python_check_deps() {
+	has_version -b "dev-python/passlib[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=(
+		$(usex compat 'xcrypt_compat' '')
+		xcrypt_nocompat
+	)
+
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	multibuild_foreach_variant multilib-minimal_src_configure
+}
+
+get_xclibdir() {
+	printf -- "%s/%s/%s\n" \
+		"$(usex split-usr '' '/usr')" \
+		"$(get_libdir)" \
+		"$(usex system '' 'xcrypt')"
+}
+
+multilib_src_configure() {
+	local -a myconf=(
+		--disable-werror
+		--libdir=$(get_xclibdir)
+		--with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig
+		--includedir="${EPREFIX}/usr/include/$(usex system '' 'xcrypt')"
+	)
+
+	case "${MULTIBUILD_ID}" in
+		xcrypt_compat-*)
+			myconf+=(
+				--disable-static
+				--disable-xcrypt-compat-files
+				--enable-obsolete-api=yes
+			)
+			;;
+		xcrypt_nocompat-*)
+			myconf+=(
+				--enable-obsolete-api=no
+				$(use_enable static-libs static)
+			)
+		;;
+		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
+	esac
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+src_compile() {
+	multibuild_foreach_variant multilib-minimal_src_compile
+}
+
+multilib_src_test() {
+	emake check
+}
+
+src_test() {
+	multibuild_foreach_variant multilib-minimal_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant multilib-minimal_src_install
+
+	(
+		shopt -s failglob || die "failglob failed"
+
+		# Make sure our man pages do not collide with glibc or man-pages.
+		for manpage in "${ED}"/usr/share/man/man3/crypt{,_r}.?*; do
+			mv -n "${manpage}" "$(dirname "${manpage}")/xcrypt_$(basename "${manpage}")" \
+				|| die "mv failed"
+		done
+	) || die "failglob error"
+
+	# remove useless stuff from installation
+	find "${D}"/usr/share/doc/${PF} -type l -delete || die
+	find "${D}" -name '*.la' -delete || die
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	# don't install the libcrypt.so symlink for the "compat" version
+	case "${MULTIBUILD_ID}" in
+		xcrypt_compat-*)
+			rm "${D}"$(get_xclibdir)/libcrypt$(get_libname) \
+				|| die "failed to remove extra compat libraries"
+		;;
+		xcrypt_nocompat-*)
+			if use split-usr; then
+				(
+					if use static-libs; then
+						# .a files are installed to /$(get_libdir) by default
+						# move static libraries to /usr prefix or portage will abort
+						shopt -s nullglob || die "failglob failed"
+						static_libs=( "${ED}"/$(get_xclibdir)/*.a )
+
+						if [[ -n ${static_libs[*]} ]]; then
+							dodir "/usr/$(get_xclibdir)"
+							mv "${static_libs[@]}" "${D}/usr/$(get_xclibdir)" \
+								|| die "moving static libs failed"
+						fi
+					fi
+
+					if use system; then
+						# Move versionless .so symlinks from /$(get_libdir) to /usr/$(get_libdir)
+						# to allow linker to correctly find shared libraries.
+						shopt -s failglob || die "failglob failed"
+
+						for lib_file in "${ED}"$(get_xclibdir)/*$(get_libname); do
+							lib_file_basename="$(basename "${lib_file}")"
+							lib_file_target="$(basename "$(readlink -f "${lib_file}")")"
+							dosym "../../$(get_libdir)/${lib_file_target}" "/usr/$(get_xclibdir)/${lib_file_basename}"
+						done
+
+						rm "${ED}"$(get_xclibdir)/*$(get_libname) || die "removing symlinks in incorrect location failed"
+					fi
+				)
+			fi
+		;;
+		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
+	esac
+}
diff --git a/sys-libs/libxcrypt/metadata.xml b/sys-libs/libxcrypt/metadata.xml
new file mode 100644
index 0000000..d84b73d
--- /dev/null
+++ b/sys-libs/libxcrypt/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>hardened@gentoo.org</email>
+    <name>Gentoo Hardened</name>
+  </maintainer>
+  <longdescription>
+        Crypt library for DES, MD5, and blowfish. Libxcrypt is a replacement for
+        libcrypt, which comes with the GNU C Library. It supports DES crypt,
+        MD5, and passwords with blowfish encryption.
+  </longdescription>
+  <use>
+    <flag name="compat">Build with compatibility interfaces for other crypt implementations</flag>
+    <flag name="system">Install as system libcrypt.so rather than to an alternate directory (will collide with sys-libs/glibc's version)</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">besser82/libxcrypt</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index c58f31d..7f613a0 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,2 +1,2 @@
-DIST tzcode2020a.tar.gz 257509 BLAKE2B 21335f0b6a3b98ba8203d49d1273c2016bfbef9903c394cda6ca97cc5ec5d1fb1605bb73ba9aa6c73eca3fe115fb2924da37b736bf0a8a0e214eed547100fe70 SHA512 5235d6590e844491df32375857f5f36ba0046f2d21a078375188dff79b125cf9b69136a0a431624de1ecfa9d53b62a232f0e6ee0b734294cec62b670e6265cb2
-DIST tzdata2020a.tar.gz 397245 BLAKE2B 2a85a9a9badbf2b74ba2ace3f7fd436cc7752202557785be503c1c8f2f698dfc8cfb412b3f08ebc0bd4a8d0e27293b47eeedf937f713dadb4386dad14322b871 SHA512 2a2fc2e3ad8a6e4c574242296c847ad582c2c1d86add9c556e65c812d19b9528522e3c4dddb5239017091825d2acc5a2ccaf21dc41b900b6c300ef4264cc5a9d
+DIST tzcode2020f.tar.gz 262454 BLAKE2B e555f4c59e11e2b091fa48fad4a74ff1577d9f1204c5cc9733a0263a4e1e1d769a548e721e29656cfd187f625d9fdc957f14dbf22b248e6d459e610ba4848101 SHA512 5f6bf1b508434842eb9dacacc744b5f3375c35b88e401ef372b5fde80ad2f523484fe52a6e99460e402230406ebf6a9261a97efde45a610f8e8085893d55c4ed
+DIST tzdata2020f.tar.gz 411739 BLAKE2B 703a8c899e76d2e8f6660dc077a92988dd69ae332daca5246cde9a4972688ba0244badd735ab3bc7537b00d44af151d95ee8bfe216028825577cdd953d455767 SHA512 dd312def18c807452fda2e697514e2064c5f51ebdbedd0cfe6f231252c76ee5d4409f653b295ed5657b7d30b868690047fdb70a10942e69eaa40b77473e3f9ca
diff --git a/sys-libs/timezone-data/metadata.xml b/sys-libs/timezone-data/metadata.xml
index a74a2f3..8770301 100644
--- a/sys-libs/timezone-data/metadata.xml
+++ b/sys-libs/timezone-data/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>djc@gentoo.org</email>
-    <name>Dirkjan Ochtman</name>
-  </maintainer>
   <maintainer type="project">
     <email>toolchain@gentoo.org</email>
     <name>Gentoo Toolchain Project</name>
@@ -15,5 +11,9 @@
       when counting seconds since the epoch (while POSIX does not) as they are
       based on the TAI (International Atomic Time) clock
     </flag>
+    <flag name="zic-slim">
+      Default to 'slim' file format for /usr/share/zoneinfo. Otherwise 'fat' format
+      is used. Not all programs can handle 'slim' format'.
+    </flag>
   </use>
 </pkgmetadata>
diff --git a/sys-libs/timezone-data/timezone-data-2020a.ebuild b/sys-libs/timezone-data/timezone-data-2020a.ebuild
deleted file mode 100644
index 842f3c9..0000000
--- a/sys-libs/timezone-data/timezone-data-2020a.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs flag-o-matic
-
-code_ver=${PV}
-data_ver=${PV}
-DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
-HOMEPAGE="https://www.iana.org/time-zones"
-SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
-	https://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
-
-LICENSE="BSD public-domain"
-SLOT="0"
-KEYWORDS="*"
-IUSE="nls leaps-timezone elibc_FreeBSD"
-
-DEPEND="nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	!sys-libs/glibc[vanilla(+)]"
-
-S=${WORKDIR}
-
-src_prepare() {
-	default
-
-	# check_web contacts validator.w3.org
-	sed -i -e 's/check_tables check_web/check_tables/g' \
-		Makefile || die "Failed to disable check_web"
-
-	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-src_configure() {
-	tc-export CC
-
-	append-lfs-flags #471102
-
-	if use elibc_FreeBSD || use elibc_Darwin ; then
-		append-cppflags -DSTD_INSPIRED #138251
-	fi
-
-	append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"'
-	LDLIBS=""
-	if use nls ; then
-		# See if an external libintl is available. #154181 #578424
-		local c="${T}/test"
-		echo 'main(){}' > "${c}.c"
-		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then
-			LDLIBS+=" -lintl"
-		fi
-	fi
-}
-
-_emake() {
-	emake \
-		REDO=$(usex leaps-timezone posix_right posix_only) \
-		TZDATA_TEXT= \
-		TOPDIR="${EPREFIX}" \
-		ZICDIR='$(TOPDIR)/usr/bin' \
-		"$@"
-}
-
-src_compile() {
-	_emake \
-		AR="$(tc-getAR)" \
-		cc="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		CFLAGS="${CFLAGS} -std=gnu99 ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}"
-	if tc-is-cross-compiler ; then
-		_emake -C "${S}"-native \
-			AR="$(tc-getBUILD_AR)" \
-			cc="$(tc-getBUILD_CC)" \
-			RANLIB="$(tc-getBUILD_RANLIB)" \
-			CFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}" \
-			LDFLAGS="${BUILD_LDFLAGS}" \
-			LDLIBS="${LDLIBS}" \
-			zic
-	fi
-}
-
-src_test() {
-	# VALIDATE_ENV is used for extended/web based tests.  Punt on them.
-	emake check VALIDATE_ENV=true
-}
-
-src_install() {
-	local zic=""
-	tc-is-cross-compiler && zic="zic=${S}-native/zic"
-	_emake install ${zic} DESTDIR="${D}" LIBDIR="/nukeit"
-	rm -rf "${D}/nukeit" "${ED}/etc" || die
-
-	insinto /usr/share/zoneinfo
-	doins "${S}"/leap-seconds.list
-
-	# Delete man pages installed by man-pages package.
-	rm "${ED}"/usr/share/man/man5/tzfile.5* "${ED}"/usr/share/man/man8/{tzselect,zdump,zic}.8 || die
-	dodoc CONTRIBUTING README NEWS *.html
-}
-
-get_TIMEZONE() {
-	local tz src="${EROOT}/etc/timezone"
-	if [[ -e ${src} ]] ; then
-		tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
-	else
-		tz="FOOKABLOIE"
-	fi
-	[[ -z ${tz} ]] && return 1 || echo "${tz}"
-}
-
-pkg_preinst() {
-	local tz=$(get_TIMEZONE)
-	if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then
-		eerror "The right & posix subdirs are no longer installed as subdirs -- they have been"
-		eerror "relocated to match upstream paths as sibling paths.  Further, posix/xxx is the"
-		eerror "same as xxx, so you should simply drop the posix/ prefix.  You also should not"
-		eerror "be using right/xxx for the system timezone as it breaks programs."
-		die "Please fix your timezone setting"
-	fi
-
-	# Trim the symlink by hand to avoid portage's automatic protection checks.
-	rm -f "${EROOT}"/usr/share/zoneinfo/posix
-
-	if has_version "<=${CATEGORY}/${PN}-2015c" ; then
-		elog "Support for accessing posix/ and right/ directly has been dropped to match"
-		elog "upstream.  There is no need to set TZ=posix/xxx as it is the same as TZ=xxx."
-		elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead.  See this post"
-		elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html"
-	fi
-}
-
-configure_tz_data() {
-	# make sure the /etc/localtime file does not get stale #127899
-	local tz src="${EROOT}/etc/timezone" etc_lt="${EROOT}/etc/localtime"
-
-	# If it's a symlink, assume the user knows what they're doing and
-	# they're managing it themselves. #511474
-	if [[ -L "${etc_lt}" ]] ; then
-		einfo "Assuming your ${etc_lt} symlink is what you want; skipping update."
-		return 0
-	fi
-
-	if ! tz=$(get_TIMEZONE) ; then
-		einfo "Assuming your empty ${etc_lt} file is what you want; skipping update."
-		return 0
-	fi
-	if [[ "${tz}" == "FOOKABLOIE" ]] ; then
-		elog "You do not have TIMEZONE set in ${src}."
-
-		if [[ ! -e "${etc_lt}" ]] ; then
-			cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
-			elog "Setting ${etc_lt} to Factory."
-		else
-			elog "Skipping auto-update of ${etc_lt}."
-		fi
-		return 0
-	fi
-
-	if [[ ! -e "${EROOT}/usr/share/zoneinfo/${tz}" ]] ; then
-		elog "You have an invalid TIMEZONE setting in ${src}"
-		elog "Your ${etc_lt} has been reset to Factory; enjoy!"
-		tz="Factory"
-	fi
-	einfo "Updating ${etc_lt} with ${EROOT}/usr/share/zoneinfo/${tz}"
-	cp -f "${EROOT}/usr/share/zoneinfo/${tz}" "${etc_lt}"
-}
-
-pkg_config() {
-	configure_tz_data
-}
-
-pkg_postinst() {
-	configure_tz_data
-}
diff --git a/sys-libs/timezone-data/timezone-data-2020f.ebuild b/sys-libs/timezone-data/timezone-data-2020f.ebuild
new file mode 100644
index 0000000..abd8779
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2020f.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs flag-o-matic
+
+code_ver=${PV}
+data_ver=${PV}
+DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
+HOMEPAGE="https://www.iana.org/time-zones"
+SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
+	https://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
+
+LICENSE="BSD public-domain"
+SLOT="0"
+KEYWORDS="*"
+IUSE="nls leaps-timezone elibc_FreeBSD zic-slim"
+
+DEPEND="nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}
+	!sys-libs/glibc[vanilla(+)]"
+
+S=${WORKDIR}
+
+src_prepare() {
+	default
+
+	# check_web contacts validator.w3.org
+	sed -i -e 's/check_tables check_web/check_tables/g' \
+		Makefile || die "Failed to disable check_web"
+
+	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
+}
+
+src_configure() {
+	tc-export CC
+
+	append-lfs-flags #471102
+
+	if use elibc_FreeBSD || use elibc_Darwin ; then
+		append-cppflags -DSTD_INSPIRED #138251
+	fi
+
+	append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"'
+
+	# Upstream default is 'slim', but it breaks quite a few programs
+	# that parse /etc/localtime directly: bug# 747538.
+	append-cppflags -DZIC_BLOAT_DEFAULT='\"'$(usex zic-slim slim fat)'\"'
+
+	LDLIBS=""
+	if use nls ; then
+		# See if an external libintl is available. #154181 #578424
+		local c="${T}/test"
+		echo 'main(){}' > "${c}.c"
+		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then
+			LDLIBS+=" -lintl"
+		fi
+	fi
+}
+
+_emake() {
+	emake \
+		REDO=$(usex leaps-timezone posix_right posix_only) \
+		TZDATA_TEXT= \
+		TOPDIR="${EPREFIX}" \
+		ZICDIR='$(TOPDIR)/usr/bin' \
+		"$@"
+}
+
+src_compile() {
+	_emake \
+		AR="$(tc-getAR)" \
+		cc="$(tc-getCC)" \
+		RANLIB="$(tc-getRANLIB)" \
+		CFLAGS="${CFLAGS} -std=gnu99 ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		LDLIBS="${LDLIBS}"
+	if tc-is-cross-compiler ; then
+		_emake -C "${S}"-native \
+			AR="$(tc-getBUILD_AR)" \
+			cc="$(tc-getBUILD_CC)" \
+			RANLIB="$(tc-getBUILD_RANLIB)" \
+			CFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}" \
+			LDFLAGS="${BUILD_LDFLAGS}" \
+			LDLIBS="${LDLIBS}" \
+			zic
+	fi
+}
+
+src_test() {
+	# VALIDATE_ENV is used for extended/web based tests.  Punt on them.
+	emake check VALIDATE_ENV=true
+}
+
+src_install() {
+	local zic=""
+	tc-is-cross-compiler && zic="zic=${S}-native/zic"
+	_emake install ${zic} DESTDIR="${D}" LIBDIR="/nukeit"
+	rm -rf "${D}/nukeit" "${ED}/etc" || die
+
+	insinto /usr/share/zoneinfo
+	doins "${S}"/leap-seconds.list
+
+	# Delete man pages installed by man-pages package.
+	rm "${ED}"/usr/share/man/man5/tzfile.5* "${ED}"/usr/share/man/man8/{tzselect,zdump,zic}.8 || die
+	dodoc CONTRIBUTING README NEWS *.html
+}
+
+get_TIMEZONE() {
+	local tz src="${EROOT}/etc/timezone"
+	if [[ -e ${src} ]] ; then
+		tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
+	else
+		tz="FOOKABLOIE"
+	fi
+	[[ -z ${tz} ]] && return 1 || echo "${tz}"
+}
+
+pkg_preinst() {
+	local tz=$(get_TIMEZONE)
+	if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then
+		eerror "The right & posix subdirs are no longer installed as subdirs -- they have been"
+		eerror "relocated to match upstream paths as sibling paths.  Further, posix/xxx is the"
+		eerror "same as xxx, so you should simply drop the posix/ prefix.  You also should not"
+		eerror "be using right/xxx for the system timezone as it breaks programs."
+		die "Please fix your timezone setting"
+	fi
+
+	# Trim the symlink by hand to avoid portage's automatic protection checks.
+	rm -f "${EROOT}"/usr/share/zoneinfo/posix
+
+	if has_version "<=${CATEGORY}/${PN}-2015c" ; then
+		elog "Support for accessing posix/ and right/ directly has been dropped to match"
+		elog "upstream.  There is no need to set TZ=posix/xxx as it is the same as TZ=xxx."
+		elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead.  See this post"
+		elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html"
+	fi
+}
+
+configure_tz_data() {
+	# make sure the /etc/localtime file does not get stale #127899
+	local tz src="${EROOT}/etc/timezone" etc_lt="${EROOT}/etc/localtime"
+
+	# If it's a symlink, assume the user knows what they're doing and
+	# they're managing it themselves. #511474
+	if [[ -L "${etc_lt}" ]] ; then
+		einfo "Assuming your ${etc_lt} symlink is what you want; skipping update."
+		return 0
+	fi
+
+	if ! tz=$(get_TIMEZONE) ; then
+		einfo "Assuming your empty ${etc_lt} file is what you want; skipping update."
+		return 0
+	fi
+	if [[ "${tz}" == "FOOKABLOIE" ]] ; then
+		elog "You do not have TIMEZONE set in ${src}."
+
+		if [[ ! -e "${etc_lt}" ]] ; then
+			cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
+			elog "Setting ${etc_lt} to Factory."
+		else
+			elog "Skipping auto-update of ${etc_lt}."
+		fi
+		return 0
+	fi
+
+	if [[ ! -e "${EROOT}/usr/share/zoneinfo/${tz}" ]] ; then
+		elog "You have an invalid TIMEZONE setting in ${src}"
+		elog "Your ${etc_lt} has been reset to Factory; enjoy!"
+		tz="Factory"
+	fi
+	einfo "Updating ${etc_lt} with ${EROOT}/usr/share/zoneinfo/${tz}"
+	cp -f "${EROOT}/usr/share/zoneinfo/${tz}" "${etc_lt}"
+}
+
+pkg_config() {
+	configure_tz_data
+}
+
+pkg_postinst() {
+	configure_tz_data
+}
diff --git a/sys-power/powertop/files/0002-intel_cpus-Enable-Alder-Lake-desktop-platform-suppor.patch b/sys-power/powertop/files/0002-intel_cpus-Enable-Alder-Lake-desktop-platform-suppor.patch
new file mode 100644
index 0000000..0e1d265
--- /dev/null
+++ b/sys-power/powertop/files/0002-intel_cpus-Enable-Alder-Lake-desktop-platform-suppor.patch
@@ -0,0 +1,47 @@
+From da8b73a94c26bc274f2eb42f4b1c344bdf1dda9c Mon Sep 17 00:00:00 2001
+From: Gayatri Kammela <gayatri.kammela@intel.com>
+Date: Tue, 24 Nov 2020 17:38:21 -0800
+Subject: [PATCH 10/11] intel_cpus: Enable Alder Lake desktop platform support
+ in PowerTop
+
+Signed-off-by: Gayatri Kammela <gayatri.kammela@intel.com>
+
+diff --git a/src/cpu/intel_cpus.cpp b/src/cpu/intel_cpus.cpp
+index 40fa5742c249..62ca2d8e1b83 100644
+--- a/src/cpu/intel_cpus.cpp
++++ b/src/cpu/intel_cpus.cpp
+@@ -80,6 +80,7 @@ static int intel_cpu_models[] = {
+ 	0x8E,	/* KBL */
+ 	0X8F, 	/* SAPPHIRERAPIDS_X */
+ 	0x96,	/* EHL */
++	0x97,	/* ADL_DESKTOP */
+ 	0x9C,	/* JSL */
+ 	0x9E,	/* KBL */
+ 	0xA5,   /* CML_DESKTOP */
+@@ -195,6 +196,7 @@ nhm_core::nhm_core(int model)
+ 		case 0x8E:	/* KBL */
+ 		case 0x8F:	/* SAPPHIRERAPIDS_X */
+ 		case 0x96:	/* EHL */
++		case 0x97:	/* ADL_DESKTOP */
+ 		case 0x9C:	/* JSL */
+ 		case 0x9E:	/* KBL */
+ 		case 0xA5:      /* CML_DESKTOP */
+@@ -386,6 +388,7 @@ nhm_package::nhm_package(int model)
+ 		case 0x8E:	/* KBL */
+ 		case 0x8F:	/* SAPPHIRERAPIDS_X */
+ 		case 0x96:      /* EHL */
++		case 0x97:	/* ADL_DESKTOP */
+ 		case 0x9C:	/* JSL */
+ 		case 0x9E:	/* KBL */
+ 		case 0xA5:      /* CML_DESKTOP */
+@@ -430,6 +433,7 @@ nhm_package::nhm_package(int model)
+ 		case 0x8D:	/* TGL_DESKTOP */
+ 		case 0x8E:	/* KBL */
+ 		case 0x96:      /* EHL */
++		case 0x97:	/* ADL_DESKTOP */
+ 		case 0x9C:	/* JSL */
+ 		case 0x9E:	/* KBL */
+ 		case 0xA5:      /* CML_DESKTOP */
+-- 
+2.17.1
+
diff --git a/sys-power/powertop/files/0003-intel_cpus-Enable-Alder-Lake-mobile-platform-support.patch b/sys-power/powertop/files/0003-intel_cpus-Enable-Alder-Lake-mobile-platform-support.patch
new file mode 100644
index 0000000..44afc50
--- /dev/null
+++ b/sys-power/powertop/files/0003-intel_cpus-Enable-Alder-Lake-mobile-platform-support.patch
@@ -0,0 +1,47 @@
+From 67494f480bd4cd9fed82c22127a49030373a2689 Mon Sep 17 00:00:00 2001
+From: Gayatri Kammela <gayatri.kammela@intel.com>
+Date: Tue, 24 Nov 2020 17:41:40 -0800
+Subject: [PATCH 11/11] intel_cpus: Enable Alder Lake mobile platform support
+ in PowerTop
+
+Signed-off-by: Gayatri Kammela <gayatri.kammela@intel.com>
+
+diff --git a/src/cpu/intel_cpus.cpp b/src/cpu/intel_cpus.cpp
+index 62ca2d8e1b83..751742d34dd6 100644
+--- a/src/cpu/intel_cpus.cpp
++++ b/src/cpu/intel_cpus.cpp
+@@ -81,6 +81,7 @@ static int intel_cpu_models[] = {
+ 	0X8F, 	/* SAPPHIRERAPIDS_X */
+ 	0x96,	/* EHL */
+ 	0x97,	/* ADL_DESKTOP */
++	0x9A,	/* ADL_MOBILE */
+ 	0x9C,	/* JSL */
+ 	0x9E,	/* KBL */
+ 	0xA5,   /* CML_DESKTOP */
+@@ -197,6 +198,7 @@ nhm_core::nhm_core(int model)
+ 		case 0x8F:	/* SAPPHIRERAPIDS_X */
+ 		case 0x96:	/* EHL */
+ 		case 0x97:	/* ADL_DESKTOP */
++		case 0x9A:	/* ADL_MOBILE */
+ 		case 0x9C:	/* JSL */
+ 		case 0x9E:	/* KBL */
+ 		case 0xA5:      /* CML_DESKTOP */
+@@ -389,6 +391,7 @@ nhm_package::nhm_package(int model)
+ 		case 0x8F:	/* SAPPHIRERAPIDS_X */
+ 		case 0x96:      /* EHL */
+ 		case 0x97:	/* ADL_DESKTOP */
++		case 0X9A:	/* ADL_MOBILE */
+ 		case 0x9C:	/* JSL */
+ 		case 0x9E:	/* KBL */
+ 		case 0xA5:      /* CML_DESKTOP */
+@@ -434,6 +437,7 @@ nhm_package::nhm_package(int model)
+ 		case 0x8E:	/* KBL */
+ 		case 0x96:      /* EHL */
+ 		case 0x97:	/* ADL_DESKTOP */
++		case 0x9A:	/* ADL_MOBILE */
+ 		case 0x9C:	/* JSL */
+ 		case 0x9E:	/* KBL */
+ 		case 0xA5:      /* CML_DESKTOP */
+-- 
+2.17.1
+
diff --git a/sys-power/powertop/powertop-2.13-r1.ebuild b/sys-power/powertop/powertop-2.13-r1.ebuild
index aa3e106..c524179 100644
--- a/sys-power/powertop/powertop-2.13-r1.ebuild
+++ b/sys-power/powertop/powertop-2.13-r1.ebuild
@@ -42,6 +42,8 @@
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.8-ncurses_tinfo.patch
 	"${FILESDIR}"/0001-configure.ac-Use-PKG_PROG_PKG_CONFIG-macro.patch
+	"${FILESDIR}"/0002-intel_cpus-Enable-Alder-Lake-desktop-platform-suppor.patch
+	"${FILESDIR}"/0003-intel_cpus-Enable-Alder-Lake-mobile-platform-support.patch
 )
 
 pkg_setup() {
diff --git a/sys-power/uhubctl/Manifest b/sys-power/uhubctl/Manifest
index b32b83b..9d19870 100644
--- a/sys-power/uhubctl/Manifest
+++ b/sys-power/uhubctl/Manifest
@@ -1 +1 @@
-DIST uhubctl-1.8.tar.gz 16158 SHA256 86a9b0b56d04b5a4c0e9852a47316f7713a02ae511bb5c5c326546353e36d5b6 SHA512 fcc88ca47467e8e6085a75461495393306ddff1d6f7c9184c129bbdd044451b6430ac916f648b9f71c798054373f3d9102185e3d0c8f355c47e2574a1984ec9d WHIRLPOOL 6dd9d606acc4e791a01c5d8a16b8ab7b229fe1474cd854e4a6fbea5769a690143a092ab3c4ecf1575883ba2eb7825c0fe4573932fc2d6e821ec385f5eb040bba
+DIST uhubctl-2.4.0.tar.gz 25661 BLAKE2B 44d1fa0ce92beb3c4c3e2d21c8acb982f71f2e450afffb8c467c488495f389b745ba437c6fbbe3049cd3f67a73fa8bda6ed9c987ab1326f12db59623ee107ece SHA512 d7f07679c4678565ce0174e1eb591263fae5629dd6fbb5aaa0321ca10176b8b2d662e75a3019caeb83aaf470c8386188848ba3095e1006451e8710b2a2c9bb1d
diff --git a/sys-power/uhubctl/uhubctl-1.8-r1.ebuild b/sys-power/uhubctl/uhubctl-1.8-r1.ebuild
deleted file mode 100644
index eb58a7d..0000000
--- a/sys-power/uhubctl/uhubctl-1.8-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="USB hub per-port power control"
-HOMEPAGE="https://github.com/mvp/uhubctl"
-SRC_URI="https://github.com/mvp/uhubctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-DEPEND="virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i "s#\$(shell git describe --abbrev=4 --dirty --always --tags)#${PV}#" Makefile || die
-	eapply_user
-}
diff --git a/sys-power/uhubctl/uhubctl-2.4.0.ebuild b/sys-power/uhubctl/uhubctl-2.4.0.ebuild
new file mode 100644
index 0000000..4683f61
--- /dev/null
+++ b/sys-power/uhubctl/uhubctl-2.4.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="USB hub per-port power control"
+HOMEPAGE="https://github.com/mvp/uhubctl"
+SRC_URI="https://github.com/mvp/uhubctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="*"
+IUSE=""
+
+DEPEND="virtual/libusb:1"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s/^GIT_VERSION/#&/" \
+		Makefile \
+		|| die
+
+	tc-export PKG_CONFIG
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
diff --git a/sys-process/lsof/Manifest b/sys-process/lsof/Manifest
index 373269f..dde8512 100644
--- a/sys-process/lsof/Manifest
+++ b/sys-process/lsof/Manifest
@@ -1 +1 @@
-DIST lsof_4.91.tar.bz2 791734 BLAKE2B cd6211caedea34fdbb89266fd78a70902117eda6d4d7fa69115426f4a6f5cb5296fa09bbd946648d8d93483881e4ea4e2190f090be155c1081850e8366cfd05a SHA512 49f811941dd6303f7cb0655fddb8b1177af5d1b18f2bd1edfab09d2c128aea73daecf09c7a5375979c66ba764c88a6e70c9086b55c3634e3be01ab1aa12e9f92
+DIST lsof-4.94.0.tar.gz 1340224 BLAKE2B b3d3c4707dac22c5431ac37c6a9f28ba5057b9a8dce65038934f1148209ef4615012ed887e263ec648679d0d95a06c78ed83a7d76cc8d97c05c013c563938793 SHA512 852b12e621e1dbf71e5f7fd848a200339ca278fbe8c39dcd33f745d1aea4e61552c0f30a3f6469ad9d4b86a9163e677f8c95298159ebd647357734225aa06c0c
diff --git a/sys-process/lsof/files/lsof-4.90-darwin-cppfix.patch b/sys-process/lsof/files/lsof-4.90-darwin-cppfix.patch
deleted file mode 100644
index fcbfeba..0000000
--- a/sys-process/lsof/files/lsof-4.90-darwin-cppfix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/dialects/darwin/libproc/dfile.c b/dialects/darwin/libproc/dfile.c
---- a/dialects/darwin/libproc/dfile.c	2018-02-19 15:04:26.011578124 +0800
-+++ b/dialects/darwin/libproc/dfile.c	2018-02-19 15:04:45.006502653 +0800
-@@ -43,7 +43,7 @@
- #include "lsof.h"
- 
- #if	defined(PROC_FP_GUARDED)
--#extern	struct pff_tab	Pgf_tab[];
-+extern	struct pff_tab	Pgf_tab[];
- #endif	/* defined(PROC_FP_GUARDED) */
- 
- 
diff --git a/sys-process/lsof/files/lsof-4.94-arm-sigbus-fix.patch b/sys-process/lsof/files/lsof-4.94-arm-sigbus-fix.patch
new file mode 100644
index 0000000..95bad20
--- /dev/null
+++ b/sys-process/lsof/files/lsof-4.94-arm-sigbus-fix.patch
@@ -0,0 +1,63 @@
+https://bugs.gentoo.org/797358
+
+From 21cb1dad1243f4c0a427d893babab12e48b60f0e Mon Sep 17 00:00:00 2001
+From: Masatake YAMATO <yamato@redhat.com>
+Date: Sun, 20 Jun 2021 21:40:55 +0900
+Subject: [PATCH] Adjust alignment of buffer passed to stat()
+
+Close #160.
+
+The original code passes char[] buffer to stat().
+This can be cause a SIGBUS.
+
+#160 reported an actual crash on armv7a + glibc-2.33 platform.
+See also https://sourceware.org/bugzilla/show_bug.cgi?id=27993.
+
+The issue is reported by @10ne1.
+
+Signed-off-by: Masatake YAMATO <yamato@redhat.com>
+[Adrian: Backported to 4.94]
+Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
+--- a/misc.c
++++ b/misc.c
+@@ -293,7 +293,15 @@ doinchild(fn, fp, rbuf, rbln)
+ 		 */
+ 
+ 		    int r_al, r_rbln;
+-		    char r_arg[MAXPATHLEN+1], r_rbuf[MAXPATHLEN+1];
++		    char r_arg[MAXPATHLEN+1];
++		    union {
++			    char r_rbuf[MAXPATHLEN+1];
++			    /*
++			     * This field is only for adjusting the alignment of r_rbuf that
++			     * can be used as an argument for stat().
++			     */
++			    struct stat _;
++		    } r;
+ 		    int (*r_fn)();
+ 		/*
+ 		 * Close sufficient open file descriptors except Pipes[0] and
+@@ -358,16 +366,16 @@ doinchild(fn, fp, rbuf, rbln)
+ 			||  read(Pipes[0], r_arg, r_al) != r_al
+ 			||  read(Pipes[0], (char *)&r_rbln, sizeof(r_rbln))
+ 			    != (int)sizeof(r_rbln)
+-			||  r_rbln < 1 || r_rbln > (int)sizeof(r_rbuf))
++			||  r_rbln < 1 || r_rbln > (int)sizeof(r.r_rbuf))
+ 			    break;
+-			zeromem (r_rbuf, r_rbln);
+-			rv = r_fn(r_arg, r_rbuf, r_rbln);
++			zeromem (r.r_rbuf, r_rbln);
++			rv = r_fn(r_arg, r.r_rbuf, r_rbln);
+ 			en = errno;
+ 			if (write(Pipes[3], (char *)&rv, sizeof(rv))
+ 			    != sizeof(rv)
+ 			||  write(Pipes[3], (char *)&en, sizeof(en))
+ 			    != sizeof(en)
+-			||  write(Pipes[3], r_rbuf, r_rbln) != r_rbln)
++			||  write(Pipes[3], r.r_rbuf, r_rbln) != r_rbln)
+ 			    break;
+ 		    }
+ 		    (void) _exit(0);
+-- 
+2.32.0
+
diff --git a/sys-process/lsof/lsof-4.91.ebuild b/sys-process/lsof/lsof-4.91.ebuild
deleted file mode 100644
index fbbca87..0000000
--- a/sys-process/lsof/lsof-4.91.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-MY_P="${P/-/_}"
-DESCRIPTION="Lists open files for running Unix processes"
-HOMEPAGE="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/"
-SRC_URI="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/${MY_P}.tar.bz2
-	http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2"
-
-LICENSE="lsof"
-SLOT="0"
-KEYWORDS="*"
-IUSE="examples ipv6 rpc selinux"
-
-RDEPEND="rpc? ( net-libs/libtirpc )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	rpc? ( virtual/pkgconfig )"
-
-S="${WORKDIR}/${MY_P}/${MY_P}_src"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.85-cross.patch #432120
-	"${FILESDIR}"/${PN}-4.90-darwin-cppfix.patch #648084
-)
-
-src_unpack() {
-	unpack ${A}
-	cd ${MY_P} || die
-	unpack ./${MY_P}_src.tar
-}
-
-src_prepare() {
-	default
-	# fix POSIX compliance with `echo`
-	sed -i \
-		-e 's:echo -n:printf:' \
-		AFSConfig Configure Customize Inventory tests/CkTestDB || die
-	# Convert `test -r header.h` into a compile test.
-	# Make sure we convert `test ... -a ...` into two `test` commands
-	# so we can then convert both over into a compile test. #601432
-	sed -i -E \
-		-e '/if test .* -a /s: -a : \&\& test :g' \
-		-e '/test -r/s:test -r \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\1>" | ${LSOF_CC} ${LSOF_CFGF} -E - >/dev/null 2>\&1:g' \
-		-e 's:grep (.*) \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\2>" | ${LSOF_CC} ${LSOF_CFGF} -E -P -dD - 2>/dev/null | grep \1:' \
-		Configure || die
-}
-
-target() {
-	case ${CHOST} in
-	*-darwin*)  echo darwin  ;;
-	*-freebsd*) echo freebsd ;;
-	*-solaris*) echo solaris ;;
-	*-aix*)     echo aixgcc  ;;
-	*)          echo linux   ;;
-	esac
-}
-
-src_configure() {
-	append-cppflags $(use rpc && $(tc-getPKG_CONFIG) libtirpc --cflags || echo "-DHASNOTRPC -DHASNORPC_H")
-	append-cppflags $(usex ipv6 -{D,U}HASIPv6)
-	[[ ${CHOST} == *-solaris2.11 ]] && append-cppflags -DHAS_PAD_MUTEX
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# make sys/proc_info.h available in ${T} because of LSOF_INCLUDE
-		# dummy location -- Darwin needs this for a Configure check to
-		# succeed
-		if [[ -e /usr/include/sys/proc_info.h ]] ; then
-			mkdir -p "${T}"/sys || die
-			( cd "${T}"/sys && ln -s /usr/include/sys/proc_info.h ) || die
-		fi
-	fi
-
-	export LSOF_CFGL="${CFLAGS} ${LDFLAGS} \
-		$(use rpc && $(tc-getPKG_CONFIG) libtirpc --libs)"
-
-	# Set LSOF_INCLUDE to a dummy location so the script doesn't poke
-	# around in it and mix /usr/include paths with cross-compile/etc.
-	touch .neverInv
-	LINUX_HASSELINUX=$(usex selinux y n) \
-	LSOF_INCLUDE=${T} \
-	LSOF_CC=$(tc-getCC) \
-	LSOF_AR="$(tc-getAR) rc" \
-	LSOF_RANLIB=$(tc-getRANLIB) \
-	LSOF_CFGF="${CFLAGS} ${CPPFLAGS}" \
-	./Configure -n $(target) || die
-}
-
-src_compile() {
-	emake DEBUG="" all
-}
-
-src_install() {
-	dobin lsof
-
-	if use examples ; then
-		insinto /usr/share/lsof/scripts
-		doins scripts/*
-	fi
-
-	doman lsof.8
-	dodoc 00*
-}
-
-pkg_postinst() {
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		einfo "Note: to use lsof on Solaris you need read permissions on"
-		einfo "/dev/kmem, i.e. you need to be root, or to be in the group sys"
-	elif [[ ${CHOST} == *-aix* ]] ; then
-		einfo "Note: to use lsof on AIX you need read permissions on /dev/mem and"
-		einfo "/dev/kmem, i.e. you need to be root, or to be in the group system"
-	fi
-}
diff --git a/sys-process/lsof/lsof-4.94.0-r1.ebuild b/sys-process/lsof/lsof-4.94.0-r1.ebuild
new file mode 100644
index 0000000..348ea37
--- /dev/null
+++ b/sys-process/lsof/lsof-4.94.0-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+MY_P="${P/-/_}"
+DESCRIPTION="Lists open files for running Unix processes"
+HOMEPAGE="https://github.com/lsof-org/lsof"
+SRC_URI="https://github.com/lsof-org/lsof/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="lsof"
+SLOT="0"
+KEYWORDS="*"
+IUSE="examples ipv6 rpc selinux"
+
+RDEPEND="rpc? ( net-libs/libtirpc )
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-apps/groff
+	rpc? ( virtual/pkgconfig )
+"
+
+# needs fixing first
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.85-cross.patch #432120
+	"${FILESDIR}"/${PN}-4.94-arm-sigbus-fix.patch
+)
+
+src_prepare() {
+	default
+	# fix POSIX compliance with `echo`
+	sed -i \
+		-e 's:echo -n:printf:' \
+		AFSConfig Configure Customize Inventory tests/CkTestDB || die
+	# Convert `test -r header.h` into a compile test.
+	# Make sure we convert `test ... -a ...` into two `test` commands
+	# so we can then convert both over into a compile test. #601432
+	sed -i -E \
+		-e '/if test .* -a /s: -a : \&\& test :g' \
+		-e '/test -r/s:test -r \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\1>" | ${LSOF_CC} ${LSOF_CFGF} -E - >/dev/null 2>\&1:g' \
+		-e 's:grep (.*) \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\2>" | ${LSOF_CC} ${LSOF_CFGF} -E -P -dD - 2>/dev/null | grep \1:' \
+		Configure || die
+
+	# "create" man-page (bug #689462)
+	# inspired by shipped "makeman" ksh script
+	soelim < Lsof.8 > lsof.8 || die
+}
+
+target() {
+	case ${CHOST} in
+	*-darwin*)  echo darwin  ;;
+	*-freebsd*) echo freebsd ;;
+	*-solaris*) echo solaris ;;
+	*-aix*)     echo aixgcc  ;;
+	*)          echo linux   ;;
+	esac
+}
+
+src_configure() {
+	append-cppflags $(use rpc && $(tc-getPKG_CONFIG) libtirpc --cflags || echo "-DHASNOTRPC -DHASNORPC_H")
+	append-cppflags $(usex ipv6 -{D,U}HASIPv6)
+	[[ ${CHOST} == *-solaris2.11 ]] && append-cppflags -DHAS_PAD_MUTEX
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# make sys/proc_info.h available in ${T} because of LSOF_INCLUDE
+		# dummy location -- Darwin needs this for a Configure check to
+		# succeed
+		if [[ -e /usr/include/sys/proc_info.h ]] ; then
+			mkdir -p "${T}"/sys || die
+			( cd "${T}"/sys && ln -s /usr/include/sys/proc_info.h ) || die
+		fi
+	fi
+
+	export LSOF_CFGL="${CFLAGS} ${LDFLAGS} \
+		$(use rpc && $(tc-getPKG_CONFIG) libtirpc --libs)"
+
+	# Set LSOF_INCLUDE to a dummy location so the script doesn't poke
+	# around in it and mix /usr/include paths with cross-compile/etc.
+	touch .neverInv
+	LINUX_HASSELINUX=$(usex selinux y n) \
+	LSOF_INCLUDE=${T} \
+	LSOF_CC=$(tc-getCC) \
+	LSOF_AR="$(tc-getAR) rc" \
+	LSOF_RANLIB=$(tc-getRANLIB) \
+	LSOF_CFGF="${CFLAGS} ${CPPFLAGS}" \
+	./Configure -n $(target) || die
+}
+
+src_compile() {
+	emake DEBUG="" all
+}
+
+src_install() {
+	dobin lsof
+
+	if use examples ; then
+		insinto /usr/share/lsof/scripts
+		doins scripts/*
+	fi
+
+	doman lsof.8
+	dodoc 00*
+}
+
+pkg_postinst() {
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		einfo "Note: to use lsof on Solaris you need read permissions on"
+		einfo "/dev/kmem, i.e. you need to be root, or to be in the group sys"
+	elif [[ ${CHOST} == *-aix* ]] ; then
+		einfo "Note: to use lsof on AIX you need read permissions on /dev/mem and"
+		einfo "/dev/kmem, i.e. you need to be root, or to be in the group system"
+	fi
+}
diff --git a/sys-process/lsof/metadata.xml b/sys-process/lsof/metadata.xml
index 4f913c0..1591821 100644
--- a/sys-process/lsof/metadata.xml
+++ b/sys-process/lsof/metadata.xml
@@ -8,4 +8,7 @@
 <use>
 	<flag name="rpc">support looking up RPC service info</flag>
 </use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:lsof_project:lsof</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-process/time/Manifest b/sys-process/time/Manifest
index c78634d..fba1430 100644
--- a/sys-process/time/Manifest
+++ b/sys-process/time/Manifest
@@ -1 +1 @@
-DIST time-1.7.2.tar.gz 108371 SHA256 be6927ef6cb08c411b907ac039d9228e1649f4944ef3e0fbe381471d6a61e45b SHA512 dfde8f48a9d52bcc9080596feca6c429556e1e510977503138195d390cb52f27dd171f519d78226b0b48adc404062ec1f9234d92ea9707ec16d1be23ced90afc WHIRLPOOL 2d9bbe909bed2861459fdd2a72104ca754f99439d0ffcd9df1db23969c44b2cfcd334907a560569d552a4ed4184fd9793ad134ccb3eaad24244953c3443a1b7d
+DIST time-1.9.tar.gz 596779 BLAKE2B b48c2def2f7aaa79ddb8838ed9e103dd7b1b573b6084d1481838cac86eb7930b3a231469936ad23d5096e576ea728e821defb27fc8b3f9187809e3f5c01b7c57 SHA512 5c6dabbbe71e9103a47b892b86bb914c1704122d4fe7dff1e2cbd28503297163118d295077d8e062b035d673a1f91c36f8a45c7383f374fd766942b32bde4406
diff --git a/sys-process/time/files/time-1.7-incorrect_memory_usage.patch b/sys-process/time/files/time-1.7-incorrect_memory_usage.patch
new file mode 100644
index 0000000..ab1f4dd
--- /dev/null
+++ b/sys-process/time/files/time-1.7-incorrect_memory_usage.patch
@@ -0,0 +1,26 @@
+https://bugs.launchpad.net/ubuntu/+source/time/+bug/742248
+https://bugs.gentoo.org/332253
+
+--- time-1.7/ChangeLog
++++ time-1.7/ChangeLog
+@@ -1,3 +1,9 @@
++Fri Oct  1 00:00:00 2010	Bob Proulx	<bob@proulx.com>
++	The struct rusage reports ru_maxrss in kbytes not pages and 
++	should not be converted through pages-to-kbytes again. 
++	Reported by Sven Hartrumpf.
++	* time.c (summarize): Do not call ptok on ru_maxrss.
++
+ Thu Jul 11 12:37:17 1996  David J MacKenzie  <djm@catapult.va.pubnix.com>
+ 
+ 	* Version 1.7.
+--- time-1.7/time.c
++++ time-1.7/time.c
+@@ -398,7 +398,7 @@ summarize (fp, fmt, command, resp)
+ 		       ptok ((UL) resp->ru.ru_ixrss) / MSEC_TO_TICKS (v));
+ 	      break;
+ 	    case 'M':		/* Maximum resident set size.  */
+-	      fprintf (fp, "%lu", ptok ((UL) resp->ru.ru_maxrss));
++	      fprintf (fp, "%lu", (UL) resp->ru.ru_maxrss);
+ 	      break;
+ 	    case 'O':		/* Outputs.  */
+ 	      fprintf (fp, "%ld", resp->ru.ru_oublock);
diff --git a/sys-process/time/time-1.7.2.ebuild b/sys-process/time/time-1.7.2.ebuild
deleted file mode 100644
index 169bf02..0000000
--- a/sys-process/time/time-1.7.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Displays info about resources used by a program"
-HOMEPAGE="https://www.gnu.org/directory/time.html"
-SRC_URI="http://git.savannah.gnu.org/cgit/time.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-DEPEND="sys-apps/texinfo"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7-build.patch
-	"${FILESDIR}"/1.7-info-dir-entry.patch
-	"${FILESDIR}"/${PN}-1.7.2-incorrect_memory_usage.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/sys-process/time/time-1.9.ebuild b/sys-process/time/time-1.9.ebuild
new file mode 100644
index 0000000..e83ad18
--- /dev/null
+++ b/sys-process/time/time-1.9.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Displays info about resources used by a program"
+HOMEPAGE="https://www.gnu.org/directory/time.html"
+SRC_URI="http://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="*"
+IUSE=""
+
+DEPEND="sys-apps/texinfo"
diff --git a/virtual/awk/awk-1.ebuild b/virtual/awk/awk-1.ebuild
index 9b85a3b..60f42ad 100644
--- a/virtual/awk/awk-1.ebuild
+++ b/virtual/awk/awk-1.ebuild
@@ -1,22 +1,16 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/awk/awk-1.ebuild,v 1.3 2014/02/18 20:55:12 ottxor Exp $
+
+EAPI=7
 
 DESCRIPTION="Virtual for awk implementation"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
 SLOT="0"
 KEYWORDS="*"
-IUSE=""
 
-DEPEND=""
 RDEPEND="
 	|| (
 		>=sys-apps/gawk-4.0.1-r1
 		sys-apps/mawk
 		sys-apps/nawk
 		sys-apps/busybox
-	)
-	!<sys-apps/gawk-4.0.1-r1" #before 4.0.1-r1 awk symlinks did belong to gawk #455696
+	)"
diff --git a/virtual/awk/metadata.xml b/virtual/awk/metadata.xml
index 4651ee5..3102125 100644
--- a/virtual/awk/metadata.xml
+++ b/virtual/awk/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>ottxor@gentoo.org</email>
-    <name>Christoph Junghans</name>
-  </maintainer>
-  <herd>base-system</herd>
+	<maintainer type="person">
+		<email>junghans@gentoo.org</email>
+		<name>Christoph Junghans</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/virtual/editor/editor-0-r3.ebuild b/virtual/editor/editor-0-r3.ebuild
new file mode 100644
index 0000000..45d3a02
--- /dev/null
+++ b/virtual/editor/editor-0-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for editor"
+
+SLOT="0"
+KEYWORDS="*"
+
+# Add a package to RDEPEND only if the editor:
+# - can edit ordinary text files,
+# - works on the console,
+# - is a "display" or "visual" editor (e.g., using ncurses).
+
+RDEPEND="|| (
+	app-editors/nano
+	app-editors/dav
+	app-editors/e3
+	app-editors/ee
+	app-editors/elvis
+	app-editors/emacs:*
+	app-editors/emact
+	app-editors/ersatz-emacs
+	app-editors/fe
+	app-editors/jasspa-microemacs
+	app-editors/jed
+	app-editors/joe
+	app-editors/jove
+	app-editors/kakoune
+	app-editors/le
+	app-editors/levee
+	app-editors/lpe
+	app-editors/mg
+	app-editors/moe
+	app-editors/ne
+	app-editors/neovim
+	app-editors/ng
+	app-editors/qemacs
+	app-editors/teco
+	app-editors/uemacs-pk
+	app-editors/vile
+	app-editors/vim
+	app-editors/gvim
+	app-editors/vis
+	app-editors/xemacs
+	app-editors/zile
+	app-misc/mc[edit]
+	dev-lisp/cmucl
+	mail-client/alpine[-onlyalpine]
+)"
+
+# Packages outside app-editors providing an editor:
+#	app-misc/mc: mcedit (#62643)
+#	dev-lisp/cmucl: hemlock
+#	mail-client/alpine: pico
+#	sys-apps/busybox: vi
diff --git a/virtual/editor/editor-0.ebuild b/virtual/editor/editor-0.ebuild
deleted file mode 100644
index ca021fc..0000000
--- a/virtual/editor/editor-0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/editor/editor-0.ebuild,v 1.19 2010/01/23 11:16:50 ulm Exp $
-
-DESCRIPTION="Virtual for editor"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-# Add a package to RDEPEND only if the editor:
-# - can edit ordinary text files,
-# - works on the console.
-
-DEPEND=""
-RDEPEND="|| ( app-editors/nano
-	app-editors/dav
-	app-editors/e3
-	app-editors/easyedit
-	app-editors/efte
-	app-editors/elvis
-	app-editors/emacs
-	app-editors/emacs-vcs
-	app-editors/emact
-	app-editors/ersatz-emacs
-	app-editors/fe
-	app-editors/gvim
-	app-editors/jasspa-microemacs
-	app-editors/jed
-	app-editors/joe
-	app-editors/jove
-	app-editors/le
-	app-editors/levee
-	app-editors/lpe
-	app-editors/mg
-	app-editors/ne
-	app-editors/ng
-	app-editors/nvi
-	app-editors/qemacs
-	app-editors/teco
-	app-editors/uemacs-pk
-	app-editors/vile
-	app-editors/vim
-	app-editors/xemacs
-	app-editors/zile
-	app-misc/mc
-	dev-lisp/cmucl
-	mail-client/pine
-	sys-apps/busybox
-	sys-apps/ed )"
-
-# Packages outside app-editors providing an editor:
-#	app-misc/mc: mcedit (#62643)
-#	dev-lisp/cmucl: hemlock
-#	mail-client/pine: pico
-#	sys-apps/busybox: vi
diff --git a/virtual/editor/metadata.xml b/virtual/editor/metadata.xml
index 472bbac..41bebe1 100644
--- a/virtual/editor/metadata.xml
+++ b/virtual/editor/metadata.xml
@@ -1,8 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>emacs</herd>
-<herd>xemacs</herd>
-<herd>vim</herd>
-<herd>base-system</herd>
+	<maintainer type="project">
+		<email>emacs@gentoo.org</email>
+		<name>Gentoo Emacs project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/virtual/glut/glut-1.0.ebuild b/virtual/glut/glut-1.0.ebuild
deleted file mode 100644
index 022d1f9..0000000
--- a/virtual/glut/glut-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/glut/glut-1.0.ebuild,v 1.9 2010/01/11 10:59:08 ulm Exp $
-
-DESCRIPTION="Virtual for OpenGL utility toolkit"
-HOMEPAGE=""
-SRC_URI=""
-LICENSE=""
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-RDEPEND="media-libs/freeglut"
-DEPEND=""
diff --git a/virtual/pager/metadata.xml b/virtual/pager/metadata.xml
index 2811ade..5a5a3aa 100644
--- a/virtual/pager/metadata.xml
+++ b/virtual/pager/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-    <email>fauli@gentoo.org</email>
-    <name>Christian Faulhammer</name>
-</maintainer>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/virtual/pager/pager-0.ebuild b/virtual/pager/pager-0.ebuild
index 6a018d5..dea6b53 100644
--- a/virtual/pager/pager-0.ebuild
+++ b/virtual/pager/pager-0.ebuild
@@ -1,19 +1,14 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/pager/pager-0.ebuild,v 1.3 2009/12/15 19:47:07 abcd Exp $
+
+EAPI=6
 
 DESCRIPTION="Virtual for command-line pagers"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
 SLOT="0"
 KEYWORDS="*"
-IUSE=""
 
-DEPEND=""
 RDEPEND="|| ( sys-apps/less
-	sys-apps/more
 	sys-apps/most
-	sys-apps/util-linux
-	app-text/lv )"
+	sys-apps/util-linux[ncurses]
+	app-text/lv
+	app-editors/vim[vim-pager] )"
diff --git a/virtual/shadow/metadata.xml b/virtual/shadow/metadata.xml
deleted file mode 100644
index 96a2d58..0000000
--- a/virtual/shadow/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-</pkgmetadata>
diff --git a/virtual/shadow/shadow-0.ebuild b/virtual/shadow/shadow-0.ebuild
deleted file mode 100644
index d42e54e..0000000
--- a/virtual/shadow/shadow-0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/shadow/shadow-0.ebuild,v 1.11 2014/01/18 04:48:11 vapier Exp $
-
-DESCRIPTION="Virtual for user account management utilities"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-# >=shadow-4-1 is required because of bug #367633 (user.eclass needs it).
-# On Prefix installations we sort of have to hope there is some shadow
-# available, on UNIX-like (or emulated) systems this usually is the case.
-DEPEND=""
-RDEPEND="!prefix? ( || ( >=sys-apps/shadow-4.1 sys-apps/hardened-shadow ) )"
diff --git a/virtual/yacc/metadata.xml b/virtual/yacc/metadata.xml
index 96a2d58..e70c63a 100644
--- a/virtual/yacc/metadata.xml
+++ b/virtual/yacc/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/virtual/yacc/yacc-0.ebuild b/virtual/yacc/yacc-0.ebuild
index 2356724..edd98fd 100644
--- a/virtual/yacc/yacc-0.ebuild
+++ b/virtual/yacc/yacc-0.ebuild
@@ -1,15 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/yacc/yacc-0.ebuild,v 1.2 2011/08/15 13:04:46 nirbheek Exp $
 
-DESCRIPTION="virtual for yacc (yet another compiler compiler)"
-HOMEPAGE=""
-SRC_URI=""
+EAPI=7
 
-LICENSE=""
+DESCRIPTION="Virtual for yacc (yet another compiler compiler)"
+
 SLOT="0"
 KEYWORDS="*"
-IUSE=""
 
-DEPEND="|| ( sys-devel/bison dev-util/yacc )"
-RDEPEND="${DEPEND}"
+RDEPEND="|| ( sys-devel/bison dev-util/byacc dev-util/yacc )"
diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest
index c916712..afc5b7f 100644
--- a/x11-base/xorg-proto/Manifest
+++ b/x11-base/xorg-proto/Manifest
@@ -1 +1 @@
-DIST xorgproto-2020.1.tar.gz 1081369 BLAKE2B 1bed8d65499926a830180ee1fce5e5e57a276a6412231508eabb6c5eea5ee20dcce4046fc82203d5be88d1f24fb7919289393551d339e5cf5cb80b1c14f22c42 SHA512 d0bc3aec517fd00fa5fd32a5715760c34810a19154e10fb1f92f2e2fe7f26136f7ba9b76b47fcd37c3c4796663154f4e5abf6a18dd634619b0f718f3e4737ae9
+DIST xorgproto-2021.4.tar.gz 1141941 BLAKE2B 016a3c2f30ed064855de2a13d86a4b7bc9420ff10e8ac3ba97e08512fef6f0495a69dcaea7f12c7d8694a52284b500a38aee73de7bf2ff0a295715354d04eab0 SHA512 5f4c94d3ee20635f2358d7644be54d5e291bafba15a7713583acbb3564c2799da4ba33ffba625273fe015e4ab733cbaec146467804fd2174eb5fd1ff3bf21019
diff --git a/x11-base/xorg-proto/xorg-proto-2020.1.ebuild b/x11-base/xorg-proto/xorg-proto-2020.1.ebuild
deleted file mode 100644
index c822e78..0000000
--- a/x11-base/xorg-proto/xorg-proto-2020.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/xorg-/xorg}"
-MY_P="${MY_PN}-${PV}"
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/${MY_PN}.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} meson
-
-DESCRIPTION="X.Org combined protocol headers"
-HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="*"
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
diff --git a/x11-base/xorg-proto/xorg-proto-2021.4.ebuild b/x11-base/xorg-proto/xorg-proto-2021.4.ebuild
new file mode 100644
index 0000000..dd413a2
--- /dev/null
+++ b/x11-base/xorg-proto/xorg-proto-2021.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+MY_PN="${PN/xorg-/xorg}"
+MY_P="${MY_PN}-${PV}"
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/${MY_PN}.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} meson python-any-r1
+
+DESCRIPTION="X.Org combined protocol headers"
+HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="*"
+	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		$(python_gen_any_dep '
+			dev-python/python-libevdev[${PYTHON_USEDEP}]
+		')
+	)
+"
+RDEPEND=""
+
+python_check_deps() {
+	has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_install() {
+	meson_src_install
+
+	mv "${ED}"/usr/share/doc/{xorgproto,${P}} || die
+}
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
deleted file mode 100644
index 1aa5bb1..0000000
--- a/x11-libs/cairo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cairo-1.14.12.tar.xz 36251896 BLAKE2B 3a6b374390cbc7ff965bcfdf72b5df28c72e8be1ed524adf0dbde2ae74840991e6c158c528c626fb0c902be95bd846366690b280449d6f74689e7090a562958e SHA512 ede6e75ae95605bf5c4b3859b1824cf125c4a2a35a67d38244cc70951ca44b1d4fd7cf622953d3a7cb868fb5b00856ef6d68ee615276b76eec437641290b01e1
diff --git a/x11-libs/cairo/cairo-1.14.12-r1.ebuild b/x11-libs/cairo/cairo-1.14.12-r1.ebuild
deleted file mode 100644
index be75689..0000000
--- a/x11-libs/cairo/cairo-1.14.12-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic autotools multilib-minimal
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/cairo"
-	SRC_URI=""
-	KEYWORDS="~*"
-else
-	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="*"
-fi
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="https://www.cairographics.org"
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-IUSE="X aqua debug gles2 +glib opengl static-libs +svg valgrind xcb"
-# gtk-doc regeneration doesn't seem to work with out-of-source builds
-#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
-
-# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
-	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
-	gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	opengl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	)
-	xcb? (
-		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-2
-	X? ( x11-base/xorg-proto )"
-#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
-#	doc? (
-#		>=dev-util/gtk-doc-1.6
-#		~app-text/docbook-xml-dtd-4.2
-#	)"
-
-REQUIRED_USE="
-	gles2? ( !opengl )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
-	"${FILESDIR}"/${PN}-respect-fontconfig.patch
-)
-
-src_prepare() {
-	default
-	if has_version ">=sys-libs/binutils-libs-2.34"; then
-		eapply "${FILESDIR}"/${PN}-1.16.0-binutils-2.34.patch
-	fi
-
-	# tests and perf tools require X, bug #483574
-	if ! use X; then
-		sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
-	fi
-
-	# Slightly messed build system YAY
-	if [[ ${PV} == *9999* ]]; then
-		touch boilerplate/Makefile.am.features
-		touch src/Makefile.am.features
-		touch ChangeLog
-	fi
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myopts
-
-	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
-
-	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
-	[[ ${CHOST} == *-darwin* ]] && myopts+=" --disable-symbol-lookup"
-
-	# TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010
-	if ! multilib_is_native_abi; then
-		myopts+=" --disable-qt"
-	fi
-
-	# [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--disable-dependency-tracking \
-		$(use_with X x) \
-		$(use_enable X tee) \
-		$(use_enable X xlib) \
-		$(use_enable X xlib-xrender) \
-		$(use_enable aqua quartz) \
-		$(use_enable aqua quartz-image) \
-		$(use_enable debug test-surfaces) \
-		$(use_enable gles2 glesv2) \
-		$(use_enable glib gobject) \
-		$(use_enable opengl gl) \
-		$(use_enable static-libs static) \
-		$(use_enable svg) \
-		$(use_enable valgrind) \
-		$(use_enable xcb) \
-		$(use_enable xcb xcb-shm) \
-		--enable-ft \
-		--enable-pdf \
-		--enable-png \
-		--enable-ps \
-		--disable-drm \
-		--disable-directfb \
-		--disable-gallium \
-		--disable-qt \
-		--disable-vg \
-		--disable-xlib-xcb \
-		${myopts}
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-}
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
deleted file mode 100644
index 6f9c024..0000000
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic autotools multilib-minimal
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/cairo"
-	SRC_URI=""
-	KEYWORDS="~*"
-else
-	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="*"
-fi
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="https://www.cairographics.org"
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils valgrind xcb"
-# gtk-doc regeneration doesn't seem to work with out-of-source builds
-#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
-
-# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
-RESTRICT="test"
-
-RDEPEND="
-	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
-	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
-	gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	opengl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
-	utils? ( >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	)
-	xcb? (
-		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-2
-	X? ( x11-base/xorg-proto )"
-#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
-#	doc? (
-#		>=dev-util/gtk-doc-1.6
-#		~app-text/docbook-xml-dtd-4.2
-#	)"
-
-REQUIRED_USE="
-	gles2? ( !opengl )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
-	"${FILESDIR}"/${PN}-respect-fontconfig.patch
-)
-
-src_prepare() {
-	default
-
-	# tests and perf tools require X, bug #483574
-	if ! use X; then
-		sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
-	fi
-
-	# Slightly messed build system YAY
-	if [[ ${PV} == *9999* ]]; then
-		touch boilerplate/Makefile.am.features
-		touch src/Makefile.am.features
-		touch ChangeLog
-	fi
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myopts
-
-	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
-
-	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
-
-	# TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010
-	if ! multilib_is_native_abi; then
-		myopts+=" --disable-qt"
-	fi
-
-	# [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--disable-dependency-tracking \
-		$(use_with X x) \
-		$(use_enable X tee) \
-		$(use_enable X xlib) \
-		$(use_enable X xlib-xrender) \
-		$(use_enable aqua quartz) \
-		$(use_enable aqua quartz-image) \
-		$(use_enable debug test-surfaces) \
-		$(use_enable gles2 glesv2) \
-		$(use_enable glib gobject) \
-		$(use_enable opengl gl) \
-		$(use_enable static-libs static) \
-		$(use_enable svg) \
-		$(use_enable utils interpreter) \
-		$(use_enable utils script) \
-		$(use_enable utils trace) \
-		$(use_enable valgrind) \
-		$(use_enable xcb) \
-		$(use_enable xcb xcb-shm) \
-		--enable-ft \
-		--enable-pdf \
-		--enable-png \
-		--enable-ps \
-		--disable-drm \
-		--disable-directfb \
-		--disable-gallium \
-		--disable-qt \
-		--disable-vg \
-		--disable-xlib-xcb \
-		${myopts}
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-}
diff --git a/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch b/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch
deleted file mode 100644
index 6822121..0000000
--- a/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 03fa352..7e11d24 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,10 +18,6 @@ ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS}
- 
- DIST_SUBDIRS = src doc util boilerplate test perf
- SUBDIRS = src doc util
--# libpng is required for our test programs
--if CAIRO_HAS_PNG_FUNCTIONS
--SUBDIRS += boilerplate test perf
--endif
- 
- configure: cairo-version.h
- 
diff --git a/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch
deleted file mode 100644
index 46e20bc..0000000
--- a/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/util/cairo-trace/lookup-symbol.c
-+++ b/util/cairo-trace/lookup-symbol.c
-@@ -145,14 +145,14 @@ find_address_in_section (bfd *abfd,
-     if (symbol->found)
- 	return;
- 
--    if ((bfd_get_section_flags (symtab->bfd, section) & SEC_ALLOC) == 0)
-+    if ((bfd_section_flags (section) & SEC_ALLOC) == 0)
- 	return;
- 
--    vma = bfd_get_section_vma (symtab->bfd, section);
-+    vma = bfd_section_vma (section);
-     if (symbol->pc < vma)
- 	return;
- 
--    size = bfd_section_size (symtab->bfd, section);
-+    size = bfd_section_size (section);
-     if (symbol->pc >= vma + size)
- 	return;
diff --git a/x11-libs/cairo/files/cairo-respect-fontconfig.patch b/x11-libs/cairo/files/cairo-respect-fontconfig.patch
deleted file mode 100644
index b0a1b29..0000000
--- a/x11-libs/cairo/files/cairo-respect-fontconfig.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- cairo-1.7.6-orig/src/cairo-ft-font.c	2008-09-29 21:43:13.000000000 +0100
-+++ cairo-1.7.6/src/cairo-ft-font.c	2008-09-29 21:52:19.000000000 +0100
-@@ -1705,7 +1705,9 @@
- 	options->base.subpixel_order = other->base.subpixel_order;
-     }
- 
--    if (options->base.hint_style == CAIRO_HINT_STYLE_DEFAULT)
-+    options->base.hint_style = CAIRO_HINT_STYLE_DEFAULT;
-+
-+    if (other->base.hint_style != CAIRO_HINT_STYLE_DEFAULT)
- 	options->base.hint_style = other->base.hint_style;
- 
-     if (other->base.hint_style == CAIRO_HINT_STYLE_NONE)
diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml
deleted file mode 100644
index 7c19663..0000000
--- a/x11-libs/cairo/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>tetromino@gentoo.org</email>
-		<name>Alexandre Rostovtsev</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<use>
-		<flag name="opengl" restrict="&gt;=x11-libs/cairo-1.10.0">Build the OpenGL backend</flag>
-		<flag name="gles2">Build the OpenGL ES 2 backend</flag>
-		<flag name="glib">Compile with GLib Object System support</flag>
-		<flag name="utils">Build support for Cairo script and trace utilities</flag>
-		<flag name="valgrind">Built-in support to mark memory regions</flag>
-	</use>
-	<upstream>
-		<remote-id type="cpe">cpe:/a:cairographics:cairo</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
new file mode 100644
index 0000000..db98225
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -0,0 +1 @@
+DIST gdk-pixbuf-2.42.6.tar.xz 7708484 BLAKE2B 003b1de915ce8f17a987059bd9b2679127a08032dc70567ea169aa0dcdcc194216f66d03f35f5580e70e1c05fa15f08b18c86a72e9bcefc2bd6ed59abdb24b82 SHA512 02e6d89de6cb6c9768d5173dada88c038e2454b4345ebc6f7b012d484303c08e53b58f085e872290555e1ccb74a478fa6cef4623a75f2e1f05c27bfc4e986f4d
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch
new file mode 100644
index 0000000..77ea7e7
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch
@@ -0,0 +1,34 @@
+From 21b8eb73d9272e06707ad6d0357f3034b8d9a46f Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <blueness@gentoo.org>
+Date: Wed, 14 Oct 2015 16:18:19 -0400
+Subject: [PATCH] tests/pixbuf-lowmem.c: Do not run pixbuf-lowmem test on
+ uClibc
+
+pixbuf-lowmem.c depends on GNU libc internals and does not build
+on musl or uClibc.  Commit e1fd25a fixes this issue for musl by
+testing if __GLIBC__ is set.  However, uClibc sets __GLIBC__ and
+so this check is insufficient there.  We expand the check so that
+we run pixbuf-lowmem on glibc, while avoiding it on both musl and
+uClibc.
+
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+---
+ tests/pixbuf-lowmem.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/pixbuf-lowmem.c b/tests/pixbuf-lowmem.c
+index 9e9571f..ec7504f 100644
+--- a/tests/pixbuf-lowmem.c
++++ b/tests/pixbuf-lowmem.c
+@@ -24,7 +24,7 @@
+ #include <time.h>
+ #include <string.h>
+ 
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
+ #define PRETEND_MEM_SIZE (16 * 1024 * 1024)
+ #define REMAINING_MEM_SIZE 100000
+ 
+-- 
+2.4.9
+
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild
new file mode 100644
index 0000000..c68e3f6
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson-multilib multilib xdg
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gdk-pixbuf"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="*"
+IUSE="gtk-doc +introspection jpeg tiff"
+
+# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
+DEPEND="
+	>=dev-libs/glib-2.56.0:2[${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	!<x11-libs/gtk+-2.90.4:3
+"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/glib:2
+	dev-libs/libxslt
+	dev-util/glib-utils
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.3
+		dev-util/gi-docgen
+	)
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	>=dev-util/meson-0.55.3
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
+)
+
+PATCHES=(
+	# Do not run lowmem test on uclibc
+	# See https://bugzilla.gnome.org/show_bug.cgi?id=756590
+	"${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	# This will avoid polluting the pkg-config file with versioned libpng,
+	# which is causing problems with libpng14 -> libpng15 upgrade
+	# See upstream bug #667068
+	# First check that the pattern is present, to catch upstream changes on bumps,
+	# because sed doesn't return failure code if it doesn't do any replacements
+	grep -q "foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]" meson.build || die "libpng check order has changed upstream"
+	sed -e "s/foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/foreach png: \[ 'libpng', 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/" -i meson.build || die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dpng=true
+		$(meson_use tiff)
+		$(meson_use jpeg)
+		-Dbuiltin_loaders=png
+		-Drelocatable=false
+		#native_windows_loaders
+		-Dinstalled_tests=false
+		-Dgio_sniffing=true
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_native_use_feature introspection)
+		$(meson_native_true man)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	if use gtk-doc; then
+		mkdir "${ED}"/usr/share/doc/${PF}/html || die
+		mv "${ED}"/usr/share/doc/{${PN}/,${PF}/html/} || die
+		mv "${ED}"/usr/share/doc/{gdk-pixdata/,${PF}/html/} || die
+	fi
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make sure loaders.cache belongs to gdk-pixbuf alone
+		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
+
+		if [[ -e ${EROOT}/${cache} ]]; then
+			cp "${EROOT}"/${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+
+	multilib_foreach_abi multilib_pkg_preinst
+	gnome2_gdk_pixbuf_savelist
+}
+
+pkg_postinst() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	xdg_pkg_postinst
+	multilib_foreach_abi gnome2_gdk_pixbuf_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		rm -f "${EROOT}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+	fi
+}
diff --git a/x11-libs/gdk-pixbuf/metadata.xml b/x11-libs/gdk-pixbuf/metadata.xml
new file mode 100644
index 0000000..21782ab
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnome:gdk-pixbuf</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
index 8dedc37..78e6e6a 100644
--- a/x11-libs/libICE/Manifest
+++ b/x11-libs/libICE/Manifest
@@ -1 +1 @@
-DIST libICE-1.0.9.tar.bz2 384921 SHA256 8f7032f2c1c64352b5423f6b48a8ebdc339cc63064af34d66a6c9aa79759e202 SHA512 daa8126ee5279c08f801274a2754132762dea2a40f4733c4b0bf8e8bdad61cba826939a2e067beb3524e256a98a2b83f23c8d4643f3e75a284ab02cc73da41b7 WHIRLPOOL efdd7bc60416d883b15af7cfd0c152a2b7f7ee539d0717704b89c0621f9cefa718b14af63fb1d10709e7b0cc84d660f30d069ff0b273d304be8f0c5a74fe1090
+DIST libICE-1.0.10.tar.bz2 393116 BLAKE2B 2089cbddab679f8565f0b7bf0313616b71f33cd403aea2cb84032a247c1e1d01de343058c31be73214bd6dea7fc167fa6a0f81704c960bc279d904bdf4bf804f SHA512 2f1ef2c32c833c71894a08fa7e7ed53f301f6c7bd22485d71c12884d8e8b36b99f362ec886349dcc84d08edc81c8b2cea035320831d64974edeba021b433c468
diff --git a/x11-libs/libICE/libICE-1.0.10.ebuild b/x11-libs/libICE/libICE-1.0.10.ebuild
new file mode 100644
index 0000000..d6d6944
--- /dev/null
+++ b/x11-libs/libICE/libICE-1.0.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org Inter-Client Exchange library"
+
+KEYWORDS="*"
+IUSE="ipv6"
+
+DEPEND="x11-base/xorg-proto
+	x11-libs/xtrans"
+RDEPEND="${DEPEND}
+	elibc_glibc? ( dev-libs/libbsd )"
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		--disable-docs
+		--disable-specs
+		--without-fop
+	)
+	xorg-3_src_configure
+}
diff --git a/x11-libs/libICE/libICE-1.0.9-r2.ebuild b/x11-libs/libICE/libICE-1.0.9-r2.ebuild
deleted file mode 100644
index e894cb6..0000000
--- a/x11-libs/libICE/libICE-1.0.9-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Inter-Client Exchange library"
-
-KEYWORDS="*"
-IUSE="ipv6"
-
-RDEPEND="x11-base/xorg-proto
-	x11-libs/xtrans
-	elibc_glibc? ( dev-libs/libbsd )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable doc docs)
-		$(use_enable doc specs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-}
diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest
index 34e0892..c85bffd 100644
--- a/x11-libs/libSM/Manifest
+++ b/x11-libs/libSM/Manifest
@@ -1 +1 @@
-DIST libSM-1.2.3.tar.bz2 362595 SHA256 2d264499dcb05f56438dee12a1b4b71d76736ce7ba7aa6efbf15ebb113769cbb SHA512 74c42e27029db78475e62025b4711dbac5e22d2f8e8a24be98a1c31b03c0fc4afe859928f851800ea0b76854f12147900dc4f27bbfd3d8ea45daaaf24b70a903 WHIRLPOOL aab4583e10a9d3fccc01d6a3634d97458868f56c39ac67740538e7664df636dcf658190460f994b6f16ba967a24a2e8db1ddcf2e2cd6e2d2cc137bb1d55c7cf8
+DIST libSM-1.2.3.tar.bz2 362595 BLAKE2B 20b7327cd16e066bd2a81eae60f52cab7499dd92d65786d0e5726faa64c2055376749562ff2158777f83711e1517b90b2dc94670892b787889b3950c0a975b68 SHA512 74c42e27029db78475e62025b4711dbac5e22d2f8e8a24be98a1c31b03c0fc4afe859928f851800ea0b76854f12147900dc4f27bbfd3d8ea45daaaf24b70a903
diff --git a/x11-libs/libSM/libSM-1.2.3-r1.ebuild b/x11-libs/libSM/libSM-1.2.3-r1.ebuild
new file mode 100644
index 0000000..033541c
--- /dev/null
+++ b/x11-libs/libSM/libSM-1.2.3-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org Session Management library"
+
+KEYWORDS="*"
+IUSE="ipv6 +uuid"
+
+RDEPEND="x11-base/xorg-proto
+	>=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
+	x11-libs/xtrans
+	uuid? (
+		elibc_Darwin? ( sys-libs/native-uuid )
+		!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? (
+			>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
+		) ) )
+	)"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local withuuid=$(use_with uuid libuuid)
+
+	# do not use uuid even if available in libc (like on FreeBSD)
+	use uuid || export ac_cv_func_uuid_create=no
+
+	if use uuid ; then
+		case ${CHOST} in
+			*-solaris*|*-darwin*)
+				if [[ ! -d ${EROOT}/usr/include/uuid ]] &&
+					[[ -d ${ROOT}/usr/include/uuid ]]
+				then
+					# Solaris and Darwin have uuid provided by the host
+					# system.  Since util-linux's version is based on this
+					# version, and on Darwin actually breaks host headers when
+					# installed, we can "pretend" for libSM we have libuuid
+					# installed, while in fact we don't
+					withuuid="--without-libuuid"
+					export HAVE_LIBUUID=yes
+					export LIBUUID_CFLAGS="-I${ROOT}/usr/include/uuid"
+					# Darwin has uuid in libSystem
+					[[ ${CHOST} == *-solaris* ]] &&	export LIBUUID_LIBS="-luuid"
+				fi
+				;;
+		esac
+	fi
+
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable doc docs)
+		$(use_with doc xmlto)
+		${withuuid}
+		--without-fop
+	)
+	xorg-3_src_configure
+}
diff --git a/x11-libs/libSM/libSM-1.2.3.ebuild b/x11-libs/libSM/libSM-1.2.3.ebuild
deleted file mode 100644
index af94a12..0000000
--- a/x11-libs/libSM/libSM-1.2.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Session Management library"
-
-KEYWORDS="*"
-IUSE="doc ipv6 +uuid"
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
-	x11-libs/xtrans
-	!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? (
-		uuid? ( >=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}] )
-	) ) )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local withuuid=$(use_with uuid libuuid)
-
-	# do not use uuid even if available in libc (like on FreeBSD)
-	use uuid || export ac_cv_func_uuid_create=no
-
-	if use uuid ; then
-		case ${CHOST} in
-			*-solaris*|*-darwin*)
-				if [[ ! -d ${EROOT}usr/include/uuid ]] &&
-					[[ -d ${ROOT}usr/include/uuid ]]
-				then
-					# Solaris and Darwin have uuid provided by the host
-					# system.  Since util-linux's version is based on this
-					# version, and on Darwin actually breaks host headers when
-					# installed, we can "pretend" for libSM we have libuuid
-					# installed, while in fact we don't
-					withuuid="--without-libuuid"
-					export HAVE_LIBUUID=yes
-					export LIBUUID_CFLAGS="-I${ROOT}usr/include/uuid"
-					# Darwin has uuid in libSystem
-					[[ ${CHOST} == *-solaris* ]] &&	export LIBUUID_LIBS="-luuid"
-				fi
-				;;
-		esac
-	fi
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable doc docs)
-		$(use_with doc xmlto)
-		${withuuid}
-		--without-fop
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 4fcb6e8..b64f51b 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1 +1 @@
-DIST libX11-1.6.12.tar.bz2 2376498 BLAKE2B a2c6c76d5d4a15073f7837e6a72ecd8b7711dfcec48c54da538a6100a4afa01334a9456376633f1a2365717e03231c6b777c5683e462d10564065dc2437da39a SHA512 79df7d61d9009b0dd3b65f67a62189aa0a43799c01026b3d2d534092596a0b67f246af5e398a89eb1ccc61a27335f81be8262b8a39768a76f62d862cd7415a47
+DIST libX11-1.7.2.tar.bz2 2392982 BLAKE2B ce64bd8172fcf4f5bf0783c4f25f4d220fa0eceb211b7a852802256f7241f543769565f70a59c1ff14e0bb1ae7d3f05914f8f0b1bd423dcb20181cfb2227c70d SHA512 d01e5c1848c76218605e5af2d353de6b301a251555b52a38dbe930e6635d5e8a92d1486eb6d328ad5d42a5939e0d16868ffa19a75e5a7863d1a32e0d0727bdc7
diff --git a/x11-libs/libX11/libX11-1.6.12.ebuild b/x11-libs/libX11/libX11-1.6.12.ebuild
deleted file mode 100644
index 179e57c..0000000
--- a/x11-libs/libX11/libX11-1.6.12.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit toolchain-funcs xorg-3
-
-DESCRIPTION="X.Org X11 library"
-
-KEYWORDS="*"
-IUSE="ipv6 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
-	!<x11-base/xorg-proto-2019.2"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/xtrans"
-BDEPEND="test? ( dev-lang/perl )"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-		$(use_enable doc specs)
-		$(use_enable ipv6)
-		--without-fop
-		CPP="$(tc-getPROG CPP cpp)"
-	)
-}
diff --git a/x11-libs/libX11/libX11-1.7.2.ebuild b/x11-libs/libX11/libX11-1.7.2.ebuild
new file mode 100644
index 0000000..66372b6
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.7.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit toolchain-funcs xorg-3
+
+# Note: please bump this with x11-misc/compose-tables
+DESCRIPTION="X.Org X11 library"
+
+KEYWORDS="*"
+IUSE="ipv6 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
+	!<x11-base/xorg-proto-2019.2
+	x11-misc/compose-tables"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/xtrans"
+BDEPEND="test? ( dev-lang/perl )"
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc xmlto)
+		$(use_enable doc specs)
+		$(use_enable ipv6)
+		--without-fop
+		CPP="$(tc-getPROG CPP cpp)"
+	)
+	xorg-3_src_configure
+}
+
+src_install() {
+	xorg-3_src_install
+	rm -rf "${ED}"/usr/share/X11/locale || die
+}
diff --git a/x11-libs/libXau/Manifest b/x11-libs/libXau/Manifest
index f68c917..2e169e2 100644
--- a/x11-libs/libXau/Manifest
+++ b/x11-libs/libXau/Manifest
@@ -1 +1 @@
-DIST libXau-1.0.8.tar.bz2 295297 SHA256 fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2 SHA512 9f933d22f8f2411ae770094589cbe170c631a1437d572664e0fa6b9608e6ec39deef752f2dd6408ab45acdf01bf1827ef3ced640a33da787d9cfb546f12397b5 WHIRLPOOL 2315bec66062227051833e6248582c77ecb776947f6dc52369e51ef1fc810a2c5480d0f56e9457d02a54d1fc403871ee80a209fedc92040bfe2c72ca4880bb80
+DIST libXau-1.0.9.tar.bz2 322650 BLAKE2B 0bc9eb01b99f13a8f978edd7ff63d76f89071ac27f1cd946f9ebc96165a892e7ba7cdcdc52f73e8ed6d5b3d672f8a29a24582195fe14d1d24730a797a592cdd3 SHA512 3ca454ba466a807ea28b0f715066d73dc76ad312697b121d43e4d5766215052e9b7ffb8fe3ed3e496fa3f2a13f164ac692ff85cc428e26731b679f0f06a1d562
diff --git a/x11-libs/libXau/libXau-1.0.8-r1.ebuild b/x11-libs/libXau/libXau-1.0.8-r1.ebuild
deleted file mode 100644
index bbe42d6..0000000
--- a/x11-libs/libXau/libXau-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org X authorization library"
-
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXau/libXau-1.0.9-r1.ebuild b/x11-libs/libXau/libXau-1.0.9-r1.ebuild
new file mode 100644
index 0000000..f7c18f9
--- /dev/null
+++ b/x11-libs/libXau/libXau-1.0.9-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org X authorization library"
+
+KEYWORDS="*"
+
+DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/libXaw/Manifest b/x11-libs/libXaw/Manifest
deleted file mode 100644
index b4481e1..0000000
--- a/x11-libs/libXaw/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libXaw-1.0.13.tar.bz2 674140 BLAKE2B e141a135d1a45edfb71687951542a31d838bf560997a631b3590db0581f94768a8cc77ebd86c7cff60668e9843b1258a9eb60383a4d25b704ce9dc91fc6d0bdf SHA512 d768a39f7111802493fa1df1b80d858e4139ceeb883d45ff13ce3b7a0e775a7d2834b7ad157c8330117f04c32f38979795332dd7a119adb2344fcb1aa9cf1e2f
diff --git a/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild b/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild
deleted file mode 100644
index edd187d..0000000
--- a/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xaw library"
-
-KEYWORDS="*"
-IUSE="deprecated"
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable deprecated xaw6)
-		$(use_enable doc specs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libXaw/metadata.xml b/x11-libs/libXaw/metadata.xml
deleted file mode 100644
index 570177e..0000000
--- a/x11-libs/libXaw/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-<use>
-	<flag name="deprecated">Install deprecated Xaw6 library.</flag>
-</use>
-</pkgmetadata>
diff --git a/x11-libs/libXcomposite/Manifest b/x11-libs/libXcomposite/Manifest
deleted file mode 100644
index 313b5f7..0000000
--- a/x11-libs/libXcomposite/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libXcomposite-0.4.3.tar.bz2 246715 RMD160 dfeb17e6fc7d48e82655c22d9c98ce79be192d76 SHA1 081b26b556d55e20d7956c80a2ea2854962aecec SHA256 32294d28f4ee46db310c344546d98484728b7d52158c6d7c25bba02563b41aad
diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.3-r1.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.3-r1.ebuild
deleted file mode 100644
index 5760310..0000000
--- a/x11-libs/libXcomposite/libXcomposite-0.4.3-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcomposite/libXcomposite-0.4.3-r1.ebuild,v 1.4 2011/06/28 21:26:29 ranger Exp $
-
-EAPI=4
-
-XORG_DOC=doc
-inherit xorg-2
-
-DESCRIPTION="X.Org Xcomposite library"
-
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXfixes
-	>=x11-proto/compositeproto-0.4
-	x11-proto/xproto"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-	)
-}
diff --git a/x11-libs/libXcomposite/metadata.xml b/x11-libs/libXcomposite/metadata.xml
deleted file mode 100644
index 01c4c00..0000000
--- a/x11-libs/libXcomposite/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-</pkgmetadata>
diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest
index f031628..b0d8cbf 100644
--- a/x11-libs/libXcursor/Manifest
+++ b/x11-libs/libXcursor/Manifest
@@ -1 +1 @@
-DIST libXcursor-1.1.14.tar.bz2 311896 SHA256 9bc6acb21ca14da51bda5bc912c8955bc6e5e433f0ab00c5e8bef842596c33df SHA512 687963b54da66be25371f64a88f91812b38de4ffc3b806070f3aeb1da379df16ede819201a352b3fb66efc6b40a36a22770add3ae464f2008aff3e23cb60a8e6 WHIRLPOOL 3cb8adedd3b4f68f37814a880949a7d05d429b3f7f80a94456af823e921844dd338c5f5fa0da4a157b1b853ca8116e8366b004c6f4561150121397440aa651ec
+DIST libXcursor-1.2.0.tar.bz2 334144 BLAKE2B d1dc7f09b88bc570653e615ec5e854b7cd9362a8429e90dc36e1d7efe26fd9c0eb9a38ae8d18a308e1912bb1765e2adbf13f36a265500be2f787d60017091898 SHA512 2b12d0fd17e311ce269dbba58588698885815eb07aa44d48525ed5cd9e5f379bb90138a792a191e2f74888ab10b3ca9a4f507f21de0984ed79748973ab927a03
diff --git a/x11-libs/libXcursor/libXcursor-1.1.14.ebuild b/x11-libs/libXcursor/libXcursor-1.1.14.ebuild
deleted file mode 100644
index f6d31be..0000000
--- a/x11-libs/libXcursor/libXcursor-1.1.14.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcursor/libXcursor-1.1.14.ebuild,v 1.1 2013/06/24 12:32:56 chithanh Exp $
-
-EAPI=4
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xcursor library"
-
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND=">=x11-libs/libXrender-0.8.2
-	x11-libs/libXfixes
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-icondir=/usr/share/cursors/xorg-x11
-	--with-cursorpath='~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps'
-)
diff --git a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
new file mode 100644
index 0000000..48823f7
--- /dev/null
+++ b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org Xcursor library"
+
+KEYWORDS="*"
+IUSE="doc"
+
+RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+XORG_CONFIGURE_OPTIONS=(
+	--with-icondir="${EPREFIX}"/usr/share/cursors/xorg-x11
+	--with-cursorpath='~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps'
+)
diff --git a/x11-libs/libXcursor/metadata.xml b/x11-libs/libXcursor/metadata.xml
index 01c4c00..e943b72 100644
--- a/x11-libs/libXcursor/metadata.xml
+++ b/x11-libs/libXcursor/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/libXdamage/Manifest b/x11-libs/libXdamage/Manifest
index a68a20d..93ac653 100644
--- a/x11-libs/libXdamage/Manifest
+++ b/x11-libs/libXdamage/Manifest
@@ -1 +1 @@
-DIST libXdamage-1.1.4.tar.bz2 278937 SHA256 7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad SHA512 1058cef11a8f0edfcae7265837369e492b007c34d56ae04145b558e5f02a163827aba1d0b80656f4c8e5d1e9a40f5077d93b7ff4f5e704f7409060dceba03904 WHIRLPOOL b375cecaf924396e186e2836ce6bdb8f78a29260898a0d8cf4dd537dd1240d5b0a0a425792727ecc42a95b4d93dd050e265c661f32bea992377c6e5533c8ab39
+DIST libXdamage-1.1.5.tar.bz2 303750 BLAKE2B 78cb593365cc842cbc6fcb4dec94aa28293c385ad7ecfef032117d19e98c7b3f252c53b79559096b1c0b259d24a59220e9af7fb60d55c55f4474a33d117958de SHA512 a3ca6cc33b1727f717a3e2aa5593f660508a81a47918a0aa949e9e8fba105e303fe5071983b48caac92feea0fe6e8e01620805e4d19b41f21f20d837b191c124
diff --git a/x11-libs/libXdamage/libXdamage-1.1.4-r2.ebuild b/x11-libs/libXdamage/libXdamage-1.1.4-r2.ebuild
deleted file mode 100644
index b650540..0000000
--- a/x11-libs/libXdamage/libXdamage-1.1.4-r2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xdamage library"
-
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXdamage/libXdamage-1.1.5.ebuild b/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
new file mode 100644
index 0000000..2edf968
--- /dev/null
+++ b/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org Xdamage library"
+
+KEYWORDS="*"
+IUSE=""
+
+RDEPEND="
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-libs/libXdmcp/Manifest b/x11-libs/libXdmcp/Manifest
index a8cc411..d2b34b6 100644
--- a/x11-libs/libXdmcp/Manifest
+++ b/x11-libs/libXdmcp/Manifest
@@ -1 +1 @@
-DIST libXdmcp-1.1.2.tar.bz2 331518 SHA256 81fe09867918fff258296e1e1e159f0dc639cb30d201c53519f25ab73af4e4e2 SHA512 f96005934b8bc752059106f8caf7df0574f5ef3c7a83bd797497b56ca556a7ff4dc1d28195e421259e82ea027b5c738094add3ec107a22544c9070725d8d46bb WHIRLPOOL ad5a3c86463d4ae582f1ffaf2ae85f5d118f7789b18f9cafd08dcc43b6fe03d9797430e0a686a7d422e09342f4a2c01f0e83a9eb9563dd6a66bf94722b81f2e0
+DIST libXdmcp-1.1.3.tar.bz2 332795 BLAKE2B 0c9df30450857dd2703c4bf54972d5a26c1b6f8e216b4f3173491def650cc32742554eee04c883670e783eb5f476df94ed2c0c52274a51e2bc54d45e5dcb8c77 SHA512 cb1d4650f97d66e73acd2465ec7d757b9b797cce2f85e301860a44997a461837eea845ec9bd5b639ec5ca34c804f8bdd870697a5ce3f4e270b687c9ef74f25ec
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.2-r2.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.2-r2.ebuild
deleted file mode 100644
index 9113d28..0000000
--- a/x11-libs/libXdmcp/libXdmcp-1.1.2-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org X Display Manager Control Protocol library"
-
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	elibc_glibc? ( dev-libs/libbsd )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc docs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-}
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
new file mode 100644
index 0000000..90761c5
--- /dev/null
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org X Display Manager Control Protocol library"
+
+KEYWORDS="*"
+
+RDEPEND="elibc_glibc? ( dev-libs/libbsd )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_enable doc docs)
+		$(use_with doc xmlto)
+		--without-fop
+	)
+	xorg-3_src_configure
+}
diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest
index 23001ac..d97a33a 100644
--- a/x11-libs/libXext/Manifest
+++ b/x11-libs/libXext/Manifest
@@ -1 +1 @@
-DIST libXext-1.3.3.tar.bz2 389523 SHA256 b518d4d332231f313371fdefac59e3776f4f0823bcb23cf7c7305bfb57b16e35 SHA512 669d61545d10b999872addbf5628127840a221cbeaafb5ffa4328e0e0e1823583ece973bcafd5f13852ed58d4b0fe313a35f304ac80c6ed2b382cbbca977761a WHIRLPOOL 4f70b913c6cdcdb6f2e050931ac00c92e5bd4b07254a3864cbc54451adc1c240b52f0a4ae5502ceef1ecde02fbe270c6b59d291f397c8734a3b65ff82c674cca
+DIST libXext-1.3.4.tar.bz2 389114 BLAKE2B 941ebf63583a05f40063ec0d2350a40ccc656c6463e58a347489f7dcd8dc5ae5c3b24b561d74a0af2661c2e3c941bd4ffd90295273c248f22e52f23e8d7c0ec9 SHA512 09146397d95f80c04701be1cc0a9c580ab5a085842ac31d17dfb6d4c2e42b4253b89cba695e54444e520be359883a76ffd02f42484c9e2ba2c33a5a40c29df4a
diff --git a/x11-libs/libXext/libXext-1.3.3-r1.ebuild b/x11-libs/libXext/libXext-1.3.3-r1.ebuild
deleted file mode 100644
index 7594cc5..0000000
--- a/x11-libs/libXext/libXext-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xext library"
-
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc specs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libXext/libXext-1.3.4.ebuild b/x11-libs/libXext/libXext-1.3.4.ebuild
new file mode 100644
index 0000000..4208140
--- /dev/null
+++ b/x11-libs/libXext/libXext-1.3.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org Xext library"
+
+KEYWORDS="*"
+
+RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_enable doc specs)
+		$(use_with doc xmlto)
+		--without-fop
+	)
+	xorg-3_src_configure
+}
diff --git a/x11-libs/libXfixes/Manifest b/x11-libs/libXfixes/Manifest
index 621cf6b..74e6a19 100644
--- a/x11-libs/libXfixes/Manifest
+++ b/x11-libs/libXfixes/Manifest
@@ -1 +1 @@
-DIST libXfixes-5.0.3.tar.bz2 294400 SHA256 de1cd33aff226e08cefd0e6759341c2c8e8c9faf8ce9ac6ec38d43e287b22ad6 SHA512 72d5ee496e5c0520c95ef6bbb52deff1ee4c29792f11aa17aeb25c8ec5eb992ca502de040c77ad95835d1b1432f315b6cb7a3308b434847c28b9c2c6f9d1ac10 WHIRLPOOL 2763a03c25f237afdf9a91e8d5be9bbe322af2413042ab20eaf78e152f3390e7e05bba1a04eb7f3e0bbaf147c1feeeb4590da3526027648843d8e679c8158a80
+DIST libXfixes-6.0.0.tar.bz2 297270 BLAKE2B 082f321bb10b02f34c439adf45ed5f9cf3c3045d68673144261aae739bad063b02f235fd80398acd2632e10816f09382c4ea661c5db4cd868d24ae1b3486b83b SHA512 1985ef156f382e9a7e1cc7e044e0f626de1e4c82557a511cbcf6431994c0ac25b1f8b3a0293bd3089331593db8ce01d3a71ddec68f19b5fe6029d5082fb6885d
diff --git a/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild b/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild
deleted file mode 100644
index 73e37c2..0000000
--- a/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xfixes library"
-
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXfixes/libXfixes-6.0.0.ebuild b/x11-libs/libXfixes/libXfixes-6.0.0.ebuild
new file mode 100644
index 0000000..3dddccf
--- /dev/null
+++ b/x11-libs/libXfixes/libXfixes-6.0.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org Xfixes library"
+
+KEYWORDS="*"
+
+RDEPEND="
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=x11-base/xorg-proto-2021.4"
diff --git a/x11-libs/libXfont2/Manifest b/x11-libs/libXfont2/Manifest
index 6d9a975..ea362bd 100644
--- a/x11-libs/libXfont2/Manifest
+++ b/x11-libs/libXfont2/Manifest
@@ -1 +1 @@
-DIST libXfont2-2.0.3.tar.bz2 497085 SHA256 0e8ab7fd737ccdfe87e1f02b55f221f0bd4503a1c5f28be4ed6a54586bac9c4e SHA512 648b664e2aa58cbc7366a1b05873aa06bd4a38060f64085783043388244af8ceced77b29a22c3ac8b6d34cd226e093bbbcc785ea1748ea65720fe7ea05b4b44b WHIRLPOOL 06eda151ccf3ce8ac4b3eb99a125361dddf82e2c2efb951b5fafd778e61d24f8933273a50db1a836862cee5798961ceb501e90f5a61fcd1beccd8c5ad94c9051
+DIST libXfont2-2.0.4.tar.bz2 513167 BLAKE2B 924cf8462a8fc593755080866b63d6cca6e58b5d875f1d25b95271a56d883e983445f72f8950adf1964e0bf10ca5b8bb2ddfe0c56d4395086e460952a5933bd7 SHA512 7cf6c58e520e48e24fc4f05fec760fcbeaaac0cedeed57dded262c855e1515cc34cd033222945a0b016f6857b83009fc2a6946c7d632c2f7bb0060f8e8a8a106
diff --git a/x11-libs/libXfont2/libXfont2-2.0.3-r1.ebuild b/x11-libs/libXfont2/libXfont2-2.0.3-r1.ebuild
deleted file mode 100644
index 180629d..0000000
--- a/x11-libs/libXfont2/libXfont2-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-inherit xorg-2
-
-DESCRIPTION="X.Org Xfont library"
-
-KEYWORDS="*"
-IUSE="bzip2 ipv6 truetype"
-
-RDEPEND="sys-libs/zlib
-	x11-base/xorg-proto
-	x11-libs/libfontenc
-	x11-libs/xtrans
-	bzip2? ( app-arch/bzip2 )
-	truetype? ( >=media-libs/freetype-2 )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable doc devel-docs)
-		$(use_with doc xmlto)
-		$(use_with bzip2)
-		$(use_enable truetype freetype)
-		--without-fop
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libXfont2/libXfont2-2.0.4.ebuild b/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
new file mode 100644
index 0000000..99e8710
--- /dev/null
+++ b/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_PACKAGE_NAME=libxfont
+XORG_DOC=doc
+inherit xorg-3
+
+DESCRIPTION="X.Org Xfont library"
+
+KEYWORDS="*"
+IUSE="bzip2 ipv6 truetype"
+
+RDEPEND="sys-libs/zlib
+	x11-base/xorg-proto
+	x11-libs/libfontenc
+	bzip2? ( app-arch/bzip2 )
+	truetype? ( >=media-libs/freetype-2 )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/xtrans"
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable doc devel-docs)
+		$(use_with doc xmlto)
+		$(use_with bzip2)
+		$(use_enable truetype freetype)
+		--without-fop
+	)
+	xorg-3_src_configure
+}
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index b3887ec..0d5a09a 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1 +1 @@
-DIST libXi-1.7.9.tar.bz2 486312 SHA256 c2e6b8ff84f9448386c1b5510a5cf5a16d788f76db018194dacdc200180faf45 SHA512 9f1536944fcd232ba725addbc3afb1154c4e0df3c4380f4a54bada31371029ce3714fe0458529cd6b2787e3283f3bd35366420bca15fedfbd41f2f6b10eddce5 WHIRLPOOL c09207a5b8ac0f8e4770734a3bc0722189811ce8bbadc729969de87a5a0ea195467f648a3ac75f422d9ed8d281dd92345658785517a75b4f8514fd8e26f8a08d
+DIST libXi-1.7.10.tar.bz2 484519 BLAKE2B b4a3a090045d65c351d21a65fdf2f3d252e11546a5eaba9bf5f22c837b84ee758fe325eff39b32df55f65ab3d6cdc0d2c7ac7e134fec0983baeb0103d109c810 SHA512 591f0860bf5904897587c4990d6c852f3729a212d1ef390362d41242440e078221877c31db2232d5cc81727fe97f4e194b077f7de917e251e60641bbd06ee218
diff --git a/x11-libs/libXi/libXi-1.7.10.ebuild b/x11-libs/libXi/libXi-1.7.10.ebuild
new file mode 100644
index 0000000..00930cd
--- /dev/null
+++ b/x11-libs/libXi/libXi-1.7.10.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org Xi library"
+KEYWORDS="*"
+
+RDEPEND="
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_enable doc specs)
+		$(use_with doc xmlto)
+		$(use_with doc asciidoc)
+		--without-fop
+	)
+	xorg-3_src_configure
+}
diff --git a/x11-libs/libXi/libXi-1.7.9-r1.ebuild b/x11-libs/libXi/libXi-1.7.9-r1.ebuild
deleted file mode 100644
index b06ddd2..0000000
--- a/x11-libs/libXi/libXi-1.7.9-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xi library"
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc specs)
-		$(use_with doc xmlto)
-		$(use_with doc asciidoc)
-		--without-fop
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libXinerama/Manifest b/x11-libs/libXinerama/Manifest
deleted file mode 100644
index 05f0135..0000000
--- a/x11-libs/libXinerama/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libXinerama-1.1.3.tar.bz2 278026 SHA256 7a45699f1773095a3f821e491cbd5e10c887c5a5fce5d8d3fced15c2ff7698e2 SHA512 c9f059697c04fdc600d9e63873e924032d6cff456674ee28a885270c54722d96df0ef7a78432c2bdc0844241f115e00ad730c29d84681efc1c45a2e1acb3288c WHIRLPOOL a97c76b2ad26b5f322cb5990c5b7643f9d283783cbe7e22b9735473f226fa92ddd78085f70f17a6231da087410bf351d533ec53cdfe1663aeacf97421f4dbc7d
diff --git a/x11-libs/libXinerama/libXinerama-1.1.3.ebuild b/x11-libs/libXinerama/libXinerama-1.1.3.ebuild
deleted file mode 100644
index d78ed54..0000000
--- a/x11-libs/libXinerama/libXinerama-1.1.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXinerama/libXinerama-1.1.3.ebuild,v 1.1 2013/06/01 03:19:13 chithanh Exp $
-
-EAPI=4
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xinerama library"
-
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-proto/xextproto
-	>=x11-proto/xineramaproto-1.2"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXinerama/metadata.xml b/x11-libs/libXinerama/metadata.xml
deleted file mode 100644
index 01c4c00..0000000
--- a/x11-libs/libXinerama/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-</pkgmetadata>
diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest
deleted file mode 100644
index cdb5884..0000000
--- a/x11-libs/libXmu/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libXmu-1.1.3.tar.bz2 394330 BLAKE2B 5bbc4345f32588a8b1e196fef39a636b9a765a2d22a12cc30bc7f5528b004c1f73370d25b023b68772081f1c58b4813293971f8f08ca8f2b9508adb4c3925c94 SHA512 8c6cc65b22aa031ad870dd92736681a068a0878a425a53dbed909943da1136c4a24034d467cfd3785c3a8d78f66850b69f1ebe1eb24aaf9bc176b1d171a5c762
diff --git a/x11-libs/libXmu/libXmu-1.1.3.ebuild b/x11-libs/libXmu/libXmu-1.1.3.ebuild
deleted file mode 100644
index 2aaa241..0000000
--- a/x11-libs/libXmu/libXmu-1.1.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org Xmu library"
-
-KEYWORDS="*"
-IUSE="ipv6"
-
-RDEPEND="
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable doc docs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-}
diff --git a/x11-libs/libXpm/Manifest b/x11-libs/libXpm/Manifest
deleted file mode 100644
index 90ef1a7..0000000
--- a/x11-libs/libXpm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libXpm-3.5.13.tar.bz2 463251 BLAKE2B eb8a390802f13ffdd8199e21f5f18d4d17141783d7259c6b558dbaddd2dce05f7cb27306dd5cb73e27d01cffa62f5e4808c143b72974dae443e958069e70cd17 SHA512 3b8f6e926272f39b1d95135c2274c00f5aaee1f9fb2ef79f71628df5edeb7ba20158819ef6a778101cc4092493a3b5b613c53634fdccadcc0fc85f0605e5e9a5
diff --git a/x11-libs/libXpm/libXpm-3.5.13.ebuild b/x11-libs/libXpm/libXpm-3.5.13.ebuild
deleted file mode 100644
index c5045f1..0000000
--- a/x11-libs/libXpm/libXpm-3.5.13.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org Xpm library"
-
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="sys-devel/gettext"
diff --git a/x11-libs/libXpm/metadata.xml b/x11-libs/libXpm/metadata.xml
deleted file mode 100644
index e943b72..0000000
--- a/x11-libs/libXpm/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/libXrandr/Manifest b/x11-libs/libXrandr/Manifest
index 5264465..974a28f 100644
--- a/x11-libs/libXrandr/Manifest
+++ b/x11-libs/libXrandr/Manifest
@@ -1 +1 @@
-DIST libXrandr-1.5.1.tar.bz2 315769 BLAKE2B 5cdf69656ac804cf8732e35d8e46d5f29b5959851a0313d17d6c767b4cce0e55a1e137f074b7f7029e031397572ad934aa2649ea7d8e2719a69f16cc1c3e172e SHA512 ddcee1c50da8810412fd747b05a073ee5522b2f3b0a74e6a9b48b489ce9712356d1bc3009f8898aeee85671cdb44e2dafa04c8caf23d97963b36b1af9174445a
+DIST libXrandr-1.5.2.tar.bz2 330726 BLAKE2B 2d91e4cd2d7af6b79ee952a0d51b0c61d64251c61f862677b47065f2eda811650a5e3bb3185d09a6401291b5a8bb30e8d29cf7aaf1699ac3f49b838ef7b1208d SHA512 fcd005f9839e7ef980607128a5d76d7b671cc2f5755949e03c569c500d7e987cb3f6932750ab8bf6e2c1086ec69dde09d5831f0c2098b9f9ad46be4f56db0d87
diff --git a/x11-libs/libXrandr/libXrandr-1.5.1-r1.ebuild b/x11-libs/libXrandr/libXrandr-1.5.1-r1.ebuild
deleted file mode 100644
index c820574..0000000
--- a/x11-libs/libXrandr/libXrandr-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xrandr library"
-
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXrandr/libXrandr-1.5.2.ebuild b/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
new file mode 100644
index 0000000..e3e470e
--- /dev/null
+++ b/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org Xrandr library"
+
+KEYWORDS="*"
+IUSE="doc"
+
+RDEPEND="
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild b/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild
deleted file mode 100644
index 7ae8f60..0000000
--- a/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xrender library"
-
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild b/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild
new file mode 100644
index 0000000..423564d
--- /dev/null
+++ b/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org Xrender library"
+
+KEYWORDS="*"
+
+RDEPEND="x11-base/xorg-proto
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest
deleted file mode 100644
index 2c3a50f..0000000
--- a/x11-libs/libXt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libXt-1.1.5.tar.bz2 771567 SHA256 46eeb6be780211fdd98c5109286618f6707712235fdd19df4ce1e6954f349f1a SHA512 29828cfc021b60e0a0b5ff0321801db20f12bd635866cd000b35a23736b5477a3d1e5f936a1124ed3e3f4c0e7a27cb8744dbb5ab4fbcd45c817a13877081e05b WHIRLPOOL ed0bc3d5e11580b5d38a30d60985d1f1976e464e0b6f544ec07eaf6a69290304d150981fdde1047b73161d38ce1505221b8e4906f13cc0a5feb962269029763f
diff --git a/x11-libs/libXt/libXt-1.1.5-r1.ebuild b/x11-libs/libXt/libXt-1.1.5-r1.ebuild
deleted file mode 100644
index 829f0bd..0000000
--- a/x11-libs/libXt/libXt-1.1.5-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2 toolchain-funcs
-
-DESCRIPTION="X.Org X Toolkit Intrinsics library"
-
-KEYWORDS="*"
-IUSE="test"
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/glib )"
-
-src_configure() {
-	tc-export_build_env
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libXt/metadata.xml b/x11-libs/libXt/metadata.xml
deleted file mode 100644
index e943b72..0000000
--- a/x11-libs/libXt/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/libXtst/libXtst-1.2.3-r1.ebuild b/x11-libs/libXtst/libXtst-1.2.3-r1.ebuild
deleted file mode 100644
index 6ac052e..0000000
--- a/x11-libs/libXtst/libXtst-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC="doc"
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xlib-based client API for the XTEST & RECORD extensions library"
-
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXtst/libXtst-1.2.3-r2.ebuild b/x11-libs/libXtst/libXtst-1.2.3-r2.ebuild
new file mode 100644
index 0000000..188bcd8
--- /dev/null
+++ b/x11-libs/libXtst/libXtst-1.2.3-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org Xlib-based client API for the XTEST & RECORD extensions library"
+
+KEYWORDS="*"
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-libs/libXv/Manifest b/x11-libs/libXv/Manifest
deleted file mode 100644
index 5cbe247..0000000
--- a/x11-libs/libXv/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libXv-1.0.9.tar.bz2 309744 SHA256 a874dbf864d0271bbe795af67ef5b3f20096c92fc11eacbf0d2af00e32bc5b4b SHA512 283c96484066fa2b3dcd2c518d3e7262fa7271eabbbca6cf2f935df7fd004047e20c27695241656abf03738ae6446c45feb5017f3fe11f7ed8ff20a4097cd1ae WHIRLPOOL 20ac48b402e86842842522e528286adc3e8c99367cd24f1da863cf3aff68c68a27939ae0dcd464ee68fabc557f002c402c22d7802ec681fc82b713a54e5708ac
diff --git a/x11-libs/libXv/libXv-1.0.9.ebuild b/x11-libs/libXv/libXv-1.0.9.ebuild
deleted file mode 100644
index 80111dc..0000000
--- a/x11-libs/libXv/libXv-1.0.9.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXv/libXv-1.0.9.ebuild,v 1.1 2013/06/23 04:52:22 mattst88 Exp $
-
-EAPI=4
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xv library"
-
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-proto/videoproto
-	x11-proto/xproto"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXv/metadata.xml b/x11-libs/libXv/metadata.xml
deleted file mode 100644
index 01c4c00..0000000
--- a/x11-libs/libXv/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-</pkgmetadata>
diff --git a/x11-libs/libXxf86vm/Manifest b/x11-libs/libXxf86vm/Manifest
index dee75d4..6903725 100644
--- a/x11-libs/libXxf86vm/Manifest
+++ b/x11-libs/libXxf86vm/Manifest
@@ -1 +1 @@
-DIST libXxf86vm-1.1.4.tar.bz2 295346 SHA256 afee27f93c5f31c0ad582852c0fb36d50e4de7cd585fcf655e278a633d85cd57 SHA512 c5f92d86e143db02ebb36bcd25618acaa2cb2831f5a23800a06dd431cd73b6702d95de8fe7407ce626336bf614c288d5256f4d87ea7781fad2ab6c517cbf09e0 WHIRLPOOL 98aae6ede09ef4e204b71d30963d37b81a9f39c25e61ad2f5834b5e370d4a884a901e3a4ba19d534ec32111f316d24ffab7cfe9450e7ee63a9e6b9a281852d61
+DIST libXxf86vm-1.1.4.tar.bz2 295346 BLAKE2B 22698db5beb0ac06663e9163e13f8afd99597afc6dbc9f9d4fb232682df6b41a155d63fc1beb58da3d83bd0e420872c457671696246dbf39a6451454a6e24b9e SHA512 c5f92d86e143db02ebb36bcd25618acaa2cb2831f5a23800a06dd431cd73b6702d95de8fe7407ce626336bf614c288d5256f4d87ea7781fad2ab6c517cbf09e0
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild
deleted file mode 100644
index deef4dc..0000000
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xxf86vm library"
-
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
new file mode 100644
index 0000000..e1fc9aa
--- /dev/null
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org Xxf86vm library"
+
+KEYWORDS="*"
+
+RDEPEND="x11-base/xorg-proto
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest
index 3bf318e..d655cf9 100644
--- a/x11-libs/libfontenc/Manifest
+++ b/x11-libs/libfontenc/Manifest
@@ -1 +1 @@
-DIST libfontenc-1.1.3.tar.bz2 301494 SHA256 70588930e6fc9542ff38e0884778fbc6e6febf21adbab92fd8f524fe60aefd21 SHA512 7346079a6980464f57f5da0e96025bbf4b13fbb7ed976b58d9c54b78525d9d0b4174b4783326a12048971cf5d05221bafe2f41c6b02931743913719cde21740c WHIRLPOOL 7ed419bac70ad80f0e67dcd985994379ef7698ecd5dd0e932b9a1ba184aaca8e2a65ef7bb9982cfc15dbd53bcc10670849b8b9122d7a85389fd1a0e0041f8831
+DIST libfontenc-1.1.4.tar.bz2 320492 BLAKE2B 34da17e220789f5078e870329390c0e3ee665598db3432ef5a33e78d1db4b12460c7467bcbcc1dad67e9f6ade0173f9fad915a2fbbee51f0be23feedc242e7bd SHA512 76fa851d00113241f15fdd5b5bb7e927b8d8b9a82ce3fcb0678b8c7e32cb5e8d898c4bda1d60dafb7748145049d3240627ac34a2360c64e98a7a912ea7c30582
diff --git a/x11-libs/libfontenc/libfontenc-1.1.3-r1.ebuild b/x11-libs/libfontenc/libfontenc-1.1.3-r1.ebuild
deleted file mode 100644
index baf5d89..0000000
--- a/x11-libs/libfontenc/libfontenc-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org fontenc library"
-
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-encodingsdir="${EPREFIX}/usr/share/fonts/encodings"
-)
diff --git a/x11-libs/libfontenc/libfontenc-1.1.4.ebuild b/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
new file mode 100644
index 0000000..5e40f67
--- /dev/null
+++ b/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="X.Org fontenc library"
+
+KEYWORDS="*"
+IUSE=""
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+XORG_CONFIGURE_OPTIONS=(
+	--with-encodingsdir="${EPREFIX}/usr/share/fonts/encodings"
+)
diff --git a/x11-libs/libxcb/files/libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch b/x11-libs/libxcb/files/libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch
new file mode 100644
index 0000000..cc7f22b
--- /dev/null
+++ b/x11-libs/libxcb/files/libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch
@@ -0,0 +1,86 @@
+From f01f3c378eb0168fbb055c7be1c2d08a7acd3752 Mon Sep 17 00:00:00 2001
+From: Ran Benita <ran@unusedvar.com>
+Date: Tue, 17 Nov 2020 23:43:06 +0200
+Subject: [PATCH] tests: don't use deprecated fail_unless check API
+
+It causes errors like this when running make check:
+
+check_public.c:40:24: error: too many arguments for format [-Werror=format-extra-args]
+   40 |   fail_unless(success, "unexpected parse failure %sfor '%s'", test_string[test_type], name);
+
+Closes: https://gitlab.freedesktop.org/xorg/lib/libxcb/-/issues/49
+Tested-by: Matt Turner <mattst88@gmail.com>
+Signed-off-by: Ran Benita <ran@unusedvar.com>
+---
+ configure.ac         |  2 +-
+ tests/check_public.c | 30 +++++++++++++++---------------
+ 2 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/tests/check_public.c b/tests/check_public.c
+index 2094bfe..aed40c8 100644
+--- a/tests/check_public.c
++++ b/tests/check_public.c
+@@ -37,18 +37,18 @@ static void parse_display_pass(const char *name, const char *host, const int dis
+ 		got_display = got_screen = -42;
+ 		mark_point();
+ 		success = xcb_parse_display(argument, &got_host, &got_display, &got_screen);
+-		fail_unless(success, "unexpected parse failure %sfor '%s'", test_string[test_type], name);
+-		fail_unless(strcmp(host, got_host) == 0, "parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
+-		fail_unless(display == got_display, "parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
+-		fail_unless(screen == got_screen, "parse %sproduced unexpected screen '%d' for '%s': expected '%d'", test_string[test_type], got_screen, name, screen);
++		ck_assert_msg(success, "unexpected parse failure %sfor '%s'", test_string[test_type], name);
++		ck_assert_msg(strcmp(host, got_host) == 0, "parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
++		ck_assert_msg(display == got_display, "parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
++		ck_assert_msg(screen == got_screen, "parse %sproduced unexpected screen '%d' for '%s': expected '%d'", test_string[test_type], got_screen, name, screen);
+ 
+ 		got_host = (char *) -1;
+ 		got_display = got_screen = -42;
+ 		mark_point();
+ 		success = xcb_parse_display(argument, &got_host, &got_display, 0);
+-		fail_unless(success, "unexpected screenless parse failure %sfor '%s'", test_string[test_type], name);
+-		fail_unless(strcmp(host, got_host) == 0, "screenless parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
+-		fail_unless(display == got_display, "screenless parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
++		ck_assert_msg(success, "unexpected screenless parse failure %sfor '%s'", test_string[test_type], name);
++		ck_assert_msg(strcmp(host, got_host) == 0, "screenless parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
++		ck_assert_msg(display == got_display, "screenless parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
+ 	}
+ 	putenv("DISPLAY=");
+ }
+@@ -79,18 +79,18 @@ static void parse_display_fail(const char *name)
+ 		got_display = got_screen = -42;
+ 		mark_point();
+ 		success = xcb_parse_display(argument, &got_host, &got_display, &got_screen);
+-		fail_unless(!success, "unexpected parse success %sfor '%s'", test_string[test_type], name);
+-		fail_unless(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
+-		fail_unless(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
+-		fail_unless(got_screen == -42, "screen changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_screen);
++		ck_assert_msg(!success, "unexpected parse success %sfor '%s'", test_string[test_type], name);
++		ck_assert_msg(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
++		ck_assert_msg(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
++		ck_assert_msg(got_screen == -42, "screen changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_screen);
+ 
+ 		got_host = (char *) -1;
+ 		got_display = got_screen = -42;
+ 		mark_point();
+ 		success = xcb_parse_display(argument, &got_host, &got_display, 0);
+-		fail_unless(!success, "unexpected screenless parse success %sfor '%s'", test_string[test_type], name);
+-		fail_unless(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
+-		fail_unless(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
++		ck_assert_msg(!success, "unexpected screenless parse success %sfor '%s'", test_string[test_type], name);
++		ck_assert_msg(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
++		ck_assert_msg(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
+ 	}
+ 	putenv("DISPLAY=");
+ }
+@@ -183,7 +183,7 @@ END_TEST
+ 
+ static void popcount_eq(uint32_t bits, int count)
+ {
+-	fail_unless(xcb_popcount(bits) == count, "unexpected popcount(%08x) != %d", bits, count);
++	ck_assert_msg(xcb_popcount(bits) == count, "unexpected popcount(%08x) != %d", bits, count);
+ }
+ 
+ START_TEST(popcount)
+-- 
+2.26.2
+
diff --git a/x11-libs/libxcb/libxcb-1.14.ebuild b/x11-libs/libxcb/libxcb-1.14.ebuild
index e17dffd..0a513c4 100644
--- a/x11-libs/libxcb/libxcb-1.14.ebuild
+++ b/x11-libs/libxcb/libxcb-1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,27 +22,37 @@
 
 RDEPEND="
 	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
-# Note: ${PYTHON_USEDEP} needs to go verbatim
+	>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
+"
 DEPEND="${RDEPEND}
 	>=x11-base/xcb-proto-1.14[${MULTILIB_USEDEP}]
+	elibc_Darwin? ( dev-libs/libpthread-stubs )
 	test? ( dev-libs/check[${MULTILIB_USEDEP}] )
-	doc? ( app-doc/doxygen[dot] )
-	dev-libs/libxslt
 "
+# Note: ${PYTHON_USEDEP} needs to go verbatim
 BDEPEND="${PYTHON_DEPS}
 	$(python_gen_any_dep '>=x11-base/xcb-proto-1.14[${PYTHON_USEDEP}]')
+	doc? ( app-doc/doxygen[dot] )
+	test? ( dev-libs/libxslt )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-tests-don-t-use-deprecated-fail_unless-check-API.patch
+)
+
 python_check_deps() {
 	has_version -b ">=x11-base/xcb-proto-1.14[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
 	python-any-r1_pkg_setup
+	xorg-3_pkg_setup
+}
 
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_enable doc devel-docs)
 		$(use_enable selinux)
 	)
+	xorg-3_src_configure
 }
diff --git a/x11-libs/libxkbfile/Manifest b/x11-libs/libxkbfile/Manifest
index df48f2f..de120bc 100644
--- a/x11-libs/libxkbfile/Manifest
+++ b/x11-libs/libxkbfile/Manifest
@@ -1 +1 @@
-DIST libxkbfile-1.0.9.tar.bz2 348009 SHA256 51817e0530961975d9513b773960b4edd275f7d5c72293d5a151ed4f42aeb16a SHA512 5fa268f10d7c4bd7b1e0c9f12adaa53d86b149f193d228fc620b3b81d360b37e4ede0192f5a0dc715bf830a57bd1388af01399fb33609413fc64623ee91cb8d1 WHIRLPOOL 5d8168ae089e15e3a43dd4cfc36445987b7dd995743807dbc184e3ac137e33da5ef1517715a7c6635bab44d94819c1260836d3a7ace66d57f64da322933f786b
+DIST libxkbfile-1.1.0.tar.bz2 364678 BLAKE2B 577da1c43e6ce681630676f3f52f40b1f31d01862a891d4c1bd853056d90b03d9993299714c5e63a903b243165a1e299e1e014cd94614eacb50aeef363be8990 SHA512 1c6a57564e916ccdc3df3c49b9f3589f701df0cec55112c12ddc35ac3ed556608c28fe98e5ba0ac1962e9a65ed1e90eb7e6169b564951bf55a7cf3499b745826
diff --git a/x11-libs/libxkbfile/libxkbfile-1.0.9-r2.ebuild b/x11-libs/libxkbfile/libxkbfile-1.0.9-r2.ebuild
deleted file mode 100644
index 729b778..0000000
--- a/x11-libs/libxkbfile/libxkbfile-1.0.9-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org xkbfile library"
-
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	x11-libs/libX11[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild b/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
new file mode 100644
index 0000000..043d655
--- /dev/null
+++ b/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org xkbfile library"
+
+KEYWORDS="*"
+IUSE=""
+
+RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-libs/libxshmfence/Manifest b/x11-libs/libxshmfence/Manifest
index cd32317..ee5c7cf 100644
--- a/x11-libs/libxshmfence/Manifest
+++ b/x11-libs/libxshmfence/Manifest
@@ -1 +1 @@
-DIST libxshmfence-1.3.tar.bz2 308644 SHA256 b884300d26a14961a076fbebc762a39831cb75f92bed5ccf9836345b459220c7 SHA512 c446e055f8fac62b9aa266132289a4cfc030282147974c45ce96d1768a98d1afb997470e58e4a68513174c404cbf373bdde2f0cd4b34abdbce1d89dd0b6fe2b7 WHIRLPOOL 771ac96a969913d843fd19838974a59dd27ce812af041e8323ed9f7ca90ddefa68e140e0c709e871c7ebb49e1771b4c3dc2cdf8c95c52fb0ec5de089b99d4187
+DIST libxshmfence-1.3.tar.bz2 308644 BLAKE2B 6e1e75fbe9d113cb258eb8f6a5106ea565f6749efd79bd3aa21222514063aadf8499d82d2a14bfcd0a69f7d4c4dce49a5efeb38d54d2019eb0c93345f0ba8a37 SHA512 c446e055f8fac62b9aa266132289a4cfc030282147974c45ce96d1768a98d1afb997470e58e4a68513174c404cbf373bdde2f0cd4b34abdbce1d89dd0b6fe2b7
diff --git a/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild
deleted file mode 100644
index 643459c..0000000
--- a/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="Shared memory fences using futexes"
-
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND=""
-DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild
new file mode 100644
index 0000000..4e3017f
--- /dev/null
+++ b/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="Shared memory fences using futexes"
+
+KEYWORDS="*"
+
+DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/pango/pango-1.42.4-r2.ebuild b/x11-libs/pango/pango-1.42.4-r2.ebuild
index 0be17ca..e67be9f 100644
--- a/x11-libs/pango/pango-1.42.4-r2.ebuild
+++ b/x11-libs/pango/pango-1.42.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@
 KEYWORDS="*"
 
 IUSE="X +introspection test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=media-libs/harfbuzz-1.4.2:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
@@ -33,7 +34,7 @@
 DEPEND="${RDEPEND}
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.20
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	test? ( media-fonts/cantarell )
 	X? ( x11-base/xorg-proto )
 	!<=sys-devel/autoconf-2.63:2.5
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index bcb99f7..e31b21c 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1 +1 @@
-DIST pixman-0.32.4.tar.bz2 701414 SHA256 ae2bd664057e330d41b40336ed296d3512318ce7f2401cc42601f2613d371e4c SHA512 76c7dd58a4c8ac3b99ab4b6dd4c0d777ad6d8814b0d0b48949846a702a07beccda4c117ec0493b9b5c24004774cf7a40914ddc0535eae4ee2516bfb9ad9eccb2 WHIRLPOOL 9b6aca5309f53129c1e6e52f9b27c8be2c828e76ed6a0980bd02df5861118e17e4e72ddbc979a6d3985e42a4f079db5f42a088a66c48fbd7154d5d08ada5fa85
+DIST pixman-0.40.0.tar.xz 634752 BLAKE2B 29b71f5eb6c3df0318c7a6153c6abbce29748b0b578697916414a869a029635fe5e0bab06b8f701a764c95e475c115ed12eb4f93c751d234b5868f4c4196d7db SHA512 8a60edb113d68791b41bd90b761ff7b3934260cb3dada3234c9351416f61394e4157353bc4d61b8f6c2c619de470f6feefffb4935bfcf79d291ece6285de7270
diff --git a/x11-libs/pixman/files/pixman-clang.patch b/x11-libs/pixman/files/pixman-clang.patch
deleted file mode 100644
index 80143b5..0000000
--- a/x11-libs/pixman/files/pixman-clang.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Apply a patch from pixman upstream to fix the follwing build error with clang:
-pixman-mmx.c:100:20: error: constraint 'K' expects an integer constant expression
-        : "y" (__A), "K" (__N)
-
-The error happens because __N is a function parameter and clang does not
-process it as an integer literal by design.
-Fix this by forcing the macro version of the function which exposes __N value
-as an integer literal. https://crbug.com/793487
-diff -Nuar old/pixman/pixman-mmx.c new/pixman/pixman-mmx.c
---- old/pixman/pixman-mmx.c
-+++ new/pixman/pixman-mmx.c
-@@ -89,20 +89,6 @@
-     return __A;
- }
- 
--#  ifdef __OPTIMIZE__
--extern __inline __m64 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
--_mm_shuffle_pi16 (__m64 __A, int8_t const __N)
--{
--    __m64 ret;
--
--    asm ("pshufw %2, %1, %0\n\t"
--	: "=y" (ret)
--	: "y" (__A), "K" (__N)
--    );
--
--    return ret;
--}
--#  else
- #   define _mm_shuffle_pi16(A, N)					\
-     ({									\
- 	__m64 ret;							\
-@@ -114,7 +100,6 @@
- 									\
- 	ret;								\
-     })
--#  endif
- # endif
- #endif
- 
diff --git a/x11-libs/pixman/metadata.xml b/x11-libs/pixman/metadata.xml
index ab31961..46b4979 100644
--- a/x11-libs/pixman/metadata.xml
+++ b/x11-libs/pixman/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 <use>
 	<flag name="loongson2f">Enable Loongson2f MMI optimizations.</flag>
 </use>
diff --git a/x11-libs/pixman/pixman-0.32.4-r1.ebuild b/x11-libs/pixman/pixman-0.32.4-r1.ebuild
deleted file mode 100644
index 93e1e9b..0000000
--- a/x11-libs/pixman/pixman-0.32.4-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.32.4.ebuild,v 1.11 2013/12/26 20:17:27 zlogene Exp $
-
-EAPI=4
-XORG_MULTILIB=yes
-inherit xorg-2 toolchain-funcs versionator
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman"
-DESCRIPTION="Low-level pixel manipulation routines"
-
-KEYWORDS="*"
-IUSE="altivec iwmmxt loongson2f mmxext neon sse2 ssse3"
-RDEPEND="abi_x86_32? (
-	!<=app-emulation/emul-linux-x86-gtklibs-20131008
-	!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-	)"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable mmxext mmx)
-		$(use_enable sse2)
-		$(use_enable ssse3)
-		$(use_enable altivec vmx)
-		$(use_enable neon arm-neon)
-		$(use_enable iwmmxt arm-iwmmxt)
-		$(use_enable loongson2f loongson-mmi)
-		--disable-gtk
-		--disable-libpng
-	)
-	# Pixman can't be built with clang's integrated assembler.
-	# Fallback to GNU assembler. Note that it has to be set with
-	# modifying CCASFLAGS (changing CFLAGS doesn't work with pixman).
-	# https://crbug.com/793487
-	CCASFLAGS+=" -fno-integrated-as"
-	xorg-2_src_configure
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/pixman-clang.patch
-}
diff --git a/x11-libs/pixman/pixman-0.40.0.ebuild b/x11-libs/pixman/pixman-0.40.0.ebuild
new file mode 100644
index 0000000..2fbe3aa
--- /dev/null
+++ b/x11-libs/pixman/pixman-0.40.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/pixman/pixman.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} meson multilib-minimal multiprocessing toolchain-funcs
+
+DESCRIPTION="Low-level pixel manipulation routines"
+HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="*"
+	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs"
+
+multilib_src_configure() {
+	local openmp=disabled
+	tc-has-openmp && openmp=enabled
+
+	local emesonargs=(
+		$(meson_feature cpu_flags_arm_iwmmxt iwmmxt)
+		$(meson_use     cpu_flags_arm_iwmmxt2 iwmmxt2)
+		$(meson_feature cpu_flags_x86_mmxext mmx)
+		$(meson_feature cpu_flags_x86_sse2 sse2)
+		$(meson_feature cpu_flags_x86_ssse3 ssse3)
+		$(meson_feature cpu_flags_ppc_altivec vmx)
+		$(meson_feature cpu_flags_arm_neon neon)
+		$(meson_feature loongson2f loongson-mmi)
+		-Ddefault_library=$(usex static-libs both shared)
+		-Dgtk=disabled
+		-Dlibpng=disabled
+		-Dopenmp=$openmp # only used in unit tests
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	export OMP_NUM_THREADS=$(makeopts_jobs)
+	meson test -v -C "${BUILD_DIR}" -t 100 || die "tests failed"
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/x11-libs/xtrans/Manifest b/x11-libs/xtrans/Manifest
index 528c5de..c048e95 100644
--- a/x11-libs/xtrans/Manifest
+++ b/x11-libs/xtrans/Manifest
@@ -1 +1 @@
-DIST xtrans-1.3.5.tar.bz2 186833 SHA256 adbd3b36932ce4c062cd10f57d78a156ba98d618bdb6f50664da327502bc8301 SHA512 049fb996313e8a1625b66e1645a5f56d8a26c5dd91afe5869269716fce05f6c97c84f8ce4a6df2057106b47982c8291cecc223bef241f694174434c981a7029b WHIRLPOOL 69cbdb9c329a6302c7dcc284d86c7f548f371e90cd1d360e56377fa60e0ce1631f720dc9fa62b457ebab673c99712a2d0f9f54edeb9fa0728a21d4b21b83aba0
+DIST xtrans-1.4.0.tar.bz2 185371 BLAKE2B 15e5ff810f8df94fa6a050dab00158646003ecc7b200e199eb713d8bd6e7ca8df1769490ebc3d8b8920915bb5f2ede698f01a1a120ca09acfc85f225c4d618f8 SHA512 4fea89a3455c0e13321cbefa43340016dbb59bdd0dbdb5b796c1a6d2a6b1fd63cf1327b769ab426286b9c54b32ec764a50cd2b46228e4e43b841bda6b94de214
diff --git a/x11-libs/xtrans/xtrans-1.3.5.ebuild b/x11-libs/xtrans/xtrans-1.3.5.ebuild
deleted file mode 100644
index b4336a9..0000000
--- a/x11-libs/xtrans/xtrans-1.3.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_PACKAGE_NAME="lib${PN}"
-# this package just installs some .c and .h files, no libraries
-XORG_STATIC=no
-XORG_DOC=doc
-inherit xorg-2
-
-DESCRIPTION="X.Org xtrans library"
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc docs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/xtrans/xtrans-1.4.0.ebuild b/x11-libs/xtrans/xtrans-1.4.0.ebuild
new file mode 100644
index 0000000..a507fdc
--- /dev/null
+++ b/x11-libs/xtrans/xtrans-1.4.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_PACKAGE_NAME="lib${PN}"
+# this package just installs some .c and .h files, no libraries
+XORG_DOC=doc
+inherit xorg-3
+
+DESCRIPTION="X.Org xtrans library"
+KEYWORDS="*"
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_enable doc docs)
+		$(use_with doc xmlto)
+		--without-fop
+	)
+	xorg-3_src_configure
+}
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
new file mode 100644
index 0000000..b64f51b
--- /dev/null
+++ b/x11-misc/compose-tables/Manifest
@@ -0,0 +1 @@
+DIST libX11-1.7.2.tar.bz2 2392982 BLAKE2B ce64bd8172fcf4f5bf0783c4f25f4d220fa0eceb211b7a852802256f7241f543769565f70a59c1ff14e0bb1ae7d3f05914f8f0b1bd423dcb20181cfb2227c70d SHA512 d01e5c1848c76218605e5af2d353de6b301a251555b52a38dbe930e6635d5e8a92d1486eb6d328ad5d42a5939e0d16868ffa19a75e5a7863d1a32e0d0727bdc7
diff --git a/x11-misc/compose-tables/OWNERS b/x11-misc/compose-tables/OWNERS
new file mode 100644
index 0000000..9883120
--- /dev/null
+++ b/x11-misc/compose-tables/OWNERS
@@ -0,0 +1,2 @@
+davidriley@chromium.org
+sidereal@google.com
diff --git a/x11-misc/compose-tables/compose-tables-1.7.2.ebuild b/x11-misc/compose-tables/compose-tables-1.7.2.ebuild
new file mode 100644
index 0000000..59f2347
--- /dev/null
+++ b/x11-misc/compose-tables/compose-tables-1.7.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=no
+inherit xorg-3
+
+# Note: please bump this with x11-libs/libX11
+DESCRIPTION="X.Org Compose Key tables from libX11"
+# xorg-3.eclass would attempt to fetch a tarball with a matching name to this package
+SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
+S="${WORKDIR}/libX11-${PV}/"
+
+KEYWORDS="*"
+
+# Only needed by configure
+DEPEND="
+	x11-base/xorg-proto
+	>=x11-libs/libxcb-1.11.1
+	x11-libs/xtrans"
+RDEPEND="!<x11-libs/libX11-1.7.0"
+
+XORG_CONFIGURE_OPTIONS=(
+	--without-xmlto
+	--without-fop
+	--disable-specs
+	--disable-xkb
+)
+
+src_compile() {
+	emake -C nls
+}
+
+src_test() {
+	:;
+}
+
+src_install() {
+	emake DESTDIR="${D}" -C nls install
+}
diff --git a/x11-misc/compose-tables/metadata.xml b/x11-misc/compose-tables/metadata.xml
new file mode 100644
index 0000000..e1e8e6f
--- /dev/null
+++ b/x11-misc/compose-tables/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+<upstream>
+  <remote-id type="cpe">cpe:/a:x.org:libx11</remote-id>
+</upstream>
+</pkgmetadata>