*/*: Drop last-rited Py2 only pkgs

Bug: https://bugs.gentoo.org/616064
Closes: https://bugs.gentoo.org/721904
Closes: https://bugs.gentoo.org/609686
Closes: https://bugs.gentoo.org/695016
Closes: https://bugs.gentoo.org/722616
Closes: https://bugs.gentoo.org/684098
Closes: https://bugs.gentoo.org/672164
Closes: https://bugs.gentoo.org/699136
Closes: https://bugs.gentoo.org/690776
Closes: https://bugs.gentoo.org/695912
Closes: https://bugs.gentoo.org/697004
Closes: https://bugs.gentoo.org/711026

Signed-off-by: Aaron Bauman <bman@gentoo.org>

110 files changed, 0 insertions, 2826 deletions

diff --git a/app-arch/deltarpm/Manifest b/app-arch/deltarpm/Manifest
deleted file mode 100644
index 7d9c0c026d91..000000000000
--- a/app-arch/deltarpm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST deltarpm-3.6.tar.bz2 500420 BLAKE2B 650193ef0bff9b534a9ff60f4bd4d9b81533a62f70e95a2cca1b96cd73f7d8b374def3300b2b079aee4ea2a1a839a79c40fe2bcfbced111414047b8b701b4314 SHA512 0ef89d8d3e7c9d3d9da06542f293b434e42d95e18616aae1de95a66a77a5937142060ff405356869454cbcf8a7bb52f64c462641e52af0fad985105af07351d9
diff --git a/app-arch/deltarpm/deltarpm-3.6.ebuild b/app-arch/deltarpm/deltarpm-3.6.ebuild
deleted file mode 100644
index 8e7abf5cdb35..000000000000
--- a/app-arch/deltarpm/deltarpm-3.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit toolchain-funcs python-single-r1
-
-DESCRIPTION="tools to create and apply deltarpms"
-HOMEPAGE="https://github.com/rpm-software-management/deltarpm"
-SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}/${P}.tar.bz2/2cc2690bd1088cfc3238c25e59aaaec1/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="python system-zlib"
-
-RDEPEND="sys-libs/zlib
-	app-arch/xz-utils
-	app-arch/bzip2
-	<app-arch/rpm-5
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-	MAKE_EXTRA_FLAGS=(
-		-j1
-		prefix=/usr
-		mandir=/usr/share/man
-		PYTHONS=$(use python && echo python)
-		CFLAGS="${CFLAGS}"
-		LDFLAGS="${LDFLAGS}"
-		CC="$(tc-getCC)"
-	)
-	use system-zlib && MAKE_EXTRA_FLAGS+=(
-		zlibbundled=
-		zlibcppflags=
-		zlibldflags=-lz
-	)
-}
-
-src_compile() {
-	emake "${MAKE_EXTRA_FLAGS[@]}" all $(use python && echo python)
-}
-
-src_install() {
-	emake "${MAKE_EXTRA_FLAGS[@]}" DESTDIR="${ED}" install
-	python_optimize
-}
diff --git a/app-arch/deltarpm/metadata.xml b/app-arch/deltarpm/metadata.xml
deleted file mode 100644
index b1f9256af634..000000000000
--- a/app-arch/deltarpm/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>A tool to create and apply deltarpms.</longdescription>
-  <use>
-    <flag name="system-zlib">
-      Use system
-      <pkg>sys-libs/zlib</pkg>.
-      Do not enable features of rsync friendly.
-    </flag>
-  </use>
-</pkgmetadata>
diff --git a/app-crypt/virtualsmartcard/Manifest b/app-crypt/virtualsmartcard/Manifest
deleted file mode 100644
index dc8487e5334d..000000000000
--- a/app-crypt/virtualsmartcard/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST virtualsmartcard-0.7.tar.gz 553122 BLAKE2B 5f7ceab19587808f2cabee87f200825d81043724cfb51ddc4ea2b86ec4df1dfae3e7e77b769b9f1e691e125ee2c7bbd6d83da79f1c5215308174f58f6b006cf0 SHA512 c6f357c26dbfa2859694f53b07bc621bf0fce0115a06db9c181dc9ea127eb32191b9c98472b27cca73bc747a5cc85d56ec19b06aa50b91d13a939308a46cac74
diff --git a/app-crypt/virtualsmartcard/metadata.xml b/app-crypt/virtualsmartcard/metadata.xml
deleted file mode 100644
index 0319eec4c8be..000000000000
--- a/app-crypt/virtualsmartcard/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="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-crypt/virtualsmartcard/virtualsmartcard-0.7.ebuild b/app-crypt/virtualsmartcard/virtualsmartcard-0.7.ebuild
deleted file mode 100644
index a65cd802bc81..000000000000
--- a/app-crypt/virtualsmartcard/virtualsmartcard-0.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 toolchain-funcs
-
-DESCRIPTION="Smart card emulator, can be used with Remote Smart Card Reader"
-HOMEPAGE="https://frankmorgner.github.io/vsmartcard/"
-SRC_URI="https://github.com/frankmorgner/vsmartcard/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="${PYTHON_DEPS}
-	media-gfx/qrencode:=
-	sys-apps/pcsc-lite"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-apps/help2man
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		# workaround buggy prefix logic
-		--enable-serialconfdir=$($(tc-getPKG_CONFIG) libpcsclite \
-			--variable=serialconfdir)
-		--enable-serialdropdir=$($(tc-getPKG_CONFIG) libpcsclite \
-			--variable=usbdropdir)/serial
-	)
-
-	econf "${myconf[@]}"
-}
diff --git a/app-dicts/duali-data/Manifest b/app-dicts/duali-data/Manifest
deleted file mode 100644
index 96c1cc0b2781..000000000000
--- a/app-dicts/duali-data/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST duali-data-0.1b.tar.gz 1155647 BLAKE2B d347f558308258972e4a17e5ef19d775a9e0676e64e48937e96149b8b09f5d6c497d7f1dd87d3505ac3b87f50e47910996689d7a8af8be04e02d4eb84f47f7b2 SHA512 c8aea8c02e91991d9ee9149ae20d5a40d6a88c7a54d13a9d1fcbf94ad4bedb177ed18cc9330fd2c4565684299d8f9359d213e27ebd46e129c41d4a7c42fa9d9c
diff --git a/app-dicts/duali-data/duali-data-0.1b-r1.ebuild b/app-dicts/duali-data/duali-data-0.1b-r1.ebuild
deleted file mode 100644
index f7e437ae580a..000000000000
--- a/app-dicts/duali-data/duali-data-0.1b-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Dictionary data for the Arab dictionary project duali"
-HOMEPAGE="https://www.arabeyes.org/Duali"
-SRC_URI="mirror://sourceforge/arabeyes/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~sparc x86"
-IUSE=""
-
-DEPEND=">=app-text/duali-0.2.0-r1"
-RDEPEND=""
-
-src_compile() {
-	dict2db --path ./ || die 'failed to compile databases'
-}
-
-src_install() {
-	dodoc README
-
-	insinto /usr/share/duali
-	doins tableab tableac tablebc
-
-	# The dict2db script (and the spellchecker itself) use the python
-	# anydbm module, which means we kinda don't know what file suffix is
-	# going to pop out in src_compile. The fact that app-text/duali
-	# requires python[gdbm] means that we should at least get the gdbm
-	# database format (e.g. stemsdb) if not stems.db.
-	if [[ -e stems.db ]]; then
-		doins stems.db prefixes.db suffixes.db
-	else
-		doins stemsdb prefixesdb suffixesdb
-	fi
-}
diff --git a/app-dicts/duali-data/metadata.xml b/app-dicts/duali-data/metadata.xml
deleted file mode 100644
index c8c6479d60fe..000000000000
--- a/app-dicts/duali-data/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-needed -->
-	<upstream>
-		<remote-id type="sourceforge">arabeyes</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/duali/Manifest b/app-text/duali/Manifest
deleted file mode 100644
index a8ef1f0e5e8c..000000000000
--- a/app-text/duali/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST duali-0.2.0.tar.bz2 13334 BLAKE2B 28366eedef3c37d40b88c1458cbc420be6dd44b252bd7b176939f1d794ef29659109d19bb7328388b6ef3e16ba8dc0c500fd962525b3e05c44900092687f5cd2 SHA512 9234647b722a54fce8f947f2f0eb8cc121e5bdd32bcf606bc8ff71854eaf68655474e374b3328b2a20af58484e5962dadf716bc220f7fd697a8cfbb99afb2d30
diff --git a/app-text/duali/duali-0.2.0-r1.ebuild b/app-text/duali/duali-0.2.0-r1.ebuild
deleted file mode 100644
index e324474ac5f5..000000000000
--- a/app-text/duali/duali-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-# Duali uses "anydbm" which should even support a slow fallback;
-# however, due to implementation details it fails when the databases
-# aren't gdbm.
-PYTHON_REQ_USE="gdbm"
-
-inherit python-single-r1
-
-DESCRIPTION="Arabic dictionary based on the DICT protocol"
-HOMEPAGE="https://www.arabeyes.org/Duali"
-SRC_URI="mirror://sourceforge/arabeyes/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~sparc x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-PDEPEND=">=app-dicts/duali-data-0.1b-r1"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_install() {
-	python_fix_shebang duali dict2db trans2arabic arabic2trans
-	python_doexe duali dict2db trans2arabic arabic2trans
-
-	insinto /etc
-	doins duali.conf
-
-	doman doc/man/*.1
-	dodoc README ChangeLog
-
-	python_domodule pyduali
-}
diff --git a/app-text/duali/metadata.xml b/app-text/duali/metadata.xml
deleted file mode 100644
index c8c6479d60fe..000000000000
--- a/app-text/duali/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-needed -->
-	<upstream>
-		<remote-id type="sourceforge">arabeyes</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/mftrace/Manifest b/app-text/mftrace/Manifest
deleted file mode 100644
index 77cc913a81f0..000000000000
--- a/app-text/mftrace/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST mftrace-1.2.18.tar.gz 79112 BLAKE2B 8c3be27985766690782338dec33955cbac80e7d8f4334ed7b62d3c52d7ea5784c14b12c87afd13099cdae226033ca3324b9e7c6e876badb75a8fb634f68a75f6 SHA512 db26a643a92cfcbb150c5f80af65b1ce6030a266023b4433ea760c3601092c42602617f52a49ce467cd3a4804aa6779e72ee38dc557dc03e1e1c86a36dbd54db
-DIST mftrace-1.2.19.tar.gz 78907 BLAKE2B 894ec3c428020cad8f2e408e141b58d7f1e0969c59e65ccb5379e346d735845f8922be4e046ca8fbd18cfd7c3b8e2179ed7af4756ddb4416b6ad42bdbff27f09 SHA512 410739ced17c5e5bb82c286b6b935c9d8d46299f9c04f0ba4c97df9ada5d7e9c778c720fb8a2377eb6df3c629a6e7264836fe7675733cf60197a817477dc49ee
diff --git a/app-text/mftrace/metadata.xml b/app-text/mftrace/metadata.xml
deleted file mode 100644
index db4b1471479e..000000000000
--- a/app-text/mftrace/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>fonts@gentoo.org</email>
-	<name>Fonts</name>
-</maintainer>
-<maintainer type="project">
-	<email>tex@gentoo.org</email>
-	<name>Gentoo TeX Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-text/mftrace/mftrace-1.2.18-r3.ebuild b/app-text/mftrace/mftrace-1.2.18-r3.ebuild
deleted file mode 100644
index eb25b659a5f2..000000000000
--- a/app-text/mftrace/mftrace-1.2.18-r3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 toolchain-funcs
-
-DESCRIPTION="Traces TeX fonts to PFA or PFB fonts (formerly pktrace)"
-HOMEPAGE="http://lilypond.org/mftrace/"
-SRC_URI="http://lilypond.org/downloads/sources/mftrace/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~hppa ppc x86"
-# SLOT 1 was used in pktrace ebuild
-SLOT="1"
-IUSE="test truetype"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=app-text/t1utils-1.25
-	media-gfx/potrace
-	truetype? ( media-gfx/fontforge )
-	virtual/latex-base
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	test? ( media-gfx/fontforge )"
-
-src_configure() {
-	tc-export CC
-	econf \
-		--datadir="$(python_get_sitedir)"
-}
-
-src_compile() {
-	emake CFLAGS="-Wall ${CFLAGS}"
-}
-
-src_install() {
-	default
-	python_optimize
-}
diff --git a/app-text/mftrace/mftrace-1.2.19-r1.ebuild b/app-text/mftrace/mftrace-1.2.19-r1.ebuild
deleted file mode 100644
index 2ad587595348..000000000000
--- a/app-text/mftrace/mftrace-1.2.19-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 toolchain-funcs
-
-DESCRIPTION="Traces TeX fonts to PFA or PFB fonts (formerly pktrace)"
-HOMEPAGE="http://lilypond.org/mftrace/"
-SRC_URI="http://lilypond.org/downloads/sources/mftrace/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-# SLOT 1 was used in pktrace ebuild
-SLOT="1"
-IUSE="test truetype"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=app-text/t1utils-1.25
-	media-gfx/potrace
-	truetype? ( media-gfx/fontforge )
-	virtual/latex-base
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	test? ( media-gfx/fontforge )"
-
-src_configure() {
-	tc-export CC
-	econf \
-		--datadir="$(python_get_sitedir)"
-}
-
-src_compile() {
-	emake CFLAGS="-Wall ${CFLAGS}"
-}
-
-src_install() {
-	default
-	python_optimize
-}
diff --git a/app-text/queequeg/Manifest b/app-text/queequeg/Manifest
deleted file mode 100644
index 2e0f66a18edc..000000000000
--- a/app-text/queequeg/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST queequeg-0.91.tar.gz 69449 BLAKE2B bd9db4bc6be37e8ee327fa5f6072cc4b2bc4b48fbfae194ef2466ebc26478c3ab3aadef212a69bf816ebdcd020c57af2b953eb9ef6a4c6d5be6516255c51666c SHA512 e5366577e587fd3f286c917135cd043ef599ef6ee673757f3538668f749ce6a57c2a257f31f1e9d38724cb6ee4680b4401800c23f84ae27deac75392ab6c5e34
diff --git a/app-text/queequeg/metadata.xml b/app-text/queequeg/metadata.xml
deleted file mode 100644
index e7804710f371..000000000000
--- a/app-text/queequeg/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>hattya@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>cjk@gentoo.org</email>
-		<name>Cjk</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">queequeg</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/queequeg/queequeg-0.91-r2.ebuild b/app-text/queequeg/queequeg-0.91-r2.ebuild
deleted file mode 100644
index bd13a71a2779..000000000000
--- a/app-text/queequeg/queequeg-0.91-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="A checker for English grammar, for people who are not native English"
-HOMEPAGE="http://queequeg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	app-dicts/wordnet"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	local dictdir=/usr/dict
-
-	if has_version ">=app-dicts/wordnet-2.0"; then
-		dictdir=/usr/share/wordnet/dict
-	fi
-
-	emake dict WORDNETDICT=${dictdir}
-
-	python_fix_shebang qq
-}
-
-src_install() {
-	local prefix=/usr/lib/queequeg
-
-	python_moduleinto "${prefix}"
-	python_domodule *.py
-	insinto "${prefix}"
-	[[ -f "dict.txt" ]] && doins dict.txt || doins dict.cdb
-
-	exeinto "${prefix}"
-	doexe qq
-	dodir /usr/bin
-	dosym ../lib/queequeg/qq /usr/bin/qq
-
-	dodoc README TODO
-	dodoc htdocs/*
-}
diff --git a/app-text/referencer/Manifest b/app-text/referencer/Manifest
deleted file mode 100644
index f45f90060c1d..000000000000
--- a/app-text/referencer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST referencer-1.2.2.tar.gz 694421 BLAKE2B 2b48b71610d0cb79feaaeae7af203dedd1dc53d194b1b93306c5f022954a5e50f5db1dd693da76b7d4f33045d3174ed82a0764a9dfee6b6bfe98f352575cf59b SHA512 de8d759890f283e7863e6174334bcb051edf70f87a6fb06f724ffa1699be60c83d0191bde0324b571fab0801752a5b92fb507a3cd337fa9adb5ea7d22b280907
diff --git a/app-text/referencer/files/referencer-1.2.2-lib_path.patch b/app-text/referencer/files/referencer-1.2.2-lib_path.patch
deleted file mode 100644
index 220b47d8b488..000000000000
--- a/app-text/referencer/files/referencer-1.2.2-lib_path.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Dominik Kriegner <dominik.kriegner@gmail.com>
-Date: Tue, 29 Nov 2016 09:56:00 +0000
-Subject: [PATCH] fix build issue
-Patch's original author is Askhat Bakarov on arch
-https://aur.archlinux.org/cgit/aur.git/commit/?h=referencer&id=961f2b5e4b286f27f610e5267465c63021b8a50f
-
-Project-Bug-URL: https://bugs.launchpad.net/referencer/+bug/1645639
-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=601174
-merged upstream: http://bazaar.launchpad.net/~referencer-devs/referencer/trunk/revision/939
-
---- a/src/Document.C	2014-01-27 03:43:00.000000000 +0700
-+++ b/src/Document.C	2016-11-03 16:25:00.698676538 +0700
-@@ -297,7 +297,7 @@
- 
- 			lib_path = lib_path->get_parent();
- 			up_dir_level += "../";
--			if (lib_path == 0) {
-+			if (!lib_path) {
- 				doc_is_relative_to_library = false;
- 				break;
- 			}
diff --git a/app-text/referencer/metadata.xml b/app-text/referencer/metadata.xml
deleted file mode 100644
index 8b254b7dbc9a..000000000000
--- a/app-text/referencer/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>dominik.kriegner@gmail.com</email>
-		<name>Dominik Kriegner</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">referencer</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/referencer/referencer-1.2.2-r1.ebuild b/app-text/referencer/referencer-1.2.2-r1.ebuild
deleted file mode 100644
index 6fa53d118dd7..000000000000
--- a/app-text/referencer/referencer-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit xdg python-single-r1 flag-o-matic
-
-DESCRIPTION="Application to organise documents or references, and to generate BibTeX files"
-HOMEPAGE="https://launchpad.net/referencer"
-SRC_URI="https://launchpad.net/${PN}/1./${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=app-text/poppler-0.12.3-r3[cairo]
-	>=dev-cpp/gtkmm-2.8:2.4
-	>=dev-cpp/libglademm-2.6.0
-	>=dev-cpp/gconfmm-2.14.0
-	>=dev-libs/boost-1.52.0-r4:="
-
-DEPEND="
-	${RDEPEND}
-	>=app-text/gnome-doc-utils-0.3.2
-	virtual/pkgconfig
-	>=dev-lang/perl-5.8.1
-	dev-perl/libxml-perl
-	dev-util/intltool
-	app-text/rarian
-	test? ( app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.5
-		app-text/scrollkeeper-dtd:1.0 )"
-
-PATCHES=( ${FILESDIR}/${PN}-${PV}-lib_path.patch )
-
-src_prepare() {
-	default
-	python_fix_shebang plugins
-}
-
-src_configure() {
-	append-cxxflags -std=gnu++11
-	econf \
-		--disable-update-mime-database \
-		--enable-python
-}
diff --git a/dev-libs/libmacaroons/Manifest b/dev-libs/libmacaroons/Manifest
deleted file mode 100644
index fdd8af021aef..000000000000
--- a/dev-libs/libmacaroons/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST libmacaroons-0.2.0.tar.gz 423629 BLAKE2B 8f3b58cbc31ad63e5e474dc76810cd921f6ee57d9836cceafcc2881518c87d185fddb48de13adb7f85fff5b831ce7abd53969ba8b0c96722909f855bb12d303f SHA512 4bc5f83b57c6a8080e646141a3c8b90c0025a894449dea4cb0ab15d1423a067b9833e70014468437d9edfe875e12ea90cae6f715893ded1eefa34f2f6506ecbe
-DIST libmacaroons-0.3.0.tar.gz 422086 BLAKE2B 16f398c93230ce745b302d212b58df1e154c8539f76437bbb49d07015c7445484fb5c187294c9a7a1fe6f33ab626a8d9a2fb4784b6bd9b652479072aaf2f0016 SHA512 57a5ffa1a8397228e29ab3f3f7d1440cd70b163b1b28904a046d7b3b1f70dbb0693ea983409f57cc63a02097a1af57209c70ecf8e3be5b8635a7ab6e498b1bcb
diff --git a/dev-libs/libmacaroons/libmacaroons-0.2.0-r1.ebuild b/dev-libs/libmacaroons/libmacaroons-0.2.0-r1.ebuild
deleted file mode 100644
index 2e904c76228f..000000000000
--- a/dev-libs/libmacaroons/libmacaroons-0.2.0-r1.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
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1
-
-DESCRIPTION="Hyperdex macaroons support library"
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test +python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) test? ( python )"
-
-# Tests can't function after 2014-12-31 ...
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/libsodium
-	dev-libs/json-c:=
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	econf $(use_enable python python-bindings)
-}
-
-src_test() {
-	emake -j1 check
-}
diff --git a/dev-libs/libmacaroons/libmacaroons-0.3.0.ebuild b/dev-libs/libmacaroons/libmacaroons-0.3.0.ebuild
deleted file mode 100644
index 2e904c76228f..000000000000
--- a/dev-libs/libmacaroons/libmacaroons-0.3.0.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
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1
-
-DESCRIPTION="Hyperdex macaroons support library"
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test +python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) test? ( python )"
-
-# Tests can't function after 2014-12-31 ...
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/libsodium
-	dev-libs/json-c:=
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	econf $(use_enable python python-bindings)
-}
-
-src_test() {
-	emake -j1 check
-}
diff --git a/dev-libs/libmacaroons/metadata.xml b/dev-libs/libmacaroons/metadata.xml
deleted file mode 100644
index 40aa45df2b01..000000000000
--- a/dev-libs/libmacaroons/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="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-libs/tut/Manifest b/dev-libs/tut/Manifest
deleted file mode 100644
index 4e1a958bcfde..000000000000
--- a/dev-libs/tut/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST tut-2013.12.18.tar.gz 248575 BLAKE2B 24fe433e38ac9c7aecdf9bc32b1a799eac39e700a9275d46e125616e4fcdbcb60ac6db8bbde9e11cd2fa7b70bc3a0bd0aafef7a2ebab53a3955b188b2ec11eb0 SHA512 daf232df8d27a5600209ee44dc72f83b9574b68c14cf9566aa826091767e2fc3c00a9e03e83386f46d7f2030bb6d6af5db6af326424a4c0bc41063e227ab8004
-DIST tut-2016.12.19.tar.gz 261753 BLAKE2B e0c053de5c50b7dd1dee44f64296e4d1050aa175f34ff0b2818817366774544cc19261171dc2a68ba76660866368fd3ad22ca8743c0a954d4d87bea987beb5c8 SHA512 296846dcaf9ed357232f69ce21927eea6a79173b66c5f16d41d7cbdb4dd5a18cc8b15217af56ef7a0a5fca0e55d148431bd872d4b815c239d21e5e4dfb4f312d
diff --git a/dev-libs/tut/metadata.xml b/dev-libs/tut/metadata.xml
deleted file mode 100644
index b5a95aa9bfb3..000000000000
--- a/dev-libs/tut/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>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mrzechonek/tut-framework</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/tut/tut-2013.12.18.ebuild b/dev-libs/tut/tut-2013.12.18.ebuild
deleted file mode 100644
index 2d40e8998857..000000000000
--- a/dev-libs/tut/tut-2013.12.18.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-NO_WAF_LIBDIR=yes
-
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="C++ Template Unit Test Framework"
-HOMEPAGE="http://mrzechonek.github.io/tut-framework/"
-SRC_URI="https://github.com/mrzechonek/tut-framework/archive/${PV//./-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=${PYTHON_DEPS}
-RDEPEND=""
-
-S="${WORKDIR}/tut-framework-${PV//./-}"
diff --git a/dev-libs/tut/tut-2016.12.19.ebuild b/dev-libs/tut/tut-2016.12.19.ebuild
deleted file mode 100644
index 2d40e8998857..000000000000
--- a/dev-libs/tut/tut-2016.12.19.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-NO_WAF_LIBDIR=yes
-
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="C++ Template Unit Test Framework"
-HOMEPAGE="http://mrzechonek.github.io/tut-framework/"
-SRC_URI="https://github.com/mrzechonek/tut-framework/archive/${PV//./-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=${PYTHON_DEPS}
-RDEPEND=""
-
-S="${WORKDIR}/tut-framework-${PV//./-}"
diff --git a/dev-python/elib-intl/Manifest b/dev-python/elib-intl/Manifest
deleted file mode 100644
index 56bfc1aec798..000000000000
--- a/dev-python/elib-intl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST elib-intl-0_pre20110711.tar.gz 29362 BLAKE2B b0e877085e88d8ef606019dfeb989ec4760b2b049ec4f96255b7051a526e9ea5daff4bc53b6be255c699de10220b8ebefb07486375231fbe5d4fa0adbc472e52 SHA512 f44388761bc1c371c0cba5ec8b3513b073eba1d620e1ebd696008999d748f8c2473d5100d625036436157c92283b29d700ad6672d7909ca284703e3146d02abf
diff --git a/dev-python/elib-intl/elib-intl-0_pre20110711.ebuild b/dev-python/elib-intl/elib-intl-0_pre20110711.ebuild
deleted file mode 100644
index b8c44da5b451..000000000000
--- a/dev-python/elib-intl/elib-intl-0_pre20110711.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Enhanced internationalization (I18N) services for your Python modules and applications"
-HOMEPAGE="https://github.com/dieterv/elib.intl/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools
-	${RDEPEND}"
diff --git a/dev-python/elib-intl/metadata.xml b/dev-python/elib-intl/metadata.xml
deleted file mode 100644
index da93a457fa9b..000000000000
--- a/dev-python/elib-intl/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-needed-->
-	<longdescription>
-		The elib.intl module provides enhanced internationalization
-		(I18N) services for your Python modules and applications.
-	</longdescription>
-	<upstream>
-		<maintainer>
-			<email>dieterv@optionexplicit.be</email>
-			<name>Dieter Verfaillie</name>
-		</maintainer>
-		<bugs-to>https://github.com/dieterv/elib.intl/issues</bugs-to>
-		<remote-id type="github">dieterv/elib.intl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/eunuchs/Manifest b/dev-python/eunuchs/Manifest
deleted file mode 100644
index d41d52d043ca..000000000000
--- a/dev-python/eunuchs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST eunuchs_20050320.1.tar.gz 8448 BLAKE2B bd2f28408ba8e709f37840202229641c22c0d5c970b90822f0ec6a4bec992c81c1ed4b756a29a937365eb15cefae26bd33a000a8a269c04e6aa7da8e4aaa44e0 SHA512 b3272de7ac2a41c2c632aa17424dcc74ef3b6d536be5684bd54e4f22ce2d7c6546ac7b1b7cef2611f00b467780b11a30eca9c8804c0f8839a13adff6894ce88d
diff --git a/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild b/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild
deleted file mode 100644
index 99f19b650d93..000000000000
--- a/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Missing manly parts of UNIX API for Python"
-HOMEPAGE="http://www.inoi.fi/open/trac/eunuchs https://pypi.org/project/python-eunuchs/"
-SRC_URI="mirror://debian/pool/main/e/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~ia64 ~sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}/${P}-python-2.5.patch" )
-DOCS=( examples/ )
-
-python_test() {
-	${PYTHON} examples/test-socketpair.py || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/eunuchs/files/eunuchs-20050320.1-python-2.5.patch b/dev-python/eunuchs/files/eunuchs-20050320.1-python-2.5.patch
deleted file mode 100644
index dfad7a8dce79..000000000000
--- a/dev-python/eunuchs/files/eunuchs-20050320.1-python-2.5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/eunuchs/sendmsg.c
-+++ lib/eunuchs/sendmsg.c
-@@ -101,7 +101,7 @@
- 	real_controllen += CMSG_SPACE(sizeof *info);
-       } else {
- 	char *data;
--	int len;
-+	Py_ssize_t len;
- 
- 	if (PyString_AsStringAndSize(rest, &data, &len))
- 	  return NULL; // TODO leaks
diff --git a/dev-python/eunuchs/metadata.xml b/dev-python/eunuchs/metadata.xml
deleted file mode 100644
index 6f09877002a5..000000000000
--- a/dev-python/eunuchs/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>
-	<longdescription lang="en">
-		Eunuchs is a library of Python extensions that complement the
-		standard libraries in parts where full support for the UNIX API (or
-		the Linux API) is missing.
-
-		Most of the functions wrapped by Eunuchs are low-level, dirty, but
-		absolutely necessary functions for real systems programming. The aim
-		is to have the functions added to mainstream Python libraries.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-python/medusa/Manifest b/dev-python/medusa/Manifest
deleted file mode 100644
index 0cdc121ad27f..000000000000
--- a/dev-python/medusa/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST medusa-0.5.4.tar.gz 107744 BLAKE2B 13050a97887d6dac4ddf561b109880fae9eb4f2e1462ed92a4963724580821190d94c3d9086dcf2b4656551d9f6e1f9d6d3dd6d501923cb25ff1f68257f6a985 SHA512 9b28c13f633c87586b88388719afdc6c8f32cb0e25583e8c03f5bb0a0ef7c75a4fbad23f5b296bf84c8fa50d7d811fa62305f3fbe64d3764aa5d28228a31a43f
diff --git a/dev-python/medusa/medusa-0.5.4-r1.ebuild b/dev-python/medusa/medusa-0.5.4-r1.ebuild
deleted file mode 100644
index 502529c46cf4..000000000000
--- a/dev-python/medusa/medusa-0.5.4-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A framework for writing asynchronous long-running, high-performance network servers in Python"
-HOMEPAGE="https://pypi.org/project/medusa/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc CHANGES.txt docs/*.txt
-	dodir /usr/share/doc/${PF}/example
-	cp -r demo/* "${ED}usr/share/doc/${PF}/example"
-	dohtml docs/*.html docs/*.gif
-}
diff --git a/dev-python/medusa/metadata.xml b/dev-python/medusa/metadata.xml
deleted file mode 100644
index 9e5274c5b4ae..000000000000
--- a/dev-python/medusa/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/python-iwscan/Manifest b/dev-python/python-iwscan/Manifest
deleted file mode 100644
index e087b8b489c2..000000000000
--- a/dev-python/python-iwscan/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST python-iwscan-20080402.tar.bz2 16891 BLAKE2B acfdfba08f6c7fbd7a89ca8932c6155f306332f03bfa1aec70618370c12480779d13726836074ab049f1ba496111a3b02cbd15fb515c317d48fe5f66d8295df4 SHA512 9e9d5e1b2cc491879a4f8a216044f46253820c6c8f30904a1867f758f6d158a9270c9c70a91f22a80f15fbe0446d786869104c5dc5d6bfcab470a79478f533d2
diff --git a/dev-python/python-iwscan/files/python-iwscan-20080402-wireless-tools-30.patch b/dev-python/python-iwscan/files/python-iwscan-20080402-wireless-tools-30.patch
deleted file mode 100644
index 16a9dce1858f..000000000000
--- a/dev-python/python-iwscan/files/python-iwscan-20080402-wireless-tools-30.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- pyiwscan.c
-+++ pyiwscan.c
-@@ -13,6 +13,11 @@
- #include <structmember.h>
- #include <iwlib.h>
- 
-+/* PROC_NET_WIRELESS is defined in iwlib-private.h since wireless-tools-30_pre9 */
-+#ifndef PROC_NET_WIRELESS
-+#define PROC_NET_WIRELESS "/proc/net/wireless"
-+#endif
-+
- #define IWSCAN_VERSION_MAJOR  0
- #define IWSCAN_VERSION_MINOR  7
- #define IWSCAN_VERSION_MICRO  0
diff --git a/dev-python/python-iwscan/metadata.xml b/dev-python/python-iwscan/metadata.xml
deleted file mode 100644
index a5c911a491f5..000000000000
--- a/dev-python/python-iwscan/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/python-iwscan/python-iwscan-20080402-r1.ebuild b/dev-python/python-iwscan/python-iwscan-20080402-r1.ebuild
deleted file mode 100644
index 1a0bfd3da421..000000000000
--- a/dev-python/python-iwscan/python-iwscan-20080402-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="A Python extension for iwscan access"
-HOMEPAGE="http://projects.otaku42.de/browser/python-iwscan"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND="net-wireless/wireless-tools"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-wireless-tools-30.patch"
-)
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-}
diff --git a/dev-util/confix/Manifest b/dev-util/confix/Manifest
deleted file mode 100644
index dfc1a6c85675..000000000000
--- a/dev-util/confix/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Confix-2.3.5.tar.bz2 678133 BLAKE2B 7aac9e7a6d3ffd629393e06c76bc13167e6b756a12e46a5d813a6e896c9cfd24ff384d8cda605507df402c1f8492c9759ac35834b1f84450b1e0fe8bf5de783b SHA512 e6adec0cd27e9064dd0f6ff32d2e68deb755631a27759b253a7a176525b515ffc9069b8f28ac48ee6fdb642dfc2098fd2d7d6bd6e4ecccd43cb92df12c48e4c7
diff --git a/dev-util/confix/confix-2.3.5-r2.ebuild b/dev-util/confix/confix-2.3.5-r2.ebuild
deleted file mode 100644
index d840e82bf489..000000000000
--- a/dev-util/confix/confix-2.3.5-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Confix: A Build Tool on Top of GNU Automake"
-HOMEPAGE="http://confix.sourceforge.net"
-SRC_URI="mirror://sourceforge/confix/Confix-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-util/confix-wrapper
-	sys-devel/autoconf-archive
-	sys-devel/automake
-	sys-devel/libtool"
-
-S="${WORKDIR}/Confix-${PV}"
-
-PATCHES=( # find jni-include dirs on hpux.
-	"${FILESDIR}"/2.1.0/jni-hpux.patch
-	# add .exe extension to TESTS
-	"${FILESDIR}"/2.3.0/exeext.patch
-	# use external autoconf archive
-	"${FILESDIR}"/2.3.0/ext-ac-archive.patch
-	# link local libraries first.
-	"${FILESDIR}"/2.3.0/local-libs-first.patch
-	# don't use automake 1.9, but any newer too...
-	"${FILESDIR}"/2.3.0/new-automake.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-pkg_preinst() {
-	local RV=2.3.0
-
-	if has_version "<dev-util/confix-${RV}"; then
-		einfo "After merging ${P} you might have to remerge all packages built"
-		einfo "with <dev-util/confix-${RV} in your EPREFIX to get all the"
-		einfo "repo files useable with current ${PN}".
-		ewarn
-		ewarn "Use this command (copy&paste) to identify packages built with confix"
-		ewarn "needing a remerge in your particular instance of Gentoo Prefix:"
-		ewarn
-		# use 'echo' to get this command from here:
-		ewarn "( cd \$(portageq envvar EPREFIX)/var/db/pkg || exit 1;" \
-			  "pattern=\$(cd ../../.. && echo \$(ls -d" \
-			  "usr/share/confix*/repo | grep -v confix-${RV}) |" \
-			  "sed -e 's, ,|,g'); if [[ -z \${pattern} ]]; then echo" \
-			  "'No more packages were built with broken Confix.'; exit 0;" \
-			  "fi; emerge --ask --oneshot \$(grep -lE \"(\${pattern})\"" \
-			  "*/*/CONTENTS | sed -e 's,^,>=,;s,/CONTENTS,,')" \
-			  ")"
-		ewarn
-	fi
-}
diff --git a/dev-util/confix/confix-2.3.5-r3.ebuild b/dev-util/confix/confix-2.3.5-r3.ebuild
deleted file mode 100644
index 11af017cd57e..000000000000
--- a/dev-util/confix/confix-2.3.5-r3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Confix: A Build Tool on Top of GNU Automake"
-HOMEPAGE="http://confix.sourceforge.net"
-SRC_URI="mirror://sourceforge/confix/Confix-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-util/confix-wrapper
-	sys-devel/autoconf-archive
-	sys-devel/automake
-	sys-devel/libtool"
-
-S="${WORKDIR}/Confix-${PV}"
-
-PATCHES=( # find jni-include dirs on hpux.
-	"${FILESDIR}"/2.1.0/jni-hpux.patch
-	# add .exe extension to TESTS
-	"${FILESDIR}"/2.3.0/exeext.patch
-	# use external autoconf archive
-	"${FILESDIR}"/2.3.0/ext-ac-archive.patch
-	# link local libraries first.
-	"${FILESDIR}"/2.3.0/local-libs-first.patch
-	# don't use automake 1.9, but any newer too...
-	"${FILESDIR}"/2.3.0/new-automake.patch
-	# support -no-undefined libtool flag
-	"${FILESDIR}"/${P}-support-no_undefined.patch
-	# drop deprecated 'dist-shar' automake flag
-	"${FILESDIR}"/${P}-nodist-shar.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-pkg_preinst() {
-	local RV=2.3.0
-
-	if has_version "<dev-util/confix-${RV}"; then
-		einfo "After merging ${P} you might have to remerge all packages built"
-		einfo "with <dev-util/confix-${RV} in your EPREFIX to get all the"
-		einfo "repo files useable with current ${PN}".
-		ewarn
-		ewarn "Use this command (copy&paste) to identify packages built with confix"
-		ewarn "needing a remerge in your particular instance of Gentoo Prefix:"
-		ewarn
-		# use 'echo' to get this command from here:
-		ewarn "( cd \$(portageq envvar EPREFIX)/var/db/pkg || exit 1;" \
-			  "pattern=\$(cd ../../.. && echo \$(ls -d" \
-			  "usr/share/confix*/repo | grep -v confix-${RV}) |" \
-			  "sed -e 's, ,|,g'); if [[ -z \${pattern} ]]; then echo" \
-			  "'No more packages were built with broken Confix.'; exit 0;" \
-			  "fi; emerge --ask --oneshot \$(grep -lE \"(\${pattern})\"" \
-			  "*/*/CONTENTS | sed -e 's,^,>=,;s,/CONTENTS,,')" \
-			  ")"
-		ewarn
-	fi
-}
diff --git a/dev-util/confix/confix-9999.ebuild b/dev-util/confix/confix-9999.ebuild
deleted file mode 100644
index 3cedd69d8468..000000000000
--- a/dev-util/confix/confix-9999.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 subversion
-
-DESCRIPTION="Confix: A Build Tool on Top of GNU Automake"
-HOMEPAGE="http://confix.sourceforge.net"
-ESVN_REPO_URI="https://svn.code.sf.net/p/confix/svn/confix/trunk"
-ESVN_PROJECT="${PN}"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS=""
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-util/confix-wrapper
-	sys-devel/autoconf-archive
-	sys-devel/automake
-	sys-devel/libtool"
-
-PATCHES=( # find jni-include dirs on hpux.
-	"${FILESDIR}"/2.1.0/jni-hpux.patch
-	# add .exe extension to TESTS
-	"${FILESDIR}"/2.3.0/exeext.patch
-	# use external autoconf archive
-	"${FILESDIR}"/2.3.0/ext-ac-archive.patch
-	# link local libraries first.
-	"${FILESDIR}"/2.3.0/local-libs-first.patch
-	# don't use automake 1.9, but any newer too...
-	"${FILESDIR}"/2.3.0/new-automake.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-pkg_preinst() {
-	local RV=2.3.0
-
-	if has_version "<dev-util/confix-${RV}"; then
-		einfo "After merging ${P} you might have to remerge all packages built"
-		einfo "with <dev-util/confix-${RV} in your EPREFIX to get all the"
-		einfo "repo files useable with current ${PN}".
-		ewarn
-		ewarn "Use this command (copy&paste) to identify packages built with confix"
-		ewarn "needing a remerge in your particular instance of Gentoo Prefix:"
-		ewarn
-		# use 'echo' to get this command from here:
-		ewarn "( cd \$(portageq envvar EPREFIX)/var/db/pkg || exit 1;" \
-			  "pattern=\$(cd ../../.. && echo \$(ls -d" \
-			  "usr/share/confix*/repo | grep -v confix-${RV}) |" \
-			  "sed -e 's, ,|,g'); if [[ -z \${pattern} ]]; then echo" \
-			  "'No more packages were built with broken Confix.'; exit 0;" \
-			  "fi; emerge --ask --oneshot \$(grep -lE \"(\${pattern})\"" \
-			  "*/*/CONTENTS | sed -e 's,^,>=,;s,/CONTENTS,,')" \
-			  ")"
-		ewarn
-	fi
-}
diff --git a/dev-util/confix/files/2.1.0/jni-hpux.patch b/dev-util/confix/files/2.1.0/jni-hpux.patch
deleted file mode 100644
index bd1b626e7bc2..000000000000
--- a/dev-util/confix/files/2.1.0/jni-hpux.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Confix-2.0.0pre20/share/confix/autoconf-archive/m4src/ac_jni_include_dir.m4.orig	2007-02-07 21:16:20.000000000 +0100
-+++ Confix-2.0.0pre20/share/confix/autoconf-archive/m4src/ac_jni_include_dir.m4	2007-02-07 21:16:34.000000000 +0100
-@@ -67,6 +67,7 @@
- mingw*)			_JNI_INC_SUBDIRS="win32";;
- cygwin*)		_JNI_INC_SUBDIRS="win32";;
- interix*)		_JNI_INC_SUBDIRS="win32";;
-+hpux*)			_JNI_INC_SUBDIRS="hp-ux";;
- *)              _JNI_INC_SUBDIRS="genunix";;
- esac
- 
diff --git a/dev-util/confix/files/2.3.0/exeext.patch b/dev-util/confix/files/2.3.0/exeext.patch
deleted file mode 100644
index 98576f5c9f8b..000000000000
--- a/dev-util/confix/files/2.3.0/exeext.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ru confix-9999.orig/libconfix/plugins/automake/makefile_am.py confix-9999/libconfix/plugins/automake/makefile_am.py
---- confix-9999.orig/libconfix/plugins/automake/makefile_am.py	2009-10-30 13:20:42.106291175 +0100
-+++ confix-9999/libconfix/plugins/automake/makefile_am.py	2009-10-30 13:23:39.562354663 +0100
-@@ -472,7 +472,15 @@
-         
-         # register automatic tests and set their environment
- 
--        tests = self.dir_primary('check', 'PROGRAMS') + \
-+        test_tmp = self.dir_primary('check', 'PROGRAMS')
-+        count = 0
-+        for prog in test_tmp:
-+            prog += "$(EXEEXT)"
-+            test_tmp[count] = prog
-+            count += 1
-+            pass
-+
-+        tests = test_tmp + \
-                 self.dir_primary('check', 'SCRIPTS')
-         if len(tests):
-             lines.extend(makefile.List(name='TESTS', values=tests, mitigate=True).lines())
diff --git a/dev-util/confix/files/2.3.0/ext-ac-archive.patch b/dev-util/confix/files/2.3.0/ext-ac-archive.patch
deleted file mode 100644
index 32122c95bfe2..000000000000
--- a/dev-util/confix/files/2.3.0/ext-ac-archive.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ru confix-9999.orig/libconfix/plugins/automake/bootstrap.py confix-9999/libconfix/plugins/automake/bootstrap.py
---- confix-9999.orig/libconfix/plugins/automake/bootstrap.py	2009-10-30 13:25:27.962172020 +0100
-+++ confix-9999/libconfix/plugins/automake/bootstrap.py	2009-10-30 13:27:14.780605001 +0100
-@@ -16,7 +16,7 @@
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- # USA
- 
--import autoconf_archive
-+#import autoconf_archive
- import kde_hack
- 
- from libconfix.core.utils.error import Error
-@@ -29,7 +29,7 @@
- 
- def bootstrap(packageroot, use_kde_hack, argv0, path=None):
-     aclocal_incdirs = []
--    aclocal_incdirs.append(autoconf_archive.include_path(argv0))
-+    #aclocal_incdirs.append(autoconf_archive.include_path(argv0))
- 
-     # if package's configure.ac looks like using libtool, then we
-     # assume that the package must be libtoolize'd.
-diff -ru confix-9999.orig/setup.py confix-9999/setup.py
---- confix-9999.orig/setup.py	2009-10-30 13:25:27.965360137 +0100
-+++ confix-9999/setup.py	2009-10-30 13:26:47.822129311 +0100
-@@ -41,8 +41,8 @@
-     return result
- 
- datafiles = []
--datafiles.extend(recdir('share/confix/autoconf-archive/m4src', '.m4', []))
--datafiles.extend(recdir('share/confix/autoconf-archive/htmldoc', '.html', []))
-+#datafiles.extend(recdir('share/confix/autoconf-archive/m4src', '.m4', []))
-+#datafiles.extend(recdir('share/confix/autoconf-archive/htmldoc', '.html', []))
- 
- # scripts to put in the auxdir.
- datafiles.extend([('share/confix/kde-hack',
diff --git a/dev-util/confix/files/2.3.0/local-libs-first.patch b/dev-util/confix/files/2.3.0/local-libs-first.patch
deleted file mode 100644
index 29d4a7a1cc9d..000000000000
--- a/dev-util/confix/files/2.3.0/local-libs-first.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-With libtool, link local libraries with /path/to/libfile.la instead of libpath,
-to avoid encoding local libpath into installed la-file.
-These also have to be linked first, to avoid finding already installed
-libraries of previous versions during libtool-relink.
-diff -ru Confix-2.3.0.orig/libconfix/plugins/automake/c/out_c.py Confix-2.3.0/libconfix/plugins/automake/c/out_c.py
---- Confix-2.3.0.orig/libconfix/plugins/automake/c/out_c.py	2010-07-06 12:55:59.286540943 +0200
-+++ Confix-2.3.0/libconfix/plugins/automake/c/out_c.py	2010-07-06 13:01:23.574428852 +0200
-@@ -411,6 +411,8 @@
-         """
-         assert isinstance(linked_builder, LinkedBuilder)
-         
-+        local_paths = []
-+        local_libraries = []
-         native_paths = []
-         native_libraries = []
-         external_linkline = []
-@@ -424,8 +426,11 @@
- 
-         for bi in native_libs_to_use:
-             if isinstance(bi, BuildInfo_CLibrary_NativeLocal):
--                native_paths.append('-L'+'/'.join(['$(top_builddir)']+bi.dir()))
--                native_libraries.append('-l'+bi.basename())
-+                if self.__use_libtool:
-+                    local_libraries.append('/'.join(['$(top_builddir)']+bi.dir()+['lib'+bi.basename()+'.la']))
-+                else:
-+                    local_paths.append('-L'+'/'.join(['$(top_builddir)']+bi.dir()))
-+                    local_libraries.append('-l'+bi.basename())
-                 continue
-             if isinstance(bi, BuildInfo_CLibrary_NativeInstalled):
-                 using_installed_library = True
-@@ -447,7 +452,7 @@
-             external_linkline.extend(elem)
-             pass
- 
--        return native_paths + native_libraries + external_linkline
-+        return local_paths + local_libraries + native_paths + native_libraries + external_linkline
- 
-     def external_libpath(self):
-         """ For unit tests only. """
diff --git a/dev-util/confix/files/2.3.0/new-automake.patch b/dev-util/confix/files/2.3.0/new-automake.patch
deleted file mode 100644
index d6f24a4cae81..000000000000
--- a/dev-util/confix/files/2.3.0/new-automake.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru Confix-2.3.0.orig/libconfix/plugins/automake/out_automake.py Confix-2.3.0/libconfix/plugins/automake/out_automake.py
---- Confix-2.3.0.orig/libconfix/plugins/automake/out_automake.py	2010-07-12 13:15:49.254867387 +0200
-+++ Confix-2.3.0/libconfix/plugins/automake/out_automake.py	2010-07-12 13:17:29.755908602 +0200
-@@ -170,7 +170,7 @@
- 
- 
-         # our minimum required automake version is 1.9
--        self.makefile_am().add_automake_options('1.9')
-+        # self.makefile_am().add_automake_options('1.9')
- 
- 
-         # enable dist'ing in the following formats
diff --git a/dev-util/confix/files/confix-2.3.5-nodist-shar.patch b/dev-util/confix/files/confix-2.3.5-nodist-shar.patch
deleted file mode 100644
index bccc437de44c..000000000000
--- a/dev-util/confix/files/confix-2.3.5-nodist-shar.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-------------------------------------------------------------------------
-r961 | mhaubi | 2017-09-26 15:34:00 +0200 (Tue, 26 Sep 2017) | 1 line
-
-drop 'dist-shar', deprecated by newer automake
-
-Index: doc/confix.texi
-===================================================================
-#--- doc/confix.texi	(revision 960)
-#+++ doc/confix.texi	(working copy)
-#@@ -992,9 +992,6 @@
- @code{dist-bzip2} creates a @file{.tar.bz2} distribution.
- 
- @item
--@code{dist-shar} creates a shell archive distribution.
--
--@item
- @code{dist-zip} create a zip file (popular on Windows).
- 
- @item
-Index: libconfix/plugins/automake/out_automake.py
-===================================================================
---- libconfix/plugins/automake/out_automake.py	(revision 960)
-+++ libconfix/plugins/automake/out_automake.py	(working copy)
-@@ -175,7 +175,6 @@
- 
-         # enable dist'ing in the following formats
-         self.makefile_am().add_automake_options('dist-bzip2')
--        self.makefile_am().add_automake_options('dist-shar')
-         self.makefile_am().add_automake_options('dist-zip')
- 
- 
-Index: libconfix/plugins/automake/tests/output.py
-===================================================================
---- libconfix/plugins/automake/tests/output.py	(revision 960)
-+++ libconfix/plugins/automake/tests/output.py	(working copy)
-@@ -146,7 +146,7 @@
- 
-         self.failUnless('1.9' in rootdir_automake_builder.makefile_am().automake_options())
-         self.failUnless('dist-bzip2' in rootdir_automake_builder.makefile_am().automake_options())
--        self.failUnless('dist-shar' in rootdir_automake_builder.makefile_am().automake_options())
-+        self.failUnless('dist-shar' not in rootdir_automake_builder.makefile_am().automake_options())
-         self.failUnless('dist-zip' in rootdir_automake_builder.makefile_am().automake_options())
-         self.failUnless(const.CONFIX2_DIR in rootdir_automake_builder.makefile_am().extra_dist())
-         self.failUnless(const.CONFIX2_PKG in rootdir_automake_builder.makefile_am().extra_dist())
diff --git a/dev-util/confix/files/confix-2.3.5-support-no_undefined.patch b/dev-util/confix/files/confix-2.3.5-support-no_undefined.patch
deleted file mode 100644
index a6ffaae89c98..000000000000
--- a/dev-util/confix/files/confix-2.3.5-support-no_undefined.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-------------------------------------------------------------------------
-r960 | mhaubi | 2017-09-26 14:51:18 +0200 (Tue, 26 Sep 2017) | 10 lines
-
-add 'has_undefined_symbols' property for libraries
-
-Windows does not support undefined symbols in shared libraries,
-so libtool refuses to create DLLs without the -no-undefined flag.
-
-Adding explicit HAS_UNDEFINED_SYMBOLS(False) api call per library,
-and the optional (has_undefined_symbols=False) argument to AutoC().
-
-For backwards compatibility, default is (has_undefined_symbols=True).
-
-------------------------------------------------------------------------
-Index: libconfix/plugins/automake/c/out_c.py
-===================================================================
---- libconfix/plugins/automake/c/out_c.py	(revision 959)
-+++ libconfix/plugins/automake/c/out_c.py	(revision 960)
-@@ -487,6 +487,9 @@
-                 elif b.default_version() is not None:
-                     automake_output_builder.makefile_am().add_compound_ldflags(automakelibname, '-release '+b.default_version())
-                     pass
-+                if b.has_undefined_symbols() is False:
-+                    automake_output_builder.makefile_am().add_compound_ldflags(automakelibname, '-no-undefined')
-+                    pass
-                 pass
-             else:
-                 automake_output_builder.configure_ac().add_paragraph(
-Index: libconfix/plugins/c/clusterer.py
-===================================================================
---- libconfix/plugins/c/clusterer.py	(revision 959)
-+++ libconfix/plugins/c/clusterer.py	(revision 960)
-@@ -33,7 +33,7 @@
- import types
- 
- class CClustererSetup(Setup):
--    def __init__(self, linkednamefinder=None):
-+    def __init__(self, linkednamefinder=None, has_undefined_symbols=True):
-         assert linkednamefinder is None or isinstance(linkednamefinder, NameFinder)
-         Setup.__init__(self)
-         if linkednamefinder is None:
-@@ -41,10 +41,11 @@
-         else:
-             self.__namefinder = linkednamefinder
-             pass
-+        self.__has_undefined_symbols = has_undefined_symbols
-         pass
- 
-     def setup(self, dirbuilder):
--        clusterer = CClusterer(namefinder=self.__namefinder)
-+        clusterer = CClusterer(namefinder=self.__namefinder, has_undefined_symbols=self.__has_undefined_symbols)
-         dirbuilder.add_builder(clusterer)
-         dirbuilder.add_interface(CClustererInterfaceProxy(clusterer=clusterer))
-         pass
-@@ -51,11 +52,12 @@
-     pass
- 
- class CClusterer(Builder):
--    def __init__(self, namefinder):
-+    def __init__(self, namefinder, has_undefined_symbols=True):
-         Builder.__init__(self)
-         self.__namefinder = namefinder
-         self.__libname = None
-         self.__libtool_version_info = None
-+        self.__has_undefined_symbols = has_undefined_symbols
-         pass
- 
-     def shortname(self):
-@@ -85,6 +87,15 @@
-             pass
-         pass
- 
-+    def set_has_undefined_symbols(self, has_undefined_symbols):
-+        self.__has_undefined_symbols = has_undefined_symbols
-+        for builder in self.parentbuilder().iter_builders():
-+            if isinstance(builder, LibraryBuilder):
-+                builder.set_has_undefined_symbols(has_undefined_symbols)
-+                break
-+            pass
-+        pass
-+
-     def enlarge(self):
-         super(CClusterer, self).enlarge()
- 
-@@ -163,7 +174,8 @@
-             LibraryBuilder(
-                 basename=libname,
-                 version=self.__libtool_version_info,
--                default_version=self.package().version()))
-+                default_version=self.package().version(),
-+                has_undefined_symbols=self.__has_undefined_symbols))
-         for b in itertools.chain(nomain_builders, header_builders):
-             library.add_member(b)
-             pass
-@@ -229,6 +241,13 @@
-             pass
-         self.__clusterer.set_libtool_version_info(version)
-         pass
-+
-+    def HAS_UNDEFINED_SYMBOLS(self, has_undefined_symbols):
-+        if type(has_undefined_symbols) is not types.BooleanType:
-+            raise Error("HAS_UNDEFINED_SYMBOLS(): 'has_undefined_symbols' argument must be a boolean")
-+        self.__clusterer.set_has_undefined_symbols(has_undefined_symbols)
-+        pass
-+
-     pass
- 
- class NameFinder:
-Index: libconfix/plugins/c/explicit_iface.py
-===================================================================
---- libconfix/plugins/c/explicit_iface.py	(revision 959)
-+++ libconfix/plugins/c/explicit_iface.py	(revision 960)
-@@ -104,7 +104,7 @@
-         self.__dirbuilder.add_builder(yacc)
-         return yacc
- 
--    def LIBRARY(self, members, basename=None, version=None):
-+    def LIBRARY(self, members, basename=None, version=None, undefined_symbols=True):
-         the_basename = basename
-         if the_basename is None:
-             the_basename=LongNameFinder().find_libname(
-@@ -113,7 +113,8 @@
-             pass
-         library = LibraryBuilder(basename=the_basename,
-                                  version=version,
--                                 default_version=self.__dirbuilder.package().version())
-+                                 default_version=self.__dirbuilder.package().version(),
-+                                 has_undefined_symbols=undefined_symbols)
-         for m in members:
-             library.add_member(m)
-             pass
-Index: libconfix/plugins/c/library.py
-===================================================================
---- libconfix/plugins/c/library.py	(revision 959)
-+++ libconfix/plugins/c/library.py	(revision 960)
-@@ -25,7 +25,8 @@
-     def __init__(self,
-                  basename,
-                  version,
--                 default_version):
-+                 default_version,
-+                 has_undefined_symbols):
- 
-         # library version. passed to libtool as "-version-info
-         # <current>:<revision>:<age>", for example.
-@@ -40,6 +41,7 @@
-         self.__basename = basename
-         self.__version = version
-         self.__default_version = default_version
-+        self.__has_undefined_symbols = has_undefined_symbols
- 
-         self.__buildinfo_added = False
-         
-@@ -82,6 +84,10 @@
-         super(LibraryBuilder, self).force_enlarge()
-         pass
- 
-+    def set_has_undefined_symbols(self, has_undefined_symbols):
-+        self.__has_undefined_symbols = has_undefined_symbols
-+        pass
-+
-     def version(self):
-         return self.__version
- 
-@@ -88,4 +94,7 @@
-     def default_version(self):
-         return self.__default_version
- 
-+    def has_undefined_symbols(self):
-+        return self.__has_undefined_symbols
-+
-     pass
-Index: libconfix/plugins/c/setups/default_setup.py
-===================================================================
---- libconfix/plugins/c/setups/default_setup.py	(revision 959)
-+++ libconfix/plugins/c/setups/default_setup.py	(revision 960)
-@@ -25,8 +25,8 @@
- 
- from libconfix.core.machinery.setup import CompositeSetup
- 
--def make_core_setups(linkednamefinder):
--    return [CClustererSetup(linkednamefinder=linkednamefinder),
-+def make_core_setups(linkednamefinder, has_undefined_symbols):
-+    return [CClustererSetup(linkednamefinder=linkednamefinder, has_undefined_symbols=has_undefined_symbols),
-             CCreatorSetup(),
-             CommonInterfaceSetup(),
-             RelocatedHeadersSetup(),
-@@ -34,8 +34,9 @@
- 
- class DefaultCSetup(CompositeSetup):
-     def __init__(self,
--                 linkednamefinder=None):
--        setups = make_core_setups(linkednamefinder=linkednamefinder)
-+                 linkednamefinder=None,
-+                 has_undefined_symbols=True):
-+        setups = make_core_setups(linkednamefinder=linkednamefinder, has_undefined_symbols=has_undefined_symbols)
-         setups.append(ImplicitInterfaceSetup())
-         CompositeSetup.__init__(
-             self,
-Index: libconfix/setups/c.py
-===================================================================
---- libconfix/setups/c.py	(revision 959)
-+++ libconfix/setups/c.py	(revision 960)
-@@ -26,7 +26,7 @@
-     pass
- 
- class AutoC(CompositeSetup):
--    def __init__(self, libnamefinder=None):
--        CompositeSetup.__init__(self, [DefaultCSetup(libnamefinder)])
-+    def __init__(self, libnamefinder=None, has_undefined_symbols=True):
-+        CompositeSetup.__init__(self, [DefaultCSetup(libnamefinder, has_undefined_symbols=has_undefined_symbols)])
-         pass
-     pass
diff --git a/dev-util/confix/metadata.xml b/dev-util/confix/metadata.xml
deleted file mode 100644
index 5cbfb3aa5288..000000000000
--- a/dev-util/confix/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="person">
-		<email>haubi@gentoo.org</email>
-		<name>Michael Haubenwallner</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">confix</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/qmtest/Manifest b/dev-util/qmtest/Manifest
deleted file mode 100644
index 2e9f114ebc31..000000000000
--- a/dev-util/qmtest/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qmtest-2.4.1.tar.gz 2792290 BLAKE2B 315ae4f79630d367e9b8198811975600f43eec3c2e9cb253fce2523f92a59536a23a7c299094b060292c9719f6edcae521faa4a300b367a226da8597b6fbaac9 SHA512 01a8b317fd5ae3d653b81d031005975d745829eda4b7d4d57c85cc13b71c142213dce053ba13999bf42a1b9b17118075e2c244c67e5c4c8a957d35d2850ae372
diff --git a/dev-util/qmtest/metadata.xml b/dev-util/qmtest/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-util/qmtest/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>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-util/qmtest/qmtest-2.4.1-r1.ebuild b/dev-util/qmtest/qmtest-2.4.1-r1.ebuild
deleted file mode 100644
index 93ad4a8feb92..000000000000
--- a/dev-util/qmtest/qmtest-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="CodeSourcery's test harness system"
-HOMEPAGE="http://www.codesourcery.com/qmtest/"
-SRC_URI="http://www.codesourcery.com/public/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	distutils-r1_src_install
-	find "${ED}" -name config.py -print0 | xargs -0 sed -i "s:${ED}:${EPREFIX}/usr:"
-	rm -r "${ED}"usr/share/doc/${PN}/{COPYING,LICENSE.OPL} || die
-	mv "${ED}"usr/share/doc/${PN}/* "${ED}"usr/share/doc/${PF} || die
-	rm -r "${ED}"/usr/share/doc/${PN} || die
-}
diff --git a/dev-util/unrpyc/Manifest b/dev-util/unrpyc/Manifest
deleted file mode 100644
index 137c525b9114..000000000000
--- a/dev-util/unrpyc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST unrpyc-1.1.3.tar.gz 77662 BLAKE2B e2fdf9015e67ee389ff84c49bd89c64d65178a26aaa7b8600202f491291e03a568bec2d8d09e47c407a9bcd025dab3b84e5167f07c9673d19bdb5bf7846c1eed SHA512 5883d58e11b2f52cffdeae744e17bf6bf2039340e53365f8ce58f716b991011bbca71c6473395a9d70c32bc77529eea3e7a9e3b8da7dc3cc8362cc0fdcbe5cf0
diff --git a/dev-util/unrpyc/metadata.xml b/dev-util/unrpyc/metadata.xml
deleted file mode 100644
index 69df492b06ae..000000000000
--- a/dev-util/unrpyc/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>bircoph@gentoo.org</email>
-		<name>Andrew Savchenko</name>
-	</maintainer>
-	<longdescription>
-		Unrpyc is a script to decompile Ren'Py (http://www.renpy.org/) compiled
-		.rpyc script files. It will not extract files from .rpa archives.
-		For that, use <pkg>app-arch/unrpa</pkg>.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">CensoredUsername/unrpyc</remote-id>
-	</upstream>
-	<use>
-		<flag name="module">Build un.rpyc module for run-time decompiling</flag>
-		<flag name="proto0">Use pickle protocol 0 for un-rpyc module. May be usefule for very old games</flag>
-		<flag name="proto1">Use pickle protocol 1 for un-rpyc module. Default if no protocol is selected</flag>
-		<flag name="proto2">Use pickle protocol 2 for un-rpyc module</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/unrpyc/unrpyc-1.1.3.ebuild b/dev-util/unrpyc/unrpyc-1.1.3.ebuild
deleted file mode 100644
index e754cac60c4a..000000000000
--- a/dev-util/unrpyc/unrpyc-1.1.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-SRC_URI="https://github.com/CensoredUsername/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-DESCRIPTION="Ren'Py's rpyc scripts decompiler"
-HOMEPAGE="https://github.com/CensoredUsername/unrpyc"
-LICENSE="BSD-1 BSD"
-SLOT="0"
-
-IUSE="+module proto0 proto1 proto2"
-
-DEPEND="module? ( dev-python/picklemagic[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	sed -i 's/unrpyc.py/unrpyc/g' README.md setup.py || die
-	mv unrpyc.py unrpyc || die
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use module; then
-		local proto=1
-		use proto0 && proto=0
-		use proto1 && proto=1
-		use proto2 && proto=2
-
-		cd un.rpyc || die
-		python_setup 'python2*'
-		./compile.py -p${proto} || die
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	if use module; then
-		install -Dpm 0644 -t "${ED}/usr/share/${PN}" un.rpyc/un.rpyc || die
-		einfo "For run-time rpyc decompiling copy ${EPREFIX}/usr/share/${PN}/un.rpyc to your game dir."
-		newdoc un.rpyc/README.md README-un.rpyc.md
-	fi
-}
diff --git a/games-engines/gemrb/Manifest b/games-engines/gemrb/Manifest
deleted file mode 100644
index fec38df11f5c..000000000000
--- a/games-engines/gemrb/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gemrb-0.8.3.tar.gz 12370971 BLAKE2B ccb35d96bec5805df4086789eb43d52cd496be1aeb8fe5ee3ce7c096843075551f8b6bf37dc217b39e487ec33eeef3e1b10bd3e20814974bf5abc61ce017908c SHA512 6f091ba54d129c47b6ad7c3b1da898c7ef79b80629b373527963a0b35096ccbf91650087c4884081d306da4be7b4cfa1dc2f6d931d7140d7eccb380d9806db1c
diff --git a/games-engines/gemrb/gemrb-0.8.3-r1.ebuild b/games-engines/gemrb/gemrb-0.8.3-r1.ebuild
deleted file mode 100644
index 6ec09ffb5278..000000000000
--- a/games-engines/gemrb/gemrb-0.8.3-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils gnome2-utils python-single-r1 cmake-utils
-
-DESCRIPTION="Reimplementation of the Infinity engine"
-HOMEPAGE="http://gemrb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gemrb/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	media-libs/freetype
-	media-libs/libpng:0=
-	>=media-libs/libsdl-1.2[video]
-	media-libs/libvorbis
-	media-libs/openal
-	media-libs/sdl-mixer
-	sys-libs/zlib
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i \
-		-e '/COPYING/d' \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBIN_DIR=bin
-		-DDATA_DIR=share/gemrb
-		-DDOC_DIR=share/doc/${PF}
-		-DICON_DIR=share/pixmaps
-		-DLIB_DIR=$(get_libdir)
-		-DMAN_DIR=share/man/man6
-		-DMENU_DIR=share/applications
-		-DSVG_DIR=share/icons/hicolor/scalable/apps
-		-DSYSCONF_DIR=/etc/${PN}
-		# needed, causes massive QA warnings otherwise
-		-DCMAKE_SKIP_RPATH=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED%/}"/usr/bin/extend2da.py
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-engines/gemrb/metadata.xml b/games-engines/gemrb/metadata.xml
deleted file mode 100644
index 48acc454984a..000000000000
--- a/games-engines/gemrb/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>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gemrb</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/lilycomp/Manifest b/media-sound/lilycomp/Manifest
deleted file mode 100644
index 0afa4aa51d3a..000000000000
--- a/media-sound/lilycomp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lilycomp.1.0.2.tar.gz 16997 BLAKE2B 29028640edaa88017c83276a4ad67427cbcce308aee0565d8920c98a35a59e46525e426134f414125297a68404733d6a57e3a2723295fcec52a2e229181860bc SHA512 e73104d446ce154497fe6a4790f1e6ce333f945b3196da589ca87765494461351a09b604e43f9a7d5e08cebdfac22aa53886aeec8284675db08a7d377350b937
diff --git a/media-sound/lilycomp/lilycomp-1.0.2-r2.ebuild b/media-sound/lilycomp/lilycomp-1.0.2-r2.ebuild
deleted file mode 100644
index b1edca49c7f9..000000000000
--- a/media-sound/lilycomp/lilycomp-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk"
-
-inherit python-single-r1
-
-MY_P="${P/-/.}"
-
-DESCRIPTION="graphical note entry program for use with LilyPond"
-HOMEPAGE="http://lilycomp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-HTML_DOCS=( "${S}/lilycomp.html" )
-
-src_prepare() {
-	default
-	python_fix_shebang lilycomp.py
-}
-
-src_install() {
-	default
-	newbin lilycomp.py lilycomp
-}
diff --git a/media-sound/lilycomp/metadata.xml b/media-sound/lilycomp/metadata.xml
deleted file mode 100644
index 2e7b268bc6c2..000000000000
--- a/media-sound/lilycomp/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-needed -->
-  <upstream>
-    <remote-id type="sourceforge">lilycomp</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/media-video/tovid/Manifest b/media-video/tovid/Manifest
deleted file mode 100644
index b026b1841326..000000000000
--- a/media-video/tovid/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tovid-0.35.2.tar.gz 527332 BLAKE2B 8cc8452d2d08f77fa66684e84702ac4ade3853af68ab51e7d2ac259f15460f6a7e0766e567a51545514aa2fa5b53f0ed7ea0ff0f892d3246be63e55a10b4a893 SHA512 35e1d2a9584127498ee7d4b772fff0643860270dd38018a7fd9c20ef2875bf037235c341b0a001b0fe9a020fb74f9d348729dec0ccb7d97ccdeec508e6fa674e
diff --git a/media-video/tovid/metadata.xml b/media-video/tovid/metadata.xml
deleted file mode 100644
index e755d3397531..000000000000
--- a/media-video/tovid/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>media-video@gentoo.org</email>
-		<name>Gentoo Video project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">tovid</remote-id>
-		<remote-id type="github">tovid-suite/tovid</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-video/tovid/tovid-0.35.2-r2.ebuild b/media-video/tovid/tovid-0.35.2-r2.ebuild
deleted file mode 100644
index c58f5de2dc2e..000000000000
--- a/media-video/tovid/tovid-0.35.2-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="A collection of DVD authoring tools"
-HOMEPAGE="http://tovid.wikia.com/wiki/Tovid_Wiki"
-SRC_URI="https://github.com/tovid-suite/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="app-cdr/dvd+rw-tools
-	dev-tcltk/tix
-	media-sound/normalize
-	>=media-sound/sox-14.3.2
-	media-video/dvdauthor
-	>=media-video/mjpegtools-2.0.0
-	|| ( >=media-video/mplayer-1.0_rc4_p20110101[dvdnav] media-video/mpv[libmpv,dvdnav] )
-	sys-devel/bc
-	media-video/ffmpeg
-	virtual/imagemagick-tools[png]"
-DEPEND="app-text/txt2tags"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	distutils-r1_src_install
-	python_optimize
-
-	# punt at least .install.log
-	find "${D}" -name '*.log' -exec rm -f {} +
-}
-
-pkg_preinst() {
-#	REPLACING_VERSIONS="media-video/tovid-0.34"
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	elog "######################################################################"
-	elog "You can install media-video/transcode for additional functionality. It"
-	elog "will speed up the creation of animated submenus with faster seeking."
-	elog "Otherwise FFmpeg/Libav will be used."
-	elog "######################################################################"
-	elog""
-	gnome2_icon_cache_update
-}
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-mail/archivemail/Manifest b/net-mail/archivemail/Manifest
deleted file mode 100644
index 155f7fd5e1e0..000000000000
--- a/net-mail/archivemail/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST archivemail-0.9.0.tar.gz 63482 BLAKE2B 46f497efde7ec906694c8ca1327853ef39d497ceecbac4346450aea4fb58a457633c05f1f14e058822949a13fdea4d97e25b5d74ef66aac422c10308388cbe96 SHA512 7c36108919be22f8cf71aea91435084495ceef54c251ede0aca9d981bb9c01119925d334c1d84eb2c53657170ac6bf0897fccd1f9df05c59fc46e1177194dfb2
diff --git a/net-mail/archivemail/archivemail-0.9.0-r1.ebuild b/net-mail/archivemail/archivemail-0.9.0-r1.ebuild
deleted file mode 100644
index ab850606ed47..000000000000
--- a/net-mail/archivemail/archivemail-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Tool written archiving old email in mailboxes"
-HOMEPAGE="http://archivemail.sourceforge.net/"
-SRC_URI="mirror://sourceforge/archivemail/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 sparc x86"
-IUSE=""
-
-python_prepare_all() {
-	# Fix tests for python-2.7
-	sed -i -e 's:\(fp_archive = \)FixedGzipFile:\1gzip.GzipFile:' \
-		test_archivemail || die "sed failed"
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${S}"/test_archivemail || die "test_archivemail failed"
-}
-
-python_install() {
-	distutils-r1_python_install --install-data=/usr/share
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc examples/* FAQ
-
-	mv "${D}/usr/share/share/man" "${D}/usr/share/" || die
-	rm -rf "${D}/usr/share/share" || die
-}
diff --git a/net-mail/archivemail/metadata.xml b/net-mail/archivemail/metadata.xml
deleted file mode 100644
index c1b730cb088f..000000000000
--- a/net-mail/archivemail/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-needed -->
-	<upstream>
-		<remote-id type="sourceforge">archivemail</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-mail/getmail/Manifest b/net-mail/getmail/Manifest
deleted file mode 100644
index 6f4c57e890fb..000000000000
--- a/net-mail/getmail/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST getmail-5.14.tar.gz 199501 BLAKE2B 54bb79cd37303f423b70bae0f3072d338a8c66b25d59f8b982029d5faebb65a3f7ea979ec35d0dab61d376754dc15e206d443cd0cb128a3c438a09dfb8107f69 SHA512 0646864af56fc044525d38088164c2c026a8f29b231c25c9cfe9aa922b1e5170cf49c63874da9bd593b49be6ed822bd4da7ea4ebfbb59cfa6e1658e2b565c184
diff --git a/net-mail/getmail/getmail-5.14.ebuild b/net-mail/getmail/getmail-5.14.ebuild
deleted file mode 100644
index 577087573948..000000000000
--- a/net-mail/getmail/getmail-5.14.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl?"
-
-inherit distutils-r1
-
-DESCRIPTION="A mail retriever with reliable Maildir and mbox delivery"
-HOMEPAGE="http://pyropus.ca/software/getmail/"
-SRC_URI="http://pyropus.ca/software/getmail/old-versions/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~ppc-macos ~x86-macos ~x64-solaris"
-IUSE="ssl"
-
-python_prepare_all() {
-	sed -i -e "s,'getmail-%s' % __version__,'${PF}'," \
-		-e "/docs\/COPYING/d" "${S}"/setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/net-mail/getmail/metadata.xml b/net-mail/getmail/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-mail/getmail/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>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-wireless/airpwn/Manifest b/net-wireless/airpwn/Manifest
deleted file mode 100644
index 9a67182c5a5f..000000000000
--- a/net-wireless/airpwn/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST airpwn-1.4.tgz 910109 BLAKE2B e1e151183e29310a2f35e869fec5f191c37bf25f3bca3f084bea060fad6a8c575cb5ddb56cd5023c252a298b5205c844597908296c6c0b61c8bd560a20b60145 SHA512 c849740848289005eb2a72b09bbfade6bf078a3ff93d39300f6a65d328c527bbafbb2a325f2813064612f91a2da20a2daacb8508497e8410ad0befc4e28331e5
diff --git a/net-wireless/airpwn/airpwn-1.4-r2.ebuild b/net-wireless/airpwn/airpwn-1.4-r2.ebuild
deleted file mode 100644
index 4c695a11a24a..000000000000
--- a/net-wireless/airpwn/airpwn-1.4-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic python-single-r1 vcs-clean
-
-DESCRIPTION="Tool for generic packet injection on 802.11"
-HOMEPAGE="http://airpwn.sf.net"
-SRC_URI="mirror://sourceforge/airpwn/$P.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="+examples"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	dev-libs/libpcre
-	dev-libs/openssl:0=
-	net-libs/libnet:1.1=
-	net-libs/libpcap
-	net-wireless/lorcon-old"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf
-	sed -i "s/python2.4/${EPYTHON}/g" conf.h || die
-	sed -i "s|-lorcon -lpthread -lpcre -lpcap -lnet|-lorcon -lpthread -lpcre -lpcap -lnet -lcrypto -l${EPYTHON}|g" Makefile  || die
-}
-
-src_install() {
-	default
-
-	if use examples; then
-		insinto /usr/share/${PN}
-		ecvs_clean
-		sed -i "s#content/#/usr/share/${PN}/content/#" conf/* || die
-		doins -r conf content
-	fi
-}
diff --git a/net-wireless/airpwn/metadata.xml b/net-wireless/airpwn/metadata.xml
deleted file mode 100644
index 90013f58cbfb..000000000000
--- a/net-wireless/airpwn/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="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">airpwn</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index 552702cdba5e..a1a883354c0b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -367,41 +367,6 @@ x11-misc/nts
 # Removal in 30 days.  Bug #711134.
 sys-apps/pacman
 
-# Aaron Bauman <bman@gentoo.org> (2020-06-28)
-# More Py2 only stuff. Plz see -dev ML for discussions
-# Remove bindings, port to Py3, etc
-# Removal in 30 days
-app-arch/deltarpm
-app-crypt/virtualsmartcard
-app-text/duali
-app-text/duali-data
-app-dicts/duali-data
-app-text/mftrace
-app-text/queequeg
-app-text/referencer
-dev-libs/libmacaroons
-dev-libs/tut
-dev-python/elib-intl
-dev-python/eunuchs
-dev-python/medusa
-dev-python/python-iwscan
-dev-util/confix
-dev-util/qmtest
-dev-util/unrpyc
-games-engines/gemrb
-media-sound/lilycomp
-media-video/tovid
-net-mail/archivemail
-net-mail/getmail
-net-wireless/airpwn
-sci-chemistry/bkchem
-sci-chemistry/pymol-plugins-bni-tools
-sci-chemistry/pymol-plugins-emovie
-sci-chemistry/viewmol
-sci-libs/chemkit
-www-misc/surl
-x11-wm/plwm
-
 # Mikle Kolyada <zlogene@gentoo.org> (2020-06-28)
 # Obsolete package.
 # Does not build.
diff --git a/sci-chemistry/bkchem/Manifest b/sci-chemistry/bkchem/Manifest
deleted file mode 100644
index dd4ad7bdb9bd..000000000000
--- a/sci-chemistry/bkchem/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bkchem-0.14.0-pre2.tar.gz 998916 BLAKE2B 07c01abb31325c3721cc478438c1b34f156bc589a186eeedd62b6ac058f8ec64b1ea86a3c25bb6ab8045e0aaa838f10c5d16b68516fdea5607795b64fb4c39bb SHA512 7fc3bbd7bfe27bc91cf69a98c347a3fb92f4ea25b45a13debd0646a6b02d7a40c5729ae1b2a9ac33c1049d6b90e38355c3cd80e06660a0a2fcc5dafb3514ef20
diff --git a/sci-chemistry/bkchem/bkchem-0.14.0_pre2-r2.ebuild b/sci-chemistry/bkchem/bkchem-0.14.0_pre2-r2.ebuild
deleted file mode 100644
index d6162080214b..000000000000
--- a/sci-chemistry/bkchem/bkchem-0.14.0_pre2-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-PYTHON_REQ_USE="tk"
-
-inherit distutils-r1 eutils versionator
-
-MY_P="${PN}-$(replace_version_separator 3 -)"
-
-DESCRIPTION="Chemical drawing program"
-HOMEPAGE="http://bkchem.zirael.org/"
-SRC_URI="http://bkchem.zirael.org/download/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2"
-IUSE="cairo"
-
-DEPEND="cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-nolauncher.patch
-)
-
-python_install() {
-	distutils-r1_python_install "--strip=${ED}/_${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	python_foreach_impl python_newscript ${PN}/${PN}.py ${PN}
-	make_desktop_entry bkchem BKChem "${EPREFIX}"/usr/share/${PN}/images/${PN}.png Science
-}
diff --git a/sci-chemistry/bkchem/files/bkchem-0.14.0_pre2-nolauncher.patch b/sci-chemistry/bkchem/files/bkchem-0.14.0_pre2-nolauncher.patch
deleted file mode 100644
index 202c47a9c74f..000000000000
--- a/sci-chemistry/bkchem/files/bkchem-0.14.0_pre2-nolauncher.patch
+++ /dev/null
@@ -1,106 +0,0 @@
- bkchem/bkchem.py | 24 +++++++++++++-----------
- setup.py         | 23 -----------------------
- 2 files changed, 13 insertions(+), 34 deletions(-)
-
-diff --git a/bkchem/bkchem.py b/bkchem/bkchem.py
-index b336b9c..bcb68b0 100644
---- a/bkchem/bkchem.py
-+++ b/bkchem/bkchem.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python2
- #--------------------------------------------------------------------------
- #     This file is part of BKChem - a chemical drawing program
- #     Copyright (C) 2002-2009 Beda Kosata <beda@zirael.org>
-@@ -18,18 +19,19 @@
- #--------------------------------------------------------------------------
- 
- 
--"""this is just a starter of the application"""
-+#"""this is just a starter of the application"""
- 
- ## support for loading from outside of bkchem dir
- 
--import os_support, sys
-+from bkchem import os_support
-+import sys
- sys.path.insert( 1, os_support.get_module_path())
- 
- 
- ### now starting for real
- 
--from singleton_store import Store
--import pref_manager
-+from bkchem.singleton_store import Store
-+from bkchem import pref_manager
- 
- # at first preference manager
- Store.pm = pref_manager.pref_manager(
-@@ -78,13 +80,13 @@ else:
- 
- 
- 
--import config
-+from bkchem import config
- 
- if not config.debug:
-   # checking of important modules availability
-   # import modules
--  import import_checker
--  import messages
-+  from bkchem import import_checker
-+  from bkchem import messages
- 
-   # we need sets from the 2.3 version
-   if not import_checker.python_version_ok:
-@@ -103,16 +105,16 @@ if not config.debug:
- 
-   
- #import Tkinter
--from main import BKChem
--from splash import Splash
--from singleton_store import Store
-+from bkchem.main import BKChem
-+from bkchem.splash import Splash
-+from bkchem.singleton_store import Store
- 
- myapp = BKChem()
- myapp.withdraw()
- 
- if __name__ == '__main__':
- 
--  import messages
-+  from bkchem import messages
-   enc = sys.getfilesystemencoding()
-   if not enc:
-     enc = sys.getdefaultencoding()
-diff --git a/setup.py b/setup.py
-index d4b2a21..2319216 100755
---- a/setup.py
-+++ b/setup.py
-@@ -91,26 +91,3 @@ if len( sys.argv) > 1 and sys.argv[1] == 'install' and '--help' not in sys.argv:
-   print "file %s created" % config_name
- 
- 
--  # the executable
--  if not os.path.isdir( bin_dir):
--    try:
--      os.mkdir( bin_dir)
--    except:
--      print "ERROR: could not create directory %s" % bin_dir
--      sys.exit( 201)      
--  exec_name = os.path.join( bin_dir, 'bkchem')
--  try:
--    file = open( exec_name, 'w')
--  except:
--    print "ERROR: couldn't open the file %s for write" %  exec_name
--    sys.exit( 201)
--  file.write( "#!/bin/sh\n")
--  file.write( 'python %s "$@"\n' % strip_path( os.path.join( py_dir, "bkchem", "bkchem.py")))
--  file.close()
--  print "file %s created" % exec_name
--  try:
--    os.chmod( os.path.join( bin_dir, 'bkchem'), 5+5*8+7*8*8)
--  except:
--    print "ERROR: failed to make %s executable" % exec_name
--    sys.exit( 201)
--  print "file %s made executable" % exec_name
diff --git a/sci-chemistry/bkchem/metadata.xml b/sci-chemistry/bkchem/metadata.xml
deleted file mode 100644
index 8937bad0b175..000000000000
--- a/sci-chemistry/bkchem/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>sci-chemistry@gentoo.org</email>
-    <name>Gentoo Chemistry Project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/sci-chemistry/pymol-plugins-bni-tools/Manifest b/sci-chemistry/pymol-plugins-bni-tools/Manifest
deleted file mode 100644
index 808e9258c6b2..000000000000
--- a/sci-chemistry/pymol-plugins-bni-tools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bni-tools-027.zip 33753 BLAKE2B 3cf52b42709c0e08879b7f3174ab6e7fd6c052a2827a0ee6d102fa16f30a985d7ff766abc6dc27595973a1f6151f684e97b34da981196c411fdac178499f9a51 SHA512 9c0ef1ca5bbb3040192ab2668f354f947e93d42c91a0cfdde5d05be273e6ba9f29ec3c6ee86367f18d87316282b4e0141183b8d6259bd36d44010b7bbb7666e5
diff --git a/sci-chemistry/pymol-plugins-bni-tools/metadata.xml b/sci-chemistry/pymol-plugins-bni-tools/metadata.xml
deleted file mode 100644
index 0f732a212193..000000000000
--- a/sci-chemistry/pymol-plugins-bni-tools/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>sci-chemistry@gentoo.org</email>
-    <name>Gentoo Chemistry Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">bni-tools</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-chemistry/pymol-plugins-bni-tools/pymol-plugins-bni-tools-0.27.ebuild b/sci-chemistry/pymol-plugins-bni-tools/pymol-plugins-bni-tools-0.27.ebuild
deleted file mode 100644
index 1de68c64d64f..000000000000
--- a/sci-chemistry/pymol-plugins-bni-tools/pymol-plugins-bni-tools-0.27.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 python-r1 versionator
-
-MY_PN="${PN#pymol-plugins-}"
-MY_P="${MY_PN}-$(delete_version_separator 1)"
-MY_P_DOT="${MY_PN}-${PV}"
-
-DESCRIPTION="Gives Pymol additional functionalities and presets to the PyMOL GUI"
-HOMEPAGE="http://bni-tools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${MY_P_DOT}/${MY_P}.zip"
-
-LICENSE="CNRI"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	sci-chemistry/pymol[${PYTHON_USEDEP}]"
-DEPEND="${PYTHON_DEPS}
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_install() {
-	python_moduleinto pmg_tk/startup
-	python_foreach_impl python_domodule bni-tools.py
-	python_foreach_impl python_optimize
-	dodoc readme.txt
-	dohtml ShortCommandDescription.html
-}
diff --git a/sci-chemistry/pymol-plugins-emovie/Manifest b/sci-chemistry/pymol-plugins-emovie/Manifest
deleted file mode 100644
index d6a95f63f57c..000000000000
--- a/sci-chemistry/pymol-plugins-emovie/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST eMovie_package.zip 22840 BLAKE2B 593548d5f940432cbf71580410fba01bcf54f884d6ac1a726a0ce65a7efa4d90c283985f81b5348eadaf54f497a32e1d478ca803cb0fbdacd7bfde30b939d864 SHA512 5d4af5f8bd6e7e0f24f33d769925bd0444389b1c0fbdd14776f4073fd3e1e818c4623791bcb0cff5496729dc55e0429c48c3c16cb5fdbb91c51f9c5445c7afe4
diff --git a/sci-chemistry/pymol-plugins-emovie/files/1.0.4-indent.patch b/sci-chemistry/pymol-plugins-emovie/files/1.0.4-indent.patch
deleted file mode 100644
index a9a77e5055dd..000000000000
--- a/sci-chemistry/pymol-plugins-emovie/files/1.0.4-indent.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/eMovie.py b/eMovie.py
-index a865732..8b5b068 100644
---- a/eMovie.py
-+++ b/eMovie.py
-@@ -931,7 +931,7 @@ class Story(tkSimpleDialog.Dialog):
- 
-         	if self.parent is not None:
-             		self.geometry("+%d+%d" % (parent.winfo_rootx()+50,parent.winfo_rooty()+50))
--			self.initial_focus.focus_set()
-+            		self.initial_focus.focus_set()
- 
-         	self.wait_window(self)
- 
-@@ -2041,7 +2041,7 @@ class AddMorph(tkSimpleDialog.Dialog):
- 
-         	if self.parent is not None:
-             		self.geometry("+%d+%d" % (parent.winfo_rootx()+50,parent.winfo_rooty()+50))
--		self.initial_focus.focus_set()
-+        	self.initial_focus.focus_set()
- 
-         	self.wait_window(self)
- 
diff --git a/sci-chemistry/pymol-plugins-emovie/metadata.xml b/sci-chemistry/pymol-plugins-emovie/metadata.xml
deleted file mode 100644
index da36ecbfcd6a..000000000000
--- a/sci-chemistry/pymol-plugins-emovie/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>sci-chemistry@gentoo.org</email>
-		<name>Gentoo Chemistry Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sci-chemistry/pymol-plugins-emovie/pymol-plugins-emovie-1.0.4.ebuild b/sci-chemistry/pymol-plugins-emovie/pymol-plugins-emovie-1.0.4.ebuild
deleted file mode 100644
index e7b2eb7d4771..000000000000
--- a/sci-chemistry/pymol-plugins-emovie/pymol-plugins-emovie-1.0.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-r1
-
-DESCRIPTION="PyMOL plugin for convinient movie creation"
-SRC_URI="http://www.weizmann.ac.il/ISPC/eMovie_package.zip"
-HOMEPAGE="http://www.weizmann.ac.il/ISPC/eMovie.html"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>sci-chemistry/pymol-0.99[${PYTHON_USEDEP}]"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-indent.patch
-}
-
-src_install() {
-	python_moduleinto pmg_tk/startup
-	python_foreach_impl python_domodule eMovie.py
-	python_foreach_impl python_optimize
-}
diff --git a/sci-chemistry/viewmol/Manifest b/sci-chemistry/viewmol/Manifest
deleted file mode 100644
index 64ae88baf763..000000000000
--- a/sci-chemistry/viewmol/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST viewmol-2.4.1.src.tgz 2229379 BLAKE2B c7d3d9f0a0a728f13be718e2b85a645d1824d2c9efd920a05a0693dfb5904e18da20fcef8080e99f497280effdb71cb21c58d9aeadf49d2477e1c931caa49389 SHA512 42701d570d97e77b84597950a9068dfdf48faf4e551957383c8eea38f082c1ad136c17b7cbd3903673478506116d6fc08d1288842e74d6a9776526c685083584
diff --git a/sci-chemistry/viewmol/files/2.4.1-change-default-paths.patch b/sci-chemistry/viewmol/files/2.4.1-change-default-paths.patch
deleted file mode 100644
index 4b1edef7ef8b..000000000000
--- a/sci-chemistry/viewmol/files/2.4.1-change-default-paths.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/source/getrc.c b/source/getrc.c
-index a39b436..c130096 100644
---- a/getrc.c
-+++ b/getrc.c
-@@ -87,7 +87,7 @@ extern XtAppContext app;
- 
- static char viewmolpath[MAXLENLINE];
- 
--#define DEFAULTPATH "/usr/local/lib/viewmol"
-+#define DEFAULTPATH "@GENTOO_PORTAGE_EPREFIX@/usr/GENTOOLIBDIR/viewmol"
- 
- int getrc(void)
- {
-diff --git a/source/install b/source/install
-index 580865b..f136af3 100755
---- a/install
-+++ b/install
-@@ -54,24 +54,27 @@ fi
- cp $dirorig/viewmol $ROOT/bin
- chmod 711 $ROOT/bin/viewmol
- 
--# install other files needed in $ROOT/lib/viewmol
--if [ ! -d $ROOT/lib/viewmol/$dir ]
-+# install other files needed in $ROOT/GENTOOLIBDIR/viewmol
-+if [ ! -d $ROOT/GENTOOLIBDIR/viewmol/$dir ]
- then
--  mkdir -p $ROOT/lib/viewmol/$dir
--  chmod 755 $ROOT/lib/viewmol/$dir
-+  mkdir -p $ROOT/GENTOOLIBDIR/viewmol/$dir
-+  chmod 755 $ROOT/GENTOOLIBDIR/viewmol/$dir
- fi
- cd $dirorig
--cp tm bio readgamess readgauss readmopac readpdb $ROOT/lib/viewmol/$dir
--chmod 711 $ROOT/lib/viewmol/$dir/*
-+cp tm bio readgamess readgauss readmopac readpdb $ROOT/GENTOOLIBDIR/viewmol/$dir
-+chmod 711 $ROOT/GENTOOLIBDIR/viewmol/$dir/*
- cd ../..
--cp readdmol readdmol.awk readgulp readpqs writecar writegauss.py writemol writetm $ROOT/lib/viewmol
--chmod 755 $ROOT/lib/viewmol/*
--cp -r doc examples locale scripts tests $ROOT/lib/viewmol
--find $ROOT/lib/viewmol -type f -exec chmod a+r {} \;
--find $ROOT/lib/viewmol -type d -exec chmod a+rx {} \;
--sed 's/\/source//g' viewmolrc > $ROOT/lib/viewmol/viewmolrc
--chmod -R 644 $ROOT/lib/viewmol/viewmolrc
--if [ -d /usr/X11R6/lib/X11/app-defaults ]
-+cp readdmol readdmol.awk readgulp readpqs writecar writegauss.py writemol writetm $ROOT/GENTOOLIBDIR/viewmol
-+chmod 755 $ROOT/GENTOOLIBDIR/viewmol/*
-+mkdir -p $ROOT/usr/share/viewmol $ROOT/usr/share/doc/GENTOODOCDIR/ $ROOT/GENTOOLIBDIR/viewmol/
-+cp -r examples scripts tests $ROOT/usr/share/viewmol
-+cp -r locale $ROOT/GENTOOLIBDIR/viewmol/
-+cp -r doc/* examples scripts tests $ROOT/usr/share/doc/GENTOODOCDIR/
-+find $ROOT/GENTOOLIBDIR/viewmol -type f -exec chmod a+r {} \;
-+find $ROOT/GENTOOLIBDIR/viewmol -type d -exec chmod a+rx {} \;
-+sed 's/\/source//g' viewmolrc > $ROOT/GENTOOLIBDIR/viewmol/viewmolrc
-+chmod -R 644 $ROOT/GENTOOLIBDIR/viewmol/viewmolrc
-+if [ -d $ROOT/X11R6/GENTOOLIBDIR/X11/app-defaults ]
- then
-   locale=`echo $LANG | cut -c1-2`
-   if [ "$locale" = "en" ]
-@@ -82,6 +85,6 @@ then
-     # The C locale is defined by default for rpm builds, overwrite it
-     locale="en_US"
-   fi
--  cp locale/${locale}/Viewmol /usr/X11R6/lib/X11/app-defaults
--  chmod a+r /usr/X11R6/lib/X11/app-defaults/Viewmol
-+  cp locale/${locale}/Viewmol ${ROOT}/X11R6/GENTOOLIBDIR/X11/app-defaults
-+  chmod a+r ${ROOT}/X11R6/GENTOOLIBDIR/X11/app-defaults/Viewmol
- fi
diff --git a/sci-chemistry/viewmol/files/2.4.1-remove-icc-check.patch b/sci-chemistry/viewmol/files/2.4.1-remove-icc-check.patch
deleted file mode 100644
index fd91e0a5a434..000000000000
--- a/sci-chemistry/viewmol/files/2.4.1-remove-icc-check.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/getmachine
-+++ b/getmachine
-@@ -269,19 +269,11 @@
-            makedir
-            cat ../.config.$os > makefile
-            use_icc=`type icc 2> /dev/null`
--           if [ "$use_icc" = "" ]
--           then
- 	     findProcessor
- 	     echo 'COMPILER=gcc' >> makefile
-              echo "OPT=-O6 -mcpu=$processor -fomit-frame-pointer -ffast-math -malign-double" >> makefile
-              echo 'CFLAGS=-Wall -I/usr/X11R6/include -DLINUX -Wno-strict-aliasing' >> makefile
-              echo "LDFLAGS=$LINKFORSHARED" >> makefile
--           else
--	     echo 'COMPILER=icc' >> makefile
--             echo 'OPT=-O2 -ipo' >> makefile
--             echo 'CFLAGS=-I/opt/intel/compiler50/ia32/include -I/usr/X11R6/include -DLINUX' >> makefile
--             echo "LDFLAGS=$LINKFORSHARED -ipo" >> makefile
--           fi
-            echo 'SCANDIR=' >> makefile
-            echo 'INCLUDE=$(TIFFINCLUDE) -I$(PNGINCLUDE) -I$(PYTHONINCLUDE)' >> makefile
-            echo 'LIBRARY=$(LIBTIFF) $(LIBPNG) -L$(LIBPYTHON)' >> makefile
diff --git a/sci-chemistry/viewmol/metadata.xml b/sci-chemistry/viewmol/metadata.xml
deleted file mode 100644
index 335c7edd503b..000000000000
--- a/sci-chemistry/viewmol/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>sci-chemistry@gentoo.org</email>
-		<name>Gentoo Chemistry Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">viewmol</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sci-chemistry/viewmol/viewmol-2.4.1-r3.ebuild b/sci-chemistry/viewmol/viewmol-2.4.1-r3.ebuild
deleted file mode 100644
index a82367bac3b7..000000000000
--- a/sci-chemistry/viewmol/viewmol-2.4.1-r3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk(-)"
-
-inherit prefix python-single-r1 toolchain-funcs
-
-DESCRIPTION="Open-source graphical front end for computational chemistry programs"
-HOMEPAGE="http://viewmol.sourceforge.net/"
-SRC_URI="mirror://sourceforge/viewmol/${P}.src.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	virtual/glu
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/motif:0
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S="${WORKDIR}/${P}/source"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-remove-icc-check.patch
-	"${FILESDIR}"/${PV}-change-default-paths.patch
-)
-
-src_prepare() {
-	default
-
-	eprefixify getrc.c
-	sed "s:GENTOOLIBDIR:$(get_libdir):g" -i install getrc.c || die
-	sed "s:GENTOODOCDIR:${PF}:g" -i install || die
-
-	mkdir "$(uname -s)" || die
-	cd "$(uname -s)" || die
-
-	cat >> ".config.$(uname -s)" <<- EOF || die
-		LIBTIFF = -L"${EPREFIX}/usr/$(get_libdir)"
-		TIFFINCLUDE = "${EPREFIX}/usr/include"
-
-		LIBPNG = -L"${EPREFIX}/usr/$(get_libdir)"
-		PNGINCLUDE = "${EPREFIX}/usr/include"
-
-		PYTHONVERSION = ${EPYTHON}
-		PYTHONINCLUDE = $(python_get_CFLAGS)
-		PYTHONLIB = $(python_get_LIBS)
-
-		COMPILER = $(tc-getCC)
-		CFLAGS = ${CFLAGS} -DLINUX
-		LDFLAGS = ${LDFLAGS}
-		SCANDIR=
-		INCLUDE=\$(TIFFINCLUDE) -I\$(PNGINCLUDE) \$(PYTHONINCLUDE)
-		LIBRARY=\$(LIBTIFF) \$(LIBPNG) \$(PYTHONLIB)
-		LIBS=-L"${EPREFIX}/usr/$(get_libdir)" -ltiff -lpng -lz -lGLU -lGL -L"${EPREFIX}/usr/X11R6/lib" -lXm -lXmu -lXp -lXi -lXext -lXt -lX11 -lpthread -lutil -ldl -lm
-	EOF
-
-	cp .config.$(uname -s) makefile || die
-	cat ../Makefile >> makefile || die
-}
-
-src_compile() {
-	emake -C "$(uname -s)" viewmol_ tm_ bio_ readgamess_ readgauss_ readmopac_ readpdb_
-	"${EPREFIX}"/bin/bash makeTranslations || die
-}
-
-src_install() {
-	./install "${ED%/}"/usr || die
-
-	# fix broken layout
-	mv "${ED%/}"/usr/{usr/share,} || die
-	rm -rf "${ED%/}"/usr/usr || die
-	mv "${ED%/}"/usr/{$(get_libdir)/${PN}/locale,share} || die
-	mv "${ED%/}"/usr/{$(get_libdir),libexec} || die
-}
diff --git a/sci-libs/chemkit/Manifest b/sci-libs/chemkit/Manifest
deleted file mode 100644
index b374781b09cc..000000000000
--- a/sci-libs/chemkit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST chemkit-0.1.tar.gz 5842235 BLAKE2B 9cf28dc6d2c067403172c4f54a057bf38ea9aeaebc96b9be819f4861d1559c1db440dd33baf15f739b2b0e6dc6ba3e73010e0b5aa1b46309435e7bbffb889259 SHA512 0273f8735333000b04007ccd7adc58f0c4809a570fa5a72e4161652d72e8953bf89cad0893c20ecbb3484d6c13a8828c92f12366dddeedaf591815c35f6ef011
diff --git a/sci-libs/chemkit/chemkit-0.1-r2.ebuild b/sci-libs/chemkit/chemkit-0.1-r2.ebuild
deleted file mode 100644
index c687d55922e1..000000000000
--- a/sci-libs/chemkit/chemkit-0.1-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1 virtualx
-
-DESCRIPTION="Library for chemistry applications"
-HOMEPAGE="https://github.com/kylelutz/chemkit"
-SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD PSF-2.2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples python test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/rapidxml
-	media-libs/glu
-	sci-libs/inchi
-	sci-libs/lemon
-	virtual/opengl
-	examples? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test" # requires disabled Qt4
-
-S="${WORKDIR}"/${PN}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-multilib.patch
-	"${FILESDIR}"/${P}-unbundle.patch
-)
-
-src_prepare() {
-	# jsoncpp API change
-	# xdrf != xdrfile
-	rm -rvf src/3rdparty/{inchi,khronos,lemon,rapidxml} || die
-	cmake-utils_src_prepare
-
-	# bug 640206
-	sed -e "/add_subdirectory(xtc/s/^/#DONT /" \
-		-i src/plugins/CMakeLists.txt || die "Failed to disable xtc"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCHEMKIT_BUILD_EXAMPLES=$(usex examples)
-		-DCHEMKIT_BUILD_DEMOS=$(usex examples)
-		-DCHEMKIT_BUILD_BINDINGS_PYTHON=$(usex python)
-		-DCHEMKIT_BUILD_APPS=OFF
-		-DCHEMKIT_BUILD_PLUGIN_BABEL=OFF
-		-DCHEMKIT_BUILD_QT_DESIGNER_PLUGINS=OFF
-		-DCHEMKIT_WITH_GRAPHICS=OFF
-		-DCHEMKIT_WITH_GUI=OFF
-		-DCHEMKIT_WITH_WEB=OFF
-		-DCHEMKIT_BUILD_TESTS=$(usex test)
-		-DUSE_SYSTEM_INCHI=ON
-		-DUSE_SYSTEM_JSONCPP=OFF
-		-DUSE_SYSTEM_RAPIDXML=ON
-		-DUSE_SYSTEM_XDRF=OFF
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	VIRTUALX_COMMAND="cmake-utils_src_test"
-	virtualmake
-}
-
-src_install() {
-	use examples && \
-		dobin \
-			"${BUILD_DIR}"/demos/*-viewer/*-viewer \
-			"${BUILD_DIR}"/examples/uff-energy/uff-energy
-
-	cmake-utils_src_install
-}
diff --git a/sci-libs/chemkit/files/chemkit-0.1-multilib.patch b/sci-libs/chemkit/files/chemkit-0.1-multilib.patch
deleted file mode 100644
index b6a61d58ed8c..000000000000
--- a/sci-libs/chemkit/files/chemkit-0.1-multilib.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e531be4..e0d6b2d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -44,7 +44,7 @@ configure_file(
-     "${CMAKE_MODULE_PATH}/ChemkitConfig.cmake.in"
-     "${CMAKE_BINARY_DIR}/ChemkitConfig.cmake"
-     IMMEDIATE @ONLY)
--install(FILES ${CMAKE_BINARY_DIR}/ChemkitConfig.cmake DESTINATION lib/chemkit)
-+install(FILES ${CMAKE_BINARY_DIR}/ChemkitConfig.cmake DESTINATION lib${LIB_SUFFIX}/chemkit)
- 
- # Create a ChemkitBuildTreeSettings.cmake file for the use from the build tree
- configure_file(
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 88c6b5f..1100c3b 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -8,12 +8,12 @@ macro(add_chemkit_library library_name)
-   add_library(${library_name} SHARED ${ARGN})
- 
-   # add install target
--  install(TARGETS ${library_name} DESTINATION lib)
-+  install(TARGETS ${library_name} DESTINATION lib${LIB_SUFFIX})
- 
-   # copy library into build directory
-   get_target_property(library_location ${library_name} LOCATION)
-   get_filename_component(library_filename ${library_location} NAME)
--  add_custom_command(TARGET ${library_name} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy ${library_location} ${CMAKE_BINARY_DIR}/lib/${library_filename})
-+  add_custom_command(TARGET ${library_name} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy ${library_location} ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/${library_filename})
- 
- endmacro(add_chemkit_library)
- 
-diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
-index dc8970f..77029b7 100644
---- a/src/plugins/CMakeLists.txt
-+++ b/src/plugins/CMakeLists.txt
-@@ -3,7 +3,7 @@ macro(add_chemkit_plugin plugin_name)
-   add_library(${plugin_name} SHARED ${ARGN})
- 
-   # add install target
--  install(TARGETS ${plugin_name} DESTINATION lib/chemkit/plugins/)
-+  install(TARGETS ${plugin_name} DESTINATION lib${LIB_SUFFIX}/chemkit/plugins/)
- 
-   # remove 'lib' prefix
-   set_target_properties(${plugin_name} PROPERTIES PREFIX "")
-@@ -11,15 +11,15 @@ macro(add_chemkit_plugin plugin_name)
-   # copy plugin into build directory
-   get_target_property(plugin_location ${plugin_name} LOCATION)
-   get_filename_component(plugin_filename ${plugin_location} NAME)
--  add_custom_command(TARGET ${plugin_name} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy ${plugin_location} ${CMAKE_BINARY_DIR}/lib/chemkit/plugins/${plugin_filename})
-+  add_custom_command(TARGET ${plugin_name} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy ${plugin_location} ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/chemkit/plugins/${plugin_filename})
- 
-   # plugin data
-   if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/data)
-     # copy plugin data into build directory
--    file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data/ DESTINATION ${CMAKE_BINARY_DIR}/lib/chemkit/plugins/data/${plugin_name}/)
-+    file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data/ DESTINATION ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/chemkit/plugins/data/${plugin_name}/)
-     
-     # install plugin data directory
--    install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/ DESTINATION lib/chemkit/plugins/data/${plugin_name})
-+    install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/ DESTINATION lib${LIB_SUFFIX}/chemkit/plugins/data/${plugin_name})
-   endif()
- endmacro(add_chemkit_plugin)
- 
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index b191b82..a4ea0b0 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -4,7 +4,7 @@ endif()
- 
- macro(add_chemkit_test test_name test_executable)
-   add_test(NAME ${test_name} COMMAND ${test_executable})
--  set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "CHEMKIT_PLUGIN_PATH=${CMAKE_BINARY_DIR}/lib/chemkit/plugins/")
-+  set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "CHEMKIT_PLUGIN_PATH=${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/chemkit/plugins/")
- endmacro(add_chemkit_test)
- 
- add_subdirectory(auto)
-diff --git a/tests/auto/bindings/python/CMakeLists.txt b/tests/auto/bindings/python/CMakeLists.txt
-index 9859867..70da693 100644
---- a/tests/auto/bindings/python/CMakeLists.txt
-+++ b/tests/auto/bindings/python/CMakeLists.txt
-@@ -5,7 +5,7 @@ endif()
- macro(add_chemkit_python_test test_name test_script)
-   add_test(${test_name} ${PYTHON_EXECUTABLE} ${test_script})
-   set_tests_properties(${test_name} PROPERTIES
--                       ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}/bindings/python/;CHEMKIT_PLUGIN_PATH=${CMAKE_BINARY_DIR}/lib/chemkit/plugins")
-+                       ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}/bindings/python/;CHEMKIT_PLUGIN_PATH=${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/chemkit/plugins")
- endmacro(add_chemkit_python_test)
- 
- add_chemkit_python_test(python.Atom ${CMAKE_CURRENT_SOURCE_DIR}/atomtest.py)
diff --git a/sci-libs/chemkit/files/chemkit-0.1-unbundle.patch b/sci-libs/chemkit/files/chemkit-0.1-unbundle.patch
deleted file mode 100644
index e8c9d18dca6e..000000000000
--- a/sci-libs/chemkit/files/chemkit-0.1-unbundle.patch
+++ /dev/null
@@ -1,191 +0,0 @@
- CMakeLists.txt                              | 21 +++++++++++++++++++++
- src/plugins/chemjson/CMakeLists.txt         |  6 +++++-
- src/plugins/chemjson/chemjsonfileformat.cpp |  4 ++++
- src/plugins/cml/cmlfileformat.h             |  4 ++++
- src/plugins/inchi/CMakeLists.txt            |  4 +++-
- src/plugins/inchi/inchikeylineformat.cpp    |  4 ++++
- src/plugins/inchi/inchilineformat.cpp       |  4 ++++
- src/plugins/pdb/pdbmlfileformat.cpp         |  4 ++++
- src/plugins/xtc/CMakeLists.txt              |  9 +++++++--
- src/plugins/xtc/xtcfileformat.cpp           |  4 ++++
- 10 files changed, 60 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e531be4..622ea9d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -55,6 +55,27 @@ configure_file(
- # export the Chemkit package
- export(PACKAGE Chemkit)
- 
-+option(USE_SYSTEM_INCHI "Use inchi installed in system" OFF)
-+option(USE_SYSTEM_JSONCPP "Use json cpp installed in system" OFF)
-+option(USE_SYSTEM_RAPIXML "Use rapidxml installed in system" OFF)
-+option(USE_SYSTEM_XDRF "Use xdrflib installed in system" OFF)
-+
-+if(USE_SYSTEM_INCHI)
-+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSYSTEM_INCHI")
-+endif()
-+
-+if(USE_SYSTEM_JSONCPP)
-+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSYSTEM_JSONCPP")
-+endif()
-+
-+if(USE_SYSTEM_RAPIDXML)
-+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSYSTEM_RAPIDXML")
-+endif()
-+
-+if(USE_SYSTEM_XDRF)
-+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSYSTEM_XDRF")
-+endif()
-+
- # build options
- option(CHEMKIT_WITH_GRAPHICS "Build the chemkit-graphics library." ON)
- option(CHEMKIT_WITH_IO "Build the chemkit-io library." ON)
-diff --git a/src/plugins/chemjson/CMakeLists.txt b/src/plugins/chemjson/CMakeLists.txt
-index 0e115b5..a5e6f48 100644
---- a/src/plugins/chemjson/CMakeLists.txt
-+++ b/src/plugins/chemjson/CMakeLists.txt
-@@ -10,7 +10,11 @@ set(SOURCES
-   chemjsonplugin.cpp
- )
- 
--aux_source_directory(../../3rdparty/jsoncpp/ JSONCPP_SOURCES)
-+if(NOT USE_SYSTEM_JSONCPP)
-+	aux_source_directory(../../3rdparty/jsoncpp/ JSONCPP_SOURCES)
-+else()
-+	target_link_libraries(chemjson jsoncpp)
-+endif()
- 
- add_chemkit_plugin(chemjson ${SOURCES} ${JSONCPP_SOURCES})
- target_link_libraries(chemjson ${CHEMKIT_LIBRARIES})
-diff --git a/src/plugins/chemjson/chemjsonfileformat.cpp b/src/plugins/chemjson/chemjsonfileformat.cpp
-index a0d271e..3cd5827 100644
---- a/src/plugins/chemjson/chemjsonfileformat.cpp
-+++ b/src/plugins/chemjson/chemjsonfileformat.cpp
-@@ -43,7 +43,11 @@
- #include <chemkit/molecule.h>
- #include <chemkit/moleculefile.h>
- 
-+#ifdef SYSTEM_JSONCPP
-+#include <jsoncpp/json/json.h>
-+#else
- #include "../../3rdparty/jsoncpp/json/json.h"
-+#endif
- 
- namespace {
- 
-diff --git a/src/plugins/cml/cmlfileformat.h b/src/plugins/cml/cmlfileformat.h
-index e813223..61a547d 100644
---- a/src/plugins/cml/cmlfileformat.h
-+++ b/src/plugins/cml/cmlfileformat.h
-@@ -38,7 +38,11 @@
- 
- #include <chemkit/moleculefileformat.h>
- 
-+#ifdef SYSTEM_RAPIDXML
-+#include <rapidxml/rapidxml.hpp>
-+#else
- #include "../../3rdparty/rapidxml/rapidxml.hpp"
-+#endif
- 
- class CmlFileFormat : public chemkit::MoleculeFileFormat
- {
-diff --git a/src/plugins/inchi/CMakeLists.txt b/src/plugins/inchi/CMakeLists.txt
-index 2b25d9b..5f45f8a 100644
---- a/src/plugins/inchi/CMakeLists.txt
-+++ b/src/plugins/inchi/CMakeLists.txt
-@@ -7,7 +7,9 @@ set(SOURCES
-   inchiplugin.cpp
- )
- 
--aux_source_directory(../../3rdparty/inchi/ IUPAC_INCHI_SOURCES)
-+if(NOT USE_SYSTEM_INCHI)
-+	aux_source_directory(../../3rdparty/inchi/ IUPAC_INCHI_SOURCES)
-+endif()
- 
- add_chemkit_plugin(inchi ${SOURCES} ${IUPAC_INCHI_SOURCES})
- target_link_libraries(inchi ${CHEMKIT_LIBRARIES})
-diff --git a/src/plugins/inchi/inchikeylineformat.cpp b/src/plugins/inchi/inchikeylineformat.cpp
-index 2682f95..cec0a17 100644
---- a/src/plugins/inchi/inchikeylineformat.cpp
-+++ b/src/plugins/inchi/inchikeylineformat.cpp
-@@ -38,7 +38,11 @@
- #include <boost/format.hpp>
- 
- #include "inchilineformat.h"
-+#ifdef SYSTEM_INCHI
-+#include <inchi_api.h>
-+#else
- #include "../../3rdparty/inchi/inchi_api.h"
-+#endif
- 
- InchiKeyLineFormat::InchiKeyLineFormat()
-     : chemkit::LineFormat("inchikey")
-diff --git a/src/plugins/inchi/inchilineformat.cpp b/src/plugins/inchi/inchilineformat.cpp
-index 5b9bc42..ea5977c 100644
---- a/src/plugins/inchi/inchilineformat.cpp
-+++ b/src/plugins/inchi/inchilineformat.cpp
-@@ -42,7 +42,11 @@
- 
- #include <boost/algorithm/string.hpp>
- 
-+#ifdef SYSTEM_INCHI
-+#include <inchi_api.h>
-+#else
- #include "../../3rdparty/inchi/inchi_api.h"
-+#endif
- 
- #include <chemkit/atom.h>
- #include <chemkit/bond.h>
-diff --git a/src/plugins/pdb/pdbmlfileformat.cpp b/src/plugins/pdb/pdbmlfileformat.cpp
-index 081a4ec..2ca4269 100644
---- a/src/plugins/pdb/pdbmlfileformat.cpp
-+++ b/src/plugins/pdb/pdbmlfileformat.cpp
-@@ -35,7 +35,11 @@
- 
- #include "pdbmlfileformat.h"
- 
-+#ifdef SYSTEM_RAPIDXML
-+#include <rapidxml/rapidxml.hpp>
-+#else
- #include "../../3rdparty/rapidxml/rapidxml.hpp"
-+#endif
- 
- #include <chemkit/atom.h>
- #include <chemkit/polymer.h>
-diff --git a/src/plugins/xtc/CMakeLists.txt b/src/plugins/xtc/CMakeLists.txt
-index 98d8ba7..8c09e64 100644
---- a/src/plugins/xtc/CMakeLists.txt
-+++ b/src/plugins/xtc/CMakeLists.txt
-@@ -13,7 +13,12 @@ set(SOURCES
-   xtcplugin.cpp
- )
- 
--aux_source_directory(../../3rdparty/xdrf/ XDRF_SOURCES)
-+
-+if(USE_SYSTEM_XDRF)
-+	find_library(XDRF_LIBRARY NAMES xdrfile libxdrfile)
-+else()
-+	aux_source_directory(../../3rdparty/xdrf/ XDRF_SOURCES)
-+endif()
- 
- add_chemkit_plugin(xtc ${SOURCES} ${XDRF_SOURCES})
--target_link_libraries(xtc ${CHEMKIT_LIBRARIES} ${Boost_LIBRARIES})
-+target_link_libraries(xtc ${CHEMKIT_LIBRARIES} ${Boost_LIBRARIES} ${XDRF_LIBRARY} )
-diff --git a/src/plugins/xtc/xtcfileformat.cpp b/src/plugins/xtc/xtcfileformat.cpp
-index 0f00cb6..f8659ca 100644
---- a/src/plugins/xtc/xtcfileformat.cpp
-+++ b/src/plugins/xtc/xtcfileformat.cpp
-@@ -47,7 +47,11 @@
- #include <chemkit/trajectoryframe.h>
- #include <chemkit/cartesiancoordinates.h>
- 
-+#ifdef SYSTEM_XDRF
-+#include <xdrfile/xdrfile.h>
-+#else
- #include "../../3rdparty/xdrf/xdrf.h"
-+#endif
- 
- XtcFileFormat::XtcFileFormat()
-     : chemkit::TrajectoryFileFormat("xtc")
diff --git a/sci-libs/chemkit/metadata.xml b/sci-libs/chemkit/metadata.xml
deleted file mode 100644
index ec37d80cac64..000000000000
--- a/sci-libs/chemkit/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>sci-chemistry@gentoo.org</email>
-    <name>Gentoo Chemistry Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">chemkit</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/www-misc/surl/Manifest b/www-misc/surl/Manifest
deleted file mode 100644
index f525ad58c7aa..000000000000
--- a/www-misc/surl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST surl-0.7.1.1.tar.gz 23873 BLAKE2B f77b9d6d083b222c09def694f2af10ba606fe0ee1a5662ce5cef3d551d6bbc5a7504d74bbf64f6e4c9488abbd55c91c0179a4f3d2fd601a4c9ed2922c9f67c35 SHA512 45895431d1b6a2854bf19e183f635689388c77b61823933f7d9ee6d87ff40510259018baa969a0253b2c96580aed04ef35a037608313cbf5a6bf558f10269257
diff --git a/www-misc/surl/metadata.xml b/www-misc/surl/metadata.xml
deleted file mode 100644
index 5f5327071648..000000000000
--- a/www-misc/surl/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="person">
-		<email>monsieurp@gentoo.org</email>
-		<name>Patrice Clement</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">surl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/www-misc/surl/surl-0.7.1.1-r1.ebuild b/www-misc/surl/surl-0.7.1.1-r1.ebuild
deleted file mode 100644
index 4f04c69fb1b3..000000000000
--- a/www-misc/surl/surl-0.7.1.1-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="URL shortening command line application that supports various sites"
-HOMEPAGE="https://launchpad.net/surl"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV%.*}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
diff --git a/x11-wm/plwm/Manifest b/x11-wm/plwm/Manifest
deleted file mode 100644
index b2efb3fe02e4..000000000000
--- a/x11-wm/plwm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST PLWM-2.7rc1.tar.gz 343570 BLAKE2B e164a1c3244e2ebd8dd2899327ec0f76ce3e0c9b7caa5babcc1afa0e7368d5d0d14a313c59cc124e04b20cd5461a63011cd2c53a6e60d688dc5a657297ea38b0 SHA512 4716677c86cf6b31ba8ea6c4e8fad729d9cf7d9c09b7d56ba6686173793c5b248865f0af281561a2df161433ea0fb2f2ca050dfb3b6c9fedbe41ff0ad0c07f7e
diff --git a/x11-wm/plwm/files/plwm-2.7_rc1-pep0263.patch b/x11-wm/plwm/files/plwm-2.7_rc1-pep0263.patch
deleted file mode 100644
index aadc8f86f458..000000000000
--- a/x11-wm/plwm/files/plwm-2.7_rc1-pep0263.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur PLWM-2.7rc1.orig/examples/hrwwm.py PLWM-2.7rc1/examples/hrwwm.py
---- PLWM-2.7rc1.orig/examples/hrwwm.py	2007-08-27 15:06:29.000000000 +0200
-+++ PLWM-2.7rc1/examples/hrwwm.py	2007-08-27 15:07:33.000000000 +0200
-@@ -1,4 +1,5 @@
- #!/usr/bin/env python
-+# -*- coding: utf-8 -*-
- #
- # hrwwm.py -- Example PLWM window manager "configuration"
- #
-diff -ur PLWM-2.7rc1.orig/plwm/mw_apm.py PLWM-2.7rc1/plwm/mw_apm.py
---- PLWM-2.7rc1.orig/plwm/mw_apm.py	2007-08-27 15:06:29.000000000 +0200
-+++ PLWM-2.7rc1/plwm/mw_apm.py	2007-08-27 15:07:00.000000000 +0200
-@@ -1,3 +1,4 @@
-+# -*- coding: utf-8 -*-
- #
- # mw_apm.py -- display APM status in a modewindow
- #
diff --git a/x11-wm/plwm/metadata.xml b/x11-wm/plwm/metadata.xml
deleted file mode 100644
index d646a8a2cb4a..000000000000
--- a/x11-wm/plwm/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>axs@gentoo.org</email>
-	</maintainer>
-	<longdescription>
-		PLWM is a Python package, containing classes suitable for
-		implementing a window manager. PLWM is also a window manager,
-		using the PLWM package.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">plwm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-wm/plwm/plwm-2.7_rc1-r1.ebuild b/x11-wm/plwm/plwm-2.7_rc1-r1.ebuild
deleted file mode 100644
index bead79daae86..000000000000
--- a/x11-wm/plwm/plwm-2.7_rc1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils
-
-MY_P=PLWM-${PV/_}
-
-DESCRIPTION="Python classes for, and an implementation of, a window manager"
-HOMEPAGE="http://plwm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/plwm/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/python-xlib-0.14[${PYTHON_USEDEP}]"
-DEPEND="sys-apps/texinfo"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pep0263.patch
-)
-
-python_compile_all() {
-	emake -C "${S}"/doc
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	python_newscript examples/examplewm.py plwm
-	python_doscript utils/*.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doinfo doc/*.info
-
-	dodoc ONEWS
-	dodoc -r examples
-	docinto utils
-	dodoc utils/ChangeLog
-}