15 files changed, 272 insertions, 277 deletions
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 41ea99704751..f1fbe10c26e7 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/buku/Manifest b/www-misc/buku/Manifest
index dd31dcc125d8..60403402ad47 100644
--- a/www-misc/buku/Manifest
+++ b/www-misc/buku/Manifest
@@ -1,7 +1,3 @@
-DIST buku-3.5.tar.gz 93634 BLAKE2B 55c4b50b3bf8121c116554613768cd836080b363d702469eb2f76349c26d8d6246f73746248123030c5657006e09a9f72242354ce3af20d93b845f1870929bbc SHA512 b9f70665c83033ca030302e805ee051a524b2f0decae6c99ad54749b4a4bc91ae8261976018741361489525f359ea71c01ddb3e2d827ab9a052fb0acc98be8ed
-DIST buku-3.6.tar.gz 92012 BLAKE2B a92f45810acfb11493ca4c0ff75c57b81064627dea632bdf55ab5e33618e2721163ba0dcaa95d8cbec579605bc714d24ef894de10f4a10f3bf6ef5eb5aa42cc3 SHA512 77fabec93e85d6b6d5dbc0a3c4d095f26093f1d86aadb2a3c961a3947ac1c59acac69c94f732d30daec9943728e35d5e08bede1f0448c02d2db9136fe426186f
-DIST buku-3.7.tar.gz 98970 BLAKE2B 7227b5fb632d9ec92ef236d1889f2ba0872d67d2c3cfb302beab48b03e8d62a762d02e517014d5041a9f79deab74d0f5ceca12c315eb77922f73d359b58a48b5 SHA512 c515e11686aa8888231ffc8c1d6ec29d6143f1714eacdf640d8d3d3fa3fd469e111073762a3ba831dd673d63034afe3db181ec66501c18165e8ddd97cbc57c82
-EBUILD buku-3.5.ebuild 1073 BLAKE2B 1c049b74a55b14564c007e81eee114bc73e369c357d71204b49682643f5945fb3fc17eed8bca0ae0ec884b596162182480d3223de4c904177b2edf908e132aca SHA512 5ce31001fcba741fb45a88ffe77bd84113940db050344b3a333762405287d92fc7f35e006e6e079ae08aab974e6674496456d03df322f4161ed22ed1b0bff649
-EBUILD buku-3.6.ebuild 1073 BLAKE2B 1c049b74a55b14564c007e81eee114bc73e369c357d71204b49682643f5945fb3fc17eed8bca0ae0ec884b596162182480d3223de4c904177b2edf908e132aca SHA512 5ce31001fcba741fb45a88ffe77bd84113940db050344b3a333762405287d92fc7f35e006e6e079ae08aab974e6674496456d03df322f4161ed22ed1b0bff649
-EBUILD buku-3.7.ebuild 1026 BLAKE2B 6914875fa9e316204b649753816d9b244b0dd923c4f88bd3dd0eb151a3bede8ce230b28682653845b67cbd68840c1c4c58004e775ff4fb66bb3caf099997825c SHA512 388db4d1645d9819009734867350716de9b2ff27e85ef94d327a31df6a6c7f2492211be1c89e099afe68a960bac6c65d136c8cea4a357c058b8baf5d4ccc3758
-MISC metadata.xml 441 BLAKE2B 93ab0c34611cf0762ce76f03634d649ab3a7c0d9c3bdbcdcbd3dad1f228f72b522df12eae7731689d7848a7ad647330bfc26202fd8099ac57e98ce73bf1bf6cc SHA512 5f00313957370e1b01d486b6712b232b33bc408884a627df3ba337197208c08cdb8c334699993b65afb2ff598ca7c7c857622442dd46bcd8e3411493b6599f7b
+DIST buku-4.3.tar.gz 264480 BLAKE2B 8bddf640512e5741f80bb5bc073208d843cac32d3c3ade0bdf36241e93d6c81d47238ad03c651e924226933efa572e65d9a4c86f861acda68935c9e96d6e6fb4 SHA512 eabf45b1cc1700b20f2a95baf14940f49e2a2ad51aef0f870c488e67cb07fb110916d93037830cd83572317c5d0a8b05c0a5732f105face2a14facf6af02b690
+EBUILD buku-4.3.ebuild 1661 BLAKE2B f319288aa0be9f9f9cf4e7e74fd0684001acb83d582fc70632543e42290e5dac607bfec7f6c6da845cc3b19bc3a073ad4b2805b2e01a231e4bf7cfee6f7ba878 SHA512 3c07c242385086450dd56e36b173c27e426c6fc923f43c39188596dcf5894c2dcb6ebe9448c2721d05412ca96fc06f70227b1d81eb5eaea9a7047eda3a86270f
+MISC metadata.xml 555 BLAKE2B e600a84c8483017dfd224fd304273ce67f2620c89dac8d3810475d2c31b298fbde7a28460e3fa5151a576503f55a7ce2d9985237638abc04217f54711b4f5aa1 SHA512 53f342ebcf730e825e00219b4ea9d6ccd53b5a9fe3e0dd568327163f7ac0511c83755c32a4fb069880eb624e024d17daf2fe6413b6cf384a16ef90413143fb0d
diff --git a/www-misc/buku/buku-3.5.ebuild b/www-misc/buku/buku-3.5.ebuild
deleted file mode 100644
index e563bc99f5a3..000000000000
--- a/www-misc/buku/buku-3.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Powerful command-line bookmark manager"
-HOMEPAGE="https://github.com/jarun/Buku"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.13.1[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/py[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
-	)
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/zsh/site-functions
-	doins auto-completion/zsh/_*
-
-	newbashcomp auto-completion/bash/buku-completion.bash "${PN}"
-
-	doman buku.1
-}
-
-python_test() {
-	py.test -v tests/test_* || die
-}
diff --git a/www-misc/buku/buku-3.6.ebuild b/www-misc/buku/buku-3.6.ebuild
deleted file mode 100644
index e563bc99f5a3..000000000000
--- a/www-misc/buku/buku-3.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Powerful command-line bookmark manager"
-HOMEPAGE="https://github.com/jarun/Buku"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.13.1[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/py[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
-	)
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/zsh/site-functions
-	doins auto-completion/zsh/_*
-
-	newbashcomp auto-completion/bash/buku-completion.bash "${PN}"
-
-	doman buku.1
-}
-
-python_test() {
-	py.test -v tests/test_* || die
-}
diff --git a/www-misc/buku/buku-3.7.ebuild b/www-misc/buku/buku-3.7.ebuild
deleted file mode 100644
index dc409e690898..000000000000
--- a/www-misc/buku/buku-3.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Powerful command-line bookmark manager"
-HOMEPAGE="https://github.com/jarun/Buku"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.13.1[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/py[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/zsh/site-functions
-	doins auto-completion/zsh/_*
-
-	newbashcomp auto-completion/bash/buku-completion.bash "${PN}"
-
-	doman buku.1
-}
-
-python_test() {
-	py.test -v tests/test_* || die
-}
diff --git a/www-misc/buku/buku-4.3.ebuild b/www-misc/buku/buku-4.3.ebuild
new file mode 100644
index 000000000000..6dcf64f9dd50
--- /dev/null
+++ b/www-misc/buku/buku-4.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Powerful command-line bookmark manager"
+HOMEPAGE="https://github.com/jarun/buku"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/attrs[${PYTHON_USEDEP}]
+		>=dev-python/click-7.0[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		>=dev-python/py-1.5.0[${PYTHON_USEDEP}]
+		>=dev-python/pylint-1.7.2[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-4.2[${PYTHON_USEDEP}]
+		>=dev-python/vcrpy-4.0.2[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare() {
+	distutils-r1_python_prepare_all
+
+	# Remove support for bukuserver - complex depgraph which isn't all
+	# sufficiently packaged in Gentoo
+	sed -ie '/console_scripts/s/,.*/]/' setup.py || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/zsh/site-functions
+	doins auto-completion/zsh/_*
+
+	newbashcomp auto-completion/bash/buku-completion.bash "${PN}"
+
+	doman buku.1
+}
+
+python_test() {
+	# Explicitly enumerate tests to avoid tests that deal with bukuserver
+	py.test -v "tests/test_"{BukuCrypt,bukuDb,buku,ExtendedArgumentParser,import_firefox_json}".py" || die
+}
diff --git a/www-misc/buku/metadata.xml b/www-misc/buku/metadata.xml
index e3171793d0f6..dfaeb72ad86a 100644
--- a/www-misc/buku/metadata.xml
+++ b/www-misc/buku/metadata.xml
@@ -5,6 +5,10 @@
 		<email>davidroman96@gmail.com</email>
 		<name>David Roman</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>jchelmertt3@gmail.com</email>
+		<name>John Helmert III</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/www-misc/htdig/Manifest b/www-misc/htdig/Manifest
index 93b1fb3b26dd..4bf58f3522ff 100644
--- a/www-misc/htdig/Manifest
+++ b/www-misc/htdig/Manifest
@@ -5,5 +5,5 @@ AUX htdig-3.2.0_beta6-gcc6.patch 3673 BLAKE2B 819647e4b323f795645e7375b301559ac7
 AUX htdig-3.2.0_beta6-musl.patch 1188 BLAKE2B f481706f23d60ff5c72086c4ff9539a280f1b0cde19e834edacfbc2bec080819ecb4d087147b182aaa60cbafa639de9194ce35473f5b4ccc33516f51346894f7 SHA512 2c766f4d49e941de8c56b3858ed32d9e90efff9f43ec699cd30c0a87c19bab786e113412087a5bec698de26b4454f5df4306a95f9e16c6cd829f5ef8572ea0a3
 AUX htdig-3.2.0_beta6-quoting.patch 1130 BLAKE2B 0257d3f79e544c13f4d17caa71bf4265aa7668c91e15f5c38b502fbc50415feb6a378430af6a147f6a2e3f087ad79fc2ab426b97b6191166a1c930e7a416e2e6 SHA512 7edadb8cecb378eac8352e43ce12d5fa6af711f847f1e1ca0a49303daedffb1cef9795b74eb8cd64120e981c57c947f082f60d857985ee5ac0d54537fd6b4181
 DIST htdig-3.2.0b6.tar.gz 3104936 BLAKE2B aa70026ce6fb10910c42b4091900980c78f81fc9d07b1dec4071811aee21c6d6a67a7fbb2ca59b785c457b13b508773f8ca8f96042f23def82b071fc40b00870 SHA512 29832f4aebd2b1f944cc4d800a5202342c8ce66936980476d49f679ec169c0268a902e85cd7440a3b6bea9db0a3b640bb1a9719c680d857ff00d34590af63064
-EBUILD htdig-3.2.0_beta6-r5.ebuild 1819 BLAKE2B 9fafdd72b73cd3a592528bba9e08edf7ba176459b866e3ae80222c432abce6e864c1fa99fe49697f953ecb225b31a3028fd8d5d7dd64fe3c40c5d8dd20734117 SHA512 e64b1663751c9b31f89fd374cf597770945c0ae75c79e0b0825bf09cadb63bda399795fd209b2d44b7132317339d718d8dc447b7f5be639d988eda2f10c746bc
+EBUILD htdig-3.2.0_beta6-r5.ebuild 1820 BLAKE2B bdca1b5dac44d289efdabdd711b79ace9e961a60142ed97fb86537c7321af82fc547ee6b425509e7e82af6c2359c8c81a0b708f0a07089fd336c1948a6613e90 SHA512 019db82b791269790d2687b8eee5292770141a08e533dc59c09a5c14b21c46b5632053ecad9dacdaa034be5f275a5ef225fd910111d967b957b918bd03fecfa5
 MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
diff --git a/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild b/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild
index e7a3625bc509..46c99dd1c157 100644
--- a/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild
+++ b/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.htdig.org/files/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="libressl ssl"
 
 DEPEND="
diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index 2ccb5f70bf0d..b87ea1d39f62 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -1,8 +1,4 @@
 AUX urlwatch-2.17-fix-yaml.load.patch 675 BLAKE2B 39198576b888d72ab9a21a99430cc32e22a113104e54008301f6caa4065d0c143116e46ed217fd5661489f0759c07399e9ca4ad06d27ac781da8f5a84ef93552 SHA512 300742195fdfed34a39b22b724ae53b9ccaa27857250c91fa431a8270eeeebbfa3ce81b72f0482a5fbea1636aa5ec78a202757fce45a3b71edae4129c6cb756c
-DIST urlwatch-2.13.tar.gz 34312 BLAKE2B 6ac618d4f1f78b0a3f6d17dd2283704e8d1fc7173ce6d79fcf0f9177f48463a610a4c20d8483a4a9c22e56eca67730ef25982981f310ca8e9927e48e298a1b1d SHA512 5ca6ad3de54c2e1d63cb545ae0d213a4483ef175dad947be00994bc990d047c7aec1f3b0a8b23290672db940001a9cc31c919aa7d9c280ab4792299e2dba684c
-DIST urlwatch-2.16.tar.gz 42713 BLAKE2B bee95c808b8705135112646ed7bf42c6606d716f447394e69fbc3355d38597e44b3e94ac91c6c2304fadcc5eb7d35349e6d54601721319c39268583fa8c7c042 SHA512 ffa9245bc4b8631e3105b1afd4ed3c3f5585bc30cd56c7531f9c2d0e4d61e36b56db3a69d62f851bed5fba9c9c332034b1757d70b32f4a4b0607ae59ed6cf887
 DIST urlwatch-2.17.tar.gz 44178 BLAKE2B 46163b3305a50c3b5165da8f794c252aeb0a3581f16ba04cc1f0d920066accd02f7eba47718012e2ac0071f6bfa31019777a28840179a28a7fe365ae2e8f1d2c SHA512 635bca7e55641dd73447f5ec9ad429539decfaa8a1c19ab073c3bd46acfc518fa6012d855e0c37dd78654da28acf1446f580def611bcb85ae94fe13f567e3613
-EBUILD urlwatch-2.13.ebuild 1473 BLAKE2B cfb60223236e71e441ac5bfffaee06d7951bd063e8bad77e7f223643852a713df1dd39a330855634633217c423cfee37f76c7f4976ef1566a01127aebf62122d SHA512 528e00914c0decf662252a1d4273e0ee005e48004e97cf2ee65d1cb6056d55ca9f935543c96ae2b3429831a6abdd0d84441e49faea305296c5809af4d6dd2a13
-EBUILD urlwatch-2.16.ebuild 1558 BLAKE2B b490262a63f6cb696758c07765f26945a76d374f116fc5de3080637d26dad4848027694c3379986f0fb338a35d9c2f4db536a0055f683b9f4e666665c21faf09 SHA512 2171a809b6c9fd2a9ecdc864fae14e8085435daf83d49f3f932789151f38d87277f63fe7521e047b8ae7f07f6ef5f14e0ae7de93ad076e84efa567ca2e42f2c6
 EBUILD urlwatch-2.17.ebuild 1648 BLAKE2B 07a0573f467042a5f1e3c9b15c9275f5915e1ee088337822b3c834037a9938f5f04c3b6ef4d8c71e804ce6adf601d5c6441b0c952cf03f688247bd5e794a6a2d SHA512 85aa007e0f120be0b896aec9549162451732ddc8bf9c2b69965948d827be78f2618db4d8ff399d8dc121fe962e710951d6731f867d8a2a51cac1f25c14578d73
 MISC metadata.xml 540 BLAKE2B feb952d37175ef6a6ec17ae6ff1751d031cd14e3e8d98d5b6cdf44074c05068a1a6ce88b9447fdc0a8dec18f37f7d07232072ba81dd0ce6401a106e5e508cb92 SHA512 7c79bc952f7be46983f83c1f357f013df14d87f906df3a3e0f8690c32d296945729ebe9f95838d6a3c3c1e85b4fc8dde20b0ef12037d17967119e4cbaf652f2c
diff --git a/www-misc/urlwatch/urlwatch-2.13.ebuild b/www-misc/urlwatch/urlwatch-2.13.ebuild
deleted file mode 100644
index 59ec3ad5a552..000000000000
--- a/www-misc/urlwatch/urlwatch-2.13.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-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/keyring[${PYTHON_USEDEP}]
-	dev-python/minidb[${PYTHON_USEDEP}]
-	<dev-python/pyyaml-5[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pycodestyle[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGELOG.md README.md )
-
-python_test() {
-	nosetests test || 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
-}
diff --git a/www-misc/urlwatch/urlwatch-2.16.ebuild b/www-misc/urlwatch/urlwatch-2.16.ebuild
deleted file mode 100644
index c7dbf7344b2d..000000000000
--- a/www-misc/urlwatch/urlwatch-2.16.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-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-5[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pycodestyle[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGELOG.md README.md )
-
-python_test() {
-	nosetests -v test || 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
-}
diff --git a/www-misc/vdradmin-am/Manifest b/www-misc/vdradmin-am/Manifest
index a5cc55e3cbdf..69162daa2eba 100644
--- a/www-misc/vdradmin-am/Manifest
+++ b/www-misc/vdradmin-am/Manifest
@@ -1,3 +1,4 @@
+AUX vdradmin-3.6.10.conf 387 BLAKE2B ababdd27b66bcbcb47ea5e69774b659c2319d3c9d8756bbbfde64c738b75d0a497778a1a6b3529f118f54519ad3895bd4ec51a613d74273a11b64f8f1e8739a2 SHA512 9308c97fd5354c16ffeb8ddaf983710d4e72a443e30ade596d1f0cd3133e28173062ac30efc18e8ec8fdd0ee9747083f697bd52865624dc3e8c8d64b0d3c8cfc
 AUX vdradmin-3.6.6.conf 557 BLAKE2B d5a9991ec16a87986bb9674d1c9b2450f8b34832e45984c731b49f4bb4c55f767e353066b38aa679d78b316431d1ad5d135dedacd9050929fe570da0d9e58455 SHA512 253ad76deb8c4b5d8ca69464381a7322efa6c638bb78049db8dce3dfc44aaa9a36e37ac62d0ac945418dd4afbde573b0b11ecab3ace149c06a8ded2c4832afe6
 AUX vdradmin-3.6.6.logrotate 116 BLAKE2B 5db1b231a4a821689c8f6198e02f56e8c8dfb89c56abf6fc4630f59081d34b222f7437186b6cdb169e2a7929c26c8bf86e3f1ae037a57bffdcdb1becca4af8b6 SHA512 27d730b67210adf314c53e87fb4ba7e6ab0a1461db0f8ddb517878341badcb27531eaedc8034ba2e72572bbaa8db07c61781be6063aaee7ef63043d4d5979b98
 AUX vdradmin-3.6.7.init 1860 BLAKE2B e8e93378a56a2a2118a5a3ac0cd879690a09c5508a54d6eb0cf7e827c915df2bcbd894fc53f4eee75eaebba0826e6712fbf3a0c1975101799a0d4575b6679fbb SHA512 73a175c7ae8f233442dedc5d2d94a81a4a63d3973c4548d508496f2d99e06eeb0683f51b8621ee8cefd5111ad2240c90d7225b96fef96b15e618b21418136731
@@ -5,6 +6,7 @@ AUX vdradmind.conf 92 BLAKE2B 14d1abac4f0718dcf0679ffaab81f2d1867cdca3f3cf8534dd
 AUX vdradmind.service 278 BLAKE2B 58b7aca123f3dc6ac00eeed25a241cd4315b93abff33ef66a0a227623a5bfd6fb5c234166a55d66f0d4a7762ab0c9c720f8e2031bf52789a52edc3d07d61bfa2 SHA512 e862d5a54e0f9b1b8c3604933ccea840e1256fac49f1b93cd7c6446f9aa4f6b8371fbd8d8b767574efe2420c7141e7af0cd5578733311a94377db8797de32b28
 DIST vdradmin-am-3.6.10.tar.bz2 606665 BLAKE2B c475b36c840548b6e0d50b2095ce3278b0b526af856c891a25d28bb2f0cb9f950aa9979533a6b6425a2a36a594dc5d6a075fca7713eb1f59071fec854582cf5b SHA512 f7546f79b786ca383c0846656e74bd69dc9faf57fe5794ffd68776123497ec2a96c2f131801e3d5d19247ac36eaa896801e1ac9cd11291418abb518ba208e597
 DIST vdradmin-am-3.6.9.tar.bz2 562006 BLAKE2B d04d7c0c3254942a388fe0f7b9832fb83f5b6c36af8e9021da8b1e5480d0a507c14da3b55590ea3ba4f58e58c7de9f36cc2a3c5f94168be605477244f62da987 SHA512 1c84ce56da238db6ab2a2fc3d59582945440436e174b3998c21b6bcb5b99c914a195728aa24fef7de8841c3be09b6e9976497acd873e768aab5fdaacddd473d5
+EBUILD vdradmin-am-3.6.10-r1.ebuild 4745 BLAKE2B ae6dcfccc5c4ee3bb42f860cb576dc952086c45cb8418bcedae3e3bcdeb99b630754a8cf1f5bbc380d386fa3df7349839fdc04a30d265934a69ecce0a37f77d2 SHA512 4af9d07e394a6e243c88718f73747282d69e60b6d40045d5364d9fda02d860709572ab252b3954f285dc0f0c4d9df417dbaefd9d8290d81e28239e8c02564374
 EBUILD vdradmin-am-3.6.10.ebuild 4768 BLAKE2B cbddb51256653c55a36ffbfab055bf6deb93eba83b1ccafa01c98bd4d8e0237a6b0cf441894281e90d05839098384193666ee9b5a650b87d928cbf420d1f0308 SHA512 cbfe87316898d2cafd01dfb8f3bd681310a80383061c9966d0fc0a246a19cbd1894f7904a2ff94280e17dc148ec1b48c74e71a5475aaa758dacc46f00330b828
 EBUILD vdradmin-am-3.6.9-r3.ebuild 4730 BLAKE2B bdc97dd0b5be9bbf0977c9fd687c9260c14831278e43dbb2ea26a00cb4f494b48ba5571a03b3e049340d381df6beb2891b5c62c9752e0e6dacdda5cf5df72e0a SHA512 69a1ce6c895f45b2b738375bcf14501fb1771f72fbf794b99019398599ed9d553402abb17e7488822cf847440939afa644ab7ce81fdd9d21a2971a91c01d849a
 EBUILD vdradmin-am-3.6.9.ebuild 4315 BLAKE2B b69fc3e119c2ed3eaf70898515b9612012ab3fbd68395eb9c50b59dc8904293f3fd83988db6f0f6d97f47641f0b85787a01547d566dd26ad9b60f7024481c407 SHA512 1ab55053c9eefd90ca28a5cd7659e6da9cb56c1178a1fffff7e7b9a111ec8b1b0ad3631d29c0206c6ddf1996b2ccd7265b62ef5621269056d566930f063499c3
diff --git a/www-misc/vdradmin-am/files/vdradmin-3.6.10.conf b/www-misc/vdradmin-am/files/vdradmin-3.6.10.conf
new file mode 100644
index 000000000000..1895b9c51dd8
--- /dev/null
+++ b/www-misc/vdradmin-am/files/vdradmin-3.6.10.conf
@@ -0,0 +1,19 @@
+# Settings for vdradmin-am
+
+# Use ssl connection
+# Allowed values: yes no
+# SSL using will disable non SSL connections
+#SSL=no
+
+# Use the ipv6 protocol [EXPERIMENTAL]
+# Allowed values: yes no
+#IPV6=no
+
+# Enable Logging
+# Allowed values: syslog file no
+# Setting this value to file will log to /var/log/vdradmin/vdradmind.log
+#LOGGING=no
+
+# Set loglevel
+# Allowed values: 0-7
+#LOGLEVEL=4
diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild
new file mode 100644
index 000000000000..0e82c2c70929
--- /dev/null
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit ssl-cert systemd
+
+DESCRIPTION="WWW Admin for the Video Disk Recorder"
+HOMEPAGE="http://andreas.vdr-developer.org/vdradmin-am/index.html"
+SRC_URI="http://andreas.vdr-developer.org/vdradmin-am/download/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ipv6 ssl"
+
+DEPEND="acct-group/vdradmin
+	acct-user/vdradmin
+	dev-lang/perl
+	dev-perl/Template-Toolkit
+	dev-perl/libwww-perl
+	dev-perl/URI
+	dev-perl/CGI
+	dev-perl/Locale-gettext
+	virtual/perl-IO-Compress
+	ipv6? ( dev-perl/IO-Socket-INET6 )
+	ssl? ( dev-perl/IO-Socket-SSL )
+	virtual/perl-libnet
+	dev-perl/Authen-SASL
+	dev-perl/Digest-HMAC"
+RDEPEND="${DEPEND}"
+
+ETC_DIR="/etc/vdradmin"
+CERTS_DIR="/etc/vdradmin/certs"
+LIB_DIR="/usr/share/vdradmin"
+VDRADMIN_USER="vdradmin"
+VDRADMIN_GROUP="vdradmin"
+
+create_ssl_cert() {
+	# The ssl-cert eclass is not flexible enough, so do some steps manually
+	SSL_ORGANIZATION="${SSL_ORGANIZATION:-vdradmin-am}"
+	SSL_COMMONNAME="${SSL_COMMONNAME:-`hostname -f`}"
+
+	gen_cnf || return 1
+
+	gen_key 1 || return 1
+	gen_csr 1 || return 1
+	gen_crt 1 || return 1
+}
+
+src_unpack() {
+	unpack ${A}
+	cp "${FILESDIR}"/vdradmind.service "${WORKDIR}"/vdradmind.service
+}
+
+src_prepare() {
+	default
+
+	sed -i vdradmind.pl \
+		-e "s-FILES_IN_SYSTEM    = 0;-FILES_IN_SYSTEM    = 1;-g" || die
+
+	if use ipv6; then
+		sed -e "s:/usr/bin/vdradmind:/usr/bin/vdradmind --ipv6:" \
+			-i "${WORKDIR}"/vdradmind.service || die
+	fi
+
+	if use ssl; then
+		sed -e "s:/usr/bin/vdradmind:/usr/bin/vdradmind --ssl:" \
+			-i "${WORKDIR}"/vdradmind.service || die
+	fi
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/vdradmin-3.6.7.init vdradmin
+	newconfd "${FILESDIR}"/vdradmin-3.6.10.conf vdradmin
+
+	systemd_dounit "${WORKDIR}"/vdradmind.service
+	systemd_dotmpfilesd "${FILESDIR}"/vdradmind.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/vdradmin-3.6.6.logrotate vdradmin
+
+	newbin vdradmind.pl vdradmind
+
+	insinto "${LIB_DIR}"/template
+	doins -r "${S}"/template/*
+
+	insinto "${LIB_DIR}"/lib/Template/Plugin
+	doins -r "${S}"/lib/Template/Plugin/JavaScript.pm
+
+	insinto /usr/share/locale/
+	doins -r "${S}"/locale/*
+
+	newman vdradmind.pl.1 vdradmind.8
+
+	dodoc CREDITS ChangeLog FAQ HISTORY INSTALL README* REQUIREMENTS
+	docinto contrib
+	dodoc "${S}"/contrib/*
+
+	keepdir "${ETC_DIR}"
+	fowners "${VDRADMIN_USER}":"${VDRADMIN_GROUP}" "${ETC_DIR}"
+
+	use ssl && keepdir "${CERTS_DIR}" && \
+	fowners "${VDRADMIN_USER}":"${VDRADMIN_GROUP}" "${CERTS_DIR}"
+}
+
+pkg_preinst() {
+	install -m 0644 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} /dev/null \
+		"${ED}"${ETC_DIR}/vdradmind.conf || die
+
+	if [[ -f "${EROOT}"${ETC_DIR}/vdradmind.conf ]]; then
+		cp "${EROOT}"${ETC_DIR}/vdradmind.conf \
+			"${ED}"${ETC_DIR}/vdradmind.conf || die
+	else
+		elog
+		elog "Creating a new config-file."
+		echo
+
+		cat <<-EOF > "${ED}"${ETC_DIR}/vdradmind.conf
+			VDRCONFDIR = "${EROOT}"/etc/vdr
+			VIDEODIR = "${EROOT}"/var/vdr/video
+			EPG_FILENAME = "${EROOT}"/var/vdr/video/epg.data
+			EPGIMAGES = "${EROOT}"/var/vdr/video/epgimages
+			PASSWORD = gentoo-vdr
+			USERNAME = gentoo-vdr
+		EOF
+		# Feed it with newlines
+		yes "" \
+			| "${ED}"/usr/bin/vdradmind --cfgdir "${ED}"${ETC_DIR} --config \
+			|sed -e 's/: /: \n/g'
+
+		[[ ${PIPESTATUS[1]} == "0" ]] \
+			|| die "Failed to create initial configuration."
+
+		elog
+		elog "Created default user/password: gentoo-vdr/gentoo-vdr"
+		elog
+		elog "You can run \"emerge --config ${PN}\" if the default-values"
+		elog "do not match your installation or change them in the Setup-Menu"
+		elog "of the Web-Interface."
+	fi
+}
+
+pkg_postinst() {
+	if use ipv6; then
+		elog
+		elog "To make use of the ipv6 protocol"
+		elog "you need to enable it in ${EROOT}/etc/conf.d/vdradmin"
+	fi
+
+	if use ssl; then
+		elog
+		elog "To use ssl connection to your vdr"
+		elog "you need to enable it in ${EROOT}/etc/conf.d/vdradmin"
+
+		if [[ ! -f "${EROOT}"${CERTS_DIR}/server-cert.pem || \
+			! -f "${EROOT}"${CERTS_DIR}/server-key.pem ]]; then
+			create_ssl_cert
+			local base=$(get_base 1)
+			install -D -m 0400 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} \
+				"${base}".key "${EROOT}"${CERTS_DIR}/server-key.pem || die
+			install -D -m 0444 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} \
+				"${base}".crt "${EROOT}"${CERTS_DIR}/server-cert.pem || die
+		fi
+	fi
+
+	elog
+	elog "To extend ${PN} you can emerge"
+	elog "media-plugins/vdr-epgsearch to search the EPG,"
+	elog "media-plugins/vdr-streamdev for livetv streaming and/or"
+	elog "media-video/vdr with USE=\"liemikuutio/vasarajanauloja/none\" "
+	elog "(depend on your vdr version) to rename recordings"
+	elog "on the machine running the VDR you connect to with ${PN}."
+}
+
+pkg_config() {
+	"${EROOT}"/usr/bin/vdradmind -c
+}