15 files changed, 77 insertions, 633 deletions
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 77e1e1021bc6..ffbc43dd54cf 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/awstats/Manifest b/www-misc/awstats/Manifest
index 01c752351014..208ab89feba7 100644
--- a/www-misc/awstats/Manifest
+++ b/www-misc/awstats/Manifest
@@ -1,9 +1,5 @@
 AUX awstats-7.1-gentoo.diff 795 BLAKE2B c3c02a9086dc8067cc739ed4b180865aa1c68d5f6786b9a1d850a3c0314bdcb8abb1e3841229ae90cef3e1f6ba24a8262895c44d0b92faffb3f4c4100021e065 SHA512 09e46f32b31389cd1d98465c8b2578c37d5d4d601baf58eb8ed6811875743c3b19819d6820977a9aaace8d8f8c97be8f798fcbaa10f7ed0cb950a2f7f843754c
 AUX awstats-7.8-mime.patch 479 BLAKE2B 320b201daae7613e532123946f073107bf6096d924caa227463817308bcb6824788d683010031dc9ac5ffaaf65d4c169d49f43dd4d9d30d14697a15975835e85 SHA512 38ff55c99fa01ac52dac492e4153bcc2851e79ce3e1d1319c34a7695e66de9f4fff74739ce06e545fcc8ea3902a0325ff370471d04e136b92a6bef1dbba3095d
-AUX awstats-perl-5.22.patch 1981 BLAKE2B 7198b110b2688a989aeecd8ddeb364ab485e615ed045b9fa836f5fd050e344224564300f089cc6f53624e7f36284c0cfdf92930c3e0a82cc52c2ecfce348699b SHA512 9b0b4768583e40a55635b5c81c608798ee3036779359747d91cf12d96757d62b79fc8abbe43dbf322f9958616fafcd99d122fcd5c8234f2e6b871173da769800
-DIST awstats-7.4.tar.gz 2936102 BLAKE2B 2bc7f9619e4d6b13d3909869d642c347d6b9cddbbb3b49d58494ce108c8fe25d59b27198d5a42f8b81c06fdaf1a2e135c82883ec8604e53c6c5adbac07223b66 SHA512 5bce97c71aabeab35e4ff5e5168531e4955d7c1474322c7b4a47d1d06e06ebd0e74d1def73826498e6253f24aeca99309777617b7a914685c927bb6e1c020e1a
 DIST awstats-7.8.tar.gz 2938739 BLAKE2B 57c692aa935a4191d1cc1f3b34dd1a70a40eef880a3672dcd17472fe6bf447dd7b85a7752d94666d6f1a8dbdcc2eac4959a7f6a83a8bd538d0909ffcaedfd385 SHA512 2fd78e8c7eefb5c9ed39d8ee830ee8ad00b622b812ae40a84cb01c4fa653b9ab7822d1592313d7a8c4b8503d04dcba48b1775d33a629f1ac1278d2300eef931d
-EBUILD awstats-7.4.ebuild 3369 BLAKE2B 6866cf202650d148525c9baccf5a0a5249dfdc51bb235f4bb44f9cb67d133be9a385b61fa43d4e3a6dbfd72fd9b94414b59e5514324acff109411ff28ddeba42 SHA512 7d732c580d6facadef850bc82ca5eaa70b44bbfcfba2b9717d325d81a154f44af15a0dc2c850d1d08807d854eae4fa14da2e163271a67d2d3d6da32de2f66b2f
 EBUILD awstats-7.8-r1.ebuild 3015 BLAKE2B b7f76d10a96968b28aa8a560183d413699405eeba6bb732478e25f1af448bc0e8cba0ab6c207981b282cad1b54efb7c0292d308dac84bb6a1b9967161c6ed1d4 SHA512 4c68225a8f766e6f91053ef53b9065dcb2424a9739f93ecb256a990326472a3cebdbb2bbb683136bb47672540da7faf5f13b4fe638ca97108534516d5dd1b87d
-EBUILD awstats-7.8.ebuild 2975 BLAKE2B 3aea1489f4d6565de27edb6916939a375ae90e0d53abf25266783ad6772054c02ed928b658529f00f3595531b6b2aba16fb416d4539885fd56f68dd1f56e73b9 SHA512 c9c14bb3ca79b963c15732169b1cb83b6cb6632eb9649e6571c5bf0dfeadf838c1482cf38f72e3ff80bcdb0a4ee08dc9a8b90192c5ecced08d8a0ede0354a00a
 MISC metadata.xml 254 BLAKE2B 53495a638333fedaee2d8d838a705aaa610797eae56298aa35ad3c965af321b3d8e9b12643d1c3564f4232ca4a7ec44182ee7b35aada373750beee6b1c2a8a12 SHA512 b4674c7f9d0dc24c25846b3fe716415b648a61099b8d2f7eb099cf14f9a8f4670af4638349f953fe1b32b9d357911e533b72eaf4bbf14f54827512fd9bbb0ee8
diff --git a/www-misc/awstats/awstats-7.4.ebuild b/www-misc/awstats/awstats-7.4.ebuild
deleted file mode 100644
index 30a6da43390e..000000000000
--- a/www-misc/awstats/awstats-7.4.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-MY_P=${PN}-${PV%_p*}
-
-DESCRIPTION="AWStats is short for Advanced Web Statistics"
-HOMEPAGE="http://www.awstats.org/"
-
-if [ ${MY_P} != ${P} ]; then
-	SRC_URI="https://dev.gentoo.org/~flameeyes/awstats/${P}.tar.gz"
-	# The following SRC_URI is useful only when fetching for the first time
-	# after bump; upstream does not bump the version when they change it, so
-	# we rename it to include the date and upload to our mirrors instead.
-	#SRC_URI="http://www.awstats.org/files/${MY_P}.tar.gz -> ${P}.tar.gz"
-else
-	SRC_URI="http://www.awstats.org/files/${P}.tar.gz"
-fi
-
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-3"
-KEYWORDS="~alpha amd64 ~hppa ppc ~sparc x86"
-IUSE="geoip ipv6"
-
-SLOT="0"
-
-RDEPEND=">=dev-lang/perl-5.6.1
-	virtual/perl-Time-Local
-	dev-perl/URI
-	geoip? ( dev-perl/Geo-IP )
-	ipv6? ( dev-perl/Net-IP dev-perl/Net-DNS )"
-DEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-7.1-gentoo.diff
-	epatch "${FILESDIR}"/${PN}-perl-5.22.patch
-
-	# change default installation directory
-	find . -type f -exec sed \
-		-e "s#/usr/local/awstats/wwwroot#/usr/share/awstats/wwwroot#g" \
-		-e '/PossibleLibDir/s:(.*):("/usr/share/awstats/wwwroot/cgi-bin/lib"):' \
-		-i {} + || die "find/sed failed"
-
-	# set default values for directories; use apache log as an example
-	sed \
-		-e "s|^\(LogFile=\).*$|\1\"/var/log/apache2/access_log\"|" \
-		-e "s|^\(SiteDomain=\).*$|\1\"localhost\"|" \
-		-e "s|^\(DirIcons=\).*$|\1\"/awstats/icon\"|" \
-		-i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
-
-	# enable plugins
-
-	if use ipv6; then
-		sed -e "s|^#\(LoadPlugin=\"ipv6\"\)$|\1|" \
-		-i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
-	fi
-
-	if use geoip; then
-		sed -e '/LoadPlugin="geoip /aLoadPlugin="geoip GEOIP_STANDARD /usr/share/GeoIP/GeoIP.dat"' \
-		-i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
-	fi
-
-	find "${S}" '(' -type f -not -name '*.pl' ')' -exec chmod -x {} + || die
-}
-
-src_install() {
-	dohtml -r docs/*
-	dodoc README.md
-	newdoc wwwroot/cgi-bin/plugins/example/example.pm example_plugin.pm
-	dodoc -r tools/xslt
-
-	keepdir /var/lib/awstats
-
-	insinto /etc/awstats
-	doins "${S}"/wwwroot/cgi-bin/awstats.model.conf
-
-	# remove extra content that we don't want to install
-	rm -r "${S}"/wwwroot/cgi-bin/awstats.model.conf \
-		"${S}"/wwwroot/classes/src || die
-
-	insinto /usr/share/awstats
-	doins -r wwwroot
-	chmod +x "${D}"/usr/share/awstats/wwwroot/cgi-bin/*.pl
-
-	cd "${S}"/tools
-	dobin awstats_buildstaticpages.pl awstats_exportlib.pl \
-		awstats_updateall.pl
-	newbin logresolvemerge.pl awstats_logresolvemerge.pl
-	newbin maillogconvert.pl awstats_maillogconvert.pl
-	newbin urlaliasbuilder.pl awstats_urlaliasbuilder.pl
-
-	dosym ../share/awstats/wwwroot/cgi-bin/awstats.pl /usr/bin/awstats.pl
-}
-
-pkg_postinst() {
-	elog "The AWStats-Manual is available either inside"
-	elog "the /usr/share/doc/${PF} - folder, or at"
-	elog "http://awstats.sourceforge.net/docs/index.html ."
-	elog
-	elog "Copy the /etc/awstats/awstats.model.conf to"
-	elog "/etc/awstats/awstats.<yourdomain>.conf and edit it."
-	elog ""
-	ewarn "This ebuild does no longer use webapp-config to install"
-	ewarn "instead you should point your configuration to the stable"
-	ewarn "directory tree in the following path:"
-	ewarn "    /usr/share/awstats"
-}
diff --git a/www-misc/awstats/awstats-7.8.ebuild b/www-misc/awstats/awstats-7.8.ebuild
deleted file mode 100644
index c73348d6087b..000000000000
--- a/www-misc/awstats/awstats-7.8.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils
-
-MY_P=${PN}-${PV%_p*}
-
-DESCRIPTION="AWStats is short for Advanced Web Statistics"
-HOMEPAGE="https://www.awstats.org/"
-SRC_URI="https://www.awstats.org/files/${P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~hppa ppc ~sparc x86"
-IUSE="geoip ipv6"
-
-SLOT="0"
-
-RDEPEND="
-	>=dev-lang/perl-5.6.1
-	dev-perl/URI
-	virtual/perl-Time-Local
-	geoip? (
-		dev-perl/Geo-IP
-	)
-	ipv6? (
-		dev-perl/Net-DNS
-		dev-perl/Net-IP
-	)
-"
-DEPEND=""
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-7.1-gentoo.diff
-
-	# change default installation directory
-	find . -type f -exec sed \
-		-e "s#/usr/local/awstats/wwwroot#/usr/share/awstats/wwwroot#g" \
-		-e '/PossibleLibDir/s:(.*):("/usr/share/awstats/wwwroot/cgi-bin/lib"):' \
-		-i {} + || die "find/sed failed"
-
-	# set default values for directories; use apache log as an example
-	sed \
-		-e "s|^\(LogFile=\).*$|\1\"/var/log/apache2/access_log\"|" \
-		-e "s|^\(SiteDomain=\).*$|\1\"localhost\"|" \
-		-e "s|^\(DirIcons=\).*$|\1\"/awstats/icon\"|" \
-		-i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
-
-	# enable plugins
-
-	if use ipv6; then
-		sed -e "s|^#\(LoadPlugin=\"ipv6\"\)$|\1|" \
-		-i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
-	fi
-
-	if use geoip; then
-		sed -e '/LoadPlugin="geoip /aLoadPlugin="geoip GEOIP_STANDARD /usr/share/GeoIP/GeoIP.dat"' \
-		-i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
-	fi
-
-	find "${S}" '(' -type f -not -name '*.pl' ')' -exec chmod -x {} + || die
-
-	eapply_user
-}
-
-HTML_DOCS="docs/"
-DOCS="README.md"
-
-src_install() {
-	einstalldocs
-
-	newdoc wwwroot/cgi-bin/plugins/example/example.pm example_plugin.pm
-	dodoc -r tools/xslt
-
-	keepdir /var/lib/awstats
-
-	insinto /etc/awstats
-	doins "${S}"/wwwroot/cgi-bin/awstats.model.conf
-
-	# remove extra content that we don't want to install
-	rm -r "${S}"/wwwroot/cgi-bin/awstats.model.conf \
-		"${S}"/wwwroot/classes/src || die
-
-	insinto /usr/share/awstats
-	doins -r wwwroot
-	chmod +x "${D}"/usr/share/awstats/wwwroot/cgi-bin/*.pl
-
-	cd "${S}"/tools
-	dobin awstats_buildstaticpages.pl awstats_exportlib.pl \
-		awstats_updateall.pl
-	newbin logresolvemerge.pl awstats_logresolvemerge.pl
-	newbin maillogconvert.pl awstats_maillogconvert.pl
-	newbin urlaliasbuilder.pl awstats_urlaliasbuilder.pl
-
-	dosym ../share/awstats/wwwroot/cgi-bin/awstats.pl /usr/bin/awstats.pl
-}
-
-pkg_postinst() {
-	elog "The AWStats-Manual is available either inside"
-	elog "the /usr/share/doc/${PF} - folder, or at"
-	elog "https://awstats.sourceforge.net/docs/index.html ."
-	elog
-	elog "Copy the /etc/awstats/awstats.model.conf to"
-	elog "/etc/awstats/awstats.<yourdomain>.conf and edit it."
-	elog ""
-	ewarn "This ebuild does no longer use webapp-config to install"
-	ewarn "instead you should point your configuration to the stable"
-	ewarn "directory tree in the following path:"
-	ewarn "    /usr/share/awstats"
-}
diff --git a/www-misc/awstats/files/awstats-perl-5.22.patch b/www-misc/awstats/files/awstats-perl-5.22.patch
deleted file mode 100644
index 8f4e1cac2c0b..000000000000
--- a/www-misc/awstats/files/awstats-perl-5.22.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 6ca56baf8e5819787c128e5ccd741701cb84bfdd Mon Sep 17 00:00:00 2001
-From: Laurent Destailleur <eldy@destailleur.fr>
-Date: Tue, 18 Aug 2015 20:41:20 +0200
-Subject: [PATCH] Compatibility with Perl 5.22
-
----
- docs/awstats_changelog.txt |  1 +
- wwwroot/cgi-bin/awstats.pl | 12 ++++++------
- 2 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/docs/awstats_changelog.txt b/docs/awstats_changelog.txt
-index 1fcca7f..1b5e342 100644
---- a/docs/awstats_changelog.txt
-+++ b/docs/awstats_changelog.txt
-@@ -8,6 +8,7 @@ New features:
-   option nboflastupdatelookuptosave on command line.
- - #199 Added geoip6 plugin with support for IPv4 AND IPv6.
- - Work with Amazon AWS log files (using %time5 tag). 
-+- Compatibility with Perl 5.22
- 
- Fixes:
- - Fixes permission on some .pl scripts.
-diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
-index c9dcee9..eb14fc0 100755
---- a/wwwroot/cgi-bin/awstats.pl
-+++ b/wwwroot/cgi-bin/awstats.pl
-@@ -9040,12 +9040,12 @@ sub DefinePerlParsingFormat {
- 		$LogFormatString =~ s/%>s/%code/g;
- 		$LogFormatString =~ s/%b(\s)/%bytesd$1/g;
- 		$LogFormatString =~ s/%b$/%bytesd/g;
--		$LogFormatString =~ s/\"%{Referer}i\"/%refererquot/g;
--		$LogFormatString =~ s/\"%{User-Agent}i\"/%uaquot/g;
--		$LogFormatString =~ s/%{mod_gzip_input_size}n/%gzipin/g;
--		$LogFormatString =~ s/%{mod_gzip_output_size}n/%gzipout/g;
--		$LogFormatString =~ s/%{mod_gzip_compression_ratio}n/%gzipratio/g;
--		$LogFormatString =~ s/\(%{ratio}n\)/%deflateratio/g;
-+		$LogFormatString =~ s/\"%\{Referer}i\"/%refererquot/g;
-+		$LogFormatString =~ s/\"%\{User-Agent}i\"/%uaquot/g;
-+		$LogFormatString =~ s/%\{mod_gzip_input_size}n/%gzipin/g;
-+		$LogFormatString =~ s/%\{mod_gzip_output_size}n/%gzipout/g;
-+		$LogFormatString =~ s/%\{mod_gzip_compression_ratio}n/%gzipratio/g;
-+		$LogFormatString =~ s/\(%\{ratio}n\)/%deflateratio/g;
- 
- 		# Replacement for a IIS and ISA format string
- 		$LogFormatString =~ s/cs-uri-query/%query/g;    # Must be before cs-uri
diff --git a/www-misc/shellinabox/Manifest b/www-misc/shellinabox/Manifest
index dd338e9275f6..23107ac9b7b9 100644
--- a/www-misc/shellinabox/Manifest
+++ b/www-misc/shellinabox/Manifest
@@ -2,9 +2,5 @@ AUX shellinaboxd.conf 3474 BLAKE2B 873c0ea46b81bac7c78f08da2d566099bbf26973f6e6b
 AUX shellinaboxd.init 1723 BLAKE2B e5e8bc573628f1b12f1390c5a481c80b9411eba156ba5513d04f1afc41d42e6a398bfa35b65c8a705cfb439238cc30b76d5c22ef14507cd8e714af1e8fde1107 SHA512 e568d9e972097960e292c73df6b493c610f0a17fec159dc933ac19b15b92649165c4e41cac8d19d32860effd0a4da8ff950a34f54f6db9ca67206056d22b2703
 AUX shellinaboxd.service 420 BLAKE2B 89973ee0f64fce39603778afef8e0544313ff05f71c7668b5055edccffa552511278ab090aad50529e949e4b16e84291302f1404660d3ab5150ce5491f2fa4ca SHA512 cdb22177b92794c7cda2e10c461f1f31ed165ede156c682fec5b682afbd48f8c9c564420950f3d39f9943cbfbfdb864869a96a2dae60f2bbe1bd36bd61282aa5
 DIST shellinabox-2.20.tar.gz 745920 BLAKE2B 34d360d2e4f0474f64490894f4ba9b9457ca7915156fc3364e874c89d9792ec52c8e756d5f356da6f680425fcc4cf9c9025a47d56cb0b0671a2749f0ba90d5b9 SHA512 369fb6e0041fc3eb52a533f14d1f856a71ec1bf166441e25a5d61bb129f2db5de6b61205ddd0cb08d53384baaf4e087bd2c549f7919b96ee465d4cc3318d2237
-DIST shellinabox-2.20.zip 792359 BLAKE2B fd6ebde4d9f81314dd439126ad9ed6759556268c4af6dbe2094fb7aaef3956e8c484deb8c3b43a485bc28cf3a2c0105bee0f8b5c2efba1d3d7f0c0b6b3f6867a SHA512 0537b6400cb7f4880c76cce270e5eefd6f536eae7e27b5f7b12de0465a1e354f7980bb2f67230237eda1f7945afb1d3bb18013106bf7c3a02e7974532f0d9190
-EBUILD shellinabox-2.20-r1.ebuild 2694 BLAKE2B bad035b871d10f39c919dd96a857335f0f21ea47e3a80d260639bcdd8d494a4b8e13e3831bbed2e62e71a47ed75faedb058a469d6a7fe9e9626b8c4b51db8606 SHA512 0567f829f8cd92b34384fd4942869acdc7145dc900c88a519b7979e34566c2a4235cae47473be15f973a5a4e97cde123b96b5c190054f11443644622b222ce3d
-EBUILD shellinabox-2.20-r2.ebuild 2673 BLAKE2B 626f9e847d8a884c0b9cfd60f0d471feeedc22d31fed5767aa999ccd1f20123e629eb46c1fc99ccb0d2422136ba893a2a230b013b0a4b961e34bfd4a4acd67c0 SHA512 28e163e20225f8e06b0bed77d06dd9cbae92973090f121c1d8aef93307776c41618bc96185dff247507bef21045a0af08456b77466c44f9af3a6812e73b5425e
-EBUILD shellinabox-2.20-r3.ebuild 2679 BLAKE2B 8eebe74aa6ad393427fa5546b7813c1a3217b9ad83dac44ebebfa88207040420d62fb6bf7dd034d5e65b4f3550a69e0c09b4f6d57d66016588c81e6dd22d1f86 SHA512 50e3079d5e77f6073f728f84bd5630a7933da41f9a9526e24bd8b24185f2a826f345d258df464259ce58d4a8401e9a8a65fa9d22660b3ed6691caa286151be5c
-EBUILD shellinabox-2.20-r4.ebuild 2589 BLAKE2B b9ba84b7b64c1ada9b1abd9098d191090bae59635b0e9d1253582c3ff46c27615847995ecf017c7e89a224802857a0241ba513c8f632250a1befc5e80ed4ad17 SHA512 e2f1c90a0919289ffc2b6c746070e16ba106daa2110c656d8e79d1f2d5f433aa0dc97134a3ea78b46eab32a4e556b4fda5035842c9e4ceb43bfc8c8cf4718254
+EBUILD shellinabox-2.20-r4.ebuild 2585 BLAKE2B fbe8c01eae8c1aac80cad5f1b64682ffd20fbc9bb5451a3fd9f4106e24355d93bf5fbeb035b6e2f63579247c995aab670b7709aa0ce3bbd8d09dd8d04d23d329 SHA512 18001c93387caccd9b5b5d99345a7cae630c20073325a34a50a1b3787ba3057cbe956b2d19db95ac4397645aba1644deaaac3bec1fcf1b05f9dfcc4bf0e66ca6
 MISC metadata.xml 465 BLAKE2B 0ab32d3a194f7f96d0620b0aaec34770f7bf66e82362e7cb71cba720de389005e42e0d97104e86f919cb666a6932e681ab2a1c0db794efcaeda07fd184eef05c SHA512 d49b6f84a6b79de40d86bbb7ec47f0f47fdae0b862e98302093f32d220115c8bebeb28477909919e252d5d48b6f64e8b5d2303f0367c19c5ed816d9a17ad60f9
diff --git a/www-misc/shellinabox/shellinabox-2.20-r1.ebuild b/www-misc/shellinabox/shellinabox-2.20-r1.ebuild
deleted file mode 100644
index 0fd76e1f2e61..000000000000
--- a/www-misc/shellinabox/shellinabox-2.20-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF="yes"
-AUTOTOOLS_IN_SOURCE_BUILD="yes"
-
-inherit user autotools-utils systemd
-
-DESCRIPTION="Export command line tools to a web based terminal emulator"
-HOMEPAGE="https://github.com/shellinabox/shellinabox"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="+pam"
-
-DEPEND="
-	dev-libs/openssl:0=
-	pam? ( sys-libs/pam )"
-
-SIAB_CERT_DIR="/etc/shellinabox/cert"
-SIAB_SSL_BASH="${SIAB_CERT_DIR}/gen_ssl_cert.bash"
-SIAB_DAEMON="${PN}d"
-
-shellinbox_gen_ssl_setup() {
-	read -r -d '' SIAB_SSL_SETUP << EOF
-cd ${SIAB_CERT_DIR}
-openssl genrsa -des3 -out server.key 1024
-openssl req -new -key server.key -out server.csr
-cp server.key server.key.org
-openssl rsa -in server.key.org -out server.key
-openssl x509 -req -days 365 -in server.csr -signkey server.key -out server.crt
-cat server.crt server.key > certificate.pem
-EOF
-}
-
-pkg_setup() {
-	enewgroup "${SIAB_DAEMON}"
-	enewuser "${SIAB_DAEMON}" -1 -1 -1 "${SIAB_DAEMON}"
-}
-
-src_configure() {
-	local myeconf=(
-		--disable-runtime-loading
-		--enable-ssl
-	)
-
-	econf \
-		$(use_enable pam) \
-		"${myeconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# make installs the binary in bin...
-	rm -rf "${D}/usr/bin" || die
-
-	# ... whereas it should put it in sbin.
-	dosbin "${SIAB_DAEMON}"
-
-	# Install init+conf files.
-	newinitd "${FILESDIR}/${SIAB_DAEMON}.init" "${SIAB_DAEMON}"
-	newconfd "${FILESDIR}/${SIAB_DAEMON}.conf" "${SIAB_DAEMON}"
-
-	# Install systemd unit file.
-	systemd_dounit "${FILESDIR}"/shellinaboxd.service
-
-	# Install CSS files.
-	insinto "/usr/share/${PN}-resources"
-	doins -r "${PN}"/*.css
-
-	# Create directory where SSL certificates will be generated.
-	dodir "${SIAB_CERT_DIR}"
-	fowners "${SIAB_DAEMON}:${SIAB_DAEMON}" "${SIAB_CERT_DIR}"
-
-	# Generate set up variable.
-	shellinbox_gen_ssl_setup
-
-	# Dump it in a bash script.
-	echo "#!/usr/bin/env bash" > "${D}/${SIAB_SSL_BASH}" || die
-	echo "${SIAB_SSL_SETUP}" >> "${D}/${SIAB_SSL_BASH}" || die
-	chmod +x "${D}/${SIAB_SSL_BASH}" || die
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "The default configuration exposes a login shell"
-	ewarn "with SSL disabled on the localhost interface only."
-	ewarn
-
-	shellinbox_gen_ssl_setup
-
-	einfo
-	einfo "To generate self-signed SSL certificates"
-	einfo "please read the procedure explained here:"
-	einfo "https://code.google.com/p/shellinabox/issues/detail?id=59#c15"
-	einfo
-	einfo "${SIAB_SSL_SETUP}"
-	einfo
-	einfo "This walkthrough has been written in ${SIAB_SSL_BASH} for your convenience."
-	einfo "Make sure to execute this script."
-	einfo
-}
diff --git a/www-misc/shellinabox/shellinabox-2.20-r2.ebuild b/www-misc/shellinabox/shellinabox-2.20-r2.ebuild
deleted file mode 100644
index f92e89f9f226..000000000000
--- a/www-misc/shellinabox/shellinabox-2.20-r2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user autotools systemd
-
-DESCRIPTION="Export command line tools to a web based terminal emulator"
-HOMEPAGE="https://github.com/shellinabox/shellinabox"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+pam"
-
-DEPEND="
-	dev-libs/openssl:0=
-	pam? ( sys-libs/pam )"
-
-SIAB_CERT_DIR="/etc/shellinabox/cert"
-SIAB_SSL_BASH="${SIAB_CERT_DIR}/gen_ssl_cert.bash"
-SIAB_DAEMON="${PN}d"
-
-shellinbox_gen_ssl_setup() {
-	read -r -d '' SIAB_SSL_SETUP << EOF
-cd ${SIAB_CERT_DIR}
-openssl genrsa -des3 -out server.key 1024
-openssl req -new -key server.key -out server.csr
-cp server.key server.key.org
-openssl rsa -in server.key.org -out server.key
-openssl x509 -req -days 365 -in server.csr -signkey server.key -out server.crt
-cat server.crt server.key > certificate.pem
-EOF
-}
-
-pkg_setup() {
-	enewgroup "${SIAB_DAEMON}"
-	enewuser "${SIAB_DAEMON}" -1 -1 -1 "${SIAB_DAEMON}"
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconf=(
-		--disable-runtime-loading
-		--enable-ssl
-	)
-
-	econf \
-		$(use_enable pam) \
-		"${myeconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# make installs the binary in bin...
-	rm -rf "${D}/usr/bin" || die
-
-	# ... whereas it should put it in sbin.
-	dosbin "${SIAB_DAEMON}"
-
-	# Install init+conf files.
-	newinitd "${FILESDIR}/${SIAB_DAEMON}.init" "${SIAB_DAEMON}"
-	newconfd "${FILESDIR}/${SIAB_DAEMON}.conf" "${SIAB_DAEMON}"
-
-	# Install systemd unit file.
-	systemd_dounit "${FILESDIR}"/shellinaboxd.service
-
-	# Install CSS files.
-	insinto "/usr/share/${PN}-resources"
-	doins -r "${PN}"/*.css
-
-	# Create directory where SSL certificates will be generated.
-	dodir "${SIAB_CERT_DIR}"
-	fowners "${SIAB_DAEMON}:${SIAB_DAEMON}" "${SIAB_CERT_DIR}"
-
-	# Generate set up variable.
-	shellinbox_gen_ssl_setup
-
-	# Dump it in a bash script.
-	echo "#!/usr/bin/env bash" > "${D}/${SIAB_SSL_BASH}" || die
-	echo "${SIAB_SSL_SETUP}" >> "${D}/${SIAB_SSL_BASH}" || die
-	chmod +x "${D}/${SIAB_SSL_BASH}" || die
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "The default configuration exposes a login shell"
-	ewarn "with SSL disabled on the localhost interface only."
-	ewarn
-
-	shellinbox_gen_ssl_setup
-
-	einfo
-	einfo "To generate self-signed SSL certificates"
-	einfo "please read the procedure explained here:"
-	einfo "https://code.google.com/p/shellinabox/issues/detail?id=59#c15"
-	einfo
-	einfo "${SIAB_SSL_SETUP}"
-	einfo
-	einfo "This walkthrough has been written in ${SIAB_SSL_BASH} for your convenience."
-	einfo "Make sure to execute this script."
-	einfo
-}
diff --git a/www-misc/shellinabox/shellinabox-2.20-r3.ebuild b/www-misc/shellinabox/shellinabox-2.20-r3.ebuild
deleted file mode 100644
index 4ddaef132e05..000000000000
--- a/www-misc/shellinabox/shellinabox-2.20-r3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user autotools systemd
-
-DESCRIPTION="Export command line tools to a web based terminal emulator"
-HOMEPAGE="https://github.com/shellinabox/shellinabox"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+pam"
-
-DEPEND="
-	dev-libs/openssl:0=
-	pam? ( sys-libs/pam )"
-
-SIAB_CERT_DIR="/etc/shellinabox/cert"
-SIAB_SSL_BASH="${SIAB_CERT_DIR}/gen_ssl_cert.bash"
-SIAB_DAEMON="${PN}d"
-
-shellinbox_gen_ssl_setup() {
-	read -r -d '' SIAB_SSL_SETUP << EOF
-cd ${SIAB_CERT_DIR}
-openssl genrsa -des3 -out server.key 1024
-openssl req -new -key server.key -out server.csr
-cp server.key server.key.org
-openssl rsa -in server.key.org -out server.key
-openssl x509 -req -days 365 -in server.csr -signkey server.key -out server.crt
-cat server.crt server.key > certificate.pem
-EOF
-}
-
-pkg_setup() {
-	enewgroup "${SIAB_DAEMON}"
-	enewuser "${SIAB_DAEMON}" -1 -1 -1 "${SIAB_DAEMON}"
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconf=(
-		--disable-runtime-loading
-		--enable-ssl
-	)
-
-	econf \
-		$(use_enable pam) \
-		"${myeconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# make installs the binary in bin...
-	rm -rf "${D}/usr/bin" || die
-
-	# ... whereas it should put it in sbin.
-	dosbin "${SIAB_DAEMON}"
-
-	# Install init+conf files.
-	newinitd "${FILESDIR}/${SIAB_DAEMON}.init" "${SIAB_DAEMON}"
-	newconfd "${FILESDIR}/${SIAB_DAEMON}.conf" "${SIAB_DAEMON}"
-
-	# Install systemd unit file.
-	systemd_dounit "${FILESDIR}"/shellinaboxd.service
-
-	# Install CSS files.
-	insinto "/usr/share/${PN}-resources"
-	doins -r "${PN}"/*.css
-
-	# Create directory where SSL certificates will be generated.
-	dodir "${SIAB_CERT_DIR}"
-	fowners "${SIAB_DAEMON}:${SIAB_DAEMON}" "${SIAB_CERT_DIR}"
-
-	# Generate set up variable.
-	shellinbox_gen_ssl_setup
-
-	# Dump it in a bash script.
-	echo "#!/usr/bin/env bash" > "${D}/${SIAB_SSL_BASH}" || die
-	echo "${SIAB_SSL_SETUP}" >> "${D}/${SIAB_SSL_BASH}" || die
-	chmod +x "${D}/${SIAB_SSL_BASH}" || die
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "The default configuration exposes a login shell"
-	ewarn "with SSL disabled on the localhost interface only."
-	ewarn
-
-	shellinbox_gen_ssl_setup
-
-	einfo
-	einfo "To generate self-signed SSL certificates"
-	einfo "please read the procedure explained here:"
-	einfo "https://code.google.com/p/shellinabox/issues/detail?id=59#c15"
-	einfo
-	einfo "${SIAB_SSL_SETUP}"
-	einfo
-	einfo "This walkthrough has been written in ${SIAB_SSL_BASH} for your convenience."
-	einfo "Make sure to execute this script."
-	einfo
-}
diff --git a/www-misc/shellinabox/shellinabox-2.20-r4.ebuild b/www-misc/shellinabox/shellinabox-2.20-r4.ebuild
index dd3929f75bfe..f42751ea0832 100644
--- a/www-misc/shellinabox/shellinabox-2.20-r4.ebuild
+++ b/www-misc/shellinabox/shellinabox-2.20-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="+pam"
 
 RDEPEND="
diff --git a/www-misc/surl/Manifest b/www-misc/surl/Manifest
deleted file mode 100644
index e06647847cd3..000000000000
--- a/www-misc/surl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST surl-0.7.1.1.tar.gz 23873 BLAKE2B f77b9d6d083b222c09def694f2af10ba606fe0ee1a5662ce5cef3d551d6bbc5a7504d74bbf64f6e4c9488abbd55c91c0179a4f3d2fd601a4c9ed2922c9f67c35 SHA512 45895431d1b6a2854bf19e183f635689388c77b61823933f7d9ee6d87ff40510259018baa969a0253b2c96580aed04ef35a037608313cbf5a6bf558f10269257
-EBUILD surl-0.7.1.1-r1.ebuild 409 BLAKE2B f873c64810a2a99a7e18cdcffcdb4ce55005fdd0229dd05ed80a98e7eb059e4c6263333b3dbc2e3af1869b2bcaa644676f7fcfcc006601d3cbb078b44a915293 SHA512 d0bc24880c7b7f245448e16a6924ff2ad4889330747df7fcecf067c6572f64b73e349ee89fba295d676c109fd62c7f903f656b87f6b9d0a21ebaafb00cea359a
-MISC metadata.xml 323 BLAKE2B 5733cca817fd7996feb74bef7c4a698f44ffe81d28677a677607f0c5d9386ba2d71f76b9ef046ae5593398136e217731a1b9f1846578d4d2b18eb3de4199faed SHA512 2163bb9c26e5542a97d68bf2a58a89df900827b3693085fea28bf262f3588309d8f2106059c5725d393b7c5cadb0af1a5c0c61c0a0567fcaf19b2c1b25c7b5dd
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/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index 1d0759bdb46b..41a6730214ca 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -2,6 +2,8 @@ AUX urlwatch-2.17-fix-yaml.load.patch 675 BLAKE2B 39198576b888d72ab9a21a99430cc3
 AUX urlwatch-2.18-pycodestyle-requirement.patch 766 BLAKE2B d30b074629d0547fcded426ce16cbc4cd3c829ccb817be4ea792273e5a00825e8fb6e332b9169cf7ce228ac592acf4d04f583acda75501f4d20886f9e13c6f55 SHA512 4fd8abdffa63438955ada5910b84548ab22ccba96dd63943a78ac72f17636e6a515b8a7aaef277099e575965bcf4a68fe01c7ee2226def85a2cc1e6a31bbbb8d
 DIST urlwatch-2.17.tar.gz 44178 BLAKE2B 46163b3305a50c3b5165da8f794c252aeb0a3581f16ba04cc1f0d920066accd02f7eba47718012e2ac0071f6bfa31019777a28840179a28a7fe365ae2e8f1d2c SHA512 635bca7e55641dd73447f5ec9ad429539decfaa8a1c19ab073c3bd46acfc518fa6012d855e0c37dd78654da28acf1446f580def611bcb85ae94fe13f567e3613
 DIST urlwatch-2.18.tar.gz 48268 BLAKE2B e595a6ed27637463f14f92ecafd123eb0c7cef7102cc35ebbc3334804f7e09cc5f933aa2d54e24acd74a1419d6a8683a0d5fb2456b35ae0797c3d8a12efc33de SHA512 4b44a78fe7f2be6f507487ad5de57d79aa55ee790b29b97f2a364c0f3b58828fea5eb2b08235c15cafd3839b9261a7f148ebc9bceb5bedd1ff8319f7f039bb23
+DIST urlwatch-2.21.tar.gz 126235 BLAKE2B 9e0f39e51e413355974ce886e019eb86dd07fb9a75c02c5c711ccdbba573c2e6b218cf11b42c714172ad00288ea0219a079fd9b8016d33c29f087537d160e80d SHA512 30d7312c72d839e8ef681a11065f82c2611b650ab1b9b9a33e718bb791712674afb31e4b2e6da97038379fb8cc4ae5bc58b4d0ee6a26c424cba01898b56566b7
 EBUILD urlwatch-2.17.ebuild 1650 BLAKE2B 01abaf115bbfb7ae572ae850505fd8b17ceb098f5ad4c11e578ec0ac554f77cb4aa689d8fb278028c6841520eb614983beb693c329cca202697e049b465df968 SHA512 b64a3a26d4a0909b85e2316b3e5d79876cb256d3f1be2ec8b820eca9f52fff2304622dc7d69d75c95e587563362fee18b06b8a15a986543893db63080ae5aab1
 EBUILD urlwatch-2.18-r1.ebuild 1811 BLAKE2B 9a42617e89c5a88cdc081b069de209455b9b382de2652493a7990c2dddf6545b8e9e58da65553c4aa64917e2797ee6f50d1e2b061a5f27e494512139d65d8446 SHA512 654098c0d31c1feffb0edf1970f59ab1cfd9b806fd1478aaebc7bfb96486c21655e1db176496de8bebbf239f4a331c31ae362258a79191ba3987f262d8fc7f3c
+EBUILD urlwatch-2.21.ebuild 2121 BLAKE2B 05e9128f1bff22de0cb9b74c15686e4506c4b3c76b7ac589a26f6d8f387c2182c6e39da167ac75e4af6e9d7e800d5abb843fb350dd41a22c9eaf60ce92bdbb41 SHA512 1be7c7c48a36e0866da80ff519044db1ac9fb46af3c970b5affa6d8724657284111a151d322c066d1817a1f5992ef826d30a6c828da93bd1de55ec92557c1880
 MISC metadata.xml 540 BLAKE2B feb952d37175ef6a6ec17ae6ff1751d031cd14e3e8d98d5b6cdf44074c05068a1a6ce88b9447fdc0a8dec18f37f7d07232072ba81dd0ce6401a106e5e508cb92 SHA512 7c79bc952f7be46983f83c1f357f013df14d87f906df3a3e0f8690c32d296945729ebe9f95838d6a3c3c1e85b4fc8dde20b0ef12037d17967119e4cbaf652f2c
diff --git a/www-misc/urlwatch/urlwatch-2.21.ebuild b/www-misc/urlwatch/urlwatch-2.21.ebuild
new file mode 100644
index 000000000000..890f051e65f0
--- /dev/null
+++ b/www-misc/urlwatch/urlwatch-2.21.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+# The package uses entry points but setup.py is weird
+# so the eclass doesn't detect it
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="A tool for monitoring webpages for updates"
+HOMEPAGE="https://thp.io/2008/urlwatch/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/cssselect[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/minidb[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( CHANGELOG.md README.md )
+
+python_test() {
+	local skipped_tests=(
+		# Require the pdftotext module
+		"lib/urlwatch/tests/test_filter_documentation.py::test_url[https://example.net/pdf-test.pdf-job12]"
+		"lib/urlwatch/tests/test_filter_documentation.py::test_url[https://example.net/pdf-test-password.pdf-job13]"
+		# Requires the pytesseract module
+		"lib/urlwatch/tests/test_filter_documentation.py::test_url[https://example.net/ocr-test.png-job26]"
+	)
+	pytest -vv ${skipped_tests[@]/#/--deselect } \
+		|| die "Tests failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		if ! has_version dev-python/chump; then
+			elog "Install 'dev-python/chump' to enable Pushover" \
+				"notifications support"
+		fi
+		if ! has_version dev-python/pushbullet-py; then
+			elog "Install 'dev-python/pushbullet-py' to enable" \
+				"Pushbullet notifications support"
+		fi
+		elog "HTML parsing can be improved by installing one of the following packages"
+		elog "and changing the html2text subfilter parameter:"
+		elog "dev-python/beautifulsoup:4"
+		elog "app-text/html2text"
+		elog "dev-python/html2text"
+		elog "www-client/lynx"
+	fi
+}