From e748ba9741f6540f4675c23e3e37b73e822c13a4 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 31 May 2021 20:59:14 +0100
Subject: gentoo resync : 31.05.2021

---
 www-apps/Manifest.gz                               | Bin 11434 -> 11285 bytes
 www-apps/chromedriver-bin/Manifest                 |   4 +-
 .../chromedriver-bin-90.0.4430.24.ebuild           |  26 -----
 .../chromedriver-bin-91.0.4472.19.ebuild           |  26 +++++
 www-apps/drupal/Manifest                           |  16 +--
 www-apps/drupal/drupal-7.78.ebuild                 |  58 ----------
 www-apps/drupal/drupal-7.80.ebuild                 |  58 ++++++++++
 www-apps/drupal/drupal-8.9.13.ebuild               |  68 ------------
 www-apps/drupal/drupal-8.9.14.ebuild               |  68 ++++++++++++
 www-apps/drupal/drupal-9.0.11.ebuild               |  68 ------------
 www-apps/drupal/drupal-9.0.12.ebuild               |  68 ++++++++++++
 www-apps/drupal/drupal-9.1.3.ebuild                |  68 ------------
 www-apps/drupal/drupal-9.1.7.ebuild                |  68 ++++++++++++
 www-apps/kibana-bin/Manifest                       |   3 -
 www-apps/kibana-bin/kibana-bin-7.10.2.ebuild       |  90 ---------------
 www-apps/mediawiki/Manifest                        |   2 +
 www-apps/mediawiki/mediawiki-1.36.0.ebuild         |  86 ++++++++++++++
 www-apps/moodle/Manifest                           |   2 +
 www-apps/moodle/moodle-3.11.ebuild                 | 120 ++++++++++++++++++++
 www-apps/netbox/Manifest                           |  11 --
 www-apps/netbox/files/gunicorn_config.py           |   5 -
 www-apps/netbox/files/netbox-2.6.7-no-pip.patch    |  32 ------
 www-apps/netbox/files/netbox-rqworker.initd        |  13 ---
 www-apps/netbox/files/netbox.initd                 |  12 --
 www-apps/netbox/metadata.xml                       |   5 -
 www-apps/netbox/netbox-2.7.2.ebuild                | 122 --------------------
 www-apps/netbox/netbox-2.7.6.ebuild                | 122 --------------------
 www-apps/netbox/netbox-2.7.8.ebuild                | 123 ---------------------
 www-apps/nextcloud/Manifest                        |  10 +-
 www-apps/nextcloud/nextcloud-19.0.12.ebuild        |  43 +++++++
 www-apps/nextcloud/nextcloud-19.0.9.ebuild         |  43 -------
 www-apps/nextcloud/nextcloud-20.0.10.ebuild        |  43 +++++++
 www-apps/nextcloud/nextcloud-21.0.0.ebuild         |  43 -------
 www-apps/nextcloud/nextcloud-21.0.2.ebuild         |  43 +++++++
 www-apps/phpBB/Manifest                            |   4 +-
 www-apps/phpBB/phpBB-3.3.3.ebuild                  |  58 ----------
 www-apps/phpBB/phpBB-3.3.4.ebuild                  |  57 ++++++++++
 www-apps/postfixadmin/Manifest                     |   2 +-
 www-apps/postfixadmin/postfixadmin-3.3.8-r1.ebuild | 106 ++++++++++++++++++
 www-apps/postfixadmin/postfixadmin-3.3.8.ebuild    | 107 ------------------
 40 files changed, 809 insertions(+), 1094 deletions(-)
 delete mode 100644 www-apps/chromedriver-bin/chromedriver-bin-90.0.4430.24.ebuild
 create mode 100644 www-apps/chromedriver-bin/chromedriver-bin-91.0.4472.19.ebuild
 delete mode 100644 www-apps/drupal/drupal-7.78.ebuild
 create mode 100644 www-apps/drupal/drupal-7.80.ebuild
 delete mode 100644 www-apps/drupal/drupal-8.9.13.ebuild
 create mode 100644 www-apps/drupal/drupal-8.9.14.ebuild
 delete mode 100644 www-apps/drupal/drupal-9.0.11.ebuild
 create mode 100644 www-apps/drupal/drupal-9.0.12.ebuild
 delete mode 100644 www-apps/drupal/drupal-9.1.3.ebuild
 create mode 100644 www-apps/drupal/drupal-9.1.7.ebuild
 delete mode 100644 www-apps/kibana-bin/kibana-bin-7.10.2.ebuild
 create mode 100644 www-apps/mediawiki/mediawiki-1.36.0.ebuild
 create mode 100644 www-apps/moodle/moodle-3.11.ebuild
 delete mode 100644 www-apps/netbox/Manifest
 delete mode 100644 www-apps/netbox/files/gunicorn_config.py
 delete mode 100644 www-apps/netbox/files/netbox-2.6.7-no-pip.patch
 delete mode 100644 www-apps/netbox/files/netbox-rqworker.initd
 delete mode 100644 www-apps/netbox/files/netbox.initd
 delete mode 100644 www-apps/netbox/metadata.xml
 delete mode 100644 www-apps/netbox/netbox-2.7.2.ebuild
 delete mode 100644 www-apps/netbox/netbox-2.7.6.ebuild
 delete mode 100644 www-apps/netbox/netbox-2.7.8.ebuild
 create mode 100644 www-apps/nextcloud/nextcloud-19.0.12.ebuild
 delete mode 100644 www-apps/nextcloud/nextcloud-19.0.9.ebuild
 create mode 100644 www-apps/nextcloud/nextcloud-20.0.10.ebuild
 delete mode 100644 www-apps/nextcloud/nextcloud-21.0.0.ebuild
 create mode 100644 www-apps/nextcloud/nextcloud-21.0.2.ebuild
 delete mode 100644 www-apps/phpBB/phpBB-3.3.3.ebuild
 create mode 100644 www-apps/phpBB/phpBB-3.3.4.ebuild
 create mode 100644 www-apps/postfixadmin/postfixadmin-3.3.8-r1.ebuild
 delete mode 100644 www-apps/postfixadmin/postfixadmin-3.3.8.ebuild

(limited to 'www-apps')

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index e4c94e1a4f6a..ec6e557db77a 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index a4d0be4f2966..0e938c639cf4 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -1,3 +1,3 @@
-DIST chromedriver-bin-90.0.4430.24.linux64.zip 5795569 BLAKE2B e4dfd2c8452631916e4d11f115fa6c1e4281d2f9350b32566779e288855318e3996d3954256e5bdc6fc8f842197aa817b694788de1b4ae8491dc075a9137e5da SHA512 b85313de6abc1b44f26a0e12e20cb66657b840417f5ac6018946de0c8392b05c11d2c22d35f0526b26c35cf8d6134348e5b6c54a28a3955c5b22cc247ae2ce4a
-EBUILD chromedriver-bin-90.0.4430.24.ebuild 587 BLAKE2B a4f3eeac5597635be0030b1456c08adfec51a128c55b8fef99a88a87738578ab5cd31211557d6d715ff46b6e5d1c719913d27fcf31119cc66f822ebc01dc228f SHA512 2a5d1d3659e518976c4d6dc75d2d4a8e7916b81e7e6ada92d5920651fcb4ecb884390223056e8918fb5857bdeb4972bbae5f2de5af81142df28425450307ccaf
+DIST chromedriver-bin-91.0.4472.19.linux64.zip 5891445 BLAKE2B f5193d7538c13f5369b6c11ba01b31d9f075172ae57ff381379dfc4c429211a7dde1956ea34cf742412591f59c70c0880f1b24818508514f9b18cd925b622341 SHA512 49622b740b1c7e66b87179a2642f6c57f21a97fc844c84b30a4858042d5609cd4475e4dcfe5d6bd338135a5b0e93773270106832ee159392202c789ca2fc4709
+EBUILD chromedriver-bin-91.0.4472.19.ebuild 587 BLAKE2B a4f3eeac5597635be0030b1456c08adfec51a128c55b8fef99a88a87738578ab5cd31211557d6d715ff46b6e5d1c719913d27fcf31119cc66f822ebc01dc228f SHA512 2a5d1d3659e518976c4d6dc75d2d4a8e7916b81e7e6ada92d5920651fcb4ecb884390223056e8918fb5857bdeb4972bbae5f2de5af81142df28425450307ccaf
 MISC metadata.xml 460 BLAKE2B 6da42de60f119a13f70f0a64f61f4fde912d15a7582b240631761e852b0db50bdb2f95102be05b09b1d653907b4c0a8a9641a9952cb6a7c1bd84d8f51ae1d83b SHA512 a8dfdafe46c651f3b06e0c004750747cfbe21e0ee704e5afd6f302c2ea61e288fad3987732b0e4b6ecec4805822c347f1d43a5e09e911e7d950196207eb81f43
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-90.0.4430.24.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-90.0.4430.24.ebuild
deleted file mode 100644
index 7c2aac12ffeb..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-90.0.4430.24.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="bindist mirror strip"
-
-BDEPEND="app-arch/unzip"
-
-RDEPEND="!www-client/chromium
-	www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install() {
-	dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-91.0.4472.19.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-91.0.4472.19.ebuild
new file mode 100644
index 000000000000..7c2aac12ffeb
--- /dev/null
+++ b/www-apps/chromedriver-bin/chromedriver-bin-91.0.4472.19.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="WebDriver for Chrome"
+HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
+SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="bindist mirror strip"
+
+BDEPEND="app-arch/unzip"
+
+RDEPEND="!www-client/chromium
+	www-client/google-chrome"
+
+S="${WORKDIR}"
+QA_PREBUILT="usr/bin/chromedriver"
+
+src_install() {
+	dobin chromedriver
+}
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index b7b235969c8a..d739acacb8ae 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,10 +1,10 @@
 AUX postinstall-en.txt 1730 BLAKE2B b335309795d753c7689338c5e94b596efa5f66dc8dee17ad30b1a2d10b694a7bc288597b526239ea1d443887b45b8cd8ef89b499b79e86ab5df1c195ee85d4a0 SHA512 4ae14616c49e6aa61dc781350b5a75defefc2f894b98422a5b69a5827e367eb00fce140e6a45bcc02c90f068fc31970512d2632bbbf398cbe34f947933990050
-DIST drupal-7.78.tar.gz 3335651 BLAKE2B 16bf438b4c7892f2d001d89e194e8735b66a0c2bdcae5f38c14bd1233122d437ad786142c82aa34c0e3e22ce9dc4b14903f1f58ea42447157615559cc02002f2 SHA512 405ed053c0b73e8768ee2a8dda9fb7257e8c8664cbf76025dd58d34ed16bfd0c9e853b92cfee03e85b38e9d6d9c578d52c6943e804224ce73cf7be414f4cfb91
-DIST drupal-8.9.13.tar.gz 19805034 BLAKE2B 2682c30b810ffd2089c51b0b9776b0b5fd664d415b4014d1923a1136683608a9231a6cda13732a28ea4cb7a277ffdb3e3427b6e49897a58645ac57c500d7e644 SHA512 2d8fa904a0c229c2430e24b89c85da9ec74ba88c12ed3b4afa9f2258377970ed8de7c0ce5397c89f2875e93b9f2e8d1bb174a71b4ad0904c1e6e2d7994c977c0
-DIST drupal-9.0.11.tar.gz 16877941 BLAKE2B 53969ee3ee1bd2ed3672e37e01cdbf181a895b20750087778b0bcd687e7b1ad5fb73d0bd280dbc324921294a0586cf966a1f781a5f1d47d3daa81c91aa17975e SHA512 98b20aba886e36f76a2bea9b6eba1e92bf81e57cc272460e510e24f4622a6895fdb37407cbfc07875ef4c04845a2255f794f8626646b17ed461342a5b04dce10
-DIST drupal-9.1.3.tar.gz 17763646 BLAKE2B 5faf8bdd1bb7cd3f062cbdb881d567f6cec706d06ce980f7aa4f666d172e635feb32ad41723e88a99a68b6026aaed3003251c3f5c879719e24e5dacf19f98ae9 SHA512 57d8edca0064221c80924a8ea981af9ea66497fee14e4d736d96024ea26abb84e16af62f4d9bf5d69c69eb6851861d09f7d6dd54d92a2c0ae8fb2ac9585f6b74
-EBUILD drupal-7.78.ebuild 1546 BLAKE2B 4049ed833958fdfebbf89a1ec584c06a66d92297b1cf71978cbb3956455959c91b920716a14cbf893d59bc1c2b97e324c97f3aa70f276ceff8ee6de8f1d992ee SHA512 902f0456f711369d90eb172e2049a1af86aade03293712208b13635fefce0786550d1b16a6bd88dccfedf4f3431993bec03b874c975016697911f1610dd23ceb
-EBUILD drupal-8.9.13.ebuild 2084 BLAKE2B 9eb091e4672abddd5dddcaebacef7a1c08ec965ed95d7fe2e7c145ba8c0a6a5d2a9fb3f16ca6a51b6b8609784891bccd1b5478d1fa8bfef7a1a099b3670b0948 SHA512 1bee0a01ca06ff0b31361a31e246e3ce045b7a833e86f219d9fa66cbd7ec188e075e1f0e554b89c2a6ab2d0f90b8d7dcb9b0c06b0e78087dc261196ae5965516
-EBUILD drupal-9.0.11.ebuild 2084 BLAKE2B 9eb091e4672abddd5dddcaebacef7a1c08ec965ed95d7fe2e7c145ba8c0a6a5d2a9fb3f16ca6a51b6b8609784891bccd1b5478d1fa8bfef7a1a099b3670b0948 SHA512 1bee0a01ca06ff0b31361a31e246e3ce045b7a833e86f219d9fa66cbd7ec188e075e1f0e554b89c2a6ab2d0f90b8d7dcb9b0c06b0e78087dc261196ae5965516
-EBUILD drupal-9.1.3.ebuild 2084 BLAKE2B 9eb091e4672abddd5dddcaebacef7a1c08ec965ed95d7fe2e7c145ba8c0a6a5d2a9fb3f16ca6a51b6b8609784891bccd1b5478d1fa8bfef7a1a099b3670b0948 SHA512 1bee0a01ca06ff0b31361a31e246e3ce045b7a833e86f219d9fa66cbd7ec188e075e1f0e554b89c2a6ab2d0f90b8d7dcb9b0c06b0e78087dc261196ae5965516
+DIST drupal-7.80.tar.gz 3342293 BLAKE2B 342c8d69b3decdb50570590a96dd90f8fbfe5b403164e7ef3e855f7adb21e015bdebb6ecd943e23e4003f74c85ce889b4e4cf8e20eb65572337543120e15fb83 SHA512 38d3325252994abfa18709e52dac8194fb773185574019ee7b5037c1cee68ec5122afaf99e9c6dffef3053bbe7547f114783287aa9bcb51ee35f023cb7467c90
+DIST drupal-8.9.14.tar.gz 19805555 BLAKE2B 342850aefb487b9e48f73227233858494bd07502d4c6114c98986c45ab037d597d71fbb86c001d4da1dc74d46aadbd0014ac2e4892dd5cc38ce0f58927a70118 SHA512 f7754700aae7eeaf7105d87d00c9656995fede2c33a7d949d783fd5e8e664c823bfe2cdff2253da994f986ea950eee840ba31a5830334e337f3cbefb2d8c2c85
+DIST drupal-9.0.12.tar.gz 16877538 BLAKE2B c54df6b12b128e4c0815589ccb05313b6c2bacd604be8c3cf09481977f78c34859a4c66de97ad7c96e920a64382adccdce83a51b85f8cfcc7de73fd6b07c0d1f SHA512 fcf3eec42361b67d58bd3e7151131db830e4d6a19fc5ea1e39f5dedaa3701fb1c9737b0025c2dce0d8c2c3be45cd701583a29d593f2f6609a104fce073aa71c0
+DIST drupal-9.1.7.tar.gz 18542878 BLAKE2B 91f6a979d0fecc754b87926083baddbeba908c8e63444ff5bee1abd0ca5cd7cd53777db05a5c58bffc6f5d697319d6f208b1631793993b9944864a33e9b9e9e2 SHA512 14b078d299e7b2d33ce37a1ad55cfaff620d676aa0745ee1f11ed0852eb93ac5681afd5a7ba13839b40dde22dcc7808b86ee43c6c2711d32a94a4300bf8e21a4
+EBUILD drupal-7.80.ebuild 1546 BLAKE2B 4049ed833958fdfebbf89a1ec584c06a66d92297b1cf71978cbb3956455959c91b920716a14cbf893d59bc1c2b97e324c97f3aa70f276ceff8ee6de8f1d992ee SHA512 902f0456f711369d90eb172e2049a1af86aade03293712208b13635fefce0786550d1b16a6bd88dccfedf4f3431993bec03b874c975016697911f1610dd23ceb
+EBUILD drupal-8.9.14.ebuild 2084 BLAKE2B 9eb091e4672abddd5dddcaebacef7a1c08ec965ed95d7fe2e7c145ba8c0a6a5d2a9fb3f16ca6a51b6b8609784891bccd1b5478d1fa8bfef7a1a099b3670b0948 SHA512 1bee0a01ca06ff0b31361a31e246e3ce045b7a833e86f219d9fa66cbd7ec188e075e1f0e554b89c2a6ab2d0f90b8d7dcb9b0c06b0e78087dc261196ae5965516
+EBUILD drupal-9.0.12.ebuild 2084 BLAKE2B 9eb091e4672abddd5dddcaebacef7a1c08ec965ed95d7fe2e7c145ba8c0a6a5d2a9fb3f16ca6a51b6b8609784891bccd1b5478d1fa8bfef7a1a099b3670b0948 SHA512 1bee0a01ca06ff0b31361a31e246e3ce045b7a833e86f219d9fa66cbd7ec188e075e1f0e554b89c2a6ab2d0f90b8d7dcb9b0c06b0e78087dc261196ae5965516
+EBUILD drupal-9.1.7.ebuild 2084 BLAKE2B 9eb091e4672abddd5dddcaebacef7a1c08ec965ed95d7fe2e7c145ba8c0a6a5d2a9fb3f16ca6a51b6b8609784891bccd1b5478d1fa8bfef7a1a099b3670b0948 SHA512 1bee0a01ca06ff0b31361a31e246e3ce045b7a833e86f219d9fa66cbd7ec188e075e1f0e554b89c2a6ab2d0f90b8d7dcb9b0c06b0e78087dc261196ae5965516
 MISC metadata.xml 381 BLAKE2B 3c01944b3e66963bbd236a45dfb708c17e9d80e050a245316cc0d9ed2c94db2f882fe57ee2f7e0ec6285da21bb860b1eae48f470f449d1f4129ac83669a8d2bc SHA512 9b69d4241578d4e3e972d2910df1eea4506092e0f6511f30df5c7b2136db05b3a0b34978875f12cc3fe5c40f165da33fde01bd831271b928ebefbaf3a8231444
diff --git a/www-apps/drupal/drupal-7.78.ebuild b/www-apps/drupal/drupal-7.78.ebuild
deleted file mode 100644
index 4e6998d1e429..000000000000
--- a/www-apps/drupal/drupal-7.78.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp
-
-MY_PV=${PV:0:3}.0
-
-DESCRIPTION="PHP-based open-source platform and content management system"
-HOMEPAGE="https://www.drupal.org/"
-SRC_URI="https://ftp.drupal.org/files/projects/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+mysql postgres sqlite +uploadprogress"
-
-RDEPEND="
-	dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml]
-	virtual/httpd-php
-	uploadprogress? ( dev-php/pecl-uploadprogress )
-"
-
-need_httpd_cgi
-
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt INSTALL.mysql.txt INSTALL.pgsql.txt INSTALL.sqlite.txt UPGRADE.txt "
-	dodoc ${docs}
-	rm -f ${docs} INSTALL COPYRIGHT.txt || die
-
-	cp sites/default/{default.settings.php,settings.php} || die
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	echo
-	ewarn "SECURITY NOTICE"
-	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
-	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
-	echo
-}
diff --git a/www-apps/drupal/drupal-7.80.ebuild b/www-apps/drupal/drupal-7.80.ebuild
new file mode 100644
index 000000000000..4e6998d1e429
--- /dev/null
+++ b/www-apps/drupal/drupal-7.80.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PV=${PV:0:3}.0
+
+DESCRIPTION="PHP-based open-source platform and content management system"
+HOMEPAGE="https://www.drupal.org/"
+SRC_URI="https://ftp.drupal.org/files/projects/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres sqlite +uploadprogress"
+
+RDEPEND="
+	dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml]
+	virtual/httpd-php
+	uploadprogress? ( dev-php/pecl-uploadprogress )
+"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt INSTALL.mysql.txt INSTALL.pgsql.txt INSTALL.sqlite.txt UPGRADE.txt "
+	dodoc ${docs}
+	rm -f ${docs} INSTALL COPYRIGHT.txt || die
+
+	cp sites/default/{default.settings.php,settings.php} || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
+
+	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	echo
+	ewarn "SECURITY NOTICE"
+	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
+	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
+	echo
+}
diff --git a/www-apps/drupal/drupal-8.9.13.ebuild b/www-apps/drupal/drupal-8.9.13.ebuild
deleted file mode 100644
index 1fa351c0c00f..000000000000
--- a/www-apps/drupal/drupal-8.9.13.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp
-
-MY_PV=${PV:0:3}.0
-MY_P=${P/_/-}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="PHP-based open-source platform and content management system"
-HOMEPAGE="https://www.drupal.org/"
-SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+mysql postgres sqlite +uploadprogress"
-
-RDEPEND="
-	dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml]
-	virtual/httpd-php
-	uploadprogress? ( dev-php/pecl-uploadprogress )
-"
-
-need_httpd_cgi
-
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
-		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
-
-	dodoc ${docs}
-	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
-
-	cp sites/default/{default.settings.php,settings.php} || die
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/files
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	echo
-	ewarn "SECURITY NOTICE"
-	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
-	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
-	echo
-	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
-	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
-	echo
-	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
-	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
-	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
-	ewarn "reported by the setup."
-	echo
-}
diff --git a/www-apps/drupal/drupal-8.9.14.ebuild b/www-apps/drupal/drupal-8.9.14.ebuild
new file mode 100644
index 000000000000..1fa351c0c00f
--- /dev/null
+++ b/www-apps/drupal/drupal-8.9.14.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PV=${PV:0:3}.0
+MY_P=${P/_/-}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="PHP-based open-source platform and content management system"
+HOMEPAGE="https://www.drupal.org/"
+SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres sqlite +uploadprogress"
+
+RDEPEND="
+	dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml]
+	virtual/httpd-php
+	uploadprogress? ( dev-php/pecl-uploadprogress )
+"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
+		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
+
+	dodoc ${docs}
+	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
+
+	cp sites/default/{default.settings.php,settings.php} || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+
+	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	echo
+	ewarn "SECURITY NOTICE"
+	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
+	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
+	echo
+	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
+	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
+	echo
+	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
+	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
+	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
+	ewarn "reported by the setup."
+	echo
+}
diff --git a/www-apps/drupal/drupal-9.0.11.ebuild b/www-apps/drupal/drupal-9.0.11.ebuild
deleted file mode 100644
index 1fa351c0c00f..000000000000
--- a/www-apps/drupal/drupal-9.0.11.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp
-
-MY_PV=${PV:0:3}.0
-MY_P=${P/_/-}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="PHP-based open-source platform and content management system"
-HOMEPAGE="https://www.drupal.org/"
-SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+mysql postgres sqlite +uploadprogress"
-
-RDEPEND="
-	dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml]
-	virtual/httpd-php
-	uploadprogress? ( dev-php/pecl-uploadprogress )
-"
-
-need_httpd_cgi
-
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
-		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
-
-	dodoc ${docs}
-	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
-
-	cp sites/default/{default.settings.php,settings.php} || die
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/files
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	echo
-	ewarn "SECURITY NOTICE"
-	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
-	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
-	echo
-	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
-	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
-	echo
-	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
-	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
-	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
-	ewarn "reported by the setup."
-	echo
-}
diff --git a/www-apps/drupal/drupal-9.0.12.ebuild b/www-apps/drupal/drupal-9.0.12.ebuild
new file mode 100644
index 000000000000..1fa351c0c00f
--- /dev/null
+++ b/www-apps/drupal/drupal-9.0.12.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PV=${PV:0:3}.0
+MY_P=${P/_/-}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="PHP-based open-source platform and content management system"
+HOMEPAGE="https://www.drupal.org/"
+SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres sqlite +uploadprogress"
+
+RDEPEND="
+	dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml]
+	virtual/httpd-php
+	uploadprogress? ( dev-php/pecl-uploadprogress )
+"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
+		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
+
+	dodoc ${docs}
+	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
+
+	cp sites/default/{default.settings.php,settings.php} || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+
+	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	echo
+	ewarn "SECURITY NOTICE"
+	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
+	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
+	echo
+	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
+	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
+	echo
+	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
+	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
+	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
+	ewarn "reported by the setup."
+	echo
+}
diff --git a/www-apps/drupal/drupal-9.1.3.ebuild b/www-apps/drupal/drupal-9.1.3.ebuild
deleted file mode 100644
index 1fa351c0c00f..000000000000
--- a/www-apps/drupal/drupal-9.1.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp
-
-MY_PV=${PV:0:3}.0
-MY_P=${P/_/-}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="PHP-based open-source platform and content management system"
-HOMEPAGE="https://www.drupal.org/"
-SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+mysql postgres sqlite +uploadprogress"
-
-RDEPEND="
-	dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml]
-	virtual/httpd-php
-	uploadprogress? ( dev-php/pecl-uploadprogress )
-"
-
-need_httpd_cgi
-
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
-		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
-
-	dodoc ${docs}
-	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
-
-	cp sites/default/{default.settings.php,settings.php} || die
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/files
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	echo
-	ewarn "SECURITY NOTICE"
-	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
-	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
-	echo
-	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
-	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
-	echo
-	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
-	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
-	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
-	ewarn "reported by the setup."
-	echo
-}
diff --git a/www-apps/drupal/drupal-9.1.7.ebuild b/www-apps/drupal/drupal-9.1.7.ebuild
new file mode 100644
index 000000000000..1fa351c0c00f
--- /dev/null
+++ b/www-apps/drupal/drupal-9.1.7.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PV=${PV:0:3}.0
+MY_P=${P/_/-}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="PHP-based open-source platform and content management system"
+HOMEPAGE="https://www.drupal.org/"
+SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres sqlite +uploadprogress"
+
+RDEPEND="
+	dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml]
+	virtual/httpd-php
+	uploadprogress? ( dev-php/pecl-uploadprogress )
+"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
+		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
+
+	dodoc ${docs}
+	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
+
+	cp sites/default/{default.settings.php,settings.php} || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+
+	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	echo
+	ewarn "SECURITY NOTICE"
+	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
+	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
+	echo
+	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
+	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
+	echo
+	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
+	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
+	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
+	ewarn "reported by the setup."
+	echo
+}
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 99cfbdf6e43f..777da320de6d 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -3,13 +3,10 @@ AUX kibana.initd 1019 BLAKE2B f57bce1793768f2936dc8cd3437aacbb4d4e034ac53612f010
 AUX kibana.logrotate 186 BLAKE2B e0446247e29b474dcab5756ac26f10fd8f46300e144386ff54a4e25fc1c2678ce0d21196b7365b01417cd0304a3f1edd6841800256e931bdc10f7d4e0f4ccd49 SHA512 1e0a51a83798e30b3807f496245b5733bc60a7bd1a529d2548a187ff8d3fa56d60bc23abf516d239ef76a8e9b66358ed84c687040a7b04c7818ea63417d33a1e
 AUX kibana.service 511 BLAKE2B 2b0786bfaf37c26e061973f38adea0a55ac1b8bf771395242c0ed3b53c6586099c121c286b23f0a3be67dc481a3e95c6f87486cd1601df997126d3cfd14435c1 SHA512 0b7754ebfa7e3538e64843436d8abe32a6ce38a9ab5e252e52657a99d97fa1801777db4502c1af5ec6082d83f0b3a0613e074f6ebe28624832bd0c258a478899
 DIST kibana-6.8.15-linux-x86_64.tar.gz 188083650 BLAKE2B ce12b1f564f9059952402d53a43c4e2b5a550b69b8835460f870fdf772ce8881325239165677659f6bfc295e148831b3e0459e7a059f73d03e218260c8e5139e SHA512 7afbcd42f332b281106fc58397d7229aa3e3ac38aa9ffcd5d7e3edf32b084f6bf812eac002166099b4e270019651a0d6cb3a9ea06f93f5927c4b4329eb36a14e
-DIST kibana-7.10.2-linux-x86_64.tar.gz 249171053 BLAKE2B 279b1f67a9aaaf6d4bd0a8ba6028794ce8a9a996c9e9daad0815f9dfe9c696748d4210a7496907ee4be8fac111a2f08cc6d84d8fdac0b959b4ce6ee48f712d1a SHA512 aa68f850cc09cf5dcb7c0b48bb8df788ca58eaad38d96141b8e59917fd38b42c728c0968f7cb2c8132c5aaeb595525cdde0859554346c496f53c569e03abe412
 DIST kibana-7.12.0-linux-x86_64.tar.gz 281022115 BLAKE2B 6400dc95f0d2eb357cce46679ab3eb1043f873dcc5904cb1d1169d44fefdc8ca5bcde8c8d3990f951754c2448c12514ac4d0a355f817e5b9b5ce7bf52fb41d00 SHA512 0b6a9596698c64a65d82cc146dad8e24118eb8991b9ed36e13f309d2e3d7af408c35358a8b39899bf2daf260ddd8d50678d437a3dba32923fe026da99a526006
 DIST kibana-7.12.1-linux-x86_64.tar.gz 281051589 BLAKE2B 041ac27f3d58ad419cf6410fcd452dad34a205699701088eeea11056974429e27a1c980ddc2609a592ee1c33f73bde39724603c17c604973a5c80bf1c36e3a70 SHA512 f215ae38c6976e0926b57a3dcb639ba532b724a8195e791a33a09540865a49e7180bed1692a6530b149e0bd6c4dd130c1d6c2dc6022b3ec5b8ec7ec4dc977b17
 DIST kibana-oss-6.8.15-linux-x86_64.tar.gz 70468224 BLAKE2B 5ad359cef5082035eaefe277128f8badce8539484f30399d504efe8fe645b1e925f22126a48bf3ef89efc466eff641241e109372ca84f34d2ac4014aeec1868a SHA512 ef67258e2f3d3f447a53ec23d519f13ea50a65f3fde7215352178a6efad9b20c9ce5ade14c4a185c2005b9ec29c997e40e435a0129dd4d03adeaaa21868c9a22
-DIST kibana-oss-7.10.2-linux-x86_64.tar.gz 111701314 BLAKE2B b72ebac1d628cdf486b815d7b9bc87d14d09d21d86affdafa2b7809486649bd10f7d63ba832bb0841102915d5efefce2d4324df8314272a37774ea031fa59ef4 SHA512 77ebb247d5326f3f9ab97d57ecc00c7f70deae0e1857d8b5d8f9a5d05d6713e27514cca342df666be79ab85a580e9dc5c7fa9676d67e95db64a0d69546d8d699
 EBUILD kibana-bin-6.8.15.ebuild 2524 BLAKE2B 1c3fd84640cf6fbb363b79410db8b5efd9a49bd2a7ef8f55cc3e3d590ee67a6b11782f368fa631cd9866344dfaccd38789efa2050a15227f39ae91406688f87b SHA512 7b36816cbadc0edc36714b81823fc2a21001337907204651a56b5c0245647af8b2c1e2ec40349ab344696971be969fd3c42ace58e3f9a7b17885751a4e351136
-EBUILD kibana-bin-7.10.2.ebuild 2341 BLAKE2B 01aa588dcc73058f0fd8ecbec786ff2b9e1f8ea3d82b50970599d2a9ced5658a36f447a117eb2b782fcaba606a4f14c5bfc0e11fa797fb593e5215c382c26fda SHA512 d95fc8e7fc727aa7928a1e011d6d25f64eea5492db94c1467597e00cb77a8ada82e28387c6b7d42829cab4c83c90d1678d289b188932220b3df45a437ef6bdac
 EBUILD kibana-bin-7.12.0-r1.ebuild 2635 BLAKE2B c5d247f7732c7fc8cd06c54c6f555d532536ad82faa36afb5a983e542e338974d5a92a96f52b5b82f193d90bffa8fb0dcdef921de5707214ad120c61615fbc64 SHA512 c4373a9b1a56c27c68ff2977d2412c87e6e1604d2d26a4403ca227912d2c6e5c499e3e2f40fd4bad586c7960fdce8930aa4fea70bf177d58ebfb9073b4dc9fca
 EBUILD kibana-bin-7.12.1.ebuild 2537 BLAKE2B d01242c393c73232af9b9c6ba4d16201c9a7e2e847d09df7484c26982d0928fbdf4f74548b5667320505efc1cb9edc5f931f2b22d9f5f8ade74333c54b8ebebe SHA512 ce3432f6a6ba0476880c3e66e8103456624ac46fb807162e118fb3c944e802ef283dd6a5b7405352acbe62a5f04d1381a025c0036b24917b53422d2f42cbd62c
 MISC metadata.xml 690 BLAKE2B 760ed33239b72e0464be29979034d3ea1ab4e44b9645f76088a5aff5d8d1812a9eb3c42dc218d35139898592580d7fa80e19115249df96552201c05b37470be1 SHA512 4d6347db943b11b799884dcc266bc4b4cb8de6516d64a9eb689d952ea9202f4efbf8f5c950c3502d4e30793d012a080f34c653b8563ad63b1701ae7afe8de7c3
diff --git a/www-apps/kibana-bin/kibana-bin-7.10.2.ebuild b/www-apps/kibana-bin/kibana-bin-7.10.2.ebuild
deleted file mode 100644
index 7efcf6021c95..000000000000
--- a/www-apps/kibana-bin/kibana-bin-7.10.2.ebuild
+++ /dev/null
@@ -1,90 +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_P=${MY_PN}-${PV}
-
-DESCRIPTION="Analytics and search dashboard for Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/kibana"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RDEPEND="
-	acct-group/kibana
-	acct-user/kibana
-	>=net-libs/nodejs-10.23.1
-	<net-libs/nodejs-14
-	x-pack? (
-		dev-libs/expat
-		dev-libs/nss
-	)"
-
-# Do not complain about CFLAGS etc since we don't use them
-QA_FLAGS_IGNORED='.*'
-
-S="${WORKDIR}/${MY_P}-linux-x86_64"
-
-src_prepare() {
-	default
-
-	# remove unused directory
-	rm -r data || die
-
-	# remove bundled nodejs
-	rm -r node || die
-	sed -i 's@\(^NODE="\).*@\1/usr/bin/node"@g' \
-		bin/kibana || die
-
-	# move plugins to /var/lib/kibana
-	rm -r plugins || die
-
-	# handle node.js version with RDEPEND
-	sed -i /node_version_validator/d \
-		src/setup_node_env/index.js \
-		src/setup_node_env/no_transpilation.js || die
-}
-
-src_install() {
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	rm -r config || die
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
-
-	newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
-	newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-
-	insinto /opt/${MY_PN}
-	doins -r .
-
-	fperms -R +x /opt/${MY_PN}/bin
-
-	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
-	keepdir /var/lib/${MY_PN}/plugins
-	keepdir /var/log/${MY_PN}
-
-	dosym ../../var/lib/kibana/plugins /opt/kibana/plugins
-}
-
-pkg_postinst() {
-	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
-	elog "Node.js 10. Some plugins may fail with other versions of Node.js (Bug #656008)."
-	elog
-	elog "To set a customized Elasticsearch instance:"
-	elog "  OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}"
-	elog "  systemd: set elasticsearch.url in /etc/${MY_PN}/kibana.yml"
-	elog
-	elog "Elasticsearch can run local or remote."
-}
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index 6a114165a31d..b760f7b338d7 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,5 +1,7 @@
 AUX postinstall-1.18-en.txt 2611 BLAKE2B c4d110d0d7c3fc270b0dc7f134cf7de8f2ca4595692ac146c2e4cd1c3647e7399d44249059496960ae94490c5b188c986dab64d4b90901bd7fc44203493532a0 SHA512 2b6a0e00160c15466bf70189499816d18a5ea06f040ed79f2361842be93a584ea19033170dc59c1d78c590da85223a61b8d04730084e60bc7906648f2532578b
 AUX postupgrade-1.16-en.txt 1519 BLAKE2B 39cf00073c5d12e04dd69126c7671acb5876bcdd592526d6aca475b98f9ed7abcb6d2691cef8642be04d8041fcbdaee0555937f1480f71a82c3f367f2a3d99b6 SHA512 495a2ea3074e96e570ed83e557691786524aea878fa6ee489080245a9bb1669d93e318c3871ce44918225d0e64d09e1e644538627bfb35a4a2a12d27365dc89d
 DIST mediawiki-1.35.2.tar.gz 48109666 BLAKE2B 913eac591bc33a37003ac65934128e4c2f318ff4a4e8cf0afc455c978871bd53de4b15848b82f94e6613222f28faf6c2d8573413c48aef637d05e5703a3e587d SHA512 2d2e2e0307fa0b8bc52088431301a2fd1aeacc2347a55f663267154c3639b478789c7105454204136b83d070a6cc37045ce4a072846ad2f298a63379712d2da7
+DIST mediawiki-1.36.0.tar.gz 49645867 BLAKE2B b4deba550448aed5773d825d5e5a78d03e2b91f317cd0f842f164ba7e3aac3a999e45f799abc3c909519f909b4b6cfdf6642364259cf96cf5a811a909bc2d6a0 SHA512 3429b8781102e2da21c67f3d31bfdb07af0924d579521b4f1a89ddc195e20a6f19f2fa073ddbd2093d4debd19eb595c2eb096a67a6566c3e5fa7260b6f23e3aa
 EBUILD mediawiki-1.35.2.ebuild 2562 BLAKE2B 2d8d6a99b214f4d28bf1e7f250cd0dbdf2482ee6422a4ba2f0f5b656317a7909f8e7c37dc3afaedb02999f3c11e69f98fa584950a2b86c2c8b4adb134ff40cf0 SHA512 6962022476690a86a1554d994bb1c13ff382a84042e5e91c7089b0494b0c45b487cb3975413dfa2d37fef2c0d539c66c0092d432b0ca3337b20848f58118873c
+EBUILD mediawiki-1.36.0.ebuild 2570 BLAKE2B 6fab5279bef31daea0a6d0077c708cab758d34675f1ff707cdd5527e34b47449f083ee8958718fe89d98e29fc364f459c265fc8c2515aaa0f114e1567113fd81 SHA512 3addd9e6f8a4026ef14d4020f9d8b2ec7f96e4b076aaf3a8faba0a11e0b215c1454638c0a2a9c7cab6e1ad9c1fe81d5f8a7fb876afcb01db1e226506ac394e62
 MISC metadata.xml 269 BLAKE2B b5fe1916a519f7f4dab2a7eafc819ccd487169cc055360ffa0376411629fa03bed0bb3a9fad9e54143ca0294edf56a4ea53569afb0cdd191ef8cba7fd6d4deb0 SHA512 399d848eb675167467ee711ad74bd73c6fccf5a31928ee86cf88ed65ee1fbfe8cb1b8b868d0a8d18a6f36d1b9449353b556e201d09ac5dccc2995b956a2c7c4c
diff --git a/www-apps/mediawiki/mediawiki-1.36.0.ebuild b/www-apps/mediawiki/mediawiki-1.36.0.ebuild
new file mode 100644
index 000000000000..b2781106013a
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.36.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit webapp
+
+MY_BRANCH=$(ver_cut 1-2)
+
+DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
+HOMEPAGE="http://www.mediawiki.org"
+SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND=">=dev-lang/php-7.3.19[ctype,fileinfo,iconv,intl,json(+),postgres?,session,ssl,unicode,xml,xmlreader]
+	imagemagick? ( virtual/imagemagick-tools )
+	!imagemagick? ( dev-lang/php[gd] )
+	mysql? ( dev-lang/php[mysql,mysqli] )
+	sqlite? (
+		dev-db/sqlite[fts3(+)]
+		dev-lang/php[pdo,sqlite]
+	)
+	virtual/httpd-php"
+
+need_httpd_cgi
+
+RESTRICT="test"
+
+src_unpack() {
+	default
+
+	# remove lua binaries (bug #631554)
+	rm -fr "${S}"/extensions/Scribunto/includes/engines/LuaStandalone/binaries || die "Failed to remove lua binaries"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	# First we install docs and then copy everything left into htdocs dir
+	# to avoid bugs like #236411.
+
+	# We ensure the directories are prepared for writing.  The post-
+	# install instructions guide the user to enable the feature.
+	local DOCS="FAQ HISTORY INSTALL README.md RELEASE-NOTES-${PV:0:4} UPGRADE"
+	dodoc ${DOCS} docs/*.txt
+	docinto databases
+	dodoc docs/databases/*
+	# Clean everything not used at the site...
+	rm -rf ${DOCS} COPYING tests docs || die
+	find . -name Makefile -delete || die
+	# and install
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# If imagemagick is enabled then setup for image upload.
+	# We ensure the directory is prepared for writing.
+	if use imagemagick ; then
+		webapp_serverowned "${MY_HTDOCSDIR}"/images
+	fi
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-1.18-en.txt"
+	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.16-en.txt"
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "=== Consult the release notes ==="
+		elog "Before doing anything, stop and consult the release notes"
+		elog "/usr/share/doc/${PF}/RELEASE-NOTES-${PV:0:4}.bz2"
+		echo
+		elog "These detail bug fixes, new features and functionality, and any"
+		elog "particular points that may need to be noted during the upgrade procedure."
+		echo
+		ewarn "Back up existing files and the database before upgrade."
+		ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki"
+		ewarn "provides an overview of the backup process."
+		echo
+	fi
+}
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index c8e62a16230f..6993a69c6c46 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -3,10 +3,12 @@ AUX config.php 718 BLAKE2B b12392f83a9feaaad4ad5ac7c7e3ff27670b9aad959db55289004
 AUX postinstall-en.txt 6524 BLAKE2B 68262eaf6318780a468d9e6f98c3b2cce43164964de6ea6626da43b1ac481b6edea6d0314cc4038adb511c4354a8f18dfd9da9145901d26665f84e746ab14e9b SHA512 bb3e5187db6be49707801cfde15ebced065f2d4b8c1a04fef2f4ced0a67dab2440b8e79d110685056cad84647f8ebb587c697452df8e2b0eab07b015d01b92cf
 AUX postinstall-nodb-en.txt 171 BLAKE2B ee2aa857cf365815b705b5e60c5b2fef0cdb0bcd8acef0375e0173f13c004e336df9b2dbc6cac376bea939e8fe73a72f06d52961500d05ee2137a8fea82286b1 SHA512 b0cf4787351f904caf06573c5bc50275b6a11361170b4006acc24224f44efde69cfe3a9b6340d6787c5805c605dc89f07072bf992b0ee255c97fba90e5d5617e
 DIST moodle-3.10.3.tgz 57483053 BLAKE2B a5129f45c4fdf101df7c96885a8c5cec7cad797a545d5a3fae621f5868cafcf3e9f1cdf06f16e689ccfe0e2bcab6fabd65a5fd45ef178f313176ca5e23350cd9 SHA512 934d42b6fc29c2c9ebcddf788c3e983c3bade77f5d2dbb28a612b17d263a67fd08c0f2a5983bbc1a87054d965cabc3c7257a940febec73f1df72bc7e586cd321
+DIST moodle-3.11.tgz 59365522 BLAKE2B f9a2f77dd851efd740b924e51de6b882955101834ca4201bf2fd243ddd8dbe403d1054dcebb5c3022e941fe9f7d119b285d6e955cdb871288cb3b0e40eb9de07 SHA512 69509d57990bf9cca7a262b78f6beb0d90d89e5d93018fd306f662d32303dd39cc0a14b2eee0d58e8f420766cf0acbeeaf6e1f7d43de6b99d0999747b438ee5a
 DIST moodle-3.5.18.tgz 46812954 BLAKE2B fc13835e9d40236b2d572f344870999cd9ea60d11a043428acacc34362fbf114c2253083a6165dc800bca9c5cbb9cefeb4f7f76111a880348bf7b0988cdda8c7 SHA512 8336ba4dd638410e0697e1ee0c9715f166d934ae1325079e5b14e6e7959e32426103bb1af1e1e80ced3764e5c49ccea254de590f729762e417b21dab3f1b849c
 DIST moodle-3.8.9.tgz 53320016 BLAKE2B 5c0c54f5a57eea97c591d75088fe89e8e12df1e233f99c7025fb4e3720a27aa8133ccd25b25876faf2335497827ca748579607dbb2d52c01043fd59854f6dba4 SHA512 ec0bc22d82ae2afb69d491df75011568dba771cc2cbab988dbfe9bc1c4daa6d5e947ca8b9d71acabecd9c57d25202d79321abf1cdda6908ad32511db6c107289
 DIST moodle-3.9.6.tgz 57105713 BLAKE2B 26b5334eda2fac641020459b8471db692f7202acc62b72e11a43fdb3893dadcf2150af7c82659c408ab9ee4660b766498c2c3005f8b43ed980ecefd60263e581 SHA512 0c66070f9cf422a6ed11ac6ff067aba294bc7f4d4b5a17f729c4e4fbb060b59ee232a4a87996557afaa7c6646bfcc3c14736ff4cb18b20a8a31386cc40a61d7f
 EBUILD moodle-3.10.3.ebuild 2809 BLAKE2B 1dcdba6d0f8c9dbcd6dc0697a9e516d1d3a362b44cc792d5cffb97efd6be25670b8263e55ccb2139c74166b164d0e0eb6d32052f51bb1f3e575045ec712d29b2 SHA512 8d5cd9354198ecfae246854cb25cc9b7ac56b6e6230d4f9d240a15a080cef74fabb92447d463644009a12fb0d679285d7348bb1f174cf5861a3ad05052ff5880
+EBUILD moodle-3.11.ebuild 2809 BLAKE2B fc5b803fd4528d458d38ac363fa943c5a287142e7da91eb698f5f9b0eb2f7e146a7926e467de8f235f343e49887c316c6df18df04bf5b6984e66e027fefee848 SHA512 dfc2e872ed4169897735414b47ea2155045ac5ddf3615408ead26b0c403c168a40cc31e041b875392db452a6b0988d79b79f1dd8d2152406abaf62539be3f2c7
 EBUILD moodle-3.5.18.ebuild 2809 BLAKE2B c1c12d463986b66c67949f8a698d1d2b9f994a24c039037ace0e8f9e0cd9c5a154ac0f4506bcee1d9660d2802eae26086921270f235019712b98ca27196e6535 SHA512 1290aede300fdd6697bd4c1ece2cea96acff535542dffea0d4d6a824d879bfcdd85eb9e44c7d4e00f1addbffb11231fa60bacf69c567fa0ebef0c51abe011e82
 EBUILD moodle-3.8.9.ebuild 2809 BLAKE2B 80ceb10f90d8288baa2ebcc639f161e31a546c029f88cf8ada174f8bd097ab97a2afe974f09a9056cab6040a63bf7e7b7b103dc55787134aced82e3e0c3f0d06 SHA512 c3ea934d47623b55c317791542ad5ca09dff19645cc3f34e9edf4795de1e952d1e901523f239102b6896447a4eea0f19a67038227aa829e061f8fc0e2e1d3b11
 EBUILD moodle-3.9.6.ebuild 2809 BLAKE2B 1dcdba6d0f8c9dbcd6dc0697a9e516d1d3a362b44cc792d5cffb97efd6be25670b8263e55ccb2139c74166b164d0e0eb6d32052f51bb1f3e575045ec712d29b2 SHA512 8d5cd9354198ecfae246854cb25cc9b7ac56b6e6230d4f9d240a15a080cef74fabb92447d463644009a12fb0d679285d7348bb1f174cf5861a3ad05052ff5880
diff --git a/www-apps/moodle/moodle-3.11.ebuild b/www-apps/moodle/moodle-3.11.ebuild
new file mode 100644
index 000000000000..cf74bb2c1bd0
--- /dev/null
+++ b/www-apps/moodle/moodle-3.11.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit webapp
+
+MY_BRANCH="stable$(ver_cut 1)$(ver_cut 2)"
+
+DESCRIPTION="The Moodle Course Management System"
+HOMEPAGE="https://moodle.org"
+SRC_URI="https://download.moodle.org/${MY_BRANCH}/${P}.tgz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-3+"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+#SLOT empty due to webapp
+
+DB_FLAGS="mysqli?,mssql?,postgres?"
+DB_TYPES=${DB_FLAGS//\?/}
+DB_TYPES=${DB_TYPES//,/ }
+
+AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
+AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
+AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
+
+PHP_REQUIRED_FLAGS="ctype,curl,iconv,json,session,simplexml,xml,zip"
+PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
+PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
+
+IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
+
+# No forced dependency on
+#  mssql? - lives on a windows server
+#  mysql? ( virtual/mysql )
+#  postgres? ( dev-db/postgresql-server-9* )
+# which may live on another server.  These USE flags affect the configuration
+# file and the dependency on php.  However other dbs are possible.  See config.php
+# and the moodle documentation for other possibilities.
+DEPEND=""
+RDEPEND="
+	>=dev-lang/php-7.3[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
+	virtual/httpd-php
+	virtual/cron"
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	# How many dbs were selected? If one and only one, which one is it?
+	MYDB=""
+	DB_COUNT=0
+	for db in ${DB_TYPES}; do
+		if use ${db}; then
+			MYDB=${db}
+			DB_COUNT=$(($DB_COUNT+1))
+		fi
+	done
+
+	if [[ ${DB_COUNT} -eq 0 ]]; then
+		eerror
+		eerror "No database selected in your USE flags,"
+		eerror "You must select at least one."
+		eerror
+		die
+	fi
+
+	if [[ ${DB_COUNT} -gt 1 ]]; then
+		MYDB=""
+		ewarn
+		ewarn "Multiple databases selected in your USE flags,"
+		ewarn "You will have to choose your database manually."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	rm COPYING.txt
+	cp "${FILESDIR}"/config-r1.php config.php
+
+	# Moodle expect pgsql, not postgres
+	MYDB=${MYDB/postgres/pgsql}
+
+	if [[ ${DB_COUNT} -eq 1 ]] ; then
+		sed -i -e "s|mydb|${MYDB}|" config.php
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
+	dodir ${MOODLEDATA}
+	webapp_serverowned -R "${MOODLEDATA}"
+
+	local MOODLEROOT="${MY_HTDOCSDIR}"
+	insinto ${MOODLEROOT}
+	doins -r *
+
+	webapp_configfile "${MOODLEROOT}"/config.php
+
+	if [[ ${DB_COUNT} -eq 1 ]]; then
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	else
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
+	fi
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	einfo
+	einfo
+	einfo "To see the post install instructions, do"
+	einfo
+	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
+	einfo
+	einfo
+}
diff --git a/www-apps/netbox/Manifest b/www-apps/netbox/Manifest
deleted file mode 100644
index 79d0570d9546..000000000000
--- a/www-apps/netbox/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX gunicorn_config.py 116 BLAKE2B 44fa3354dce54136bd031012bad2c6cc5ed6208bd253985a29a0e7c6f76aee4f042b8f707d9c09e1c49be8e61b27e44ff2195b8bdc54f4c51659924717f0cdd9 SHA512 43a065aa044a028334a96a0d22ffe1c35ad1f76b605215c4d5a288943cfeeb03e7e71a6d22116764c55bd95aaea103c1026d6355c9ded9577b4a7aefbc6f71c3
-AUX netbox-2.6.7-no-pip.patch 1062 BLAKE2B c134503d9c65bdc82147dcf045b69531276c021d650842b28407ed92ac6c7811e98be83b73279f93db2838e2edf7c651ab4e2a43f5421487029c708edb5a6f8f SHA512 e0ac02fcb65a5b7a0e199ef1d82993f75018fd45779bd073b3cfa75b18c221b17db390d5f6a81545505771effa5cd7aabfc96da107b3968b8f7e2a8bcbed9ade
-AUX netbox-rqworker.initd 463 BLAKE2B 9a77e8366018cc6d6a3130580df1ce5e84db06f44857a89243f6f7f527c94477669d2da1f1b588386ca341acd2825484761635346e1cd61ff576c85b506525b7 SHA512 881ef3745aeab79f641e5648301d5584b9ebc8e75c550c01ce6f8d78731b5dde4d4f4b47e2f01d55c788f755eea7e633c82b2dd6027b9cd32385f7d66ff3e1ef
-AUX netbox.initd 432 BLAKE2B 500eeb7a042c930e38e5417eab92fb141dae14ae5dcb62257cd0a6ae6ca4fd0034fdf3dada4cc49a259edd9e565571102351eca447f568ab9becbd7e6a86099e SHA512 14e4544717f17d37209a1613a962fad9110ae0ec39512649d50776eaa2270fd8ba8a4456b11fb66941081aa96553668d7b3ebd12f631f56d234784bdd25f9de0
-DIST netbox-2.7.2.tar.gz 4936914 BLAKE2B 905e2667d0637d2edb655efcba1d697eacb097ddd67c8e4586ee2a3ce5a81e4fe98a71f574ae5c732190e03e42fd4cab2f781a30622e79d5e9ea4db7c86de263 SHA512 87753ce955e296d9605e44d5f0df58c14876ca8feda3245dee166fba8a51cbfda7def8da39663570cd0e7c9195cc163d9e877b59027ea1161c7eec33702a3ea4
-DIST netbox-2.7.6.tar.gz 4949672 BLAKE2B 1847e5a05493f55ca777737c11b4751bc63183d693f742c7f9b9e5d6a498fe786a60619d40394473488881e6ef922a343cacd796126b8c618158eea9ab26216d SHA512 065e9c4338fb876ac626f5dec5c98ba2ee798b2fd6d4d8a8d4e57fff4072c649e51a1db633c2718be9ca10b362e7ead9b70655fa77ae6da9f01706e60135e306
-DIST netbox-2.7.8.tar.gz 5587481 BLAKE2B 9b524ca7acc1d650402a72aa65f75d7205cf29a3a5cfa9256ff47d12f240fc38903a6db76b8cee2b923947f6e31b124ba0bfdfbf4385fb6fd027634b3b8ba675 SHA512 cce73b9bbd79725e4af01a9265c0a9f14a1ac708186123c1a90f267149157a0c174cd32d5e56875b5fdb55ef87b2ec668ec542b1d3a01256544065d6a0457b54
-EBUILD netbox-2.7.2.ebuild 4415 BLAKE2B de159d8764334ff65f3a7e36efdc890522ef035f62ba50732de1fc01bb0cede1b18b07236b357d418f0299d10818ea4e0c9b552a5946e21ad690fdadd18326e2 SHA512 b142e641ff712d0440a9500ec2718f8e1e06a442c324b0897118a424b96efe4c7713bfdf5a9d9f9cba3cd708df52a87eeb36a6a0c2fca6d4353d2363508d2389
-EBUILD netbox-2.7.6.ebuild 4415 BLAKE2B de159d8764334ff65f3a7e36efdc890522ef035f62ba50732de1fc01bb0cede1b18b07236b357d418f0299d10818ea4e0c9b552a5946e21ad690fdadd18326e2 SHA512 b142e641ff712d0440a9500ec2718f8e1e06a442c324b0897118a424b96efe4c7713bfdf5a9d9f9cba3cd708df52a87eeb36a6a0c2fca6d4353d2363508d2389
-EBUILD netbox-2.7.8.ebuild 4475 BLAKE2B 91289267eddfe747c3b526e6981aec2d5210733ea0885c679936409bef3c94eae2be782109c46b734054395d96b65115788d0fb8c071dc875ec3dbe8a518c0bf SHA512 3ac04abaf56dbdb13be3276ba8335c996af8845be200b046690852a604bfdd9ec5704eca52c6dfa8c2bbdd77b65e6f12b71e32651ae1419d06f43ed40fc16d63
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/www-apps/netbox/files/gunicorn_config.py b/www-apps/netbox/files/gunicorn_config.py
deleted file mode 100644
index 4cb7111fac44..000000000000
--- a/www-apps/netbox/files/gunicorn_config.py
+++ /dev/null
@@ -1,5 +0,0 @@
-command = '/usr/bin/gunicorn'
-pythonpath = '/opt/netbox/netbox'
-bind = '127.0.0.1:8001'
-workers = 3
-user = 'netbox'
diff --git a/www-apps/netbox/files/netbox-2.6.7-no-pip.patch b/www-apps/netbox/files/netbox-2.6.7-no-pip.patch
deleted file mode 100644
index a47e151c0842..000000000000
--- a/www-apps/netbox/files/netbox-2.6.7-no-pip.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/upgrade.sh b/upgrade.sh
-index d17dec06..6972ed2f 100755
---- a/upgrade.sh
-+++ b/upgrade.sh
-@@ -10,27 +10,6 @@ cd "$(dirname "$0")"
- PYTHON="python3"
- PIP="pip3"
- 
--# Uninstall any Python packages which are no longer needed
--COMMAND="${PIP} uninstall -r old_requirements.txt -y"
--echo "Removing old Python packages ($COMMAND)..."
--eval $COMMAND
--
--# Install any new Python packages
--COMMAND="${PIP} install -r requirements.txt --upgrade"
--echo "Updating required Python packages ($COMMAND)..."
--eval $COMMAND
--
--# Validate Python dependencies
--COMMAND="${PIP} check"
--echo "Validating Python dependencies ($COMMAND)..."
--eval $COMMAND || (
--  echo "******** PLEASE FIX THE DEPENDENCIES BEFORE CONTINUING ********"
--  echo "* Manually install newer version(s) of the highlighted packages"
--  echo "* so that 'pip3 check' passes. For more information see:"
--  echo "* https://github.com/pypa/pip/issues/988"
--  exit 1
--)
--
- # Apply any database migrations
- COMMAND="${PYTHON} netbox/manage.py migrate"
- echo "Applying database migrations ($COMMAND)..."
diff --git a/www-apps/netbox/files/netbox-rqworker.initd b/www-apps/netbox/files/netbox-rqworker.initd
deleted file mode 100644
index 54794f26fb90..000000000000
--- a/www-apps/netbox/files/netbox-rqworker.initd
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2019 Sony Interactive Entertainment Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-name="netbox-rqworker daemon"
-description="nnetbox-rqworker daemon"
-command=/usr/bin/python3
-command_args="/opt/netbox/netbox/manage.py rqworker"
-command_user=netbox:netbox
-directory=/opt/netbox/netbox
-error_log=/var/log/netbox/netbox-rcworker.log
-output_log=/var/log/netbox/"${RC_SVCNAME}".log
-supervisor=supervise-daemon
diff --git a/www-apps/netbox/files/netbox.initd b/www-apps/netbox/files/netbox.initd
deleted file mode 100644
index 74e6c3b717fb..000000000000
--- a/www-apps/netbox/files/netbox.initd
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2019 Sony Interactive Entertainment Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-description="netbox daemon"
-command=/usr/bin/gunicorn
-command_args="-c /etc/netbox/gunicorn_config.py netbox.wsgi"
-command_user=netbox:netbox
-directory=/opt/netbox/netbox
-error_log=/var/log/netbox/"${RC_SVCNAME}".log
-output_log=/var/log/netbox/"${RC_SVCNAME}".log
-supervisor=supervise-daemon
diff --git a/www-apps/netbox/metadata.xml b/www-apps/netbox/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/www-apps/netbox/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/www-apps/netbox/netbox-2.7.2.ebuild b/www-apps/netbox/netbox-2.7.2.ebuild
deleted file mode 100644
index cc78230888df..000000000000
--- a/www-apps/netbox/netbox-2.7.2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-inherit python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="IP address and data center infrastructure management tool"
-HOMEPAGE="https://github.com/netbox-community/netbox"
-SRC_URI="https://github.com/netbox-community/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ldap"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	acct-group/netbox
-	acct-user/netbox
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cacheops-4.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cors-headers-3.2.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-debug-toolbar-2.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-filter-2.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-prometheus-1.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-rq-2.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-tables2-2.2.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-1.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-timezone-field-4.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/djangorestframework-3.10.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/drf-yasg-1.17.0[${PYTHON_MULTI_USEDEP},validation]
-		>=dev-python/jinja-2.10.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
-		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-7.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psycopg-2.8.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycryptodome-3.9.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pyyaml-5.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/redis-py-3.3.11[${PYTHON_MULTI_USEDEP}]
-		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
-		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.7-no-pip.patch
-	)
-
-DISABLE_AUTOFORMATTING=YES
-DOC_CONTENTS="
-netbox is installed on your system. However, there are some manual steps
-you need to complete from the installation guide [1].
-
-On Gentoo, the configuration files you need to edit are located in
-/etc/netbox, not /opt/netbox as shown in the installation guide.
-
-If this is a new installation, please follow the installation guide
-other than this difference. Also, if you need ldap, set the appropriate
-use flag when emerging netbox to install the dependency for it.
-
-Once that is done, you should be able to add the netbox service to the
-default runlevel and start it.
-
-If you want to use webhooks,  you should also add the netbox-rqworker
-service to the default runlevel and start it.
-
-If this is an upgrade, follow these instructions:
-
-Stop the netbox service. If the  netbox-rqworker service is running,
-stop it as well.
-
-Next, run the upgrade script as described in the upgrading guide[2].
-
-Next, check for new configuration options and set them as appropriate
-for your system.
-
-Next, start the netbox service.
-
-Finally, if you are using webhooks, start the netbox-rqworker service.
-
-[1] https://netbox.readthedocs.io/en/stable/installation/
-[2] https://netbox.readthedocs.io/en/stable/installation/upgrading/
-"
-
-src_install() {
-	dodir /opt
-	cp -a ../${P} "${ED}"/opt
-	dosym ${P} /opt/netbox
-dosym ../../etc/netbox/gunicorn_config.py /opt/netbox/gunicorn_config.py
-	dosym ../../../../etc/netbox/configuration.py \
-	/opt/netbox/netbox/netbox/configuration.py
-	dodir /etc/netbox
-	insinto /etc/netbox
-	newins netbox/netbox/configuration.example.py configuration.py
-	doins "${FILESDIR}"/gunicorn_config.py
-	fowners -R netbox:netbox /etc/netbox /opt/${P}
-	fowners -h netbox:netbox /opt/netbox
-	fperms o= /etc/netbox/configuration.py /etc/netbox/gunicorn_config.py
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newinitd "${FILESDIR}"/${PN}-rqworker.initd ${PN}-rqworker
-	keepdir /var/log/netbox
-	fowners -R netbox:netbox /var/log/netbox
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	local r
-	for r in $REPLACING_VERSIONS; do
-		if [[ $r = "2.5.10" ]]; then
-			ewarn "The home directory of the netbox user is now /var/lib/netbox"
-			ewarn "Please adjust your system."
-		fi
-	done
-}
diff --git a/www-apps/netbox/netbox-2.7.6.ebuild b/www-apps/netbox/netbox-2.7.6.ebuild
deleted file mode 100644
index cc78230888df..000000000000
--- a/www-apps/netbox/netbox-2.7.6.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-inherit python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="IP address and data center infrastructure management tool"
-HOMEPAGE="https://github.com/netbox-community/netbox"
-SRC_URI="https://github.com/netbox-community/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ldap"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	acct-group/netbox
-	acct-user/netbox
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cacheops-4.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cors-headers-3.2.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-debug-toolbar-2.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-filter-2.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-prometheus-1.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-rq-2.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-tables2-2.2.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-1.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-timezone-field-4.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/djangorestframework-3.10.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/drf-yasg-1.17.0[${PYTHON_MULTI_USEDEP},validation]
-		>=dev-python/jinja-2.10.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
-		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-7.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psycopg-2.8.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycryptodome-3.9.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pyyaml-5.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/redis-py-3.3.11[${PYTHON_MULTI_USEDEP}]
-		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
-		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.7-no-pip.patch
-	)
-
-DISABLE_AUTOFORMATTING=YES
-DOC_CONTENTS="
-netbox is installed on your system. However, there are some manual steps
-you need to complete from the installation guide [1].
-
-On Gentoo, the configuration files you need to edit are located in
-/etc/netbox, not /opt/netbox as shown in the installation guide.
-
-If this is a new installation, please follow the installation guide
-other than this difference. Also, if you need ldap, set the appropriate
-use flag when emerging netbox to install the dependency for it.
-
-Once that is done, you should be able to add the netbox service to the
-default runlevel and start it.
-
-If you want to use webhooks,  you should also add the netbox-rqworker
-service to the default runlevel and start it.
-
-If this is an upgrade, follow these instructions:
-
-Stop the netbox service. If the  netbox-rqworker service is running,
-stop it as well.
-
-Next, run the upgrade script as described in the upgrading guide[2].
-
-Next, check for new configuration options and set them as appropriate
-for your system.
-
-Next, start the netbox service.
-
-Finally, if you are using webhooks, start the netbox-rqworker service.
-
-[1] https://netbox.readthedocs.io/en/stable/installation/
-[2] https://netbox.readthedocs.io/en/stable/installation/upgrading/
-"
-
-src_install() {
-	dodir /opt
-	cp -a ../${P} "${ED}"/opt
-	dosym ${P} /opt/netbox
-dosym ../../etc/netbox/gunicorn_config.py /opt/netbox/gunicorn_config.py
-	dosym ../../../../etc/netbox/configuration.py \
-	/opt/netbox/netbox/netbox/configuration.py
-	dodir /etc/netbox
-	insinto /etc/netbox
-	newins netbox/netbox/configuration.example.py configuration.py
-	doins "${FILESDIR}"/gunicorn_config.py
-	fowners -R netbox:netbox /etc/netbox /opt/${P}
-	fowners -h netbox:netbox /opt/netbox
-	fperms o= /etc/netbox/configuration.py /etc/netbox/gunicorn_config.py
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newinitd "${FILESDIR}"/${PN}-rqworker.initd ${PN}-rqworker
-	keepdir /var/log/netbox
-	fowners -R netbox:netbox /var/log/netbox
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	local r
-	for r in $REPLACING_VERSIONS; do
-		if [[ $r = "2.5.10" ]]; then
-			ewarn "The home directory of the netbox user is now /var/lib/netbox"
-			ewarn "Please adjust your system."
-		fi
-	done
-}
diff --git a/www-apps/netbox/netbox-2.7.8.ebuild b/www-apps/netbox/netbox-2.7.8.ebuild
deleted file mode 100644
index d89acd9c0ad3..000000000000
--- a/www-apps/netbox/netbox-2.7.8.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-inherit python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="IP address and data center infrastructure management tool"
-HOMEPAGE="https://github.com/netbox-community/netbox"
-SRC_URI="https://github.com/netbox-community/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ldap"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	acct-group/netbox
-	acct-user/netbox
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cacheops-4.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cors-headers-3.2.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-debug-toolbar-2.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-filter-2.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-pglocks-1.0.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-prometheus-1.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-rq-2.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-tables2-2.2.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-1.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-timezone-field-4.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/djangorestframework-3.10.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/drf-yasg-1.17.0[${PYTHON_MULTI_USEDEP},validation]
-		>=dev-python/jinja-2.10.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
-		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-7.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psycopg-2.8.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycryptodome-3.9.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pyyaml-5.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/redis-py-3.3.11[${PYTHON_MULTI_USEDEP}]
-		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
-		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.7-no-pip.patch
-	)
-
-DISABLE_AUTOFORMATTING=YES
-DOC_CONTENTS="
-netbox is installed on your system. However, there are some manual steps
-you need to complete from the installation guide [1].
-
-On Gentoo, the configuration files you need to edit are located in
-/etc/netbox, not /opt/netbox as shown in the installation guide.
-
-If this is a new installation, please follow the installation guide
-other than this difference. Also, if you need ldap, set the appropriate
-use flag when emerging netbox to install the dependency for it.
-
-Once that is done, you should be able to add the netbox service to the
-default runlevel and start it.
-
-If you want to use webhooks,  you should also add the netbox-rqworker
-service to the default runlevel and start it.
-
-If this is an upgrade, follow these instructions:
-
-Stop the netbox service. If the  netbox-rqworker service is running,
-stop it as well.
-
-Next, run the upgrade script as described in the upgrading guide[2].
-
-Next, check for new configuration options and set them as appropriate
-for your system.
-
-Next, start the netbox service.
-
-Finally, if you are using webhooks, start the netbox-rqworker service.
-
-[1] https://netbox.readthedocs.io/en/stable/installation/
-[2] https://netbox.readthedocs.io/en/stable/installation/upgrading/
-"
-
-src_install() {
-	dodir /opt
-	cp -a ../${P} "${ED}"/opt
-	dosym ${P} /opt/netbox
-dosym ../../etc/netbox/gunicorn_config.py /opt/netbox/gunicorn_config.py
-	dosym ../../../../etc/netbox/configuration.py \
-	/opt/netbox/netbox/netbox/configuration.py
-	dodir /etc/netbox
-	insinto /etc/netbox
-	newins netbox/netbox/configuration.example.py configuration.py
-	doins "${FILESDIR}"/gunicorn_config.py
-	fowners -R netbox:netbox /etc/netbox /opt/${P}
-	fowners -h netbox:netbox /opt/netbox
-	fperms o= /etc/netbox/configuration.py /etc/netbox/gunicorn_config.py
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newinitd "${FILESDIR}"/${PN}-rqworker.initd ${PN}-rqworker
-	keepdir /var/log/netbox
-	fowners -R netbox:netbox /var/log/netbox
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	local r
-	for r in $REPLACING_VERSIONS; do
-		if [[ $r = "2.5.10" ]]; then
-			ewarn "The home directory of the netbox user is now /var/lib/netbox"
-			ewarn "Please adjust your system."
-		fi
-	done
-}
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index dd904a046173..f9d5ea54e501 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,14 +1,16 @@
 AUX php-argon2-en.txt 416 BLAKE2B 9940a3e218d1db382790f4754352594c9098eccce7426729e75471f017e15bb45b50cc885609e54817077e36d9feb4484bcff5b40c4f669ad80d4d5a643da8bc SHA512 076bbbfb9305a2608b60fb7f9802a5a455c5d049d39c8f209eadac1a306ba2015d11a30b4544d8cdf43025077a3c3087f3e9922cd9b530a08c089a7818590115
 DIST nextcloud-19.0.10.tar.bz2 95762826 BLAKE2B 305661eeb7e754ddcf662c9749501d84adf57a06a55dbf438f80ea35fb56e36d2bb64f46ad30e16193274f494e8e01bed500bc03daa2e02013a48719062b80e2 SHA512 ce04f665d5b1a6942a08f1442f96258327d6bf1082df5f7b4a5972e08250e96c71dd3c2674f313f7e5abfa587cdefbedf21fdd7053cadebdf90274f937d7de26
-DIST nextcloud-19.0.9.tar.bz2 82504506 BLAKE2B bcd456b96e778675509f0c3bb900c7489667f723bf9f4680bb9b353f762e2ed7dc0456212d659b71cbb978e222301a1bdc0e46358eb179e125ef93f4206b17c7 SHA512 12c9f3c9938cd37a852008e1490ab892f1adb8b37983cd58fbba7afe0231adaa9fc328c18c15136741eca5f0e2a2048c9cdff17e1ba5d8acc6cc660af99b948d
+DIST nextcloud-19.0.12.tar.bz2 95471173 BLAKE2B 662afe90817d02a76ca2bcd2f1070bd9c34a07e8da88b49cb8b096717bd0efd993f7e84672a226747c2a510c229edf609be681a7ef9f5b743b6a05c3f7f56401 SHA512 9e182e8b85f62d001b937379bb628a723ecf38701b24f314548feb79c1a4492fcac3a8c1d68b3a2fe9d8c53dacea1915846275820fd48765288743e267c223c4
+DIST nextcloud-20.0.10.tar.bz2 123375030 BLAKE2B 881777f0ee0489e14ae67eef5d7eaa37b8b7b6e047eb3953467470e7e39268c7680b0ccd43f10426de1668cde3f4ad82ec57148e93a84142d1cfbee7c1ee354f SHA512 a65a4c19894d61ac7d168f03a7aae489e39eb53f42cd02301800fe511483df056afab15a9d8708effa0109af6c451c9cb13ab3502ccea7447ec3cdb10367fcf1
 DIST nextcloud-20.0.8.tar.bz2 104577806 BLAKE2B 97647905fb18e99d1b99f41119fd83f0461f0e5c06dfc29cb91a8178884d9bcdb60a4d02de25b61cd4c64bf2fbb3c0c065358b98a4f88488bb8d458c72672902 SHA512 dd512c3a6f624a20b49743d2ecdfc31c740452bf50fb87f3ab0d6b365ebbfc9004bdc4495e5f378c26085312e138939a6c707f045421e0be6ef2ab881b6c2e66
 DIST nextcloud-20.0.9.tar.bz2 123135180 BLAKE2B ecec2a5646295d26e2197db6333369617ba3bebaa2e7b54bc57cb1cb9c02b2fa0aa0014028255090c3a0d73ee7c109ef62a540ece664e3fb3833ed5470bae4be SHA512 e37ee8874e73d340e7072afe1dc85ed798d5bd3dae4fc8d777bbbc8daa728a8eac260dca92441c269275c086f512881c837d767a860d5ee3bbc1abb445914e2d
-DIST nextcloud-21.0.0.tar.bz2 110504725 BLAKE2B 7c583c150f6b315830191329310993582439e7aef57f306b93681d654b8fa7d4d5dafee082befd493aafd2bf6efd940d52ca0ca05b8e42b79a1599ff3e809550 SHA512 a1ae3400f0fb5997e54b0cee821c50d13e4ba0e27c9d11731c8b5233cba564666121a58aed848ccd2593a9783e27db1ed98ff559588a76a1acaeaf083ef4404a
 DIST nextcloud-21.0.1.tar.bz2 129229822 BLAKE2B 75483871d83b5513ccdd8b4e142c63ac2efbe651df15a2a3631ccfdc0865d5a78f0aca2205359fe329ea28a550a6bdcfd05c45f2d059bca98ebca52f8d7d6c88 SHA512 a1339515349af45d293985e939235cf7a6723f0b65144c0635c66bc8110caa13a7e10672550aeb9aa46a61b93b28240cdb76696e41ccae76b8bed6d8667d3c51
+DIST nextcloud-21.0.2.tar.bz2 129247099 BLAKE2B 282f79e9f764f1444dfe339e73fb955a7c77ad9335304ce0d9f8f7353769f3d11ee455ab01aea03ea04f5f8a029b3e97e49845fe6490d5db4d07324460626917 SHA512 a222c55c7ff515b96b7c826da13ff1770f82bebda2e73df6bb31df635338155dff611a560b665b0e9b17f2d8f33132abf75ffa80e84f5a115ee5d8a4737b6795
 EBUILD nextcloud-19.0.10.ebuild 1083 BLAKE2B 0e18f62655dfa0bdf7a81f5280be99c34c876a8c57e66e206e1c7e43e0cf93745cda3247f05da592fc5882e872e8249dac9391f22648940fe95e8cd2bc158422 SHA512 e0d8a192c51901913a40521b5259c7276356b8c15246c5df193c4a4a5b0652034148dd971c5014a72f378d4449b778e5867030f9ec3d8ad9bf42efa955ce63c5
-EBUILD nextcloud-19.0.9.ebuild 1083 BLAKE2B 0e18f62655dfa0bdf7a81f5280be99c34c876a8c57e66e206e1c7e43e0cf93745cda3247f05da592fc5882e872e8249dac9391f22648940fe95e8cd2bc158422 SHA512 e0d8a192c51901913a40521b5259c7276356b8c15246c5df193c4a4a5b0652034148dd971c5014a72f378d4449b778e5867030f9ec3d8ad9bf42efa955ce63c5
+EBUILD nextcloud-19.0.12.ebuild 1083 BLAKE2B 0e18f62655dfa0bdf7a81f5280be99c34c876a8c57e66e206e1c7e43e0cf93745cda3247f05da592fc5882e872e8249dac9391f22648940fe95e8cd2bc158422 SHA512 e0d8a192c51901913a40521b5259c7276356b8c15246c5df193c4a4a5b0652034148dd971c5014a72f378d4449b778e5867030f9ec3d8ad9bf42efa955ce63c5
+EBUILD nextcloud-20.0.10.ebuild 1083 BLAKE2B 0e18f62655dfa0bdf7a81f5280be99c34c876a8c57e66e206e1c7e43e0cf93745cda3247f05da592fc5882e872e8249dac9391f22648940fe95e8cd2bc158422 SHA512 e0d8a192c51901913a40521b5259c7276356b8c15246c5df193c4a4a5b0652034148dd971c5014a72f378d4449b778e5867030f9ec3d8ad9bf42efa955ce63c5
 EBUILD nextcloud-20.0.8.ebuild 1081 BLAKE2B 51166655fca8673a06762990e4cd9770655e2fe027e51a2a51b4ae3a1a05f020f5a863d415d132ef7d0974654170205879c4d4eded787195490d8abb7cf2249a SHA512 a198ebbb7005113bb1f2eec73ef7ca56e7c1831da6dc1eacc5a942ae59344d8d10f1c6f8467db6e430359e9dcdc807de21e90ea7269f795d088ec9618708ea5a
 EBUILD nextcloud-20.0.9.ebuild 1083 BLAKE2B 0e18f62655dfa0bdf7a81f5280be99c34c876a8c57e66e206e1c7e43e0cf93745cda3247f05da592fc5882e872e8249dac9391f22648940fe95e8cd2bc158422 SHA512 e0d8a192c51901913a40521b5259c7276356b8c15246c5df193c4a4a5b0652034148dd971c5014a72f378d4449b778e5867030f9ec3d8ad9bf42efa955ce63c5
-EBUILD nextcloud-21.0.0.ebuild 1083 BLAKE2B e6abe80192e7a00277126f901c655f1eab03544572da0071c0734ece0a4a5574d2fcbd7f06f935ccf61a91640a8ca549c3bc359c68103f7f46632fef89d62322 SHA512 9fe6b70447bd9e4d3678eaaca5174586a1a96c0e4763ccd30f9749410892b78c59087c06c0fe42372e6126bf5c7fb5973ed0ead0c664c2040abffd5e7951dfe6
 EBUILD nextcloud-21.0.1.ebuild 1083 BLAKE2B e6abe80192e7a00277126f901c655f1eab03544572da0071c0734ece0a4a5574d2fcbd7f06f935ccf61a91640a8ca549c3bc359c68103f7f46632fef89d62322 SHA512 9fe6b70447bd9e4d3678eaaca5174586a1a96c0e4763ccd30f9749410892b78c59087c06c0fe42372e6126bf5c7fb5973ed0ead0c664c2040abffd5e7951dfe6
+EBUILD nextcloud-21.0.2.ebuild 1083 BLAKE2B e6abe80192e7a00277126f901c655f1eab03544572da0071c0734ece0a4a5574d2fcbd7f06f935ccf61a91640a8ca549c3bc359c68103f7f46632fef89d62322 SHA512 9fe6b70447bd9e4d3678eaaca5174586a1a96c0e4763ccd30f9749410892b78c59087c06c0fe42372e6126bf5c7fb5973ed0ead0c664c2040abffd5e7951dfe6
 MISC metadata.xml 644 BLAKE2B 893952d31b289d07befd82be0d9998df95149363a0bfcfbb64626d8679b67048017a520fe65e5eb14224432a98efbb726e866c95562de23f2dc650df90df5371 SHA512 ec4bcd3ea472df2201830ac14e6dbc01a8317fc8ad8eadd5231014c49a07151ed7647b6d87c22a62df9a2f67d8c2911d44b504a612c9f446228f9a227e6bed7b
diff --git a/www-apps/nextcloud/nextcloud-19.0.12.ebuild b/www-apps/nextcloud/nextcloud-19.0.12.ebuild
new file mode 100644
index 000000000000..2aebb2320d5d
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-19.0.12.ebuild
@@ -0,0 +1,43 @@
+# 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-8[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.9.ebuild b/www-apps/nextcloud/nextcloud-19.0.9.ebuild
deleted file mode 100644
index 2aebb2320d5d..000000000000
--- a/www-apps/nextcloud/nextcloud-19.0.9.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-8[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-20.0.10.ebuild b/www-apps/nextcloud/nextcloud-20.0.10.ebuild
new file mode 100644
index 000000000000..2aebb2320d5d
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-20.0.10.ebuild
@@ -0,0 +1,43 @@
+# 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-8[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-21.0.0.ebuild b/www-apps/nextcloud/nextcloud-21.0.0.ebuild
deleted file mode 100644
index ab3ba8e01bc4..000000000000
--- a/www-apps/nextcloud/nextcloud-21.0.0.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-21.0.2.ebuild b/www-apps/nextcloud/nextcloud-21.0.2.ebuild
new file mode 100644
index 000000000000..ab3ba8e01bc4
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-21.0.2.ebuild
@@ -0,0 +1,43 @@
+# 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/phpBB/Manifest b/www-apps/phpBB/Manifest
index 7eb4f142d6bd..e6a989b8982a 100644
--- a/www-apps/phpBB/Manifest
+++ b/www-apps/phpBB/Manifest
@@ -1,5 +1,5 @@
 AUX permissions 600 BLAKE2B ae5ced85bf5ce72bc6bca533e68ae55499ace30590de37be55c4267efacf03fe752c9c3d96ff1f6ba54beda0df238fa663281195a7c874eb3cea422fb16b5a82 SHA512 ea8f2796a43c825fbe160606dc4a3cdabd6ed8fd6692c841cadb87b06803f448df48446a83366a3af3cfba65a50bb9ed3361c0495bb5058c542b6cac9c7b2a1b
 AUX postinstall-en.txt 554 BLAKE2B 6560cb0c3a95cbbba91932af13790eae010193e6bcca4d46c640eb05b18bcae23645d5962a6be08f28aa721a10668bd128d19f505b9d463119d1a7aff845e732 SHA512 d1d61b525b2746d558f9fa1bd56e92e182d44bb406302f1646a40b0b1f06fc900ae46c3e600e27495edce1fa4188915dcf8f96b4762938ec0f324bdbb8d91759
-DIST phpBB-3.3.3.tar.bz2 4703855 BLAKE2B 28eb4ad42c80adad372858e899ac33ae2da80044aed1d43edd94de4698d9bf91a5a9571daf7d9be52204c4c8262902f725a40564f921ddf9d89c31f73661bc8c SHA512 a43ff244a4cf3917dfac6e24c21bd52e70ae3391313fd6a3dcaba08907485359c42200bd767137061258b125134f4798b26ecd82bbf8ba360755a63d875ae5d5
-EBUILD phpBB-3.3.3.ebuild 1648 BLAKE2B c6fb9a0efbad4c6c59e489bbc2af19ec099ad5273d60ff3123ada14d8e3b20063394c0b2915c644c3a40b9b0f96926c0285340ce0091bf6787b46427aaac6ac0 SHA512 4510c1751597da76070ab39ad48ab3049e53d45aff4c0f25fe0ec598ebe083fa5a26ca3d1cf2131a78b45fe04f7059a49bf3dbf3a6a2b48eb54d14d56ef84f74
+DIST phpBB-3.3.4.tar.bz2 4707921 BLAKE2B d70797c88514b1b0409194784e510401e1af910e4577e5b679d5b18b0664fe8eb011567fd9a2894f18ce4f78bf5e694305def7dc7d0c3000b23753dc9ca6a67d SHA512 d021530a2e89eb3fea818c5c13cc1e66dc5b5bb3f9db838243be0fb167d21f0d1f1311c2a2fe4f9ac2b81621a949c1c1db139bd32fc3007d6deade4e9f7386d8
+EBUILD phpBB-3.3.4.ebuild 1620 BLAKE2B 09849f298aa42a32957d8286c0010078aa47c7d27fe9ff744a7afc6043c342fedeb10c520245802a24bfa1d2848db5696f156d5b5aeda9dea8c5792913e03bac SHA512 ea29b23ace1dfc439f8775358e130b8cab9167527420d13078741215dc8d76e72e9bde36ddc62edec065e146e4849e2cb4186d6e9bb0dcea786366292a85fcbe
 MISC metadata.xml 899 BLAKE2B a37867591aed9f31f074deda43ae3ddd4176435989f8f6952d8fd75f38bbdf4bf88ea2528ca5b63ce64cb66e8771732fb81b6496a0ab07bb3be690de0bf850fa SHA512 deba7a30f29ed0ab14617d10ab908b063890df843dd834c5db7e4fd07c3810e57d978b9f9ab336c174908fce33340330bbd15a7c5b85e6b900f70df1ff198da6
diff --git a/www-apps/phpBB/phpBB-3.3.3.ebuild b/www-apps/phpBB/phpBB-3.3.3.ebuild
deleted file mode 100644
index 186d7c2f037f..000000000000
--- a/www-apps/phpBB/phpBB-3.3.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="An open-source PHP-based bulletin board package"
-HOMEPAGE="https://www.phpbb.com/"
-SRC_URI="https://download.phpbb.com/pub/release/$(ver_cut 1-2)/${PV}/${P}.tar.bz2"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
-IUSE="ftp gd mssql mysqli postgres sqlite zlib"
-REQUIRED_USE="|| ( mssql mysqli postgres sqlite )"
-
-PHP_RDEPEND="(
-	virtual/httpd-php:@SLOT@
-	dev-lang/php:@SLOT@[ftp?,gd?,json(+),mssql?,mysqli?,postgres?,sqlite?,xml,zlib?]
-)"
-
-RDEPEND="|| (
-	${PHP_RDEPEND//@SLOT@/8.0}
-	${PHP_RDEPEND//@SLOT@/7.4}
-	${PHP_RDEPEND//@SLOT@/7.3}
-	${PHP_RDEPEND//@SLOT@/7.2}
-)"
-
-need_httpd_cgi
-
-S="${WORKDIR}/${PN}${PV%%.*}"
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_configfile  "${MY_HTDOCSDIR}"/config.php
-	webapp_hook_script "${FILESDIR}"/permissions
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-
-	# phpBB needs docs together with the other files.
-	dosym ../webapps/${PN}/${SLOT}/htdocs/docs /usr/share/doc/${PF}
-}
-
-pkg_postinst() {
-	einfo "phpBB needs a specific web server configuration. For Apache httpd, an"
-	einfo "example configuration is provided via .htaccess files. For lighttpd and"
-	einfo "NGINX, example configuration files can be found in the documentation."
-
-	if use vhosts; then
-		echo
-		ewarn "When installing with webapp-config, specify a group that includes your"
-		ewarn "PHP user with the -g option. It will default to the web server group"
-		ewarn "when running webapp-config as root."
-	fi
-}
diff --git a/www-apps/phpBB/phpBB-3.3.4.ebuild b/www-apps/phpBB/phpBB-3.3.4.ebuild
new file mode 100644
index 000000000000..70b57df522aa
--- /dev/null
+++ b/www-apps/phpBB/phpBB-3.3.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+DESCRIPTION="An open-source PHP-based bulletin board package"
+HOMEPAGE="https://www.phpbb.com/"
+SRC_URI="https://download.phpbb.com/pub/release/$(ver_cut 1-2)/${PV}/${P}.tar.bz2"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+IUSE="ftp gd mssql mysqli postgres sqlite zlib"
+REQUIRED_USE="|| ( mssql mysqli postgres sqlite )"
+
+PHP_RDEPEND="(
+	virtual/httpd-php:@SLOT@
+	dev-lang/php:@SLOT@[ftp?,gd?,json(+),mssql?,mysqli?,postgres?,sqlite?,xml,zlib?]
+)"
+
+RDEPEND="|| (
+	${PHP_RDEPEND//@SLOT@/8.0}
+	${PHP_RDEPEND//@SLOT@/7.4}
+	${PHP_RDEPEND//@SLOT@/7.3}
+)"
+
+need_httpd_cgi
+
+S="${WORKDIR}/${PN}${PV%%.*}"
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_configfile  "${MY_HTDOCSDIR}"/config.php
+	webapp_hook_script "${FILESDIR}"/permissions
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+
+	# phpBB needs docs together with the other files.
+	dosym ../webapps/${PN}/${SLOT}/htdocs/docs /usr/share/doc/${PF}
+}
+
+pkg_postinst() {
+	einfo "phpBB needs a specific web server configuration. For Apache httpd, an"
+	einfo "example configuration is provided via .htaccess files. For lighttpd and"
+	einfo "NGINX, example configuration files can be found in the documentation."
+
+	if use vhosts; then
+		echo
+		ewarn "When installing with webapp-config, specify a group that includes your"
+		ewarn "PHP user with the -g option. It will default to the web server group"
+		ewarn "when running webapp-config as root."
+	fi
+}
diff --git a/www-apps/postfixadmin/Manifest b/www-apps/postfixadmin/Manifest
index 896d5ae60ddc..1d5688b7a9c1 100644
--- a/www-apps/postfixadmin/Manifest
+++ b/www-apps/postfixadmin/Manifest
@@ -1,6 +1,6 @@
 AUX postinstall-en-2.3.txt 1827 BLAKE2B 49402566ddf6981cf0226f6a963fdd2c482957903583807f5c42731dfd5b4aea56de7d1ebd47ab6909f12492bd5e7a788322e0b2d80e15d883483a080f8fe11c SHA512 59e304d63830227b1619ed1299e9b61f5b6e534cb03da4d3a0e35a0fe727ccf2d994a034bd12d515bba4f8a6a8ca513cf2131c031fa63f85906639aca159993a
 DIST postfixadmin-3.3.8.tar.gz 1865581 BLAKE2B f8b29248e839d973fd72647747e0bba7452676543f44310f12203d5e64e83222a3992e282a3898fa077dc54100b3446e4d1cded56cd464d72b2997ce34f064db SHA512 bfe5d874083568f1e8b1830394338d2aa29e39e30834d4c8c728836495f12f6d49c65b83b1fae1fce20e7456afaef0058320033866b720a5858911ceec22a022
 DIST postfixadmin-3.3.9.tar.gz 1866167 BLAKE2B 28546631dce340d3c1128b525de1c33e9e3aa23cd557e6c8f7e9b26f97aedba67f2e5f3ea351e0db2d79e068e16cfa1672cbe3e6abbffd19e5009e2a9df84523 SHA512 791b05df34a4f2eec01fe6f6b9038a6630cd60c42e1f2e725fe3d033a692b77d2d688858b947c53d1ce48258c7c87a2e3fb31356e553632b88149d5a29bfa70e
-EBUILD postfixadmin-3.3.8.ebuild 2978 BLAKE2B 3339b2f17788c81245e9c6315fc99e70e39fc4a55412af0ed1ae7ecf52a81a1e012e79d65c7a2f35c613ccfd050066275dd0e1ebee6b0fcf2f9a6623fb6b955a SHA512 edfef8358f540a0293fe3a6b10f7c420dbd934673e2afa4007a32544ccf173fb7843942518e3760a4a848638aa372ccf4fa5a832f91caa6bbed49076130e7576
+EBUILD postfixadmin-3.3.8-r1.ebuild 2947 BLAKE2B 602dcc93661ef702db5e0d9a4b421fc9927249c8262404f146c43f0ba6cb955e94e5bd70a7dfeaca5f7d667102f484e0fb1946c86cca4097abe22038b2c02df7 SHA512 524c976ba58552cde68cd9b8fea87efb1ad35de3b018701683cc9906b8ad36beda05f6f49eeb1d9ab84b02676d03da3ac25ea51a871ce9ed1a09ad1e089cdb4d
 EBUILD postfixadmin-3.3.9.ebuild 2980 BLAKE2B 13d801092bb1b4206d00eebb0d6cb184c271560a8d827f5b30adbf91727323180faedf42d47d1219f08a35cb54de030e825595f843dcdbd8e7abdfc53e669bbe SHA512 2264b4f9af839aacc07e90797d2ca59022014546443cc079e78aca48124e1d5b56c68f32099cd53029de61dc3447c01506683a9d2dced77266b4bae054dc6e89
 MISC metadata.xml 560 BLAKE2B 2dccae38d76ef72520678dcc26582c6d99d2221c8cad753063e4948b75cd84b39f47b854a010217a6a52186a7308a3355c41ab6a7229af2417deb39ccb3eae84 SHA512 4ab5d3db2584f100b9f1d9729eb50487e40b27d16c436cbe09dd03d24c533d5d7c61b4b19eda03aa423fb34d9cf2b9f3ec55679196bb8e8da5ea3157c0bc567b
diff --git a/www-apps/postfixadmin/postfixadmin-3.3.8-r1.ebuild b/www-apps/postfixadmin/postfixadmin-3.3.8-r1.ebuild
new file mode 100644
index 000000000000..317c3a956736
--- /dev/null
+++ b/www-apps/postfixadmin/postfixadmin-3.3.8-r1.ebuild
@@ -0,0 +1,106 @@
+# 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
+
+	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/postfixadmin/postfixadmin-3.3.8.ebuild b/www-apps/postfixadmin/postfixadmin-3.3.8.ebuild
deleted file mode 100644
index 20b1f26da4e5..000000000000
--- a/www-apps/postfixadmin/postfixadmin-3.3.8.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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
-}
-- 
cgit v1.2.3