gentoo resync : 15.12.2019

27 files changed, 297 insertions, 63 deletions

diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 7f8999578a46..72ec60a939dc 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/awstats/Manifest b/www-misc/awstats/Manifest
index 1edd69a186fc..a8048b3d381e 100644
--- a/www-misc/awstats/Manifest
+++ b/www-misc/awstats/Manifest
@@ -3,7 +3,7 @@ AUX awstats-perl-5.22.patch 1981 BLAKE2B 7198b110b2688a989aeecd8ddeb364ab485e615
 DIST awstats-7.1_p20121017.tar.gz 1258135 BLAKE2B 0a43154d044346acdf4e71e96b05f9b8914d0df8a3812c6a20edb33a0b9d8b6f0aadc065466f1ee23c0469e41eda9622c380bd35c579b887a6547fd6749e9bd4 SHA512 171ff3118955c8b73c968a23983885d967632d2c6e95a45f71e5f6fea74afe34d869c9cc901e2e739419068babc96385d7d7df1e8ca10074be7388fbe5c51f53
 DIST awstats-7.4.tar.gz 2936102 BLAKE2B 2bc7f9619e4d6b13d3909869d642c347d6b9cddbbb3b49d58494ce108c8fe25d59b27198d5a42f8b81c06fdaf1a2e135c82883ec8604e53c6c5adbac07223b66 SHA512 5bce97c71aabeab35e4ff5e5168531e4955d7c1474322c7b4a47d1d06e06ebd0e74d1def73826498e6253f24aeca99309777617b7a914685c927bb6e1c020e1a
 DIST awstats-7.5.tar.gz 2936644 BLAKE2B 666e4d50e8011315351e1aff538ec56507c5bc8e4fb4890c29aee1f73985b8466f346982a6022ae1689e30d587b21ee0f2038f46783e4f25454dfa6e5fe39771 SHA512 d69a66b5ef94d8a7378ece0453a3617f71ad030d81c45cff926fae1319eacdcdcbe2e68513153cd7444d77cbb950827964b0157ce74c04be76781c071f016a35
-EBUILD awstats-7.1_p20121017.ebuild 3335 BLAKE2B 4bbeeeaf68ab3930a0e1c836453a28eee9cadfe5273523f8004d03c04a6bdefe625811b8a8472ee8d9065a85f46eabaa74ac4679ce51089f287e71ad49c45c9e SHA512 74fdff6cf6df0bc552f37a999594237205046cded90780c718e70ce15fcc797df05875cff8899a9bbe24f5f65817c8c14d2f17a6815a2f34950edffe045b5a17
-EBUILD awstats-7.4.ebuild 3378 BLAKE2B 9b96bd6c41ecd000b811dc80f98d7736f74b1ff630e7cf9d6c6ccb1de8cece1115c168a95fb9d129541d859dac41d9d17759c318ce98da9194c89468acdaa20a SHA512 6e66923a9e6f6ea6449584d55039299da0b913fcf7e7c20b395eb5be64bb62e1172e351a62592f4bef0d62facd15095548c96b824b84e8de013de01e1f7d6e75
-EBUILD awstats-7.5.ebuild 3368 BLAKE2B ce32b2b1d0175a4188af5e73082784863ba7ecf811932c7fdbddab99cbbffa66e21168f13b4a71660729f69d04aa7d629815bd1b95264af42f46eeeba99089e0 SHA512 4ce90a7349112747b85de9622c0553a72fc3c6dd5a448b29b5780896af24b5f18171447d88347b3421d104b2a7ae5aa3ae0f879e9e57d469a7e35ae479c784b6
+EBUILD awstats-7.1_p20121017.ebuild 3328 BLAKE2B 93261899da03ea1af0f9d66ed55319bbeb40603b6e4865faca8bff641ba4c59a9e9cd5da43e3935ebc1d7aec26ed0e58a98641d2009481aa1737408f377be694 SHA512 61e61c366423e23a3bf93082dd96dd8090b055d9656a68de4fcb01526c1d50c78184b525dda4beb17d29c635e00ea4446c3c702ddbbcfa57217000a36b120d44
+EBUILD awstats-7.4.ebuild 3371 BLAKE2B 8f63483d519115fd14848035cc031cea90e41b8b2ab860b4a248b9bc5f8e20677c6bc63c24aa5e4809c47c745a6caa9e89046ec63433ac1ae8f81afcdecc9c53 SHA512 ceec39ac5af01bd18d232b38a0074366199d8b815c4543c03b4baebb25f6c707227d6688d0a4da6c3967676d7fe6eb550f79d5621f75eba30e021e40d30b5c7f
+EBUILD awstats-7.5.ebuild 3361 BLAKE2B bf1461352c0ca0a3bad65c3783de83e37c0246ae07ad3ae93ca17af6863e0e37f445a73d242bcd45c158662758a05db3841d816b5dce67963f3caee5f9b766af SHA512 3831b265c5571c538e572840c4a8486840bb6ccb336737e33b6cfa69a96e57be3be5a87000237fa66f4ebb6ef084307be6220f995499ebec5d62cf9e3bc46a9b
 MISC metadata.xml 254 BLAKE2B 53495a638333fedaee2d8d838a705aaa610797eae56298aa35ad3c965af321b3d8e9b12643d1c3564f4232ca4a7ec44182ee7b35aada373750beee6b1c2a8a12 SHA512 b4674c7f9d0dc24c25846b3fe716415b648a61099b8d2f7eb099cf14f9a8f4670af4638349f953fe1b32b9d357911e533b72eaf4bbf14f54827512fd9bbb0ee8
diff --git a/www-misc/awstats/awstats-7.1_p20121017.ebuild b/www-misc/awstats/awstats-7.1_p20121017.ebuild
index d9163b128103..2257b4cdf060 100644
--- a/www-misc/awstats/awstats-7.1_p20121017.ebuild
+++ b/www-misc/awstats/awstats-7.1_p20121017.ebuild
@@ -92,7 +92,7 @@ src_install() {
 	newbin maillogconvert.pl awstats_maillogconvert.pl
 	newbin urlaliasbuilder.pl awstats_urlaliasbuilder.pl
 
-	dosym ../share/awstats/wwwroot/cgi-bin/awstats.pl /usr/bin/awstats.pl || die
+	dosym ../share/awstats/wwwroot/cgi-bin/awstats.pl /usr/bin/awstats.pl
 }
 
 pkg_postinst() {
diff --git a/www-misc/awstats/awstats-7.4.ebuild b/www-misc/awstats/awstats-7.4.ebuild
index b915d62d25db..bac4b390c7bb 100644
--- a/www-misc/awstats/awstats-7.4.ebuild
+++ b/www-misc/awstats/awstats-7.4.ebuild
@@ -93,7 +93,7 @@ src_install() {
 	newbin maillogconvert.pl awstats_maillogconvert.pl
 	newbin urlaliasbuilder.pl awstats_urlaliasbuilder.pl
 
-	dosym ../share/awstats/wwwroot/cgi-bin/awstats.pl /usr/bin/awstats.pl || die
+	dosym ../share/awstats/wwwroot/cgi-bin/awstats.pl /usr/bin/awstats.pl
 }
 
 pkg_postinst() {
diff --git a/www-misc/awstats/awstats-7.5.ebuild b/www-misc/awstats/awstats-7.5.ebuild
index 8e7b28821a6b..b53c2ad5ba11 100644
--- a/www-misc/awstats/awstats-7.5.ebuild
+++ b/www-misc/awstats/awstats-7.5.ebuild
@@ -97,7 +97,7 @@ src_install() {
 	newbin maillogconvert.pl awstats_maillogconvert.pl
 	newbin urlaliasbuilder.pl awstats_urlaliasbuilder.pl
 
-	dosym ../share/awstats/wwwroot/cgi-bin/awstats.pl /usr/bin/awstats.pl || die
+	dosym ../share/awstats/wwwroot/cgi-bin/awstats.pl /usr/bin/awstats.pl
 }
 
 pkg_postinst() {
diff --git a/www-misc/buku/Manifest b/www-misc/buku/Manifest
index 68191cc3f861..c3e8acf45843 100644
--- a/www-misc/buku/Manifest
+++ b/www-misc/buku/Manifest
@@ -1,7 +1,7 @@
 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 1050 BLAKE2B 390057e137c762244ddbd699550412503143c13faeda856d434fbaacd25339d6c193086f460bfbd525402d878eb90166789cbe2a549b3a76ac37d50ce4855ea8 SHA512 792e2331f1ef77dc973682dacb54762f5bc9f526162823078212cbae4c969fea44fa671bc8a785f3fd47a68421eeb685bae4b5d52e18916bdd510112f912925e
-EBUILD buku-3.6.ebuild 1050 BLAKE2B 390057e137c762244ddbd699550412503143c13faeda856d434fbaacd25339d6c193086f460bfbd525402d878eb90166789cbe2a549b3a76ac37d50ce4855ea8 SHA512 792e2331f1ef77dc973682dacb54762f5bc9f526162823078212cbae4c969fea44fa671bc8a785f3fd47a68421eeb685bae4b5d52e18916bdd510112f912925e
-EBUILD buku-3.7.ebuild 1003 BLAKE2B 7014afc40d046d7d7f14736c5090bfada86d0292c120ee7f3abf33a8c2d492d3428a10beeeb25f3539853328684cd5dd003ae02c1988e8a548b2dd087584dd47 SHA512 6b41ed965b0cc0e9f2a77bd604fd615555b974e5faf3e4b0d731da2fe4e13f6bd8438c35326c3de6eb13193d4f8ccf70c2471c34b3345cdd8c74b2ca24ad1a15
+EBUILD buku-3.5.ebuild 1077 BLAKE2B d2a9c133f184f0d83adfa9a52cda15ca4d6eb557e96026f36db919ab728924e7a8da1518793f24ce92a47e443e934923e88fe336713f54af8da55d2d5fc0eaa6 SHA512 b9713e51c9d26ddbe4beffc4d7d36d74e0afbdf63d0fb6dd557e4ba5afc70c313857a68cc77973ac377ed05f60a8904452e2b7a796cd89ea8bfc0172c54a0ceb
+EBUILD buku-3.6.ebuild 1077 BLAKE2B d2a9c133f184f0d83adfa9a52cda15ca4d6eb557e96026f36db919ab728924e7a8da1518793f24ce92a47e443e934923e88fe336713f54af8da55d2d5fc0eaa6 SHA512 b9713e51c9d26ddbe4beffc4d7d36d74e0afbdf63d0fb6dd557e4ba5afc70c313857a68cc77973ac377ed05f60a8904452e2b7a796cd89ea8bfc0172c54a0ceb
+EBUILD buku-3.7.ebuild 1030 BLAKE2B 1aefe56ed6c1fda9d0a98ed9dc95958c9dfbadeebff1c56780ab61b3402917fa5bea5579f1d42b0edadd8799d641aceba36e785c82b2e567fbdb72ca3d500e3d SHA512 76c610316e15dd2242b98a1d1ed2296aaacd88ba02fdf94c4df7142ecfa0cebb1fbdb19060c504385e36ea8c640832feffd7605ef6ce2e43d090119a85834f96
 MISC metadata.xml 441 BLAKE2B 93ab0c34611cf0762ce76f03634d649ab3a7c0d9c3bdbcdcbd3dad1f228f72b522df12eae7731689d7848a7ad647330bfc26202fd8099ac57e98ce73bf1bf6cc SHA512 5f00313957370e1b01d486b6712b232b33bc408884a627df3ba337197208c08cdb8c334699993b65afb2ff598ca7c7c857622442dd46bcd8e3411493b6599f7b
diff --git a/www-misc/buku/buku-3.5.ebuild b/www-misc/buku/buku-3.5.ebuild
index 4c586ac6b8d0..f4547b52f7d7 100644
--- a/www-misc/buku/buku-3.5.ebuild
+++ b/www-misc/buku/buku-3.5.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
diff --git a/www-misc/buku/buku-3.6.ebuild b/www-misc/buku/buku-3.6.ebuild
index 4c586ac6b8d0..f4547b52f7d7 100644
--- a/www-misc/buku/buku-3.6.ebuild
+++ b/www-misc/buku/buku-3.6.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
diff --git a/www-misc/buku/buku-3.7.ebuild b/www-misc/buku/buku-3.7.ebuild
index 5534cfafa74e..c75dcf65081c 100644
--- a/www-misc/buku/buku-3.7.ebuild
+++ b/www-misc/buku/buku-3.7.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
diff --git a/www-misc/mergelog/Manifest b/www-misc/mergelog/Manifest
index 00f50504dc38..2d564159bb65 100644
--- a/www-misc/mergelog/Manifest
+++ b/www-misc/mergelog/Manifest
@@ -1,5 +1,5 @@
 AUX mergelog-4.5-asneeded.patch 1106 BLAKE2B f125b2f5604202ddcbc03656c4086532672306d3d5780c65c816dd249e29ce5944d4a8da80a316344b881166a43215047159d511712f1dc3a2c855cf61ccf4b9 SHA512 88c6e44645b41d84e67e4973dede40e550ea64b8d98490eed4c55b8240e3cecbedcf6697b5b73264e5358f3c4eea11cf2534f9588c0bf638d288678e60f8f5fa
 AUX mergelog-4.5-splitlog.patch 13678 BLAKE2B 9d6a020d492edfacce955087e165254708547c800da25cb70d338ec190b7431473068e32fee3acb8798a6f0b09134af0f7668cf9ac01de5026fd84c999ac8348 SHA512 1d3b104e0ea27e41227cf903196a1cdbd4f362a85f9aabe95ea2a648dcc3db5378dc0a64c06b406237c88db91ac8cd63b73bce32de3a80bd44b14f5cf24de803
 DIST mergelog-4.5.tar.gz 39407 BLAKE2B ea51ab27a4a76e635b3a364854cb488ef5b88878a5cb5118443f14658661157c4a8cf601f945e8869614b0205ff71f89d8d8e0b80815a2671ba497e740d6d01a SHA512 f2259cb8981871c1f9d7cadc5414997789aa13eed0e18701673ffbddedc74954e137e282c1357cafaf515e18b39e256f890ec31568a305feefa1089a9347991f
-EBUILD mergelog-4.5-r2.ebuild 553 BLAKE2B d24c4fc9fc34f77e4bf9faa10b507400ef8cb03aff2e501c5b76088de2062155bff2ade0ca6f4f61a5d3507e28f3412f87365631b7994da290c8dfbb30983b29 SHA512 c88404e2cb413c57f6802756c31d4b53d4073df9e68735b9bd78004f00e1991cdb283648f8e570db48c6c23fec613d3bb52c342fc39f31b7d4b5f018d385c595
+EBUILD mergelog-4.5-r2.ebuild 526 BLAKE2B 52674bc3341aa9d74a80fa815263aafef02c7dcbccd907c64cb2d5ea43de695d89670c74462d8c7622c000c666430d3cc448fdb5d34eaf643c45d43f23cf7546 SHA512 e77a5320c9a304b0e20094b4086c7a2ee619cf134dfea17f1348de08a9aadde2c678a9ffa207815afb6913c77921da0fe6f030c458af990b96b4495b2685e64d
 MISC metadata.xml 588 BLAKE2B b1b0444cee23d8cb7dab856ca462529046683b0a3987f490fda2e0a4e5db796eda47e61f164f7af277d87f771657f3bdf62c400179f2fb97751628102a79be6d SHA512 8301f5e4da25f389e6d3c26bad59c5170c6f971f56b79cd62786cb6fba287e9b3d865f648c04ae4ab22a40fb2815ca69ad36afd917b92d0bab97cd75cbfa41ca
diff --git a/www-misc/mergelog/mergelog-4.5-r2.ebuild b/www-misc/mergelog/mergelog-4.5-r2.ebuild
index 936acbb1f570..8872f3141239 100644
--- a/www-misc/mergelog/mergelog-4.5-r2.ebuild
+++ b/www-misc/mergelog/mergelog-4.5-r2.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils eutils
+inherit autotools
 
 DESCRIPTION="A utility to merge apache logs in chronological order"
-SRC_URI="mirror://sourceforge/mergelog/${P}.tar.gz"
 HOMEPAGE="http://mergelog.sourceforge.net"
+SRC_URI="mirror://sourceforge/mergelog/${P}.tar.gz"
 
 IUSE=""
 SLOT="0"
@@ -18,8 +17,12 @@ KEYWORDS="amd64 ppc x86"
 RDEPEND="sys-libs/zlib"
 DEPEND="${DEPEND}"
 
-DOCS=( AUTHORS ChangeLog README)
 PATCHES=(
 	"${FILESDIR}"/${P}-splitlog.patch
 	"${FILESDIR}"/${P}-asneeded.patch
 )
+
+src_prepare() {
+	eapply_user
+	eautoreconf
+}
diff --git a/www-misc/nx_util/Manifest b/www-misc/nx_util/Manifest
index 919e33bc3cb6..40eac1a1d3f5 100644
--- a/www-misc/nx_util/Manifest
+++ b/www-misc/nx_util/Manifest
@@ -3,4 +3,4 @@ DIST ngx_http_naxsi-0.52-1.tar.gz 162044 BLAKE2B 59944e8aff454f8b2b7eb5d548a7c4a
 DIST ngx_http_naxsi-0.53-1.tar.gz 165627 BLAKE2B faef43290a629e3e7b05b0135d50eeb6ad44edfef330b81a7655ad416066aa86e00f75713108d22d874a10a069ac8962c3182bb6647dfa35673857c331e99747 SHA512 33e3a92242304f4e5900cb66915651f1c5ba78f40b27f41c1d81353390ef6baef5a6a03042441c200d4e489e70f251d782efe0644b916a2ff34833be8a8fd385
 EBUILD nx_util-0.52.1.ebuild 929 BLAKE2B 2fe9540db4037a9e4b89bd32a5ed7e55ed1940240eb233f714fd1f7081046f857c086586ef7254a5eccf506547834b28ef0101d329176f259a41da9a298098a4 SHA512 fe52b5b0989304dce76cf3b617fa2107d104adad72f12cd1b724447e2ab8edd7244a709f63218ce7d86ad65d00a1e54759b85af7b04850766a3a529dbeb399b0
 EBUILD nx_util-0.53.1.ebuild 930 BLAKE2B c18a1b6ee2dcbfe7f62c9cc295d64255cc96b5b94702ef1fd2252419d58a9b9854b517b9e89c6f407cefabe5ec48ad677ce7aa9d60c284b283564dfb89bfb5f4 SHA512 b788feea8d7f795c96fcac71198421017e6a3f4a81b19e08de80385bea9bff66659a69371ca59a40a0918c817c92bf0ec6e1bc78b0d4a2cc83155cc77c20d7a0
-MISC metadata.xml 381 BLAKE2B b49ff81972fb6b059efdceca3e4721e0420fcfc6c611576645248d280e38cbd25f14a1b7a7ebecd97060266288e5341d5af89ee4ad048697dad57e728478deda SHA512 9da7d67a3663f7ab3bc28cfa880d60a8ad70706a106dc00d181146b099e550f1c66940113c9c26f52b0639e7013407eafd9ee58d53f41a55f1330eb203d345f5
+MISC metadata.xml 298 BLAKE2B d3c6dc34d4282606472964558199b03b43d8ef3cdff4eeff99763a82360e424fcc8b288f491684ef6e5ca07de103fe313e67d91038f89d1c8af5cafda3a229b2 SHA512 8443ac0b92ff6aa0e3cfa64b3c880539ef35eb54672dc6cf0b9b51d75b6ecd357701850350d6a102786cf8ed98cae84fe76e296def40bcd4aea22113a945d74f
diff --git a/www-misc/nx_util/metadata.xml b/www-misc/nx_util/metadata.xml
index ac4aa6c210b4..57bdd9e71c0d 100644
--- a/www-misc/nx_util/metadata.xml
+++ b/www-misc/nx_util/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dev-zero@gentoo.org</email>
-		<name>Tiziano Müller</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">naxsi</remote-id>
 		<remote-id type="github">nbs-system/naxsi</remote-id>
diff --git a/www-misc/shellinabox/Manifest b/www-misc/shellinabox/Manifest
index 849fa28d2ac4..37ca6ac63074 100644
--- a/www-misc/shellinabox/Manifest
+++ b/www-misc/shellinabox/Manifest
@@ -1,6 +1,9 @@
-AUX shellinaboxd.conf 3564 BLAKE2B 82b42901c93e64b2f6f950af13a628c35a50b076c394e73132e32725fb9fe3d8e4d2a607688adb4f512838f2996b7945aee72a4a545d5a4169b4bdd815c36e55 SHA512 62c29e61a9fb332660806210533d30cdbd473f7c8acba9d1bb7d1960013920962f23b4af5e98b0ccc8a05a6ebfb6907f77b2c26ef3f8d5dee8fb23d2d074681a
-AUX shellinaboxd.init 1673 BLAKE2B 1489e72db618f71708cec4f576ca56fc7623b80bf5538b51578712f1c04365edc8957d34bce45acd0e083f30c24eb5f551bda5bc581fd880375b4e508be8bd26 SHA512 7fc79a4a7633c452277ebcfb871ce34f4f3350beae863ad0cf5540ca12c9c8f33367cedddd8777eb1ea75d3ef7816935ef176d8eefac700b3e2917d11bfd280b
+AUX shellinaboxd.conf 3474 BLAKE2B 873c0ea46b81bac7c78f08da2d566099bbf26973f6e6b1ca1d3f4a0926b9971c282f48c65b9db30b445d8185d2273a4795c208e104903c94ad55953ffd1ad18b SHA512 7bd213a7f58bbf3aab29a77b31d3c29a7b885bacb23782ede738e1afbebb4d2dab9de30245ca0493652f3d487882b7332d6ed1a932df2a643dc91da75e3f9fac
+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 39197dae01645b3f3fbaf0fbb1c46b4f3c5fcd960fb32c146af70daf2ca37a12e248f490f9d952b448ffd851121a38754f074efa39f97b12a47b6d25684c6a08 SHA512 325d00ec3c11c089550e72aaf31bc5bc6b60593348666f863d7cdfda6766b85f92f97ed77cc319b041779683d17d410c4628e0b635d45cb1e44dcd566df75233
+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
 MISC metadata.xml 526 BLAKE2B 35b2638ace4b739a89974a6d9fcff93530172088c5a8ec49bff2f9949fd44220aeb8d1bffbed2d56b0550963625e99d52582926741517e612269495ca88242e8 SHA512 c9986b020184cb4393a1934b30dc2fce77ef6e926bd3f1f2f474adc201ae8302fe759c2b64e2775506b3ec0a097f10891490c39b9928359f31886d7818c8b64d
diff --git a/www-misc/shellinabox/files/shellinaboxd.conf b/www-misc/shellinabox/files/shellinaboxd.conf
index 3c34ab08f5e9..d80ecd0250d2 100644
--- a/www-misc/shellinabox/files/shellinaboxd.conf
+++ b/www-misc/shellinabox/files/shellinaboxd.conf
@@ -1,5 +1,5 @@
 # conf.d file for shellinaboxd
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Options available (copied from the man page):
@@ -26,8 +26,8 @@ SIAB_CSS_DIR="/usr/share/shellinabox-resources"
 # 
 # The administrator should make sure that there are matching certificates for
 # each of the virtual hosts on this server, and that there is a generic certifi‐
-# cate.pem file.                                                                                                                                                       
-# 
+# cate.pem file.
+
 # If no suitable certificate is installed, shellinaboxd will attempt to invoke
 # /usr/bin/openssl and create a new self-signed certificate. This only
 # succeeds if, after dropping privileges, shellinaboxd has write
@@ -41,7 +41,7 @@ SIAB_CSS_DIR="/usr/share/shellinabox-resources"
 #
 SIAB_CERT_DIR="/etc/shellinabox/cert"
 
-# By default, shellinaboxd redirectes all incoming HTTP requests to their
+# By default, shellinaboxd redirects all incoming HTTP requests to their
 # equivalent HTTPS URLs. If promoting of connections to encrypted SSL/TLS
 # sessions is undesired, this behavior can be disabled.
 # 
@@ -49,7 +49,7 @@ SIAB_CERT_DIR="/etc/shellinabox/cert"
 # intranets, if SSL certificates are unavailable.
 #
 # SIAB_DISABLE_SSL and SIAB_CERT_DIR are mutually exclusive options.
-#
+
 # Add this option to SIAB_OPTS if you don't want SSL support.
 SIAB_DISABLE_SSL="--disable-ssl"
 
@@ -65,10 +65,13 @@ SIAB_GROUP="shellinaboxd"
 # Default service to launch
 SIAB_SERVICE="/:LOGIN"
 
+# SIAB log file.
+SIAB_LOGFILE="/var/log/shellinabox.log"
+
 # Do not add both SIAB_CSS_DIR or SIAB_CERT_DIR to SIAB_OPTS.
 
 # Default setup turns off SSL.
-SIAB_OPTS="${SIAB_DISABLE_SSL} --port=${SIAB_HTTP_PORT} --user=${SIAB_USER} --group=${SIAB_GROUP} --service=${SIAB_SERVICE}"
+SIAB_OPTS="${SIAB_DISABLE_SSL} --port=${SIAB_HTTP_PORT} --user=${SIAB_USER} --group=${SIAB_GROUP} --service=${SIAB_SERVICE} --verbose"
 
 # Uncomment this line to activate SSL.
 # SIAB_OPTS="--cert=${SIAB_CERT_DIR} --port=${SIAB_HTTP_PORT} --user=${SIAB_USER} --group=${SIAB_GROUP} --service=${SIAB_SERVICE}"
diff --git a/www-misc/shellinabox/files/shellinaboxd.init b/www-misc/shellinabox/files/shellinaboxd.init
index 657a137a5c6b..11c50d437914 100644
--- a/www-misc/shellinabox/files/shellinaboxd.init
+++ b/www-misc/shellinabox/files/shellinaboxd.init
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 my_daemon="shellinaboxd"
@@ -33,7 +33,7 @@ start_pre() {
             SIAB_CSS_FILES+=("\"${_NAME}\":-${_CSS}")
         done
 
-        # The 1st one, which the default one, must be turned on using a + sign.
+        # The 1st one, which is the default one, must be turned on using the + sign.
         SIAB_CSS_FILES[0]=$(sed 's#:-#:+#' <<< ${SIAB_CSS_FILES[0]})
 
         command_args="${command_args} --user-css=$(my_join , "${SIAB_CSS_FILES[@]}")"
@@ -50,6 +50,7 @@ start() {
         --pidfile ${pidfile} \
         --make-pidfile \
         --exec ${command} \
+        -1 ${SIAB_LOGFILE} -2 ${SIAB_LOGFILE} \
         -- ${command_args}
     eend $?
 }
diff --git a/www-misc/shellinabox/shellinabox-2.20-r1.ebuild b/www-misc/shellinabox/shellinabox-2.20-r1.ebuild
index 402d2b3c081b..0fd76e1f2e61 100644
--- a/www-misc/shellinabox/shellinabox-2.20-r1.ebuild
+++ b/www-misc/shellinabox/shellinabox-2.20-r1.ebuild
@@ -66,7 +66,7 @@ src_install() {
 	newinitd "${FILESDIR}/${SIAB_DAEMON}.init" "${SIAB_DAEMON}"
 	newconfd "${FILESDIR}/${SIAB_DAEMON}.conf" "${SIAB_DAEMON}"
 
-	# Install systemd unit files
+	# Install systemd unit file.
 	systemd_dounit "${FILESDIR}"/shellinaboxd.service
 
 	# Install CSS files.
diff --git a/www-misc/shellinabox/shellinabox-2.20-r2.ebuild b/www-misc/shellinabox/shellinabox-2.20-r2.ebuild
new file mode 100644
index 000000000000..f92e89f9f226
--- /dev/null
+++ b/www-misc/shellinabox/shellinabox-2.20-r2.ebuild
@@ -0,0 +1,109 @@
+# 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
new file mode 100644
index 000000000000..4ddaef132e05
--- /dev/null
+++ b/www-misc/shellinabox/shellinabox-2.20-r3.ebuild
@@ -0,0 +1,109 @@
+# 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/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index e5f3ede86b74..8f2901856fd0 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -2,7 +2,7 @@ AUX urlwatch-2.17-fix-yaml.load.patch 675 BLAKE2B 39198576b888d72ab9a21a99430cc3
 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 1452 BLAKE2B 2079320ef673d4164ef5fe6dc1716caac14a23743081b62460106bb857200d5a14792e940ece3aeacfdcc975fc821f0ad0ff758c4c55a38be47fe6f01f1e5e8c SHA512 0bb97cb1f13d18528a6b1a0c5cf2d2a74e749c4af3f4ea4270fabf400a72b7ef16d7844a8e4632b2fc50bcf4f365bdd1867b04407e9465b6b497b7c85f9c8a62
-EBUILD urlwatch-2.16.ebuild 1533 BLAKE2B 4cc32bb54e9855766e07629ba4a94665fd0c4681cff7070b3a886151dcf1d5b8c7a0805db88ac6b84f57b98e7dba7d1f34ef505c33c275e265275a8747ced38c SHA512 b924226b5839f8db9b6cb3b1224fe304ca87916f461d23034520b9996a846fe6b6dbfa78eccfe6e45d00ad102d152c3785cefbc10a4e6a5601143b9de530e615
-EBUILD urlwatch-2.17.ebuild 1623 BLAKE2B 0b6bfbdd63245d40e3726c6470d37aa3d5164da6da2959b20c4dd4032e6ce63b2fe9c51579bfffa3e0fb722ba87a525962d6a572cf226bf04bda9a345d17201a SHA512 fdfb5242eee1fde5dfaef3e7bd2f94e73676974aa081b9c2bf4714f5447b9a6ac7f634baab4daaa922a1ceb1fd6e7b235dbe70510f8cae844b94398c8df3261e
+EBUILD urlwatch-2.13.ebuild 1479 BLAKE2B d717b3ad19f22ef18f07041426d807ed1a44d8ab1e7e8ca8fd3aa125c995b3840e0eb4bfa22e0d7be8414d61234ee4df9349ccbcf5d667e0a645d76709c2530a SHA512 6eb7bd48e7e874d94c48b4e52bc3a513b1c0fb2bd2b1183ee18c0ebf5b6ba042f61af05552f1a47251a81a05659919bc31da2a3804dd6e7f1fb263e308783724
+EBUILD urlwatch-2.16.ebuild 1560 BLAKE2B 005abb55a1140d2e02fb5f21cba94c7b4f28cfa6662ccaa83e6622d1b77b0c102cf4e0c2fe700302fad2489210a14cf8852a164cdcb3ab869b75f94613611e71 SHA512 8f098129e900c38ab2a16b33bdfb68a64b99d945c860d8fbb508f7588b63736d85f6ab519c2660ddae0ecfe52fc4418c971b4062c33b1d2ba2a2fd2c2eb5facc
+EBUILD urlwatch-2.17.ebuild 1650 BLAKE2B 9fe2214f5f5b7d5e562948b72631ba2e0c9e5e36027a4b83f7b05bd40fc1cb1c7b6136695105a320f6d305c816a60bdf83518cccca1ea99028838314d0810774 SHA512 394342a521a86028dfa1022d9e72ad926fab3418f1b91ee0ac972de8f328ad42d2365aea0bf12b0352a6d921d4bffcf3bb62715b2381ea97269e687292df2baa
 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
index 5d7b14fea6ec..52b1a92a7159 100644
--- a/www-misc/urlwatch/urlwatch-2.13.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.13.ebuild
@@ -14,6 +14,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/www-misc/urlwatch/urlwatch-2.16.ebuild b/www-misc/urlwatch/urlwatch-2.16.ebuild
index fd8b473177eb..6662753d06ec 100644
--- a/www-misc/urlwatch/urlwatch-2.16.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.16.ebuild
@@ -14,6 +14,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/www-misc/urlwatch/urlwatch-2.17.ebuild b/www-misc/urlwatch/urlwatch-2.17.ebuild
index 52aa2776d4c3..7115b4f594cb 100644
--- a/www-misc/urlwatch/urlwatch-2.17.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.17.ebuild
@@ -14,6 +14,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/www-misc/vdradmin-am/Manifest b/www-misc/vdradmin-am/Manifest
index 9f7b14d24304..a9bbcb05c9b9 100644
--- a/www-misc/vdradmin-am/Manifest
+++ b/www-misc/vdradmin-am/Manifest
@@ -5,7 +5,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.ebuild 4733 BLAKE2B ddbd8b56d04b2e262c1e8867df7b0c273dc4cab04f714cd3833e9340a74e9be855b8540877813bf786cc34aa038c5c50bfb5a83a9ddcdb76854999e97921b8f8 SHA512 fe8f935a54169aa261696d07e90f02958c120d610b5b11a0608f3fd6df50fb2f9d38641a28e7e5b4faa5aa604d5846d184a6d60f8b478d02cd11808be18c5b8a
-EBUILD vdradmin-am-3.6.9-r3.ebuild 4733 BLAKE2B ddbd8b56d04b2e262c1e8867df7b0c273dc4cab04f714cd3833e9340a74e9be855b8540877813bf786cc34aa038c5c50bfb5a83a9ddcdb76854999e97921b8f8 SHA512 fe8f935a54169aa261696d07e90f02958c120d610b5b11a0608f3fd6df50fb2f9d38641a28e7e5b4faa5aa604d5846d184a6d60f8b478d02cd11808be18c5b8a
-EBUILD vdradmin-am-3.6.9.ebuild 4318 BLAKE2B 442e0c96b7f7646c70b62701acb0ebc3143d5ef63bcb59e23aa0eca53521e3f0c680a612147684a313ed117ba6d632ae6296a287e1d7ee42333af2b4293d94d5 SHA512 f64a92d865b4647d70140bfd89faeeba2e926b0c4cc65a803c9a084ff11091166c11a51e3f4aafe511a146204d6194ccb7d950d83e365edab0585a06748da4dd
+EBUILD vdradmin-am-3.6.10.ebuild 4747 BLAKE2B 8b1ac0d95b21a76ed5e7bde9eb3748b5201dae971466f5fefd05c0622c6e68dd8b75e276ef820fb36f3da2e32afc352d0fba19e3296d1f64674d249687e7d2f4 SHA512 c551fa86798b7d3d48e325b3d1c12bd37f8fe5d5522254cf91eed9724381bc7940f3e050246552673e64734aa351d5ef7fa54341b1cc3e28fd6725d1c35f6e51
+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
 MISC metadata.xml 644 BLAKE2B cc2a5a6a3850a15bbb5188a1d08f9496df43dc0a964c71cad73ff3cadaf9e4c629bdee2e80841540a0ee087f3f42c4bfd9feea53a0e0ec5e04e853ada394b5f9 SHA512 a51923afa708144a4ee6ea9b5f5ee08b90c69840218979a855f5021f2ea351838206c2d2bd6f9be52a61884ce4da3990630672d85e2a077b504351ddb202422f
diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild
index dd8b73c217f3..17158acefd59 100644
--- a/www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils ssl-cert systemd user
+inherit ssl-cert systemd user
 
 DESCRIPTION="WWW Admin for the Video Disk Recorder"
 HOMEPAGE="http://andreas.vdr-developer.org/vdradmin-am/index.html"
@@ -18,6 +18,7 @@ DEPEND="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 )
@@ -35,7 +36,7 @@ VDRADMIN_USER=vdradmin
 VDRADMIN_GROUP=vdradmin
 
 create_ssl_cert() {
-	# The ssl-cert eclass is not flexible enough so do some steps manually
+	# 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`}"
 
@@ -57,8 +58,10 @@ src_unpack() {
 }
 
 src_prepare() {
+	default
+
 	sed -i vdradmind.pl \
-		-e "s-FILES_IN_SYSTEM    = 0;-FILES_IN_SYSTEM    = 1;-g" || die
+		-e "s-FILES_IN_SYSTEM    = 0;-FILES_IN_SYSTEM    = 1;-g"
 
 	if use ipv6; then
 		sed -e "s:/usr/bin/vdradmind:/usr/bin/vdradmind --ipv6:" \
@@ -105,27 +108,27 @@ src_install() {
 
 pkg_preinst() {
 	install -m 0644 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} /dev/null \
-		"${D}"${ETC_DIR}/vdradmind.conf || die
+		"${ED}"${ETC_DIR}/vdradmind.conf || die
 
-	if [[ -f "${ROOT}"${ETC_DIR}/vdradmind.conf ]]; then
-		cp "${ROOT}"${ETC_DIR}/vdradmind.conf \
-			"${D}"${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 > "${D}"${ETC_DIR}/vdradmind.conf
-			VDRCONFDIR = "${ROOT%/}"/etc/vdr
-			VIDEODIR = "${ROOT%/}"/var/vdr/video
-			EPG_FILENAME = "${ROOT%/}"/var/vdr/video/epg.data
-			EPGIMAGES = "${ROOT%/}"/var/vdr/video/epgimages
+		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 "" \
-			| "${D}"/usr/bin/vdradmind --cfgdir "${D}"${ETC_DIR} --config \
+			| "${ED}"/usr/bin/vdradmind --cfgdir "${ED}"${ETC_DIR} --config \
 			|sed -e 's/: /: \n/g'
 
 		[[ ${PIPESTATUS[1]} == "0" ]] \
@@ -144,22 +147,22 @@ pkg_postinst() {
 	if use ipv6; then
 		elog
 		elog "To make use of the ipv6 protocol"
-		elog "you need to enable it in ${ROOT%/}/etc/conf.d/vdradmin"
+		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 ${ROOT%/}/etc/conf.d/vdradmin"
+		elog "you need to enable it in ${EROOT}/etc/conf.d/vdradmin"
 
-		if [[ ! -f "${ROOT}"${CERTS_DIR}/server-cert.pem || \
-			! -f "${ROOT}"${CERTS_DIR}/server-key.pem ]]; then
+		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 "${ROOT}"${CERTS_DIR}/server-key.pem || die
+				"${base}".key "${EROOT}"${CERTS_DIR}/server-key.pem || die
 			install -D -m 0444 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} \
-				"${base}".crt "${ROOT}"${CERTS_DIR}/server-cert.pem || die
+				"${base}".crt "${EROOT}"${CERTS_DIR}/server-cert.pem || die
 		fi
 	fi
 
@@ -173,5 +176,5 @@ pkg_postinst() {
 }
 
 pkg_config() {
-	"${ROOT}"/usr/bin/vdradmind -c
+	"${EROOT}"/usr/bin/vdradmind -c
 }
diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.9-r3.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.9-r3.ebuild
index dd8b73c217f3..64aadf4d8c1d 100644
--- a/www-misc/vdradmin-am/vdradmin-am-3.6.9-r3.ebuild
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.9-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild
index bc4de53ee76e..5809bec4db56 100644
--- a/www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"