diff --git a/dev-python/tlslite-ng/Manifest b/dev-python/tlslite-ng/Manifest
deleted file mode 100644
index 4809b8a36..000000000
--- a/dev-python/tlslite-ng/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tlslite-ng-0.7.6.tar.gz 342749 BLAKE2B 4dd946c6c9036dfe8e2d632078dad6b8329922cfd033eca69c4b11a73b587492dd5727469566fdf6dae00536725a61cef778567891097e8ad14d4772301c9742 SHA512 c4fcdfaf45b40cd85fee26657956651b781d41f9c9f35a8a927d00c9f13cdcfae1b4f7a594d0d07d08d477b19480af152988c6075dc9f564215761bcf9857119
diff --git a/dev-python/tlslite-ng/metadata.xml b/dev-python/tlslite-ng/metadata.xml
deleted file mode 100644
index ace7c2d3a..000000000
--- a/dev-python/tlslite-ng/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- unknown@pentoo.ch
- Author Unknown
-
-
diff --git a/dev-python/tlslite-ng/tlslite-ng-0.7.6.ebuild b/dev-python/tlslite-ng/tlslite-ng-0.7.6.ebuild
deleted file mode 100644
index da389f03d..000000000
--- a/dev-python/tlslite-ng/tlslite-ng-0.7.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..9} )
-EGO_PN=github.com/tomato42/${PN}
-
-inherit distutils-r1
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/tomato42/tlslite-ng"
- KEYWORDS=""
-else
- KEYWORDS="amd64 ~arm64 x86"
- EGIT_COMMIT="v${PV}"
- SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="New home of the TLS implementation in pure python."
-HOMEPAGE="https://github.com/tomato42/tlslite-ng"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/coverage
- dev-python/hypothesis
- dev-python/pylint
- dev-python/unittest2"
-DEPEND="${RDEPEND}"
diff --git a/net-analyzer/cipherscan/Manifest b/net-analyzer/cipherscan/Manifest
deleted file mode 100644
index 0071ec84e..000000000
--- a/net-analyzer/cipherscan/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST cipherscan-20190726.tar.gz 13388732 BLAKE2B 98370c242648b8e9aa8183dd354c380d7470b571dae0b6aad60fde849b86d0a1ec80dbb3b55bb0a9ef22481b5ba7056f956e1fe9f0db17bfb38e8e8006b2a53c SHA512 70e293b479cdd598b7628cc86bdc0b41f18db0cdffc923d063f5b093276a555d169e6531a0ae03dd08b83f98a6748a87f1f0a9da36e48e8d461393151b682dc0
-DIST cipherscan-20200312.tar.gz 13388777 BLAKE2B bc4254f6679d76ccb4b8857739841c8fa275cb46c42cf34eec37a95f315d212888a8c27afb1d2c61a1d3208c218733ff7014b87939c491571670457d59dabe8e SHA512 929f3e2482f1f392d3e1315d3f90dc1de466e0364963ec57f1a4d3423991b6a6e8427d21e534a6b6397a38a3435145e6009cb73c568fc2cdaedce87779e38898
diff --git a/net-analyzer/cipherscan/cipherscan-20190726.ebuild b/net-analyzer/cipherscan/cipherscan-20190726.ebuild
deleted file mode 100644
index dd1f6cd34..000000000
--- a/net-analyzer/cipherscan/cipherscan-20190726.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{8..9} )
-EGO_PN=github.com/mozilla/${PN}
-
-inherit eutils python-single-r1
-
-DESCRIPTION="A very simple way to find out which SSL ciphersuites are supported by a target"
-HOMEPAGE="https://github.com/mozilla/cipherscan"
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mozilla/cipherscan.git"
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~x86"
- HASH_COMMIT="ff8eac48c360cf9bd84d82e247ade1e52e8281ce"
- SRC_URI="https://${EGO_PN}/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="MPL-2.0"
-SLOT="0"
-
-# cipherscan depends on dev-python/tlslite-ng, not dev-python/tlslite.
-RDEPEND="${PYTHON_DEPS}
- $(python_gen_cond_dep '
- !dev-python/tlslite[${PYTHON_MULTI_USEDEP}]
- dev-python/tlslite-ng[${PYTHON_MULTI_USEDEP}]
- dev-python/ecdsa[${PYTHON_MULTI_USEDEP}]
- ')"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${HASH_COMMIT}"
-
-QA_PREBUILT="/usr/share/${PN}/openssl"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- # Dirty hack to actually add a shebang to the file, so that we can then fix
- # it using python_fix_shebang. Without a shebang, python_fix_shebang won't
- # even work.
- sed -i '1i#!/usr/bin/env python' cscan.py || die
- python_fix_shebang "${S}"
-
- # We don't want cipherscan pulling in the latest and greatest
- # dev-python/tlslite and dev-python/ecdsa using GitHub. We fixed its
- # dependencies in RDEPEND.
- sed -e 's|\$DIRNAMEPATH/cscan.sh|$DIRNAMEPATH/cscan.py|' -i ${PN} || die "sed for ${PN} failed"
-
- sed -e 's|import .messages|import cscan.messages|' -i cscan/*.py
-}
-
-src_install(){
- insinto /usr/share/${PN}
- doins -r *
-
- fperms 0755 "/usr/share/${PN}/${PN}"
- fperms 0755 "/usr/share/${PN}/cscan.py"
- python_optimize "${D}usr/share/${PN}"
-
- # cipherscan needs to be run from its installation directory.
- make_wrapper $PN \
- "/usr/share/${PN}/${PN}"
-
- dodoc README.md
-}
diff --git a/net-analyzer/cipherscan/cipherscan-20200312.ebuild b/net-analyzer/cipherscan/cipherscan-20200312.ebuild
deleted file mode 100644
index cea1cecc8..000000000
--- a/net-analyzer/cipherscan/cipherscan-20200312.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{8..9} )
-EGO_PN=github.com/mozilla/${PN}
-
-inherit eutils python-single-r1
-
-DESCRIPTION="A very simple way to find out which SSL ciphersuites are supported by a target"
-HOMEPAGE="https://github.com/mozilla/cipherscan"
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mozilla/cipherscan.git"
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~x86"
- HASH_COMMIT="885b34593035c73d1fd2dd6ca1a42e211932fee0"
- SRC_URI="https://${EGO_PN}/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="MPL-2.0"
-SLOT="0"
-
-# cipherscan depends on dev-python/tlslite-ng, not dev-python/tlslite.
-RDEPEND="${PYTHON_DEPS}
- $(python_gen_cond_dep '
- !dev-python/tlslite[${PYTHON_MULTI_USEDEP}]
- dev-python/tlslite-ng[${PYTHON_MULTI_USEDEP}]
- dev-python/ecdsa[${PYTHON_MULTI_USEDEP}]
- ')"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${HASH_COMMIT}"
-
-QA_PREBUILT="/usr/share/${PN}/openssl"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- # Dirty hack to actually add a shebang to the file, so that we can then fix
- # it using python_fix_shebang. Without a shebang, python_fix_shebang won't
- # even work.
- sed -i '1i#!/usr/bin/env python' cscan.py || die
- python_fix_shebang "${S}"
-
- # We don't want cipherscan pulling in the latest and greatest
- # dev-python/tlslite and dev-python/ecdsa using GitHub. We fixed its
- # dependencies in RDEPEND.
- sed -e 's|\$DIRNAMEPATH/cscan.sh|$DIRNAMEPATH/cscan.py|' -i ${PN} || die "sed for ${PN} failed"
-
- sed -e 's|import .messages|import cscan.messages|' -i cscan/*.py
-}
-
-src_install(){
- insinto /usr/share/${PN}
- doins -r *
-
- fperms 0755 "/usr/share/${PN}/${PN}"
- fperms 0755 "/usr/share/${PN}/cscan.py"
- python_optimize "${D}usr/share/${PN}"
-
- # cipherscan needs to be run from its installation directory.
- make_wrapper $PN \
- "/usr/share/${PN}/${PN}"
-
- dodoc README.md
-}
diff --git a/net-analyzer/cipherscan/metadata.xml b/net-analyzer/cipherscan/metadata.xml
deleted file mode 100644
index ace7c2d3a..000000000
--- a/net-analyzer/cipherscan/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- unknown@pentoo.ch
- Author Unknown
-
-