gentoo resync : 03.03.2021

40 files changed, 337 insertions, 809 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 8847636ce8c6..f623a18e0334 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index 4ce4f9c8f8e5..4217bdce0651 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -1,3 +1,3 @@
-DIST chromedriver-bin-88.0.4324.96.linux64.zip 5685461 BLAKE2B 77a6f1c3919e620bcf0c6cfb08b31adc47c091abefa9b1dce9c6c28883c09165cb21a76a81e90c3cae27eb6781fbae74e901b7553344ace6fda8025df1458727 SHA512 a1dfa0106e77ebab742fa865519be7e0f50997263a6b7968b74948dc0c788567b9eadc1f3b433f8d35babff564210f89a910ef14476845438db11a50418ffe75
-EBUILD chromedriver-bin-88.0.4324.96.ebuild 595 BLAKE2B fe73112c4f6ea61c1b278ea6af2162af8f1fa5cddfe3bc8be34dc268422af49dfc7985cc1d2fe88c732ff35cb0744124fcc1405eb36ff5678b25ae4818bc453a SHA512 1e7fcea01a0db5165a273b354bd42c12bcbf99ac94ccba72d35496d1ece39871869bd3e298e5aaafe6967c131f5c68b259456eadde688688cb1be7d32c4e03d5
+DIST chromedriver-bin-89.0.4389.23.linux64.zip 5845152 BLAKE2B 84c6c31498144ea9f8e76df29ca87d49ed8c079bf618d12ae2ed7b68d34bd9018476be32f84e59e5620652a0a259ce576c34de49850eefd5785e31802858a56c SHA512 1ad51b0b75525975166a63b0fe9527b0e9729aeefa6d3855cc2312e5f341e6457ead2d235353ebd046ecbaddb1ac7587e9daa18c5fe6650b2015953506bedf30
+EBUILD chromedriver-bin-89.0.4389.23.ebuild 595 BLAKE2B fe73112c4f6ea61c1b278ea6af2162af8f1fa5cddfe3bc8be34dc268422af49dfc7985cc1d2fe88c732ff35cb0744124fcc1405eb36ff5678b25ae4818bc453a SHA512 1e7fcea01a0db5165a273b354bd42c12bcbf99ac94ccba72d35496d1ece39871869bd3e298e5aaafe6967c131f5c68b259456eadde688688cb1be7d32c4e03d5
 MISC metadata.xml 460 BLAKE2B 6da42de60f119a13f70f0a64f61f4fde912d15a7582b240631761e852b0db50bdb2f95102be05b09b1d653907b4c0a8a9641a9952cb6a7c1bd84d8f51ae1d83b SHA512 a8dfdafe46c651f3b06e0c004750747cfbe21e0ee704e5afd6f302c2ea61e288fad3987732b0e4b6ecec4805822c347f1d43a5e09e911e7d950196207eb81f43
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-88.0.4324.96.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-89.0.4389.23.ebuild
index 3d245b3e146a..3d245b3e146a 100644
--- a/www-apps/chromedriver-bin/chromedriver-bin-88.0.4324.96.ebuild
+++ b/www-apps/chromedriver-bin/chromedriver-bin-89.0.4389.23.ebuild
diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest
index e14a97b30aaa..28713a2188b9 100644
--- a/www-apps/davical/Manifest
+++ b/www-apps/davical/Manifest
@@ -1,6 +1,8 @@
+AUX davical-1.1.9.3-php8_compatibility.patch 1978 BLAKE2B fa49a36e29f490cf93b9dc68e06ec9eae317c01e68f4e201fe51b049c1279c124c586553ef2a6e472ff955e0592def7983aa66af44083e4051bf7aa8d9db2a38 SHA512 2c2e7bd99e661bd7f1b0fa39e31b4eb883bd1a726820d199c319017636aa02a206cb5f25b41e21125a8dab369038ba89d624079f3920d6ebd1f5469c8c0ca653
 AUX postinstall-en.txt 201 BLAKE2B 4e4ff030cb8031785d62b17e83b7bb2e40124466081b407e7638cb41a9045cb478f8e71a2122005668047620a7fff644a0ae069b924709139ac6d87edf527e57 SHA512 a35c6e0700a047d39f5f685c5ef9453a430cc871f3c965b859dfbd9564953e2cb7ae6dabe59e4efe23fbbd971500c20c1d7174398d9e8e66cdc4d3ccc03ac988
 AUX postupgrade-en.txt 218 BLAKE2B 83d752f4a76637ac90d65b7c458c7dadb44a2d5ba496419ce71c9763793abbd95b97b0ead133fe7afd1b2b4b382dc00149d9b6135fa2430300281741ed2a8d34 SHA512 0154d820ed27e43f091d535550dc61fdb91faaf303926cd3a2ba16300b963d0ea5226015fc546cb6419c9df82ab7e99f0f05287b4a5240c2ea381a43ec8e52d3
 AUX vhost-example 366 BLAKE2B 2aef55fee2759d1063936a583cdf6b96fcab77a0d6b056d59390931327ebcfdc338a515a8f7d9cfc5a6f071e0266fa82f0b6b3b4bab97979ff4dd8231fa2d729 SHA512 a2fde5ad64445aee0936a4fe2c608f48ec8163c46949cccd98c1b36b548e769477d387fb82e065b6dade5277580ad43426264ce13dca614182db16a4951247b9
 DIST davical-1.1.9.3.tar.xz 1359608 BLAKE2B d936fa5809413eac92e996262074972a04e1ac2d50d06c921e0f70468dde2b67175c6463d73ead09d5b2bce4ab1c2a02ccb45b64ee43066f6a9609c5ccdd01ee SHA512 cad28a991900d4cd9b1f86aeda7861482eef8707a02a371af53bd9cd17f9b5417ae81ccf1129d01fa5786f7bc9edc7478eb5a7274147039ce3ef603874c093a6
+EBUILD davical-1.1.9.3-r1.ebuild 1788 BLAKE2B b46528deab3559d94a3c84e3f022823d40d8eada03b470e6519020c1ab8b3605774d041278193a2688080ca4294e1f39244ffb51c8888f15966255151793dff5 SHA512 7cf4f9efd719214c38bf28bbc4ac3081d36b9fa7d55eca571ac9e25d5e8373a4afb6b7f446b91d0ee5a1947d082108bd33647962f2c129bf79a6993d40318e49
 EBUILD davical-1.1.9.3.ebuild 1736 BLAKE2B d10c9a3af1d34ef20912dfa4929ebc63fdf79f83c18d1d08fc4e7625d3b603416100bcfbd170c208c7bc4e33d621f71e9af4cdc41009b59b690f1eb639f39ef6 SHA512 250d2e292f9e4b074876ef8ae742272e4ffe502f0c711636dc6f756e8d8f8529c80e01c21d43bec3cc7171ac6f9033b8fd324068362cdb3e8ba680196bb10329
 MISC metadata.xml 488 BLAKE2B 415da89c18eca6883cead611be82292f6f3936c01e81db2166e0bdaf5d73dafb550546c0639da311e2f7685a98175212bfe9c9709ec2ff0fab7e00cbf39ed1fe SHA512 6d0e48e689eabd408efa8addab142c14a199ac62b16350f56fcd238f470094c108a56db1719961dc5a80d906102b069ee47e99aef64677cf765be0d79a754485
diff --git a/www-apps/davical/davical-1.1.9.3-r1.ebuild b/www-apps/davical/davical-1.1.9.3-r1.ebuild
new file mode 100644
index 000000000000..4b2bc1b3ed47
--- /dev/null
+++ b/www-apps/davical/davical-1.1.9.3-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+DESCRIPTION="A CalDAV and CardDAV Server"
+HOMEPAGE="https://www.davical.org/"
+SRC_URI="https://www.davical.org/downloads/${PN}_${PV}.orig.tar.xz -> ${P}.tar.xz"
+
+LICENSE="GPL-2 GPL-2+ GPL-3+ LGPL-2.1+ LGPL-3+"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap"
+
+BDEPEND="sys-devel/gettext"
+
+# >=dev-lang/php-8:curly braces string offset access was removed (Bug 764908)
+RDEPEND="app-admin/pwgen
+	dev-lang/php[calendar,curl,iconv,imap,ldap?,nls,pdo,postgres,xml]
+	dev-perl/DBD-Pg
+	dev-perl/DBI
+	dev-perl/YAML
+	>=dev-php/awl-0.61
+	virtual/httpd-php"
+
+PATCHES=( "${FILESDIR}/${P}-php8_compatibility.patch" )
+
+need_httpd
+
+S="${WORKDIR}"
+
+src_compile() {
+	emake built-locale
+}
+
+src_install() {
+	webapp_src_preinst
+
+	einstalldocs
+
+	einfo "Installing web files"
+	insinto "${MY_HTDOCSDIR}"
+	doins -r htdocs/. htdocs/.htaccess
+
+	einfo "Installing main files and i18n"
+	insinto "${MY_HOSTROOTDIR}/${PN}"
+	doins -r inc locale
+	rm "${ED}/${MY_HOSTROOTDIR}/${PN}/inc/always.php.in" || die
+
+	einfo "Installing sql files"
+	insinto "${MY_SQLSCRIPTSDIR}"
+	doins -r dba/.
+
+	insinto /etc/${PN}
+	doins -r config/. "${FILESDIR}/vhost-example"
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
+	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-en.txt"
+	webapp_src_install
+
+	fperms +x "${MY_SQLSCRIPTSDIR}/create-database.sh"
+	fperms +x "${MY_SQLSCRIPTSDIR}/update-davical-database"
+}
+
+pkg_postinst() {
+	elog "If you are upgrading from a previous version of davical, don't forget to"
+	elog "upgrade the database structure with"
+	elog "       cd /usr/share/webapps/davical/${PVR}/sqlscripts/"
+	elog "       ./update-davical-database -dbuser xxxxxxx -appuser xxxxxx"
+
+	webapp_pkg_postinst
+}
diff --git a/www-apps/davical/files/davical-1.1.9.3-php8_compatibility.patch b/www-apps/davical/files/davical-1.1.9.3-php8_compatibility.patch
new file mode 100644
index 000000000000..de9db47ff7fe
--- /dev/null
+++ b/www-apps/davical/files/davical-1.1.9.3-php8_compatibility.patch
@@ -0,0 +1,58 @@
+From f376be164eacf51d7354c728094e697ee2336218 Mon Sep 17 00:00:00 2001
+From: Jan Hicken <jan.hicken@posteo.de>
+Date: Sun, 31 Jan 2021 11:46:32 +0100
+Subject: [PATCH 1/2] Use brackets instead of curly braces for string offset
+ access
+
+Curly braces have been deprecated in PHP 7.4 and unsupported in PHP 8.0.
+---
+ inc/check_UTF8.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/inc/check_UTF8.php b/inc/check_UTF8.php
+index e3c93dbf..62dbfc00 100644
+--- a/inc/check_UTF8.php
++++ b/inc/check_UTF8.php
+@@ -67,7 +67,7 @@ function utf8ToUnicode(&$str)
+ 
+   $len = strlen($str);
+   for($i = 0; $i < $len; $i++) {
+-    $in = ord($str{$i});
++    $in = ord($str[$i]);
+     if (0 == $mState) {
+       // When mState is zero we expect either a US-ASCII character or a
+       // multi-octet sequence.
+-- 
+GitLab
+
+
+From 6cdbfcf226f0235a00206edfd119fcc90465a2b8 Mon Sep 17 00:00:00 2001
+From: Jan Hicken <jan.hicken@posteo.de>
+Date: Sun, 31 Jan 2021 11:47:41 +0100
+Subject: [PATCH 2/2] Add default value for errcontext variable in error
+ handler function
+
+This variable is no longer passed in PHP 8.0.
+
+It cannot be removed however, because it would not be backwards
+compatible.
+---
+ htdocs/setup.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/htdocs/setup.php b/htdocs/setup.php
+index 8b13d0ad..2a82dbf3 100644
+--- a/htdocs/setup.php
++++ b/htdocs/setup.php
+@@ -13,7 +13,7 @@ function log_setup_error($errno , $errstr , $errfile , $errline) {
+   error_log('DAViCal setup.php: Informational: '.$errfile.'('.$errline.'): ['.$errno.'] '.$errstr);
+ }
+ 
+-function catch_setup_errors($errno , $errstr , $errfile , $errline , $errcontext ) {
++function catch_setup_errors($errno , $errstr , $errfile , $errline , $errcontext = null ) {
+   if ( $errno == 2 ) {
+     // A working installation will regularly fail to include_once() for several files as it searches for the location
+     log_setup_error($errno , $errstr , $errfile , $errline);
+-- 
+GitLab
+
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 4c0813bf1440..d9afc6dc5ad5 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,16 +1,10 @@
+AUX grafana-r1.confd 870 BLAKE2B e222e17f5a14dc48f9bbc922250754d88610a951b1e6230736fffc0624a24a140bd9a9f11c6900e0f57b652ce3f334963ea453a5db5ee667863c6b69acc0f207 SHA512 cb6836ba69b9d1f0c50778823c507eaffd963341edbc4ea5409d0b068cfcecececfacac71e34b1d546a85674f67b12db99f384e5c6aa2186abe86814818d5db1
 AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e871a86738f21b8b3ee68caf1e2b437343f739564dac5ef91db5dcb6b2f31b49a936f9d4e6a62cca4 SHA512 13b9868a4c0a5a7209e6f4aa1206a93a0fb33b0234c4c0a6942bdab9d1cf139049181c066e01c49f639165ea422259fa7cab9e0bdf21537b3722bd86691d9b2c
+AUX grafana.initd 1498 BLAKE2B ac97391c228c09353ef11efb0de37f25802484fbbf71bccedfc9858079ca679ba1567a2a7a40e250ed1fa7477189c30b8c5f175e607b455ae755566a9d89098d SHA512 c3ef1926fabe53728adca6954eb48e8d69c33b4238795e2d0d0406e55e08b3f84760b1abfec556f258af3184e10e6fa116c1b21c704575a54f88050a5266ec87
 AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743e94fc59f76ef77220610d2fd02950ad0157b9ebbfd8380a489cd0da33b5b25102fbaa936c1212e2f SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
-DIST grafana-bin-7.3.1.tar.gz 53950606 BLAKE2B 16e0253371cb267876772e788e00d2330c664e3f0fea7f3891dbf5d4300e0baf99dd626ac2801201fda87f967d0013a151c672b341179e355acd43430f51acaa SHA512 0436b5bec58e52582542bb1efe7825ffc7abd5289d82916c6a54c6aee77a7350060ef877734b32332a5f3935cf1a3404b670e5f9344a8bb9b5c91d95ad81e214
-DIST grafana-bin-7.3.3.tar.gz 53921906 BLAKE2B 7fff1f6d1ef833815011505ec712e625fca59718ecdc8855bf5495c252b76f7d3dfe7ef28b6c66bd219750817c03a55921e6658c318ec3a227531641e9eb489a SHA512 0b982ac893f31c898865349f41efcb60ccf5789108d573677d9f33a5baf3cb532a8e80704bbd00154062de4d201a3e203f58569f1fd291fec2edfc0a2f434dfb
-DIST grafana-bin-7.3.4.tar.gz 53996284 BLAKE2B c84efcfc0bd6229dbceb364acb418ded4e20158563253d6dc1937cf14a3bf2a4a06a1694e8f2baa2099221d14d64f09437454cdf81cf3f62299ffa0c4178b5d7 SHA512 0bf2e1e199bc2c520a3218b0691c7743ff3b2306c43e4f6821c78015863488456bf85a7fceceaa6a64152d21053b9676e47ceb7ceda02ec446d06ee1878cafb6
-DIST grafana-bin-7.3.7.tar.gz 54132750 BLAKE2B 19bd49cd254b87492e072a0a13d7dfd3b33aa19dedefd68cd1f945d58cfcd5dd0b3cd10363c5cccd5309b0bf86a088df50839c3c66cfd25e4de4c6ab84b8c5da SHA512 40d698ef0f877a9c0e692494345138cb7bc76ef75881643804f75613427fb2174fd29abbf2d3c4c11dec515b6bc2913398d1a90d6000ffcfae1e0e5eead4241a
-DIST grafana-bin-7.4.0.tar.gz 51244405 BLAKE2B a041ed84a2ba250b0d2369004471f35b0e8a51df955fc71e073f27cc2de6f885ee26715d10223d2ce2c70fd4ee7edb18f292182e796a3a31eb7c80e755990ee7 SHA512 0d81ccefbc4488b83d262191f588411afa6c2eebd7e97cd0219810a73082442ae1fc04132c6e42332b92b45f40f0c2aa3a2ccb586ae8703716d762a7179ba976
 DIST grafana-bin-7.4.1.tar.gz 51266762 BLAKE2B 8f0cc812e67ea2c91d0b1758a3d675289d6b5bedd42061fb994473073fcb3e174740d7a3546fa2b1482b39425daa45bb817f867deedf85ba56966282ee8aa9cb SHA512 f7d2e91139d32999d43cabb7843a5368eff2af1386bf865ae8aaf9c099c6c24a5b494029e4a5e4f4c7c5ecd5f23e0e0229c82fd5c142a2e01edf2c63239e5cf0
-EBUILD grafana-bin-7.3.1.ebuild 1768 BLAKE2B 23986d4f829d0bcddc32ff228a71e3855652f0d990222d307d25b5e17cd96c6dee2680654d6538178c9197bafd777eec7c0b7da14b12d2bcd45d13684c12767d SHA512 ec778d6f7768395692eb0db5287b9c8203b73bad269a8109fb71b462987732bafbf39995ac6c18753042a6245773c8b0bf870cb51af6437651f0d857bf39cadd
-EBUILD grafana-bin-7.3.3.ebuild 1768 BLAKE2B 23986d4f829d0bcddc32ff228a71e3855652f0d990222d307d25b5e17cd96c6dee2680654d6538178c9197bafd777eec7c0b7da14b12d2bcd45d13684c12767d SHA512 ec778d6f7768395692eb0db5287b9c8203b73bad269a8109fb71b462987732bafbf39995ac6c18753042a6245773c8b0bf870cb51af6437651f0d857bf39cadd
-EBUILD grafana-bin-7.3.4.ebuild 1768 BLAKE2B 23986d4f829d0bcddc32ff228a71e3855652f0d990222d307d25b5e17cd96c6dee2680654d6538178c9197bafd777eec7c0b7da14b12d2bcd45d13684c12767d SHA512 ec778d6f7768395692eb0db5287b9c8203b73bad269a8109fb71b462987732bafbf39995ac6c18753042a6245773c8b0bf870cb51af6437651f0d857bf39cadd
-EBUILD grafana-bin-7.3.7.ebuild 1768 BLAKE2B 1b643ac33f03e7a792a334017259deaa2b178ea565987cd9690439b583e5245465533fd1569c3d11b8f3fc34bece619173320cd308e6fa7ff9272df4a87acc7d SHA512 2e5f1f8f588175e72f2b167cc07add05eb33345d48618a2bf0b13a8cfb16a802b906a3d532574c558ee614b9ae7dcae5b105c3cfebecafdc503709771fd32025
-EBUILD grafana-bin-7.4.0.ebuild 1768 BLAKE2B 1b643ac33f03e7a792a334017259deaa2b178ea565987cd9690439b583e5245465533fd1569c3d11b8f3fc34bece619173320cd308e6fa7ff9272df4a87acc7d SHA512 2e5f1f8f588175e72f2b167cc07add05eb33345d48618a2bf0b13a8cfb16a802b906a3d532574c558ee614b9ae7dcae5b105c3cfebecafdc503709771fd32025
+DIST grafana-bin-7.4.2.tar.gz 51266527 BLAKE2B ce1edd1b1a718fbc8acf5e20218f1d5dc82823e5246ea6504f10c92c6309e7a89cdb270b2fa448554370acc521d5b2eb1ac8d160cb206cd9ba223be849fe4e50 SHA512 404e36d0fa4bbe2b39d6bcba0ab04a92a0f5db5878089c2b972ecb2d7b8a7409aa1b1d1fc81deec620da223b942113500661003804b93f17ddccd38f1f1ad361
 EBUILD grafana-bin-7.4.1.ebuild 1768 BLAKE2B 1b643ac33f03e7a792a334017259deaa2b178ea565987cd9690439b583e5245465533fd1569c3d11b8f3fc34bece619173320cd308e6fa7ff9272df4a87acc7d SHA512 2e5f1f8f588175e72f2b167cc07add05eb33345d48618a2bf0b13a8cfb16a802b906a3d532574c558ee614b9ae7dcae5b105c3cfebecafdc503709771fd32025
+EBUILD grafana-bin-7.4.2.ebuild 1769 BLAKE2B 5a68f16b65e6ef167c4476131b505a9947878b9f64b77e9a52240fff659f2d5ca6a0256c240a32d7d2f1b59505284a5ea974059cecae785ff5d5f0aca5c83e3d SHA512 45afd377bf5400a620744f7ad2daebcf36bd972f98a8baab270c68497d0c28662154bef6a68aac0123e6a1c382c9c77d02a28c7b0ae7a0f0e1ceb9f2a5b89bb5
 MISC metadata.xml 218 BLAKE2B 2189d142b4baed0b8edb49fcc98f7397610a257a4cb5f87873272b284f84290420f0950c8b41d1d050ca7a1e0486c6e00344672a3f0479d1d382c14bf7f18485 SHA512 882f7787b97aa780dd3ba4112b9e1dcc84986e2a17704cba9a557ec3a3f9211bcf93532b92d42f60157b56b457ee9ee17e5409066230e54d48931b91bd6786cd
diff --git a/www-apps/grafana-bin/files/grafana-r1.confd b/www-apps/grafana-bin/files/grafana-r1.confd
new file mode 100644
index 000000000000..fffd31d43b65
--- /dev/null
+++ b/www-apps/grafana-bin/files/grafana-r1.confd
@@ -0,0 +1,27 @@
+# Config file for /etc/init.d/grafana
+
+# The user to run your application as
+#GRAFANA_USER=grafana
+
+# The group to run your application as
+#GRAFANA_GROUP=grafana
+
+# Configuration file
+#GRAFANA_CONFIGFILE="/etc/grafana/${RC_SVCNAME}.ini"
+
+# PID file
+#GRAFANA_PIDFILE="/run/${RC_SVCNAME}.pid"
+
+# The grafana datadir
+#GRAFANA_DATADIR=/var/lib/grafana
+
+# You can use this configuration option to pass additional options to the
+# start-stop-daemon, see start-stop-daemon(8) for more details.
+# Per default we wait 1000ms after we have started the service to ensure
+# that the daemon is really up and running.
+#GRAFANA_SSDARGS="--wait 1000"
+
+# The termination timeout (start-stop-daemon parameter "retry") ensures
+# that the service will be terminated within a given time (60 + 5 seconds
+# per default) when you are stopping the service.
+#GRAFANA_TERMTIMEOUT="TERM/60/KILL/5"
diff --git a/www-apps/grafana-bin/files/grafana.initd b/www-apps/grafana-bin/files/grafana.initd
new file mode 100644
index 000000000000..ec72725100f8
--- /dev/null
+++ b/www-apps/grafana-bin/files/grafana.initd
@@ -0,0 +1,36 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+GRAFANA_USER="${GRAFANA_USER:-"grafana"}"
+GRAFANA_GROUP="${GRAFANA_GROUP:-"grafana"}"
+GRAFANA_CONFIGFILE="${GRAFANA_CONFIGFILE:-"/etc/grafana/${RC_SVCNAME}.ini"}"
+GRAFANA_DATADIR="${GRAFANA_DATADIR:-"/var/lib/grafana"}"
+GRAFANA_LOGDIR="${GRAFANA_LOGDIR:-"/var/log/grafana"}"
+GRAFANA_PIDFILE="${GRAFANA_PIDFILE:-"/run/${RC_SVCNAME}.pid"}"
+GRAFANA_SSDARGS=${GRAFANA_SSDARGS:-"--wait 1000"}
+GRAFANA_TERMTIMEOUT=${GRFANA_TERMTIMEOUT:-"TERM/60/KILL/5"}
+
+command="/usr/bin/grafana-server"
+command_args="-homepath=/usr/share/grafana"
+command_args="${command_args} -config=\"${GRAFANA_CONFIGFILE}\""
+command_args="${command_args} cfg:default.paths.data=\"${GRAFANA_DATADIR}\""
+command_args="${command_args} cfg:default.paths.logs=\"${GRAFANA_LOGDIR}\""
+command_background="yes"
+pidfile="${GRAFANA_PIDFILE}"
+retry="${GRAFANA_TERMTIMEOUT}"
+start_stop_daemon_args="--user ${GRAFANA_USER}:${GRAFANA_GROUP} ${GRAFANA_SSDARGS}"
+
+description="Grafana server, feature rich metrics dashboard and graph editor."
+
+required_files="${GRAFANA_CONFIGFILE}"
+
+depend() {
+	need localmount
+}
+
+start_pre() {
+	checkpath -d -o "${GRAFANA_USER}:${GRAFANA_GROUP}" -m750 "${GRAFANA_DATADIR}" || return 1
+	checkpath -d -o "${GRAFANA_USER}:${GRAFANA_GROUP}" -m750 "${GRAFANA_DATADIR}/dashboards" || return 1
+	checkpath -d -o "${GRAFANA_USER}:${GRAFANA_GROUP}" -m750 "${GRAFANA_DATADIR}/plugins" || return 1
+}
diff --git a/www-apps/grafana-bin/grafana-bin-7.3.1.ebuild b/www-apps/grafana-bin/grafana-bin-7.3.1.ebuild
deleted file mode 100644
index d666b4c9db30..000000000000
--- a/www-apps/grafana-bin/grafana-bin-7.3.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_beta/-beta}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="acct-group/grafana
-	acct-user/grafana"
-RDEPEND="${DEPEND}
-	media-libs/fontconfig"
-
-QA_PREBUILT="usr/bin/grafana-*"
-QA_PRESTRIPPED=${QA_PREBUILT}
-
-src_install() {
-	keepdir /etc/grafana
-	insinto /etc/grafana
-	newins "${S}"/conf/sample.ini grafana.ini
-	rm "${S}"/conf/sample.ini || die
-
-	# Frontend assets
-	insinto /usr/share/${MY_PN}
-	doins -r public conf
-
-	dobin bin/grafana-cli
-	dobin bin/grafana-server
-
-	newconfd "${FILESDIR}"/grafana.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd.3 grafana
-	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
-
-	keepdir /var/{lib,log}/grafana
-	keepdir /var/lib/grafana/{dashboards,plugins}
-	fowners grafana:grafana /var/{lib,log}/grafana
-	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
-	fperms 0750 /var/{lib,log}/grafana
-	fperms 0750 /var/lib/grafana/{dashboards,plugins}
-}
-
-postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		elog "${PN} has built-in log rotation. Please see [log.file] section of"
-		elog "/etc/grafana/grafana.ini for related settings."
-		elog
-		elog "You may add your own custom configuration for app-admin/logrotate if you"
-		elog "wish to use external rotation of logs. In this case, you also need to make"
-		elog "sure the built-in rotation is turned off."
-	fi
-}
diff --git a/www-apps/grafana-bin/grafana-bin-7.3.3.ebuild b/www-apps/grafana-bin/grafana-bin-7.3.3.ebuild
deleted file mode 100644
index d666b4c9db30..000000000000
--- a/www-apps/grafana-bin/grafana-bin-7.3.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_beta/-beta}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="acct-group/grafana
-	acct-user/grafana"
-RDEPEND="${DEPEND}
-	media-libs/fontconfig"
-
-QA_PREBUILT="usr/bin/grafana-*"
-QA_PRESTRIPPED=${QA_PREBUILT}
-
-src_install() {
-	keepdir /etc/grafana
-	insinto /etc/grafana
-	newins "${S}"/conf/sample.ini grafana.ini
-	rm "${S}"/conf/sample.ini || die
-
-	# Frontend assets
-	insinto /usr/share/${MY_PN}
-	doins -r public conf
-
-	dobin bin/grafana-cli
-	dobin bin/grafana-server
-
-	newconfd "${FILESDIR}"/grafana.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd.3 grafana
-	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
-
-	keepdir /var/{lib,log}/grafana
-	keepdir /var/lib/grafana/{dashboards,plugins}
-	fowners grafana:grafana /var/{lib,log}/grafana
-	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
-	fperms 0750 /var/{lib,log}/grafana
-	fperms 0750 /var/lib/grafana/{dashboards,plugins}
-}
-
-postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		elog "${PN} has built-in log rotation. Please see [log.file] section of"
-		elog "/etc/grafana/grafana.ini for related settings."
-		elog
-		elog "You may add your own custom configuration for app-admin/logrotate if you"
-		elog "wish to use external rotation of logs. In this case, you also need to make"
-		elog "sure the built-in rotation is turned off."
-	fi
-}
diff --git a/www-apps/grafana-bin/grafana-bin-7.3.4.ebuild b/www-apps/grafana-bin/grafana-bin-7.3.4.ebuild
deleted file mode 100644
index d666b4c9db30..000000000000
--- a/www-apps/grafana-bin/grafana-bin-7.3.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_beta/-beta}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="acct-group/grafana
-	acct-user/grafana"
-RDEPEND="${DEPEND}
-	media-libs/fontconfig"
-
-QA_PREBUILT="usr/bin/grafana-*"
-QA_PRESTRIPPED=${QA_PREBUILT}
-
-src_install() {
-	keepdir /etc/grafana
-	insinto /etc/grafana
-	newins "${S}"/conf/sample.ini grafana.ini
-	rm "${S}"/conf/sample.ini || die
-
-	# Frontend assets
-	insinto /usr/share/${MY_PN}
-	doins -r public conf
-
-	dobin bin/grafana-cli
-	dobin bin/grafana-server
-
-	newconfd "${FILESDIR}"/grafana.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd.3 grafana
-	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
-
-	keepdir /var/{lib,log}/grafana
-	keepdir /var/lib/grafana/{dashboards,plugins}
-	fowners grafana:grafana /var/{lib,log}/grafana
-	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
-	fperms 0750 /var/{lib,log}/grafana
-	fperms 0750 /var/lib/grafana/{dashboards,plugins}
-}
-
-postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		elog "${PN} has built-in log rotation. Please see [log.file] section of"
-		elog "/etc/grafana/grafana.ini for related settings."
-		elog
-		elog "You may add your own custom configuration for app-admin/logrotate if you"
-		elog "wish to use external rotation of logs. In this case, you also need to make"
-		elog "sure the built-in rotation is turned off."
-	fi
-}
diff --git a/www-apps/grafana-bin/grafana-bin-7.4.0.ebuild b/www-apps/grafana-bin/grafana-bin-7.4.0.ebuild
deleted file mode 100644
index 0de07551fc7b..000000000000
--- a/www-apps/grafana-bin/grafana-bin-7.4.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_beta/-beta}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="acct-group/grafana
-	acct-user/grafana"
-RDEPEND="${DEPEND}
-	media-libs/fontconfig"
-
-QA_PREBUILT="usr/bin/grafana-*"
-QA_PRESTRIPPED=${QA_PREBUILT}
-
-src_install() {
-	keepdir /etc/grafana
-	insinto /etc/grafana
-	newins "${S}"/conf/sample.ini grafana.ini
-	rm "${S}"/conf/sample.ini || die
-
-	# Frontend assets
-	insinto /usr/share/${MY_PN}
-	doins -r public conf
-
-	dobin bin/grafana-cli
-	dobin bin/grafana-server
-
-	newconfd "${FILESDIR}"/grafana.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd.3 grafana
-	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
-
-	keepdir /var/{lib,log}/grafana
-	keepdir /var/lib/grafana/{dashboards,plugins}
-	fowners grafana:grafana /var/{lib,log}/grafana
-	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
-	fperms 0750 /var/{lib,log}/grafana
-	fperms 0750 /var/lib/grafana/{dashboards,plugins}
-}
-
-postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		elog "${PN} has built-in log rotation. Please see [log.file] section of"
-		elog "/etc/grafana/grafana.ini for related settings."
-		elog
-		elog "You may add your own custom configuration for app-admin/logrotate if you"
-		elog "wish to use external rotation of logs. In this case, you also need to make"
-		elog "sure the built-in rotation is turned off."
-	fi
-}
diff --git a/www-apps/grafana-bin/grafana-bin-7.3.7.ebuild b/www-apps/grafana-bin/grafana-bin-7.4.2.ebuild
index 0de07551fc7b..229e2a789b9e 100644
--- a/www-apps/grafana-bin/grafana-bin-7.3.7.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-7.4.2.ebuild
@@ -38,8 +38,8 @@ src_install() {
 	dobin bin/grafana-cli
 	dobin bin/grafana-server
 
-	newconfd "${FILESDIR}"/grafana.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd.3 grafana
+	newconfd "${FILESDIR}"/grafana-r1.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd grafana
 	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
 
 	keepdir /var/{lib,log}/grafana
diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index d94940f4fe41..76c794524a74 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -751,5 +751,5 @@ DIST hugo-0.78.1.tar.gz 35977945 BLAKE2B 1bb0b99b848277a09a4a62085988a0fe4a641d6
 DIST pack.ag%2Famqp%2F@v%2Fv0.11.0.mod 20 BLAKE2B d5f63707dc993966cf972285b18d24c5448f4e40f4a9dd5cd5b2eaa20ac8b7c19d5a6391aae35d2fa108cd21275c5e624a1adec488e4d214bdb770c83d7ed3d4 SHA512 fd1aa736efb3454de105d381170d31621ebb53f331e8c677498c90843ff2b1230a86e721905a93e621369b3c50d513d957b7447803e31576c4e3ebba6ea44dc0
 DIST pack.ag%2Famqp%2F@v%2Fv0.8.0.mod 20 BLAKE2B d5f63707dc993966cf972285b18d24c5448f4e40f4a9dd5cd5b2eaa20ac8b7c19d5a6391aae35d2fa108cd21275c5e624a1adec488e4d214bdb770c83d7ed3d4 SHA512 fd1aa736efb3454de105d381170d31621ebb53f331e8c677498c90843ff2b1230a86e721905a93e621369b3c50d513d957b7447803e31576c4e3ebba6ea44dc0
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
-EBUILD hugo-0.78.1.ebuild 75389 BLAKE2B ef66535ac42b88674da62187691812e7034e22228a1939b01e3cd23c98b066ed0bf4eaeaac4ec0d42ab0da51a26fc32f3957f58cb158aa40f9a758d063fd71bb SHA512 48a2e86da1bee190f09c510ded808dfcdc39130c7e150374714c6664aaf23b00233031cc06c7ca52d69e9ba38f5c7f1dbea746d2305ce48dbfd0804feffb4687
+EBUILD hugo-0.78.1.ebuild 75394 BLAKE2B ee0e893d75eb34c1408ffaad48abdb44720d413e7dfe8b9cc2af4894cce2186fa7c597d8189c5ffd0d91637534ca51db7a9bfd907435e8ce0a632ea51e541008 SHA512 d4c62627f66f1fd74728cd206f6897adbb91960ac16133ff8ede9d9c0ce33293fe02385a96bbb3a07ef894f00f8027f6743deeab64b341abf8123a56786370fb
 MISC metadata.xml 488 BLAKE2B 679ac4794639883bf9f4cee6fb28084356c7c85db39bdf1a304b8b2fc1bdacced57a68e18a6ec8b5364f86f64433d5fbe66fe0f7343f7505a4e2b39f4468f836 SHA512 48a64b00f278eeb3de11b3a21c5d9099d135d72b47e103db4645181889a54d02f71e9b63f14b21b7f72dd6b7ae85477de7be553500993c6c30f2a57d5064dcc8
diff --git a/www-apps/hugo/hugo-0.78.1.ebuild b/www-apps/hugo/hugo-0.78.1.ebuild
index 2a5ed35a23d8..0b6a58a6630a 100644
--- a/www-apps/hugo/hugo-0.78.1.ebuild
+++ b/www-apps/hugo/hugo-0.78.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 inherit go-module bash-completion-r1
 
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index c5761e4fa730..5eaa414f7a97 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,20 +1,14 @@
 AUX php-argon2-en.txt 416 BLAKE2B 9940a3e218d1db382790f4754352594c9098eccce7426729e75471f017e15bb45b50cc885609e54817077e36d9feb4484bcff5b40c4f669ad80d4d5a643da8bc SHA512 076bbbfb9305a2608b60fb7f9802a5a455c5d049d39c8f209eadac1a306ba2015d11a30b4544d8cdf43025077a3c3087f3e9922cd9b530a08c089a7818590115
-DIST nextcloud-18.0.12.tar.bz2 95691445 BLAKE2B 3c10ca58de3a65f30f9dd28752844e7bdc9ad940ced89c4067940859a694f697091076e390fe11cdeea76bf8a0f5bf467cc3864698756bf3f137c8930cce21da SHA512 cd9679a730768d143f9cabda8c5b29782369bed7310d31a408358a8b5f0e9794a7ce802e1fdfbb78fbc936160fa681be874d252c4d5e3f985951ad8c2fd48f81
-DIST nextcloud-18.0.13.tar.bz2 79529563 BLAKE2B 44bb25fd3bc1bb7a8f275b13c1bd5a2913a746858a903f4a2ec803bce3372af8342daf0cdcb7a3da48d6878e452a36d2b1ea88b587ed2b6eaf3db496eff74b2f SHA512 8040dece29a2de2ac0e5c02aa26f899c05c936312c7e8a5f1b0d2f97fa12150f0c66ec9f08764ce81e92fc90ecc9bde45fa43da3293437d40ec4a3b16b6a744e
-DIST nextcloud-18.0.14.tar.bz2 79583000 BLAKE2B 10af5da16e3581ac01cecb38365598742599390f0424dfd3dc0c68c63c267cd466a31f38653645232c4cdcd7ec9a7ff92b95a3a8d8e1bd55afbe74d4b753c1e1 SHA512 979b44fa8f44ac43c3a7d90fc43524f794f88e2c66b206234e29ee4f8881114b73d74c00da8f946b7b74c8e340c47a7d0d91eb5958ac05b479897f5705bf1ff7
-DIST nextcloud-19.0.6.tar.bz2 98375846 BLAKE2B d93eeac7ccadbea53663c5f215a5b745e34251655691bc39f00466781b5b6cfaea1ae2d8cd65ff61c7fcd6e754757d74f758a2d0b198c1c3cc9183ddc5d5ec21 SHA512 a8b33fb106809fc071399229e8af201d31be85cf28f0ab447a23b77067afe85b093031c15b01d14e811bf82fcfc28c30727ae773f7be9047d10a224b122d2590
-DIST nextcloud-19.0.7.tar.bz2 82202484 BLAKE2B ceae5ef0ddec99be9e8a27c17e83ee7ed138e93ca816f37d2c0d87e480732dcc361823ddd03e8091d43a2c628f204fac719db06d6837eabe6c618e4b275f317f SHA512 0a68a4985786a146ea1cc9e8e53319f8dcdf99dfe86b6d80bebb431edbb6c7a629d4bc6ab2c6ca23e7e5a434bb74824bf1b103c801e6ec37ab89b085372ce8e0
 DIST nextcloud-19.0.8.tar.bz2 82313065 BLAKE2B ebea55cdbf935a9df8ea7e8f1f8dfbaefb92d01a7e0fe50bdc2dde4a4fa0e3a9c19e41d95e0cdffb6ceed61060ec7cabfdf3ca1b6728c37f7690cefe39da45f2 SHA512 3ba6c639e5e1c833d0a4d7e46d23424c66af22211b39ff78928987c04d8cffb3d3b5fa6d51e8a043ee919dc8ae2eec7dec221512596e2b34703082ab02da0020
+DIST nextcloud-19.0.9.tar.bz2 82504506 BLAKE2B bcd456b96e778675509f0c3bb900c7489667f723bf9f4680bb9b353f762e2ed7dc0456212d659b71cbb978e222301a1bdc0e46358eb179e125ef93f4206b17c7 SHA512 12c9f3c9938cd37a852008e1490ab892f1adb8b37983cd58fbba7afe0231adaa9fc328c18c15136741eca5f0e2a2048c9cdff17e1ba5d8acc6cc660af99b948d
 DIST nextcloud-20.0.5.tar.bz2 105422202 BLAKE2B 5fdfcd75bdb257d803caec9d563b34527cfc54d55ba93b9912ee4dd9ee41624fcd38fa2fe243313ebd057487d1b53e99e0bc33f57dbab1c860a2ae952d8bedf0 SHA512 8839795e0c31c0bb264888f55c189214b802bc50e096af90530b4ef395e54a29bd3b9a7de5bfabc314ded61fd8ddf79c7d445b4277a46bb342f4273c64bd0219
-DIST nextcloud-20.0.6.tar.bz2 105381388 BLAKE2B b09da12c95c7fa1ac44d9409fe940c12498701c9aa8d220b3be47d430239c02378dfcac653eba460d60ff563f64d5a2584fa089cf41dcf7e6abe69f030a0ae02 SHA512 5a705852821f1fe846880c3d6fc710c47af46dda19a3676afeb98fa37241389cfccb0da378afd250de525484941f51e834744dbc3ce62d8972e29978e026075f
 DIST nextcloud-20.0.7.tar.bz2 105883310 BLAKE2B 05bf673e9f7d24248c5993db5d28e5a0acb56407c743d77449777b44a2e09ae0006ecab49cc824b3c75700532ab5a77ce492f1cfbf89547aa47eacbb08ba2465 SHA512 24cda9579d24422ea1c72c256ad208e936372077f62a91b3ca4e99ac511127dee5cc128c163174373394883114107cdda52bcb012faa282767710e1365ced3b3
-EBUILD nextcloud-18.0.12.ebuild 1080 BLAKE2B 452ea4bead6e463a6e5999ba2646c155dc2af4f258b11de4a8e22aa8ea6b94584ab734651ec7f7a26e3c9bac43ca2c02b84136d2a269213d3fb577fda5dc081f SHA512 86f65b9384517a04a35dc380a009d0d044aeec73d8a16cb8b54fb97ee13f6940e2166b4b45fc090502d0e18da8ab2463adf22b38ded5008b9060409ee891911b
-EBUILD nextcloud-18.0.13.ebuild 1080 BLAKE2B 452ea4bead6e463a6e5999ba2646c155dc2af4f258b11de4a8e22aa8ea6b94584ab734651ec7f7a26e3c9bac43ca2c02b84136d2a269213d3fb577fda5dc081f SHA512 86f65b9384517a04a35dc380a009d0d044aeec73d8a16cb8b54fb97ee13f6940e2166b4b45fc090502d0e18da8ab2463adf22b38ded5008b9060409ee891911b
-EBUILD nextcloud-18.0.14.ebuild 1080 BLAKE2B 452ea4bead6e463a6e5999ba2646c155dc2af4f258b11de4a8e22aa8ea6b94584ab734651ec7f7a26e3c9bac43ca2c02b84136d2a269213d3fb577fda5dc081f SHA512 86f65b9384517a04a35dc380a009d0d044aeec73d8a16cb8b54fb97ee13f6940e2166b4b45fc090502d0e18da8ab2463adf22b38ded5008b9060409ee891911b
-EBUILD nextcloud-19.0.6.ebuild 1080 BLAKE2B 452ea4bead6e463a6e5999ba2646c155dc2af4f258b11de4a8e22aa8ea6b94584ab734651ec7f7a26e3c9bac43ca2c02b84136d2a269213d3fb577fda5dc081f SHA512 86f65b9384517a04a35dc380a009d0d044aeec73d8a16cb8b54fb97ee13f6940e2166b4b45fc090502d0e18da8ab2463adf22b38ded5008b9060409ee891911b
-EBUILD nextcloud-19.0.7.ebuild 1080 BLAKE2B 452ea4bead6e463a6e5999ba2646c155dc2af4f258b11de4a8e22aa8ea6b94584ab734651ec7f7a26e3c9bac43ca2c02b84136d2a269213d3fb577fda5dc081f SHA512 86f65b9384517a04a35dc380a009d0d044aeec73d8a16cb8b54fb97ee13f6940e2166b4b45fc090502d0e18da8ab2463adf22b38ded5008b9060409ee891911b
+DIST nextcloud-20.0.8.tar.bz2 104577806 BLAKE2B 97647905fb18e99d1b99f41119fd83f0461f0e5c06dfc29cb91a8178884d9bcdb60a4d02de25b61cd4c64bf2fbb3c0c065358b98a4f88488bb8d458c72672902 SHA512 dd512c3a6f624a20b49743d2ecdfc31c740452bf50fb87f3ab0d6b365ebbfc9004bdc4495e5f378c26085312e138939a6c707f045421e0be6ef2ab881b6c2e66
+DIST nextcloud-21.0.0.tar.bz2 110504725 BLAKE2B 7c583c150f6b315830191329310993582439e7aef57f306b93681d654b8fa7d4d5dafee082befd493aafd2bf6efd940d52ca0ca05b8e42b79a1599ff3e809550 SHA512 a1ae3400f0fb5997e54b0cee821c50d13e4ba0e27c9d11731c8b5233cba564666121a58aed848ccd2593a9783e27db1ed98ff559588a76a1acaeaf083ef4404a
 EBUILD nextcloud-19.0.8.ebuild 1080 BLAKE2B 452ea4bead6e463a6e5999ba2646c155dc2af4f258b11de4a8e22aa8ea6b94584ab734651ec7f7a26e3c9bac43ca2c02b84136d2a269213d3fb577fda5dc081f SHA512 86f65b9384517a04a35dc380a009d0d044aeec73d8a16cb8b54fb97ee13f6940e2166b4b45fc090502d0e18da8ab2463adf22b38ded5008b9060409ee891911b
+EBUILD nextcloud-19.0.9.ebuild 1080 BLAKE2B 452ea4bead6e463a6e5999ba2646c155dc2af4f258b11de4a8e22aa8ea6b94584ab734651ec7f7a26e3c9bac43ca2c02b84136d2a269213d3fb577fda5dc081f SHA512 86f65b9384517a04a35dc380a009d0d044aeec73d8a16cb8b54fb97ee13f6940e2166b4b45fc090502d0e18da8ab2463adf22b38ded5008b9060409ee891911b
 EBUILD nextcloud-20.0.5.ebuild 1078 BLAKE2B 0ee654f01c61ed026136494171d215bb63762edee39d1ed00ae460403462c9186780aa580f58beff98c00baedb69c72337cb941a54d3eef5b5d2ea46413d1d62 SHA512 71630de1135c3c5e5cc9c4b507496010a96786c27f1d16213e75352af0fea3755d7fb81ca033f52fae8f786a73c8594adef707f682bcbea46ae4f1cfdf2b088d
-EBUILD nextcloud-20.0.6.ebuild 1080 BLAKE2B 452ea4bead6e463a6e5999ba2646c155dc2af4f258b11de4a8e22aa8ea6b94584ab734651ec7f7a26e3c9bac43ca2c02b84136d2a269213d3fb577fda5dc081f SHA512 86f65b9384517a04a35dc380a009d0d044aeec73d8a16cb8b54fb97ee13f6940e2166b4b45fc090502d0e18da8ab2463adf22b38ded5008b9060409ee891911b
 EBUILD nextcloud-20.0.7.ebuild 1080 BLAKE2B 452ea4bead6e463a6e5999ba2646c155dc2af4f258b11de4a8e22aa8ea6b94584ab734651ec7f7a26e3c9bac43ca2c02b84136d2a269213d3fb577fda5dc081f SHA512 86f65b9384517a04a35dc380a009d0d044aeec73d8a16cb8b54fb97ee13f6940e2166b4b45fc090502d0e18da8ab2463adf22b38ded5008b9060409ee891911b
+EBUILD nextcloud-20.0.8.ebuild 1080 BLAKE2B 452ea4bead6e463a6e5999ba2646c155dc2af4f258b11de4a8e22aa8ea6b94584ab734651ec7f7a26e3c9bac43ca2c02b84136d2a269213d3fb577fda5dc081f SHA512 86f65b9384517a04a35dc380a009d0d044aeec73d8a16cb8b54fb97ee13f6940e2166b4b45fc090502d0e18da8ab2463adf22b38ded5008b9060409ee891911b
+EBUILD nextcloud-21.0.0.ebuild 1080 BLAKE2B 452ea4bead6e463a6e5999ba2646c155dc2af4f258b11de4a8e22aa8ea6b94584ab734651ec7f7a26e3c9bac43ca2c02b84136d2a269213d3fb577fda5dc081f SHA512 86f65b9384517a04a35dc380a009d0d044aeec73d8a16cb8b54fb97ee13f6940e2166b4b45fc090502d0e18da8ab2463adf22b38ded5008b9060409ee891911b
 MISC metadata.xml 475 BLAKE2B 74871cad366634084aef18e597f13073b53e1716ab6d1f8c5fb9e63a3150670167982c60bcae5d8dbada774ba374c686f33dd5eafbd7b0571449ea9a13e0cab0 SHA512 5196408ac6cd288b3989e64ad0a1b3dea869c46377c13ded4b4f0b6e0527825e4036dffdf54230482218b0fa3e1a623463888986d64fad1b997fe35dfde7c302
diff --git a/www-apps/nextcloud/nextcloud-19.0.6.ebuild b/www-apps/nextcloud/nextcloud-19.0.6.ebuild
deleted file mode 100644
index 0aa3ba1808c6..000000000000
--- a/www-apps/nextcloud/nextcloud-19.0.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="https://nextcloud.com/"
-SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-19.0.7.ebuild b/www-apps/nextcloud/nextcloud-19.0.7.ebuild
deleted file mode 100644
index 0aa3ba1808c6..000000000000
--- a/www-apps/nextcloud/nextcloud-19.0.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="https://nextcloud.com/"
-SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-18.0.12.ebuild b/www-apps/nextcloud/nextcloud-19.0.9.ebuild
index 0aa3ba1808c6..0aa3ba1808c6 100644
--- a/www-apps/nextcloud/nextcloud-18.0.12.ebuild
+++ b/www-apps/nextcloud/nextcloud-19.0.9.ebuild
diff --git a/www-apps/nextcloud/nextcloud-20.0.6.ebuild b/www-apps/nextcloud/nextcloud-20.0.6.ebuild
deleted file mode 100644
index 0aa3ba1808c6..000000000000
--- a/www-apps/nextcloud/nextcloud-20.0.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="https://nextcloud.com/"
-SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-18.0.13.ebuild b/www-apps/nextcloud/nextcloud-20.0.8.ebuild
index 0aa3ba1808c6..0aa3ba1808c6 100644
--- a/www-apps/nextcloud/nextcloud-18.0.13.ebuild
+++ b/www-apps/nextcloud/nextcloud-20.0.8.ebuild
diff --git a/www-apps/nextcloud/nextcloud-18.0.14.ebuild b/www-apps/nextcloud/nextcloud-21.0.0.ebuild
index 0aa3ba1808c6..0aa3ba1808c6 100644
--- a/www-apps/nextcloud/nextcloud-18.0.14.ebuild
+++ b/www-apps/nextcloud/nextcloud-21.0.0.ebuild
diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index 3dc26a77feb0..dfbd93429938 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -1,13 +1,3 @@
-AUX nikola-8.0.4-setup-py.patch 1340 BLAKE2B 7eb27b287eaf588dfc50b21b4be27ec7239a745c2d61ee665d0c4578de4bdbcd5050ae38a2376d2fe7caae0fd41ed62e3e3e0e0bd67ac71a3b66c71c00dd6a6d SHA512 b3d16bd453192bc14208c55d0502192a24577b422fc9ca865512a5693544e238bf15d0bf79ca67bf279a4259e2f70894579f81e3b8ea1914f09bccdcd467b366
-DIST Nikola-8.0.4.tar.gz 4137494 BLAKE2B 04db8b83f34ca9b3cee785c5eed9d0421d27acf750c4f17dc3bec0df6fd4f462af52a65c0c97a07777922da3bf3fa855d58d546479b19bfb152e8190d2f74524 SHA512 eb6774d11be4eab81fbe41115d80e5d0d38694b734431d5d6355fcd3e3d8ae5ff4a02114c5dd0dbbc9e1ea5a625e9ac2b6b91e82f6e017b4376e4ca8d56cfec7
-DIST Nikola-8.1.0.tar.gz 4298799 BLAKE2B 568b6b39506ab78c84bdb5fc1bf66829a714d41e1c88afe40236e915a801ce8214e7913ecfda7816d11af17beb9bdb54a0c60a88ef72ce53f7bdac91d057489d SHA512 b88fdf4848314e6428b7f3c4a891aefe682f1ae6a2cdc8da25de1d6af839f5d6f3410e23d90b76094f082aebe15d7e51b2c9cd079d017960bb979503d62a4b68
-DIST Nikola-8.1.1.tar.gz 4299903 BLAKE2B 75997604e21484bcaab26afa056c3c82f5d19c810e8a388af07aa3c10f8bd341e912c089af5d3aeda51748b6ec17ee07a7c577d5df1a801b032b0bd100188a9a SHA512 a833cb7687077266a20f7043f99b03391f350b48ceea71250158e760b0e44b603de1d6e398a03ec848483775501ad248b6ac45a23ceb250d120a63f110d482b5
-DIST Nikola-8.1.2.tar.gz 4351283 BLAKE2B 28b4a9905a92ba2714e05aec5854ffbd9bf136e9d31218e032d6697f54b3b2711256b83e74ef6ebd0411fdeb0ac17d6454c52473cb396c029af5086cc085728e SHA512 5f53f4939dddececfaf75922147b18fd08434242373d3f4a54e300475adf274b716cdc6e485e6703bdb17fe038656a8c4ac9b260b4ddd47c252a645c3d26a30a
 DIST Nikola-8.1.3.tar.gz 4340545 BLAKE2B 535870b7cd147169b511166186ac200ab9d31d976c58363e42235e07ea8ba68e01738d378190663864e6a8605986771500569004e7a73ea043ae8982be09afe1 SHA512 7b6a8391d023a339125392082cc3d2ea2a2fe25b8938bd82b8c9efe0cbb3e8b83537f1bd00d97a648e3fc2b096e673702026fa3942ab9c97e76bf21b5afefe16
-EBUILD nikola-8.0.4.ebuild 2360 BLAKE2B c0c5364d1bf7aee04b70d18086e27242c1f7bb19df63a5005b78985f948bc54eda049de1a55e7c182e8cf7f9dce5d23a7d8a8a7e44edb7a0d5c27d4fd7017611 SHA512 95980033b9831f98d04f6a41cb04946b5280714663ea26a97db5e49289607cb8828a0dffd048ce8b2430e2b97ce2b0544c27da980a7f1be74a00b7577670cff9
-EBUILD nikola-8.1.0.ebuild 2310 BLAKE2B dc5603a8c25bbb783042c5898809697437b5686311a63ae961675584fe89b74c293e0cfe7576bd55c00db2bac158b9bc33a8383219b374456f922513ab47b15f SHA512 dd10ec3de5d3b3bce7a6de672e42afe2c4002c5edc54b8476c991912ee107187a7a5a7196e2114dc89bec782179936c0fe40387b0de7715a1276c463ff263f9a
-EBUILD nikola-8.1.1-r1.ebuild 2189 BLAKE2B 3d4585281d365cd5f05acecc21accf0171a6a606659349a357b793722473b8ec9cdb426d54cf53953bf38d7ed5ae62a0ac167ef110a61dfbe483833f20f0b630 SHA512 c28c0c3ef71a8e0240a6e29274f19e67a035551c4f913b90eb6e76d7ad285a8dfb279bed9cc4210568ff26cfd25ec018dcff311d8996ef249b0a0b6fbf5bd2a6
-EBUILD nikola-8.1.1.ebuild 2310 BLAKE2B dc5603a8c25bbb783042c5898809697437b5686311a63ae961675584fe89b74c293e0cfe7576bd55c00db2bac158b9bc33a8383219b374456f922513ab47b15f SHA512 dd10ec3de5d3b3bce7a6de672e42afe2c4002c5edc54b8476c991912ee107187a7a5a7196e2114dc89bec782179936c0fe40387b0de7715a1276c463ff263f9a
-EBUILD nikola-8.1.2.ebuild 2190 BLAKE2B c1581251064c89cf0c6d3892554a63aa0a64189f03fae433f7424c15f46e4154e6f6da98296c627adc9daa67226e8ee9b5727f38dd367dd78296624d65c5704e SHA512 0060d2872954dea010c9a0a0143378b7fa1479acbfc93d275ed71d9be94c6a4f17bd9a8c92f20b53a5c232f89dd726e3fb313bcd19e87bd40e3572fc4c23d10a
-EBUILD nikola-8.1.3.ebuild 2190 BLAKE2B d601d2a3200840e823dd61f466178d5e37d8a418f02a00a9d4dc089a5334d53d923284ef0ee036bacebbb79b0a0ae09ae78f46576b2ef8e679b6512004d064a2 SHA512 ebf7410883b69219c209a51cb3cb0a26e112a066d78c8680c3bc45334bac4ca7029d5053fa24f31a6330e06445793df1bf5f9f3685b73dbe663437674e14caa2
-MISC metadata.xml 1408 BLAKE2B c23be01555581f4fe904d10b24f098a689546d8a84665427f9fbed15a8676be590e16ef4f129c3eacc3db62eb61576bf86815fd80879d6fe64136ee11243ab17 SHA512 0edc102eae251cd7a095373ac293d0baf2f4eff541a85ebceba3ecf539b51fbe68d8fac9154450d16543af618faa55ac9aa39bdcdda64ade35847bbdb0e78fa8
+EBUILD nikola-8.1.3.ebuild 2189 BLAKE2B 206f7e721ec97e49b7590828652830725a3b388dea8aefcd0830d72909c08563e8aafacde7372884d0f1cda12e6c1378c244ad613c75c8c7c62aad76f0df4c62 SHA512 d27e54d934f3c366cc715e922cb6fb3ba636a0d175c6b8d64eda6dd775dac070de4beb2de3fcf74382b74b7096e8c828642022bb1af0711896b900c398a4d442
+MISC metadata.xml 1214 BLAKE2B fc4a6c041debeecb1597d59a04430bb49a4e66dab1e6cf2d4b16937c2326bd12cf0e0f883228b9e143a53676f12d90d38599be526ed40aa50282ea664dd73bb7 SHA512 1492dddff35b80436ffb14156456c87b82909304b64313a29eb6d589d30385478c1dca0b9605e840d3b493cea001c7064399c97252f394f866258b39ce339c4d
diff --git a/www-apps/nikola/files/nikola-8.0.4-setup-py.patch b/www-apps/nikola/files/nikola-8.0.4-setup-py.patch
deleted file mode 100644
index 8089b4ee8b24..000000000000
--- a/www-apps/nikola/files/nikola-8.0.4-setup-py.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 89bfbfb5bb0ffc823664557ff59f90db03f7b10f Mon Sep 17 00:00:00 2001
-From: Chris Warrick <kwpolska@gmail.com>
-Date: Fri, 7 Feb 2020 13:06:06 +0100
-Subject: [PATCH] =?UTF-8?q?Fix=20#3348=20=E2=80=94=20don=E2=80=99t=20ship?=
- =?UTF-8?q?=20tests=20to=20site-packages?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- CHANGES.txt | 12 ++++++++++++
- setup.py    |  2 +-
- 2 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/CHANGES.txt b/CHANGES.txt
-index e76f24bee..815b37849 100644
---- a/CHANGES.txt
-+++ b/CHANGES.txt
-@@ -1,3 +1,15 @@
-+New in master
-+============
-+
-+Features
-+--------
-+
-+Bugfixes
-+--------
-+
-+* Avoid installing ``tests`` package to site-packages, remove it from
-+  your environment if it was inadvertently added (Issue #3348)
-+
- New in v8.0.4
- =============
- 
-diff --git a/setup.py b/setup.py
-index f6ca027b7..e4f2c7fc7 100755
---- a/setup.py
-+++ b/setup.py
-@@ -105,7 +105,7 @@ def run(self):
-       author='Roberto Alsina and others',
-       author_email='ralsina@netmanagers.com.ar',
-       url='https://getnikola.com/',
--      packages=find_packages(exclude=('tests',)),
-+      packages=find_packages(exclude=('tests', 'tests.*')),
-       license='MIT',
-       keywords='website, blog, static',
-       classifiers=['Development Status :: 5 - Production/Stable',
diff --git a/www-apps/nikola/metadata.xml b/www-apps/nikola/metadata.xml
index 56b283c01d83..4c68f03e7ce9 100644
--- a/www-apps/nikola/metadata.xml
+++ b/www-apps/nikola/metadata.xml
@@ -12,9 +12,6 @@
     <flag name="charts">
       Support chart generation through <pkg>dev-python/pygal</pkg>
     </flag>
-    <flag name="ghpages">
-      Add support for direct uploading to github pages
-    </flag>
     <flag name="hyphenation">
       Add hyphenation support through <pkg>dev-python/pyphen</pkg>
     </flag>
@@ -35,9 +32,6 @@
       Use <pkg>dev-python/micawber</pkg> to extract metadata from web media
       links
     </flag>
-    <flag name="websocket">
-      Add websocket support thru <pkg>dev-python/ws4py</pkg>
-    </flag>
   </use>
   <upstream>
     <remote-id type="pypi">Nikola</remote-id>
diff --git a/www-apps/nikola/nikola-8.0.4.ebuild b/www-apps/nikola/nikola-8.0.4.ebuild
deleted file mode 100644
index 1bc96ad266f7..000000000000
--- a/www-apps/nikola/nikola-8.0.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_PN="Nikola"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A static website and blog generator"
-HOMEPAGE="https://getnikola.com/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket"
-RESTRICT="test" # needs coveralls
-
-DEPEND=">=dev-python/docutils-0.13[${PYTHON_USEDEP}]" # needs rst2man to build manpage
-RDEPEND="${DEPEND}
-	>=dev-python/Babel-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
-	>=dev-python/doit-0.30.1[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
-	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/natsort-3.5.2[${PYTHON_USEDEP}]
-	>=dev-python/piexif-1.0.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
-	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
-	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
-	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
-	ghpages? ( >=dev-vcs/ghp-import-0.4.1[${PYTHON_USEDEP}] )
-	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
-	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
-	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
-	watchdog? ( >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
-	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
-	websocket? ( ~dev-python/ws4py-0.3.4[${PYTHON_USEDEP}] )"
-#	typography? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] ) # needs smartypants
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-setup-py.patch
-)
-
-src_install() {
-	distutils-r1_src_install
-
-	# hackish way to remove docs that ended up in the wrong place
-	rm -rv "${D}/usr/share/doc/${PN}" || die
-
-	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.rst
-	gunzip "${D}/usr/share/man/man1/${PN}.1.gz" || die
-}
diff --git a/www-apps/nikola/nikola-8.1.0.ebuild b/www-apps/nikola/nikola-8.1.0.ebuild
deleted file mode 100644
index 02cf2f92674c..000000000000
--- a/www-apps/nikola/nikola-8.1.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_PN="Nikola"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A static website and blog generator"
-HOMEPAGE="https://getnikola.com/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket"
-RESTRICT="test" # needs coveralls
-
-DEPEND=">=dev-python/docutils-0.13[${PYTHON_USEDEP}]" # needs rst2man to build manpage
-RDEPEND="${DEPEND}
-	>=dev-python/Babel-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
-	>=dev-python/doit-0.32[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
-	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/natsort-3.5.2[${PYTHON_USEDEP}]
-	>=dev-python/piexif-1.0.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
-	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
-	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
-	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
-	ghpages? ( >=dev-vcs/ghp-import-0.4.1[${PYTHON_USEDEP}] )
-	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
-	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
-	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
-	watchdog? ( >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
-	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
-	websocket? ( ~dev-python/ws4py-0.3.4[${PYTHON_USEDEP}] )"
-#	typography? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] ) # needs smartypants
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	distutils-r1_src_install
-
-	# hackish way to remove docs that ended up in the wrong place
-	rm -rv "${D}/usr/share/doc/${PN}" || die
-
-	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.rst
-	gunzip "${D}/usr/share/man/man1/${PN}.1.gz" || die
-}
diff --git a/www-apps/nikola/nikola-8.1.1-r1.ebuild b/www-apps/nikola/nikola-8.1.1-r1.ebuild
deleted file mode 100644
index f5e1a159852b..000000000000
--- a/www-apps/nikola/nikola-8.1.1-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_PN="Nikola"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A static website and blog generator"
-HOMEPAGE="https://getnikola.com/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="assets charts hyphenation ipython jinja server watchdog webmedia"
-REQUIRED_USE="server? ( watchdog )"
-RESTRICT="test" # needs coveralls
-
-DEPEND=">=dev-python/docutils-0.13[${PYTHON_USEDEP}]" # needs rst2man to build manpage
-RDEPEND="${DEPEND}
-	>=dev-python/Babel-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
-	>=dev-python/doit-0.32[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
-	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/natsort-3.5.2[${PYTHON_USEDEP}]
-	>=dev-python/piexif-1.0.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
-	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
-	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
-	dev-python/pillow[jpeg,${PYTHON_USEDEP}]
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
-	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
-	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
-	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
-	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
-	server? ( dev-python/aiohttp[${PYTHON_USEDEP}] )
-	watchdog? ( >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
-	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	distutils-r1_src_install
-
-	# hackish way to remove docs that ended up in the wrong place
-	rm -rv "${ED}/usr/share/doc/${PN}" || die
-
-	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.rst
-	gunzip "${ED}/usr/share/man/man1/${PN}.1.gz" || die
-}
diff --git a/www-apps/nikola/nikola-8.1.1.ebuild b/www-apps/nikola/nikola-8.1.1.ebuild
deleted file mode 100644
index 02cf2f92674c..000000000000
--- a/www-apps/nikola/nikola-8.1.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_PN="Nikola"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A static website and blog generator"
-HOMEPAGE="https://getnikola.com/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket"
-RESTRICT="test" # needs coveralls
-
-DEPEND=">=dev-python/docutils-0.13[${PYTHON_USEDEP}]" # needs rst2man to build manpage
-RDEPEND="${DEPEND}
-	>=dev-python/Babel-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
-	>=dev-python/doit-0.32[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
-	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/natsort-3.5.2[${PYTHON_USEDEP}]
-	>=dev-python/piexif-1.0.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
-	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
-	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
-	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
-	ghpages? ( >=dev-vcs/ghp-import-0.4.1[${PYTHON_USEDEP}] )
-	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
-	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
-	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
-	watchdog? ( >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
-	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
-	websocket? ( ~dev-python/ws4py-0.3.4[${PYTHON_USEDEP}] )"
-#	typography? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] ) # needs smartypants
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	distutils-r1_src_install
-
-	# hackish way to remove docs that ended up in the wrong place
-	rm -rv "${D}/usr/share/doc/${PN}" || die
-
-	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.rst
-	gunzip "${D}/usr/share/man/man1/${PN}.1.gz" || die
-}
diff --git a/www-apps/nikola/nikola-8.1.2.ebuild b/www-apps/nikola/nikola-8.1.2.ebuild
deleted file mode 100644
index 347b90da687f..000000000000
--- a/www-apps/nikola/nikola-8.1.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_PN="Nikola"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A static website and blog generator"
-HOMEPAGE="https://getnikola.com/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="assets charts hyphenation ipython jinja server watchdog webmedia"
-REQUIRED_USE="server? ( watchdog )"
-RESTRICT="test" # needs coveralls
-
-DEPEND=">=dev-python/docutils-0.13[${PYTHON_USEDEP}]" # needs rst2man to build manpage
-RDEPEND="${DEPEND}
-	>=dev-python/Babel-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
-	>=dev-python/doit-0.32[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
-	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/natsort-3.5.2[${PYTHON_USEDEP}]
-	>=dev-python/piexif-1.0.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
-	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
-	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
-	dev-python/pillow[jpeg,${PYTHON_USEDEP}]
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
-	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
-	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
-	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
-	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
-	server? ( dev-python/aiohttp[${PYTHON_USEDEP}] )
-	watchdog? ( >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
-	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	distutils-r1_src_install
-
-	# hackish way to remove docs that ended up in the wrong place
-	rm -rv "${ED}/usr/share/doc/${PN}" || die
-
-	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.rst
-	gunzip "${ED}/usr/share/man/man1/${PN}.1.gz" || die
-}
diff --git a/www-apps/nikola/nikola-8.1.3.ebuild b/www-apps/nikola/nikola-8.1.3.ebuild
index 470843bb79b3..b8c901ed3b02 100644
--- a/www-apps/nikola/nikola-8.1.3.ebuild
+++ b/www-apps/nikola/nikola-8.1.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="assets charts hyphenation ipython jinja server watchdog webmedia"
 REQUIRED_USE="server? ( watchdog )"
 RESTRICT="test" # needs coveralls
diff --git a/www-apps/novnc/Manifest b/www-apps/novnc/Manifest
index 35ad218c7386..9ec32c742be4 100644
--- a/www-apps/novnc/Manifest
+++ b/www-apps/novnc/Manifest
@@ -1,6 +1,6 @@
 DIST novnc-1.1.0.tar.gz 1034997 BLAKE2B 0cb920cac99c3567cbf1c6a58e12649d4bca211d552a472a73ac1089d7c8a18d9478dcfeb558b6302c0c74d321b62575c35a492b02717dc4721b6a9b42f54415 SHA512 9c736912f5a3051027efe779fc64b182f523b9378ff412d78202e52665772678846d97fe3cc5ac18f5c29dd83d5ff2a2dd915e5eadf9af3573fe871db2e7821e
 DIST novnc-1.2.0.tar.gz 1356408 BLAKE2B a84b767afcdaa641a21943d19ac93c9200074c24c83c899fe2452a82eef526ecd74de92da47b3caa85abe9d51f2fb8d5078f3bf66c0868a241218d22a9088239 SHA512 461490da7bb983e9c94b8ce39f8455ee6609b5a9df8d88254bcc37ebaa5153f5ee9db6afbd88b51762d6d55661bc5cde6fbe70616597583bfce1203e337adf75
 EBUILD novnc-1.1.0.ebuild 1067 BLAKE2B d0631012fc7545269046d6f2d60480c0b7e054317c510ce78f0f8759f2c84da0fbff7a416c14abfada07a7941fbbdc4ab57febbf0abe78bd0487fb065fb79a2e SHA512 7c45f0426318595a48c8202d96adf8af26f94d0e479f4f03433de420d44fd9661658f61fd5f12bb9db5a4ddbe64cd558c721b11d7ce6727f75c281181f9346bf
-EBUILD novnc-1.2.0.ebuild 1079 BLAKE2B 6a590aa94711473dc4ae36d3bc4b3c997e64c0539ad5561dd23a1920d14a27975303b2c011c2214129696a677b06a4c685cf4424fe35d74e36b006870403dae8 SHA512 76f15691d2355b3ca321c281e806bdd9b4e404f1923f1ec341578f96869695f3893fe0d3d4f2e782a1981405e5b5a4393886695e952765703313b2d576ab2051
-EBUILD novnc-9999.ebuild 1069 BLAKE2B 4c53155046f208da5ffcb601509b936c052cac4c6e7e9ada235d4fe1fdca6873ba3dad8c619e2fe6f3dc05020e752a2e058d53ad2687853045e40860f9f85d10 SHA512 1da094392effe32748ff6565b228993e2b0f9f762351b0eaed543ace1ac4b8f2639c15eacd95b578203241fc1687246f8c1fe0a0b25bf1db50a6e0910bf76ae7
-MISC metadata.xml 341 BLAKE2B 11a60501b1f7725f315055b98ecda3928e1755ad88983b8c7c4900ba053325ecb030b68e70e453c2860e67ec13337918da68422cb5c5cd432fda06b2a8027c70 SHA512 a41f01affc9fcb0cf61dba100f01ffe730a1278218c120f6a7d2c699a13d24868b6f7936c8ed5a28625e7c68a646e99556e745cead53c676037a5acbc92ffba8
+EBUILD novnc-1.2.0.ebuild 1047 BLAKE2B 93e31645198b2d82815a7ea22c5672e2ca2faa591fb7bf275ea0ba8d221cec267277b2c6ab12fd702f99e3d003182f04be1d850755ff72e616e88f7ba5b92300 SHA512 3a5def70433820dc2fcfe76e7c08dfb306f0047ae92200068d85e0dfb420f2b2b42760cb59b2a86cc1625cf3df54bc50830c5e81c88799d7c8eec659025318b1
+EBUILD novnc-9999.ebuild 1047 BLAKE2B 93e31645198b2d82815a7ea22c5672e2ca2faa591fb7bf275ea0ba8d221cec267277b2c6ab12fd702f99e3d003182f04be1d850755ff72e616e88f7ba5b92300 SHA512 3a5def70433820dc2fcfe76e7c08dfb306f0047ae92200068d85e0dfb420f2b2b42760cb59b2a86cc1625cf3df54bc50830c5e81c88799d7c8eec659025318b1
+MISC metadata.xml 366 BLAKE2B 906b92c7ce5ff24c210578573f975a37d59277c2166f0a974586a4291283989bff4d434f08357b5ea2c8d59daec1e7a7f0f181c4f49317c04338f3d39a2c7090 SHA512 b40cc0d12181b3b3a723f929894445c913bc3410cf5651e72bf9cbe3538e9effde67edd4de1c5547a723e995998d7d11ca44e69bf9cd7683bfc30269f3e5148e
diff --git a/www-apps/novnc/metadata.xml b/www-apps/novnc/metadata.xml
index 2981c92d1633..7ef0581e1082 100644
--- a/www-apps/novnc/metadata.xml
+++ b/www-apps/novnc/metadata.xml
@@ -5,6 +5,7 @@
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">kanaka/noVNC</remote-id>
   </upstream>
diff --git a/www-apps/novnc/novnc-1.2.0.ebuild b/www-apps/novnc/novnc-1.2.0.ebuild
index d055a2d70452..02803bff38ac 100644
--- a/www-apps/novnc/novnc-1.2.0.ebuild
+++ b/www-apps/novnc/novnc-1.2.0.ebuild
@@ -3,14 +3,13 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 python3_8 )
-
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="noVNC is a VNC client implemented using HTML5 technologies"
 HOMEPAGE="https://kanaka.github.com/noVNC/"
 
-if [[ ${PV} == 9999 ]] ; then
+if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/kanaka/noVNC.git"
 else
@@ -21,10 +20,8 @@ fi
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}
+RDEPEND="
 	dev-python/websockify[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]"
 
diff --git a/www-apps/novnc/novnc-9999.ebuild b/www-apps/novnc/novnc-9999.ebuild
index 8b29092df33b..02803bff38ac 100644
--- a/www-apps/novnc/novnc-9999.ebuild
+++ b/www-apps/novnc/novnc-9999.ebuild
@@ -3,14 +3,13 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
-
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="noVNC is a VNC client implemented using HTML5 technologies"
 HOMEPAGE="https://kanaka.github.com/noVNC/"
 
-if [[ ${PV} == 9999 ]] ; then
+if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/kanaka/noVNC.git"
 else
@@ -21,10 +20,8 @@ fi
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}
+RDEPEND="
 	dev-python/websockify[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]"
 
diff --git a/www-apps/postfixadmin/Manifest b/www-apps/postfixadmin/Manifest
index 51b5540b94fe..46a844b57f83 100644
--- a/www-apps/postfixadmin/Manifest
+++ b/www-apps/postfixadmin/Manifest
@@ -1,6 +1,8 @@
 AUX postinstall-en-2.3.txt 1827 BLAKE2B 49402566ddf6981cf0226f6a963fdd2c482957903583807f5c42731dfd5b4aea56de7d1ebd47ab6909f12492bd5e7a788322e0b2d80e15d883483a080f8fe11c SHA512 59e304d63830227b1619ed1299e9b61f5b6e534cb03da4d3a0e35a0fe727ccf2d994a034bd12d515bba4f8a6a8ca513cf2131c031fa63f85906639aca159993a
 DIST postfixadmin-3.2.4.tar.gz 1331185 BLAKE2B a16df15f6376f9024114c5870174168e5f3d4b0f52d8759db0d83cb4c05fbbe2949056de0ca5ce097652588b777d59f08bcc2555577c95fbd7f2ebc5dd7f357f SHA512 2bd7ae05addbaf3c6c7eebea16ec1e21b2c67c8e6161446ed82a9553c26c04e19c1ec9ce248a9b9df504df56d309590259e6f04907b04b593548028b40e40d47
 DIST postfixadmin-3.3.5.tar.gz 1857139 BLAKE2B f6e051e8439a5bc4a2145fa58219d3e92f9599923a8b9380db2e1a241cbcca03c6cec893a63de78329f78633cd97e09ab08cc4179667629e7ef77687d2a6d752 SHA512 1db7dd42335d1704501f2491ceed3f0ecb3063a1df4b6487a1f1aac397f658e3479e4ccbc374b3e2f854f90406c1465a68579b1bd9a98386dbd6dda6b22d94c5
+DIST postfixadmin-3.3.7.tar.gz 1858520 BLAKE2B 5da2663fe6c445828118cb4531cbb7ca8a0a81b2d4997b71fe1a39dc25031ec3b1ead393dd3dbbef80d139c1518d172b1937a052a15a0a43dfb6bd6f693bee5b SHA512 c635b885235f2683532ff4fcd6d3e123fa5af8314cfcdbcdf412d7242444bb9c040a6eeb2f6b0669b9f5dd9fc56c53127779727768c68699885cc642717453ca
 EBUILD postfixadmin-3.2.4.ebuild 2768 BLAKE2B 54b3084b81fa92ca8826e9b8a11b41557f1c7566af775bbf1e0a95282723187eaa1cfa534099f937dda51a9965793175afa9998b3f41e3ce2c0a199a30db50fe SHA512 00cdb45baf4c12463c6b19763bf0de878e4cc26ecc3074f2be110b9c3d01109f344337a5caf55c5390b67e594f4b9b2eb48969e98b287808c8160073be183045
 EBUILD postfixadmin-3.3.5.ebuild 2980 BLAKE2B 13d801092bb1b4206d00eebb0d6cb184c271560a8d827f5b30adbf91727323180faedf42d47d1219f08a35cb54de030e825595f843dcdbd8e7abdfc53e669bbe SHA512 2264b4f9af839aacc07e90797d2ca59022014546443cc079e78aca48124e1d5b56c68f32099cd53029de61dc3447c01506683a9d2dced77266b4bae054dc6e89
+EBUILD postfixadmin-3.3.7.ebuild 2980 BLAKE2B 13d801092bb1b4206d00eebb0d6cb184c271560a8d827f5b30adbf91727323180faedf42d47d1219f08a35cb54de030e825595f843dcdbd8e7abdfc53e669bbe SHA512 2264b4f9af839aacc07e90797d2ca59022014546443cc079e78aca48124e1d5b56c68f32099cd53029de61dc3447c01506683a9d2dced77266b4bae054dc6e89
 MISC metadata.xml 560 BLAKE2B 2dccae38d76ef72520678dcc26582c6d99d2221c8cad753063e4948b75cd84b39f47b854a010217a6a52186a7308a3355c41ab6a7229af2417deb39ccb3eae84 SHA512 4ab5d3db2584f100b9f1d9729eb50487e40b27d16c436cbe09dd03d24c533d5d7c61b4b19eda03aa423fb34d9cf2b9f3ec55679196bb8e8da5ea3157c0bc567b
diff --git a/www-apps/postfixadmin/postfixadmin-3.3.7.ebuild b/www-apps/postfixadmin/postfixadmin-3.3.7.ebuild
new file mode 100644
index 000000000000..0df1b6d26679
--- /dev/null
+++ b/www-apps/postfixadmin/postfixadmin-3.3.7.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user webapp
+
+DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users"
+HOMEPAGE="http://postfixadmin.sourceforge.net"
+SRC_URI="https://github.com/postfixadmin/postfixadmin/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+mysql postgres +vacation"
+REQUIRED_USE="|| ( mysql postgres )"
+
+DEPEND="
+	dev-lang/php:*[unicode,imap,postgres?]
+	vacation? (
+		dev-perl/DBI
+		dev-perl/Email-Sender
+		dev-perl/Email-Valid
+		dev-perl/Log-Dispatch
+		dev-perl/Log-Log4perl
+		dev-perl/MIME-Charset
+		dev-perl/MIME-EncWords
+		mysql? ( dev-perl/DBD-mysql )
+		postgres? ( dev-perl/DBD-Pg )
+	)
+"
+RDEPEND="${DEPEND}
+	virtual/httpd-php
+	mysql? ( || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) )"
+
+S="${WORKDIR}/${PN}-${P}"
+
+need_httpd_cgi
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	if use vacation; then
+		enewgroup vacation
+		enewuser vacation -1 -1 -1 vacation
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	if use vacation; then
+		insinto /var/spool/vacation
+		newins VIRTUAL_VACATION/vacation.pl vacation.pl-${SLOT}
+		fowners vacation:vacation /var/spool/vacation/vacation.pl-${SLOT}
+		fperms 770 /var/spool/vacation/vacation.pl-${SLOT}
+		dodoc VIRTUAL_VACATION/FILTER_README
+		newdoc VIRTUAL_VACATION/INSTALL.md VIRTUAL_VACATION_INSTALL.md
+		rm -r VIRTUAL_VACATION/{vacation.pl,INSTALL.md,tests,FILTER_README} || die
+	fi
+
+	docinto /usr/share/doc/${PF}/
+	dodoc -r ADDITIONS
+
+	local docs="DOCUMENTS/*.txt INSTALL.TXT CHANGELOG.TXT"
+	dodoc ${docs}
+
+	rm -rf ${docs} DOCUMENTS/ GPL-LICENSE.TXT LICENSE.TXT debian/ tests/ ADDITIONS/
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config.inc.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-2.3.txt
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	einfo "Please note that if upgrading from version prior to 3.3.0,"
+	einfo "existing setup_password will no longer work and you will"
+	einfo "need to generate new one. See instructions in setup.php."
+
+	if use vacation; then
+		# portage does not update owners of directories (feature :)
+		chown vacation:vacation "${ROOT}"/var/spool/vacation/
+		einfo
+		einfo "/var/spool/vacation/vacation.pl symlink was updated to:"
+		einfo "/var/spool/vacation/vacation.pl-${SLOT}"
+		ln -sf "${ROOT}"/var/spool/vacation/vacation.pl{-${SLOT},} || die
+	fi
+}
+
+pkg_postrm() {
+	# Make sure we don't leave broken vacation.pl symlink
+	find -L "${ROOT}"/var/spool/vacation/ -type l -delete
+	local shopt_save=$(shopt -p nullglob)
+	shopt -s nullglob
+	local vacation=( "${ROOT}"/var/spool/vacation/vacation.pl-* )
+	${shopt_save}
+	if [[ ! -e "${ROOT}"/var/spool/vacation/vacation.pl && -n ${vacation[@]} ]]; then
+		ln -s "${vacation[-1]}" "${ROOT}"/var/spool/vacation/vacation.pl || die
+		ewarn "/var/spool/vacation/vacation.pl was updated to point on most"
+		ewarn "recent verion, but please, do your own checks"
+	fi
+}
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 5641a836468c..d64dcbda71c3 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,5 +1,5 @@
 AUX postinstall-en.txt 1285 BLAKE2B 09a372660022bda4064f2b298e6409be4d8f8943fd06d672e15c6126029acf2551b2eb0447f378a7c9287f757a820787ab6e592556e5cf199b0d8c0dd8f98f18 SHA512 8fa41aa39a1dfead723c87e6b16f979839dd5c585b9f9bb14a8a1ef556b69f9dcab113622b56c24890d1414df045b055b6997be02364ab4d5c7c06db2e4c12b2
 AUX postupgrade-en.txt 963 BLAKE2B c08e2ecca3d462d544549c80fb11abde670251002257d75fa8dd41d890f1327b08f1796c54125663fd35aca999f63b89035b610bdeedc32396c35d9d9b92ce4d SHA512 dbc86a1cf3b5280137322794a344818be8cfc137153f0e634e7bbd856ccb7ac589199353f2ccd5c28a8aa7d35cc2e041137bfc5d812fc6267efc758a1113c2d4
-DIST wordpress-5.6.1.tar.gz 15606691 BLAKE2B f1a218958146abe4e4c641d5612040e5c890c39043acdb322e518f6f7c683e092d9ea5141df50ccd1920e83b46ce553c4b443c5eb31c3f6f66cc356d109a6e0c SHA512 c6ede085a3b9fc66e5b9d685bfb0f82c5c69fda92a5184baf2ed0e9ae375e1b122628fd3d59cad88f67ea5f8d069fe84ca736be6f183ff539fd575889699b286
-EBUILD wordpress-5.6.1.ebuild 1368 BLAKE2B a0e95cf88dd7d7d2eaf901ceec7cf43abcbf6575661f03079fe88229b5f1172516bc4c67a06206a5e33327e07055e930d79013e6429fc063de17f50530bee2db SHA512 312c59227d518c4cfc55f10657c04b18ba9028b16b4333015f64c612103bf9d7e86283395deaa5fbd7d5e04d97f7e66d7628dc738d7d4517e99653970e153197
+DIST wordpress-5.6.2.tar.gz 15603881 BLAKE2B bae9af32d91b15586f94eb84a16970528bfca9f394e1655603a1d25750b7a39044ed7fc07f6c626c64cbaedefcb9770fbea439f3467b67c42de4a26ac51d6586 SHA512 5602104cdaaaf354f0b24782ceb0b32b8a8af5e4a9d698376a9ac263bc77f0c5d461d40587e0010e63e97c3d415db6ad3aead6069bba5ebcba03e783fbacbb69
+EBUILD wordpress-5.6.2.ebuild 1368 BLAKE2B a0e95cf88dd7d7d2eaf901ceec7cf43abcbf6575661f03079fe88229b5f1172516bc4c67a06206a5e33327e07055e930d79013e6429fc063de17f50530bee2db SHA512 312c59227d518c4cfc55f10657c04b18ba9028b16b4333015f64c612103bf9d7e86283395deaa5fbd7d5e04d97f7e66d7628dc738d7d4517e99653970e153197
 MISC metadata.xml 428 BLAKE2B 0995af6d73ebb2fb3d42dcd56376b05e62f4f5a716ba21d19cfca37acb284ef350312c5d0d21d8797bf7255494cd5077656c38be502bbfd40bdc10d1cc74987d SHA512 cc1dcdc59abafcb9cceb0423f3be99ba3abfed728420c0def6de048a011c9345daba0b3ebc0ef0220e3755a64f8be8d667472535c637512ca8e80ab372faca77
diff --git a/www-apps/wordpress/wordpress-5.6.1.ebuild b/www-apps/wordpress/wordpress-5.6.2.ebuild
index 230beac91636..230beac91636 100644
--- a/www-apps/wordpress/wordpress-5.6.1.ebuild
+++ b/www-apps/wordpress/wordpress-5.6.2.ebuild