gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /www-apps
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
76 files changed, 635 insertions, 1041 deletions
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 974d4ffadb6f..2c3e5144c0cf 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/ampache/Manifest b/www-apps/ampache/Manifest
index a785ceb8659d..fef0f79def52 100644
--- a/www-apps/ampache/Manifest
+++ b/www-apps/ampache/Manifest
@@ -1,6 +1,6 @@
 AUX installdoc.txt 223 BLAKE2B 08e17cb76e549112b488a666257454c41f6397e2ba7d7065a73b90787f976a494d3efbca375297573641da4b6744a541bef4c5386df3f6b2f469b660c0452903 SHA512 07636e6b53e9f259e1195795d15e6dc88e3e5401a700553df55cf7c0a39997c8bdfc3f5a83b0bac2a2ef474bea11d71e442ce6e45ef88b0fac0cf9c3307732d2
 DIST ampache-3.8.3.tar.gz 8444610 BLAKE2B a08f49ee043ea8dbf89d7ac8a3bed892be389605f6d23aa1454166d7058ae227ec6f24cf397e4d7e9d93c9441a43df54824ece768980cbf7e98bd5a098648a5d SHA512 35deb6bde949641bf39f58e033953bc0d79f1f56033d496e5a3d302d16c998da3468d1d82ac49e0702fada34a6dafb22ffa5bc931fe886e35c81ba2a5cf1233e
 DIST ampache-3.8.8.tar.gz 8453616 BLAKE2B 4cfd19e90dda22012b6dd73d4540bb5252e514682b0e51be35456e7179f86123b6e8a7af8e3d936e53e0889da8927a9975ef07761415d019dc9668fc91461615 SHA512 4aa010b6bb42a192d6e2408265a78e738a356c08bfb43464fbc6e6375d8cdc9e4701280db0b21f73a1302b2792f9474c6dc5c7808c977a29aab2047a80caebfc
-EBUILD ampache-3.8.3.ebuild 1235 BLAKE2B c0a36f4d78018c02165f0c121d29a02ee833becf26c56ddc71bf7f2a4e3e215f876468420b0f08b011a49600e9a021a5051126c6290a63b3b3fb9d4c09035c95 SHA512 3a8bbfe71415fe4f466ef9fc7c4b2769e61a4e9df7d260e98784cf0c8427ab4227c032d0dff62a54bd5af31bedae92355044370d8064e4eefa75c019bfc3aa4b
-EBUILD ampache-3.8.8.ebuild 1237 BLAKE2B 7d45aafdb4f05b6524b9e08cbc7ed731eb6f7e683f1f7946fc4a5c2ed9494608f7e6a223ee8aed2a59f4aa5e726f53d47db34f480ad7c43b74d9757bd1c62946 SHA512 c2725065b12585544fb62372b03c817ba18f968b2600be96a09cc7406e27c3e8c36afe0fa5c03b8a590e0d3158ea2719b30ceedad6ea10472712b47cbee01662
+EBUILD ampache-3.8.3-r1.ebuild 1367 BLAKE2B 43e68b105f306b48ba18f36e2b1f98396557d1db4fe0c8c7d18d32577c280d2d2a530f847f718ec42883e059d71e8cb650e3353ff43f742e98b0c664763039f2 SHA512 9dc6298518d22c89c31a9f128ebfa28eff4c2b4bf3d5c0550ac55e088e9f776927102cf4b16b8c7c49cc0416e55c42b0e6a7e7e79d6c2a59930a0eba624d7209
+EBUILD ampache-3.8.8-r1.ebuild 1369 BLAKE2B 62a76ebed6d76be195ce6356a3db61772b39faba289329241785b3c9eddc318f208e71b292236d310fef143567ea17c028bfea3577ab6f751156fd40d40aa49d SHA512 25a8ca33eac372dacc40089b16bf00e121f69b4dfdc04d162a941ff0e3279cf5c9115ea3890b0f3ddaccb6510781592f74dd3bda07c5f29a6827b9c1213bd7ed
 MISC metadata.xml 432 BLAKE2B 2dc5db83850f35f36e81f9d050d63cfae5028858683769301d8525a37131ebf47207a4febcd280264ed75837f90b465afb0bccc0708962a52cb8b523a19261a8 SHA512 a10625a3ee73dbea032a0e6389a140a32441ac32bb11adbb9c01dc122da44a625604854bce9d34bbeed4969b3fdbe2bd5cf10678e1d2c362a3db55351eccf2de
diff --git a/www-apps/ampache/ampache-3.8.3.ebuild b/www-apps/ampache/ampache-3.8.3-r1.ebuild
index 346eeb744af8..5466c51401ae 100644
--- a/www-apps/ampache/ampache-3.8.3.ebuild
+++ b/www-apps/ampache/ampache-3.8.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,11 +9,14 @@ DESCRIPTION="PHP-based tool for managing,updating and playing audio files via a
 HOMEPAGE="http://www.ampache.org/"
 SRC_URI="https://github.com/ampache/ampache/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
+# Remove this and the SLOT line below if the code changes. Added for a dependency only change
+WEBAPP_MANUAL_SLOT="yes"
+SLOT="${PV}"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="aac flac mp3 ogg transcode"
 
-RDEPEND="dev-lang/php[gd,hash,iconv,mysql,pdo,session,unicode,xml,zlib]
+RDEPEND="dev-lang/php[gd,hash(+),iconv,mysql,pdo,session,unicode,xml,zlib]
 	transcode? ( media-sound/lame
 		aac? ( || ( media-libs/faad2 media-sound/alac_decoder ) )
 		flac? ( media-libs/flac )
diff --git a/www-apps/ampache/ampache-3.8.8.ebuild b/www-apps/ampache/ampache-3.8.8-r1.ebuild
index 448fc8754f3e..1e494dd35081 100644
--- a/www-apps/ampache/ampache-3.8.8.ebuild
+++ b/www-apps/ampache/ampache-3.8.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,11 +9,14 @@ DESCRIPTION="PHP-based tool for managing,updating and playing audio files via a
 HOMEPAGE="http://www.ampache.org/"
 SRC_URI="https://github.com/ampache/ampache/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
+# Remove this and the SLOT line below if the code changes. Added for a dependency only change
+WEBAPP_MANUAL_SLOT="yes"
+SLOT="${PV}"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="aac flac mp3 ogg transcode"
 
-RDEPEND="dev-lang/php[gd,hash,iconv,mysql,pdo,session,unicode,xml,zlib]
+RDEPEND="dev-lang/php[gd,hash(+),iconv,mysql,pdo,session,unicode,xml,zlib]
 	transcode? ( media-sound/lame
 		aac? ( || ( media-libs/faad2 media-sound/alac_decoder ) )
 		flac? ( media-libs/flac )
diff --git a/www-apps/blohg/Manifest b/www-apps/blohg/Manifest
index 1e4898c683fb..a659ac3c19e0 100644
--- a/www-apps/blohg/Manifest
+++ b/www-apps/blohg/Manifest
@@ -1,5 +1,5 @@
-AUX use-recent-libgit2.patch 724 BLAKE2B 393c488bf71af9a7ae89c53a64739a729043ba1408722e8b64636ca6e099d859c63c4421eb821b26a89423e8dfdfaca9c95fccffee1b76d50b25b0d772169580 SHA512 fab12807128e60d6c9105947ca313233ea00e8b81329d9eb92e5307d24f0ec7b1173de6d1b6b6571bf2e8ce4820dc8d7c1e5dac0a3dfed14157357532b99d1e9
 DIST blohg-0.13.tar.gz 75003 BLAKE2B 6b9760ffa99ca85a40e35c81341e395fdfc00256f5e80091c6883e54f050d4cf3f345c4752b635b1297d15e0055c182e00e74165451d695bb396c869c285646f SHA512 de8643e85e3f72827408d726bbe2f8674dcc6dcf1efdc47d33a934892071f8365cb54e63a6adb803361c7fd04032b2ac4e786c442676e8a8132b6d3221696865
-EBUILD blohg-0.13-r3.ebuild 1737 BLAKE2B 04f1e8bc211894e6c1e8a02650f434150729c413164401a61fba903c430b0c97a1fa4f296c6f1f8fad7f1c0b15475b8731b4fd56e9feb3532aa45f6e5d512511 SHA512 2182b11e686e521a398531d713d36ad6524983c7e632b3e212b096c30ef8b8aa56c822c0da4809c10683507ee8f274bc7d8f1bc6ba3a869e3c534ada50d6a77c
-EBUILD blohg-9999.ebuild 1672 BLAKE2B 3fd775eb873d59fe296a26346778eaae5c9f03bad92bd0cee1f4f5c6eca4eff444c60fc7ef34d9f8302eacc539bc2add10d2561a20e14eb510b4922745808208 SHA512 b6a72c8a9043f3dd5fc8efb1557b45647b0938508ea123d5885d369fee29a4b3adfa05fd6ec1a4ef4a1ce782a248010e7ad386b3c9ff06871ceafef2889f5dff
+DIST blohg-patches-0.13-r4.tar.xz 14960 BLAKE2B 31458f412395000a05b359db25e8af648c54e554a3b3216f6c62355fd7203fc19c4452defe7692d0382653563f7b0565395af4ceb2177cc8e6de1d7e1a3c7b41 SHA512 3f709880bdd1826b74982866931f5002fdda451a205b6c278a9869979314413f37c8bf6400e3064a463f2fd34810e22d0d4cd5dfc89786f9e276dd9bd9fe5ec2
+EBUILD blohg-0.13-r4.ebuild 1776 BLAKE2B a78101332ab32b5147743a0ff566d5d164f6004016298ea9c956e93bfba9723990f12eac5b64eafb7ce0a0bc92a9d98cf42193bf8b5186dcc13ee9be9827390d SHA512 ccc2fd369f31e7da5603b5c22f2e3a86d2ec158653c1aeb671eee38cb9915f9ba9c2bec89068065f2df4282e4ba5293821929673d6c6608ea713cdb4b621bbbf
+EBUILD blohg-9999.ebuild 1776 BLAKE2B a78101332ab32b5147743a0ff566d5d164f6004016298ea9c956e93bfba9723990f12eac5b64eafb7ce0a0bc92a9d98cf42193bf8b5186dcc13ee9be9827390d SHA512 ccc2fd369f31e7da5603b5c22f2e3a86d2ec158653c1aeb671eee38cb9915f9ba9c2bec89068065f2df4282e4ba5293821929673d6c6608ea713cdb4b621bbbf
 MISC metadata.xml 983 BLAKE2B b57921e5e260e283cc261200cefcba516918e21ab44ff009a5fb08c58036cd39263de239e65e20714bac823bd7d0c6889dbd0737904109af635809cd16ce2f55 SHA512 39e0799c5a6e685ea188c12b8e2ddd34178fce3630a0cb84308a66c710730e8aeaeaf23444e4f8091ec2adf6eb1da3ea7bf74e1df1adb3d5caa2205da99cc6f8
diff --git a/www-apps/blohg/blohg-0.13-r3.ebuild b/www-apps/blohg/blohg-0.13-r4.ebuild
index f30c7c0ad0b4..6a4abc9a54f5 100644
--- a/www-apps/blohg/blohg-0.13-r3.ebuild
+++ b/www-apps/blohg/blohg-0.13-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_6 )
 
 GIT_ECLASS=""
 if [[ ${PV} = *9999* ]]; then
@@ -16,7 +16,8 @@ inherit distutils-r1 ${GIT_ECLASS}
 DESCRIPTION="A Mercurial (or Git) based blogging engine"
 HOMEPAGE="https://github.com/rafaelmartins/blohg"
 
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~rafaelmartins/distfiles/${PN}-patches-${PVR}.tar.xz"
 KEYWORDS="~amd64 ~x86"
 if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
@@ -32,27 +33,28 @@ REQUIRED_USE="|| ( git mercurial )
 	test? ( git mercurial )"
 
 RDEPEND="
-	>=dev-python/click-2.0
-	>=dev-python/docutils-0.11
-	>=dev-python/flask-0.10.1
-	>=dev-python/flask-babel-0.7
-	>=dev-python/frozen-flask-0.7
-	>=dev-python/jinja-2.5.2
-	dev-python/pyyaml
-	dev-python/setuptools
-	dev-python/pygments
-	git? ( >=dev-python/pygit2-0.21.3 )
-	mercurial? ( >=dev-vcs/mercurial-1.6 )"
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/feedgenerator[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-babel[${PYTHON_USEDEP}]
+	dev-python/frozen-flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	git? ( dev-python/pygit2[${PYTHON_USEDEP}] )
+	mercurial? ( >=dev-vcs/mercurial-5.2[${PYTHON_USEDEP}] )"
 
 DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-	test? ( dev-python/mock )"
+	doc? ( dev-python/sphinx )"
 
 python_prepare_all() {
+	if [[ ${PV} != *9999* ]]; then
+		eapply "${WORKDIR}/${PN}-patches-${PVR}"
+	fi
+
 	if ! use git; then
 		rm -rf blohg/vcs_backends/git || die 'rm failed'
-	else
-		local PATCHES=( "${FILESDIR}/use-recent-libgit2.patch" )
 	fi
 
 	if ! use mercurial; then
@@ -74,11 +76,3 @@ python_install_all() {
 python_test() {
 	esetup.py test
 }
-
-pkg_postinst() {
-	local ver="${PV}"
-	[[ ${PV} = *9999* ]] && ver="latest"
-
-	elog "You may want to check the upgrade notes:"
-	elog "http://docs.blohg.org/en/${ver}/upgrade/"
-}
diff --git a/www-apps/blohg/blohg-9999.ebuild b/www-apps/blohg/blohg-9999.ebuild
index 03b42c18276f..6a4abc9a54f5 100644
--- a/www-apps/blohg/blohg-9999.ebuild
+++ b/www-apps/blohg/blohg-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_6 )
 
 GIT_ECLASS=""
 if [[ ${PV} = *9999* ]]; then
@@ -16,7 +16,8 @@ inherit distutils-r1 ${GIT_ECLASS}
 DESCRIPTION="A Mercurial (or Git) based blogging engine"
 HOMEPAGE="https://github.com/rafaelmartins/blohg"
 
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~rafaelmartins/distfiles/${PN}-patches-${PVR}.tar.xz"
 KEYWORDS="~amd64 ~x86"
 if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
@@ -32,23 +33,26 @@ REQUIRED_USE="|| ( git mercurial )
 	test? ( git mercurial )"
 
 RDEPEND="
-	>=dev-python/click-2.0
-	>=dev-python/docutils-0.11
-	>=dev-python/flask-0.10.1
-	>=dev-python/flask-babel-0.7
-	>=dev-python/frozen-flask-0.7
-	>=dev-python/jinja-2.5.2
-	dev-python/pyyaml
-	dev-python/setuptools
-	dev-python/pygments
-	git? ( >=dev-python/pygit2-0.21.3 )
-	mercurial? ( >=dev-vcs/mercurial-1.6 )"
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/feedgenerator[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-babel[${PYTHON_USEDEP}]
+	dev-python/frozen-flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	git? ( dev-python/pygit2[${PYTHON_USEDEP}] )
+	mercurial? ( >=dev-vcs/mercurial-5.2[${PYTHON_USEDEP}] )"
 
 DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-	test? ( dev-python/mock )"
+	doc? ( dev-python/sphinx )"
 
 python_prepare_all() {
+	if [[ ${PV} != *9999* ]]; then
+		eapply "${WORKDIR}/${PN}-patches-${PVR}"
+	fi
+
 	if ! use git; then
 		rm -rf blohg/vcs_backends/git || die 'rm failed'
 	fi
@@ -72,11 +76,3 @@ python_install_all() {
 python_test() {
 	esetup.py test
 }
-
-pkg_postinst() {
-	local ver="${PV}"
-	[[ ${PV} = *9999* ]] && ver="latest"
-
-	elog "You may want to check the upgrade notes:"
-	elog "http://docs.blohg.org/en/${ver}/upgrade/"
-}
diff --git a/www-apps/blohg/files/use-recent-libgit2.patch b/www-apps/blohg/files/use-recent-libgit2.patch
deleted file mode 100644
index decd01b78fb5..000000000000
--- a/www-apps/blohg/files/use-recent-libgit2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/blohg/vcs_backends/git/filectx.py b/blohg/vcs_backends/git/filectx.py
-index 84f7aa3..5e20762 100644
---- a/blohg/vcs_backends/git/filectx.py
-+++ b/blohg/vcs_backends/git/filectx.py
-@@ -73,7 +73,11 @@ def _last_changeset(self):
-                                       GIT_SORT_TIME):
-             diff = self._repo.diff(head, commit)
-             for patch in diff:
--                if patch.new_file_path == self._path:
-+                try:
-+                    new_file_path = patch.delta.new_file.path
-+                except AttributeError:
-+                    new_file_path = patch.new_file_path
-+                if new_file_path == self._path:
-                     return head
-             head = commit
- 
diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest
index 5b6a6518529a..0e08734b0f35 100644
--- a/www-apps/cgit/Manifest
+++ b/www-apps/cgit/Manifest
@@ -1,10 +1,10 @@
 AUX cgitrc 2632 BLAKE2B d806a93ed671a3dc8369067cd5af512f4d2653d8959d99dded2460f70f83f93b0297199fc839705591555b0b40ccbb477b0a114c4225c87375eea51580b321d1 SHA512 e54745599d14b595d83aa179dfcaa704d883c3513c77ff2c4eeb8d98a4c7955d9dd94b595b6a60382e8f9a3eb5460886395f858a49e888a8004a535efb759281
 AUX postinstall-en.txt 1844 BLAKE2B ce765acde48fb3b1c95b8b773f20dd196507b7b6b908806f2b1dece5c9b4dbf5ca93a61331b5f69efa9dc9a9728761d432c6e54a3d767868046c4b9cbbf210fc SHA512 40848a103f12cebe1572b51640abf8bb8c7cab58b6bcb95493498af61ee743abb987b59b6e5d6d9ff4eec5ba7d21cf2e5173ddbf4c51cd4210fdfa430da3aadc
 DIST cgit-1.2.1.tar.xz 89648 BLAKE2B c1dc2fe9af58cc00bef9e11c5f784c5696d108671456be61c46e971659df3274874e751b26d6e124c2b3e7b407bbad2878ec5d74f26a0469146bfc66a479501c SHA512 c7380df9afbc3735ef9e4f196f4f5bbd26cf52e473fa6f435e7d0c00dc295cc8de6bee6bfb1857144025c8591d41a6a74efb1af551e8610848d90ac40fcfab36
-DIST cgit-1.2.2.tar.xz 90204 BLAKE2B de8c4c8cd96b3f12f914c5df9e5f1af408fc6f268a3cee185f5721696fe5a064340eb05243aa9b8536d096daaf794c3f74669388d029d21a12722917e0dc0903 SHA512 ac006db0b14ae84fc9304b4cb1b49c3445d229593071be39b2d6e2709b54d03b11efd0ac1b5daef8160278303a7611c897fb6cf1e008c66c3f2463151e650af9
+DIST cgit-1.2.3.tar.xz 90632 BLAKE2B 594a9b2ae0b449e0ef090f428f955cc02833f5f5b1e4d6dc8c737daa565d01ba6840933c0bdc53d4eb683b2f44e2fae885ddd020cfb2de38141a870a6eae2380 SHA512 58f9bb644b07be49dc51f3ef30a3d0e53699cede3c06b1d6920f3874fe846c83dd2589632aa84357b70ea2d60272448409aa1b892f405d14dd6745f5559b4504
 DIST git-2.18.0.tar.xz 5102264 BLAKE2B 94a8469a0e489d517136233301f1af622a3e612967316620800a771721f4e558dfb9159f158ddd07d294fce3ceb256038483f5a8c1fe6a84f661710857945dce SHA512 db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46
-DIST git-2.25.0.tar.xz 5873532 BLAKE2B 7e9e54677ac3c4d3295e9f92ba7e3f7f5b33620d6d0fb8105d5e57d609fe3ee499d1c1bc4a6d8832927a28f4948f4466a6ca4edf996b8a324279f91d25627660 SHA512 8bbada0451fe0a3314e1b9a43a74135115449aa41f5b3e7f960279e4a7fe6069c36e78825fc4b60d06806e3a6fa8158f327cb8a3801686ac22a35e3704244191
+DIST git-2.25.1.tar.xz 5875548 BLAKE2B 582da3d4ac996d7b9ce6cf505661496ab1a2cd061f058745350498121956b33d79739b567fb5fea0b4e298303261256034aa0b8da0b842feab04ae67a7d5b142 SHA512 15241143acfd8542d85d2709ac3c80dbd6e8d5234438f70c4f33cc71a2bdec3e32938df7f6351e2746d570b021d3bd0b70474ea4beec0c51d1fc45f9c287b344
 EBUILD cgit-1.2.1.ebuild 2347 BLAKE2B d9df9cbae9d4e6110e8cc4ef185993617f09838aae5df53b0e275cbe4fb0eac0729f4be643b19e219ec21d92cab236092bdc63e2293eefcee3fd23dfd764bd65 SHA512 1aceb24cc626f4d3c8a4ce7219d276979647b6f177ae8cb25ad2586397420bf3942bd2bd4c543355b208fe8c2eb48224943dee8614a6e568ff3f573a112d047b
-EBUILD cgit-1.2.2.ebuild 2350 BLAKE2B 578cdba972a7f7d5e58f3ac70127aa7c86aa32e5ae0b9dafb9eb01e81d50bf2c754d313ff097c5239695c6400f5a4f40250a2d3f161f56d9662714524d10607c SHA512 630465b1fb8619e001db304c108c934caefae8acbe4b65ab148aa160f5a5f085c0536f8a6fa08e630faf7add84da333209cf25502c374403dcdecd84917e7737
-EBUILD cgit-9999.ebuild 2133 BLAKE2B 45c46354898416a54f7179ce54cdc4c40d44244ff295c4682649a4e3a133363417066bfa006659906f7dfe34575bb951cc232a73215d6a7290e106ba6025a2eb SHA512 84f5cfd877af31d277db2e4ce0ee6da17f3fcc4bf16433bc89cde6a107de055dc706e46742afc6758a65e0d24283efd79fe187a25fd3e8c1c4bf7d0e2e540d8a
-MISC metadata.xml 785 BLAKE2B 77499510fb3060d6e2317f9b83f3bdc1580bade8eb81d27febcdfbf1171fbb0266670a55b8f5cfd99cd748a10ee772946ff0178b0c1f2ba71aaee7af0c5ea4da SHA512 dd9913901422f70df64638a4e8244da670ac9708ea8a0027b2e6aab5b960e27c117f2c486e6ebede40f8c5f475eec054a2896c08166f38113e1ee3ab97694d90
+EBUILD cgit-1.2.3.ebuild 2356 BLAKE2B 5e39bfa383449891743deabbcb039e587b9c3d28a15a9d687b14cec9a73638a5611d3caa1431ea65bf9e918e5d32a2a73e7b2276dd6b568aa8868828247ff041 SHA512 5b9392924214fc0d2a64028108f7bf9674c2ec0b07695b0ef511876b2d3a7e585e3bc213068561c802f647fb7371b886e783ca4a835b6cefeddc3d9af68dcd88
+EBUILD cgit-9999.ebuild 2139 BLAKE2B f732529b2b3da6ea011d110843b56dafacc4e7faea92d4f2d5d9757de1e92190c81445ae0bf94c750249b87364252620e8357bf23c3a0237de947094bf3865ce SHA512 d29655eb8d1219aade639eac70ef8bbcb125bd922ce0f5865135c06444a1aee08313dbdc40c915716965abaa5aae62b578e59b9abcc34b6b332f977fe60255bb
+MISC metadata.xml 692 BLAKE2B 686d1d71de3f247f8ed3609dc304f70e555dc5234a3a715974ef590251591b7188bd563c30c6895ef89b162d94941e9c23db15591375f58ce2523e1780a58ef2 SHA512 eec0e54b7308526767247245f719685f122e97fa7fea524e645dd3604f13cc220e9e381d2f87b452adf195e893e5bccabab70b0d9d7feaead4d60c59b5e27240
diff --git a/www-apps/cgit/cgit-1.2.2.ebuild b/www-apps/cgit/cgit-1.2.3.ebuild
index a74743dfbc30..e01974c18b1e 100644
--- a/www-apps/cgit/cgit-1.2.2.ebuild
+++ b/www-apps/cgit/cgit-1.2.3.ebuild
@@ -9,7 +9,7 @@ inherit webapp eutils multilib user toolchain-funcs
 
 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
 
-GIT_V="2.25.0"
+GIT_V="2.25.1"
 
 DESCRIPTION="a fast web-interface for git repositories"
 HOMEPAGE="https://git.zx2c4.com/cgit/about"
@@ -19,7 +19,7 @@ SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc +highlight libressl +lua +jit"
+IUSE="doc +highlight libressl +lua +luajit"
 
 RDEPEND="
 	dev-vcs/git
@@ -28,11 +28,13 @@ RDEPEND="
 	highlight? ( || ( dev-python/pygments app-text/highlight ) )
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
-	lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua:0 ) )
+	lua? (
+		luajit? ( dev-lang/luajit )
+		!luajit? ( dev-lang/lua:0 )
+	)
 "
 # ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
 DEPEND="${RDEPEND}
-	!<www-apps/cgit-0.8.3.3
 	doc? ( app-text/docbook-xsl-stylesheets
 		>=app-text/asciidoc-8.5.1 )
 "
@@ -54,7 +56,7 @@ src_prepare() {
 	echo "CACHE_ROOT = ${CGIT_CACHEDIR}" >> cgit.conf
 	echo "DESTDIR = ${D}" >> cgit.conf
 	if use lua; then
-		if use jit; then
+		if use luajit; then
 			echo "LUA_PKGCONFIG = luajit" >> cgit.conf
 		else
 			echo "LUA_PKGCONFIG = lua" >> cgit.conf
@@ -62,6 +64,8 @@ src_prepare() {
 	else
 		echo "NO_LUA = 1" >> cgit.conf
 	fi
+
+	epatch_user
 }
 
 src_compile() {
diff --git a/www-apps/cgit/cgit-9999.ebuild b/www-apps/cgit/cgit-9999.ebuild
index 1d737f2e39fd..6c5cb1217c44 100644
--- a/www-apps/cgit/cgit-9999.ebuild
+++ b/www-apps/cgit/cgit-9999.ebuild
@@ -17,7 +17,7 @@ EGIT_REPO_URI="https://git.zx2c4.com/cgit"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc +highlight +lua +jit"
+IUSE="doc +highlight +lua +luajit"
 
 RDEPEND="
 	dev-vcs/git
@@ -25,11 +25,13 @@ RDEPEND="
 	dev-libs/openssl:0
 	virtual/httpd-cgi
 	highlight? ( || ( dev-python/pygments app-text/highlight ) )
-	lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua:0 ) )
+	lua? (
+		luajit? ( dev-lang/luajit )
+		!luajit? ( dev-lang/lua:0 )
+	)
 "
 # ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
 DEPEND="${RDEPEND}
-	!<www-apps/cgit-0.8.3.3
 	doc? ( app-text/docbook-xsl-stylesheets
 		>=app-text/asciidoc-8.5.1 )
 "
@@ -48,7 +50,7 @@ src_prepare() {
 	echo "CACHE_ROOT = ${CGIT_CACHEDIR}" >> cgit.conf
 	echo "DESTDIR = ${D}" >> cgit.conf
 	if use lua; then
-		if use jit; then
+		if use luajit; then
 			echo "LUA_PKGCONFIG = luajit" >> cgit.conf
 		else
 			echo "LUA_PKGCONFIG = lua" >> cgit.conf
@@ -56,6 +58,8 @@ src_prepare() {
 	else
 		echo "NO_LUA = 1" >> cgit.conf
 	fi
+
+	epatch_user
 }
 
 src_compile() {
diff --git a/www-apps/cgit/metadata.xml b/www-apps/cgit/metadata.xml
index 8839288399a0..7c228e381512 100644
--- a/www-apps/cgit/metadata.xml
+++ b/www-apps/cgit/metadata.xml
@@ -18,6 +18,5 @@
 	<use>
 		<flag name="highlight">Enable source code highlighting</flag>
 		<flag name="lua">Enable support for Lua scripting</flag>
-		<flag name="jit">If the lua flag is enabled, jit uses LuaJIT instead of vanilla Lua</flag>
 	</use>
 </pkgmetadata>
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index 2b50a785c014..d2289c82cdda 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -11,6 +11,8 @@ DIST chromedriver-bin-77.0.3865.40.linux64.zip 5425800 BLAKE2B b1b0ef7e4a6822838
 DIST chromedriver-bin-78.0.3904.105.linux64.zip 5528166 BLAKE2B 02cb41da4f04dedc8bdb1d6137c7646f03ee07861a3f44b51ba6547768645e90d4acdc0898d272be8337ef99d12ec2dc838778750ecf5d354224340664adedcd SHA512 fdbf9112b6e9d2e2e1fdcc4960ff5ea3a8ec4181a5afb273d5cf647193a7e9e439dc9643767e006e647d823bae524892d7b111be68165a03e9a3edb94d5c97ec
 DIST chromedriver-bin-78.0.3904.70.linux64.zip 5527671 BLAKE2B 41c29c580ed00a23ea31bd536399eb850b4978bbfb132895baeef24e6cc53b0e0ab1ad8095fb5de9dba2a4a09dd3c7641d76f704a7ffb556fe11810af27cd6ec SHA512 ec5844a1eb788d5b6649178f22702fbfbe49533d061dede19179c97c0e578d4240ccfce0e0a7b9e82d618585c8f32c96e540f8ccdb295bac787e516e26bc3887
 DIST chromedriver-bin-79.0.3945.36.linux64.zip 4875160 BLAKE2B b5f91702ea415dd65e7b5807ace37dd2c27cf77733383f97e46d4e12234afcde1642b6a814088122a5e893124e6c6cbe117b3dfa2a7cc9c97dfa6948df5c5995 SHA512 78c11beb107f4775d40dd4f28f713d6f3228930a5647dd7a5a824a6c9902364f8267e40812b4ca8dc3b849cb5adc3fb6c810146b29d29ed85e6e55e13c86ded7
+DIST chromedriver-bin-80.0.3987.106.linux64.zip 4943146 BLAKE2B 7e5656fbd223f157702e0b31a52c5d9f9bf72b0bcff15dd40571f7b470efe591b46829b3cb5139d5d2ff94fac6e9829d444a33cb1427ffd02434a7c894d889d1 SHA512 afdffdffa3cdb685c1fe96e47ed625f5bc01b5fd180c201f6eafe120b6d11bb26c60bcfabf71a07d12213eec8e606d3dc52917b0830dc86fd384f30cd18c6229
+DIST chromedriver-bin-81.0.4044.69.linux64.zip 4956612 BLAKE2B 9d7bc8fe5f62e940c8b711bd7d7918de974b6c7731bb6cd7ba6597958c20a57acb333989ab47c8298786e168a03d7456007a34d9a85e20bbd033e7380deac957 SHA512 6dcb05d7fb117051caf3091501f708cbfc45adecb8f2591b7cb5664dbe4999e93542f878a6de8c116761c8fd2f53f4f2df3604704dd4e8dc33b973ed749e25ff
 EBUILD chromedriver-bin-2.24-r1.ebuild 644 BLAKE2B 1827f95c6dd8fe6bf87da9252d5b16a894626201a8eb2e62163970cad4abc048bac8e012043aa0e791cac28736dae680cce014b4177d85b4f6268ca4525ab8cb SHA512 5b5d5a6e5e333e8e36b8041247581aa687b756a01068f98052aa0d2898d662178530171fc58bd1e82cd32bdd742c7d8ec334f6adee2606ee156a7d22f7ef5604
 EBUILD chromedriver-bin-2.30-r1.ebuild 644 BLAKE2B 1827f95c6dd8fe6bf87da9252d5b16a894626201a8eb2e62163970cad4abc048bac8e012043aa0e791cac28736dae680cce014b4177d85b4f6268ca4525ab8cb SHA512 5b5d5a6e5e333e8e36b8041247581aa687b756a01068f98052aa0d2898d662178530171fc58bd1e82cd32bdd742c7d8ec334f6adee2606ee156a7d22f7ef5604
 EBUILD chromedriver-bin-2.35-r1.ebuild 539 BLAKE2B d41fdf3b40b52c2904abdd9f98623a248456ba07e20297ab5e367fd316e26012a76cff0745971e80fbc7f9c93565f7d89be9371177fc8e40374eb1515f7d0ec4 SHA512 f23bdc20e88e733db2006b29c533636a3a3135ee2225e39e7f5d8b718444feb6cff5351b3b46a6dcc7a4b8328a3f269c0c3a87d8e7d8abe64756436afc1b2f6a
@@ -22,4 +24,6 @@ EBUILD chromedriver-bin-77.0.3865.40.ebuild 536 BLAKE2B 33443cfcfae910fbe0fffcb9
 EBUILD chromedriver-bin-78.0.3904.105.ebuild 595 BLAKE2B 50a3893369b0bf26c1ac28cf30f6fceebc04096f4602d4a433c29fcae1a1dbefae0e159c95dbbebf8ca4fbb3fb78aedd5c3dd7ef7d5ac0e8c3c324e3d4c4f667 SHA512 ebd62f835d0aa6ab6a517b4b2084227969f2b087540984d46a5a1f67d235baa77f1e98c0f7e13cbbdb5bccaa106cf30a539c79e94e846e2d2e4fda7d624ae638
 EBUILD chromedriver-bin-78.0.3904.70.ebuild 536 BLAKE2B 33443cfcfae910fbe0fffcb92137fcc80e754883d180316acef1629b3508752dd5917e717d5fd26c94fd41591a7d817bf4ac4b99b592deb0977eb5290a921db3 SHA512 4a5ff3ae076a62a748d51f7418e1d26ee401ff2f3da81f7ec42cbb21f357269912b54fcb7276fce3556f02ac68d05b12726e0748b020de28474f585e17cfe12e
 EBUILD chromedriver-bin-79.0.3945.36.ebuild 595 BLAKE2B 50a3893369b0bf26c1ac28cf30f6fceebc04096f4602d4a433c29fcae1a1dbefae0e159c95dbbebf8ca4fbb3fb78aedd5c3dd7ef7d5ac0e8c3c324e3d4c4f667 SHA512 ebd62f835d0aa6ab6a517b4b2084227969f2b087540984d46a5a1f67d235baa77f1e98c0f7e13cbbdb5bccaa106cf30a539c79e94e846e2d2e4fda7d624ae638
+EBUILD chromedriver-bin-80.0.3987.106.ebuild 595 BLAKE2B 630d77aec56a4bc0d3bdf7a602f7568b205b4511fef2ffd28d0b811c86e6c31b436ed172198901e143eff56c0633d1b463c338907c79798e10e5468b7a0b5bc8 SHA512 33779f842a2e2e5aedf085c50f91c856438396705dd1191beceb85ae3cd6cfec23fe707de697f2de533289562676e9779bb8195bb63911eb245884bafc7a56fa
+EBUILD chromedriver-bin-81.0.4044.69.ebuild 595 BLAKE2B 630d77aec56a4bc0d3bdf7a602f7568b205b4511fef2ffd28d0b811c86e6c31b436ed172198901e143eff56c0633d1b463c338907c79798e10e5468b7a0b5bc8 SHA512 33779f842a2e2e5aedf085c50f91c856438396705dd1191beceb85ae3cd6cfec23fe707de697f2de533289562676e9779bb8195bb63911eb245884bafc7a56fa
 MISC metadata.xml 460 BLAKE2B 6da42de60f119a13f70f0a64f61f4fde912d15a7582b240631761e852b0db50bdb2f95102be05b09b1d653907b4c0a8a9641a9952cb6a7c1bd84d8f51ae1d83b SHA512 a8dfdafe46c651f3b06e0c004750747cfbe21e0ee704e5afd6f302c2ea61e288fad3987732b0e4b6ecec4805822c347f1d43a5e09e911e7d950196207eb81f43
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-80.0.3987.106.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-80.0.3987.106.ebuild
new file mode 100644
index 000000000000..c96967a171b8
--- /dev/null
+++ b/www-apps/chromedriver-bin/chromedriver-bin-80.0.3987.106.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 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"
+IUSE=""
+
+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-81.0.4044.69.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-81.0.4044.69.ebuild
new file mode 100644
index 000000000000..c96967a171b8
--- /dev/null
+++ b/www-apps/chromedriver-bin/chromedriver-bin-81.0.4044.69.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 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"
+IUSE=""
+
+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 c83da665aa0b..3ade8b1c6845 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,10 +1,8 @@
 AUX postinstall-en.txt 1595 BLAKE2B 9b5c237befcf415d0f769052c9634da830326ff57da1a1db538059138780c8ebf8d0666908fb6bb3eba99fee5d5869cd12042f0d276b560b51db60803e46c146 SHA512 6a0a5388d40b3c49f3c685a6a7986c2a9efe3e6d7c5115fbb3110ebe4c19c605a4ff785447a20c0296f3cb16811a8a6e77f2439d58253a011603709c9dd9b760
 DIST drupal-7.69.tar.gz 3314294 BLAKE2B bfa1d528caf5dc1fa8a21d65244801e2d10961ec707bdb05c99cdd4fbb1e8f90692549b00befd29583371791a22fdf46af87dcc8c43204dce6ba505376bff5d4 SHA512 521eec475cbd11d9c997f660c8cd3f92e7a164650eaec67bc1d40c53e901576bc827a3805d2341ab80e9a5bb2f4524e7541d0a99970f2a51a3e45a9ac8ae7880
-DIST drupal-8.7.11.tar.gz 17899106 BLAKE2B b0971595319abcae978a0a85f3d11345e3411d412775754139c9562baf5e3c4e49f5ff279139ab1b2128f72987746f13b3edb801cca9984269ce929492243f79 SHA512 1952630cce84c3d819e9f34e2beed3268f0e6aaa634aa367310b4aad59c1d86a59fe11d258aa6d0823cd0d2c227ce54d88fc27e07c53b660a6833e1f15feb9f1
-DIST drupal-8.8.1.tar.gz 19409293 BLAKE2B f0fb8874fc4c706f15ab35795357088d4edf75a2bac23343feadf9e02a706f553d3985c418369c76ede310744c645d3ca4085d920f1bd3069c36d31ef3b90d52 SHA512 68663b078c7e4468d8fcaa82c385c79930d4d5741e9ec598faeda6b1f8eeb37dbd8a841bc5a458c1dc97dda9a566edaa981991cdd19fea1edc963f72d746c639
-DIST drupal-8.8.2.tar.gz 19438764 BLAKE2B d37d1a4387b8873d6b42ed6afcae89025325aefddecfc3528b161fc86898630f6117301217b4aeeff0aa35ee906aa21de367dc1958db27ec26987c1e599217db SHA512 e4ec3e93649e1698da95a46af9087068beaf5c89a7941d7a3d9fd90d5d28a6ba765cc2ba1954a9c27117197e4322df711c07017b29fd89abc75bfa596fa58362
+DIST drupal-8.7.12.tar.gz 17917274 BLAKE2B 931876fffaab011416d992910317e0b24f89ea4c01fbb09e7d256fb90652b30509051d60c61863434762eccf382ed9f25be41f84b797ffba89aff83a15ff908d SHA512 f9b140d52d11d9ec0543b8e18315b898f1d09bb4c360c544498b1b6df8d40e59c04e5e04749140c896c51f2ea1844fab8220dd556986b39af0fc846d2571e5c2
+DIST drupal-8.8.4.tar.gz 19488274 BLAKE2B 47cd41ec3d494f5dc948d70c45072fa8040698db133141947348b201e9853c04b91460b1c064d36e45dd20d0ce99c2a1a592e4f2a0f99348cdfd08fb97b9f0e1 SHA512 e85e1262eff6274ada1d2625fbd7744b22611807e55252fcaeae722dae5dbc1c552841681f80d552e2d68f7ab2cdca8915e9a2e4c3dac9870fa92c0cb3910286
 EBUILD drupal-7.69.ebuild 1546 BLAKE2B 35cdab15e35337c9f7afd5188883ae89c4729ef0616de25fafe42d0252a517771fe1a075255239b3c7f1290a411490ddc6d4a64c66c67f1a25c09f06e0fc3d9a SHA512 bddd764fb0eeec6170b936829aad59cb7fe20dffef37eea6df80dd3ce05a13ee36710ab7b36975a450ee310ec94f0362763cb5541f6c721a5054b961c665a42d
-EBUILD drupal-8.7.11.ebuild 2084 BLAKE2B 11f1dfac694f10e65ef501c4e8d6306c005115ff7c617e97ba9b37480f5d7d6792e2f84114197388ee8a94b9d3b0bf5dc9f3e84a5e70e11a2c6aa3f357714d78 SHA512 2a81cb1142d338d34b0c9d0bad5cc6a6b0b48879ac20e3e3fb18434aa29f8e9428b406790d591ce397337af5e69d0ad52d5859a92ec79d7d3c5edf24c41b0063
-EBUILD drupal-8.8.1.ebuild 2084 BLAKE2B 11f1dfac694f10e65ef501c4e8d6306c005115ff7c617e97ba9b37480f5d7d6792e2f84114197388ee8a94b9d3b0bf5dc9f3e84a5e70e11a2c6aa3f357714d78 SHA512 2a81cb1142d338d34b0c9d0bad5cc6a6b0b48879ac20e3e3fb18434aa29f8e9428b406790d591ce397337af5e69d0ad52d5859a92ec79d7d3c5edf24c41b0063
-EBUILD drupal-8.8.2.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
+EBUILD drupal-8.7.12.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
+EBUILD drupal-8.8.4.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
 MISC metadata.xml 350 BLAKE2B 6142fb739e77e5ea96afb08fc4874d79efcac28348eb84333b77010fe74286d2939e160ad4ae0bbc7ca1630a73683d6d956ea1dc804b602f7fb925fff3e4b814 SHA512 10953373bc06435a35f07b9f0950c7e930c6c23cd3e6d35393eb98e581a3daeecf9b6c1f26bf1343e9ff4be84b7db3a6967c5c61bae78dc5cc7a8b786a93d6c4
diff --git a/www-apps/drupal/drupal-8.7.11.ebuild b/www-apps/drupal/drupal-8.7.11.ebuild
deleted file mode 100644
index 945c43dcf134..000000000000
--- a/www-apps/drupal/drupal-8.7.11.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 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.8.2.ebuild b/www-apps/drupal/drupal-8.7.12.ebuild
index 50acdd30770d..50acdd30770d 100644
--- a/www-apps/drupal/drupal-8.8.2.ebuild
+++ b/www-apps/drupal/drupal-8.7.12.ebuild
diff --git a/www-apps/drupal/drupal-8.8.1.ebuild b/www-apps/drupal/drupal-8.8.4.ebuild
index 945c43dcf134..50acdd30770d 100644
--- a/www-apps/drupal/drupal-8.8.1.ebuild
+++ b/www-apps/drupal/drupal-8.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index bee35f0f73c3..b9f0b420efb3 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -2,7 +2,7 @@ AUX gitea-logflags.patch 4568 BLAKE2B 280697f7ca87c3c985aef0462f63f431860411ad7c
 AUX gitea.confd-r1 243 BLAKE2B 87caa8371f53f52b0a85f720342f9f358dedec9240ab78998655a03df6bf3f301fe077afabdca1b1895dbcab2fa05748735d6f38f9b3ad53534fe8ae6e72db49 SHA512 485dc9d0b86d0a7b3ba958aac9de1129aa0ffbb47219419d38811f2accca2539e49dd93cc4a24b21f1c3802b024aa8449f54e320e8a16197f201532edeca6836
 AUX gitea.initd-r3 802 BLAKE2B 2e33e95f7d2762986184d45b0bbb250cc5e04fffc4e4b006233b28e5b57be69eef1d83441adebe2b94681585edaf77f9da4eb97930f91e75c1b1a5cd8d137633 SHA512 5ff2e653180a0601734fcd055dfffdfdc12363736ed2e56c8576c802398b90f4025b44002cbb9a3fd1e0c2d4c169f62d460381c6c549746d3390e55fc1c677d1
 AUX gitea.service-r2 734 BLAKE2B 84825b8198e9495e2803ca3702e6a631fb269c5c8fb4ff4246465a5bd7f7d796b0c3eaea72d0a25cef4f5d38d27a6c99a1b6d41f489749bef322a4ac93cfdd12 SHA512 287670f196bf6353dbdeb6ac37b4ac73693e16a6a3a83f57e7179ccb64364d1d85950a2ddd0a77238a3d218afdaacc8ba849c2810a7ba1238c7277074d1ebe39
-DIST gitea-1.10.3.tar.gz 30145162 BLAKE2B 4b851580a4e081148ee99d0b6daab52df3251711e309b05ba6ac590d2c5f7983b5d65040b474c09efdc0e999e6f011b14a6e8f8069e3bf7957c23dc118b82cf8 SHA512 2e3962069f2160ea536a7ab4322261c5063fffe0d291796cba61c9d0a3cf965d339441bc0b2259883695a6ce4b62de1f3e16e3fc78016ce303847b70f4f8ff34
-EBUILD gitea-1.10.3.ebuild 3427 BLAKE2B bbbeac7a2b28d7cd601d9a3a2c8ef88165238933544ab95a9e7acf915b86164afc7f97b93a8e1f3f94b8bf526bf318e1d19eead4ca81c5e779e50c4b074b9d4f SHA512 8d09ae65094ab6403b61e7ef3fb045ac54d7f5e27184ea98b1a8da1618ef546bfec0787949faeb3b8c598d8868bcc08a62c3ed2a7288aaa696832478dec1c0ea
+DIST gitea-1.10.6.tar.gz 30147860 BLAKE2B e41e226be820eb0a436783f49bf90a1149eef4e0dde00edc09bc76bb086ea53ff2856563e31ab261e1529a03753785e04c1fe8a02f72eef01a6de173df82098d SHA512 be64f73eb0819c28e444b9dae8d4baecd910aad790efeb515a981542125679257f48a5f4ab1c8453b5372a0c8b1e9b84275e61c89dcd2137d7f7cfe8c71f917b
+EBUILD gitea-1.10.6.ebuild 3427 BLAKE2B bbbeac7a2b28d7cd601d9a3a2c8ef88165238933544ab95a9e7acf915b86164afc7f97b93a8e1f3f94b8bf526bf318e1d19eead4ca81c5e779e50c4b074b9d4f SHA512 8d09ae65094ab6403b61e7ef3fb045ac54d7f5e27184ea98b1a8da1618ef546bfec0787949faeb3b8c598d8868bcc08a62c3ed2a7288aaa696832478dec1c0ea
 EBUILD gitea-9999.ebuild 3379 BLAKE2B 02f80718715f55e172ac372e3d15aea4112c7043ace30d8441bdc9822f8c617e1a3d0109ed640904b9baf8d80a085c390ec2d008aaca03cd14b6d62b1a72bddf SHA512 d3c7b02a3000c23ce3ed491e63737e3bdd59b5008019b7459927b042a926a72f2a4756714d8347d15cce6b5a26d0c91839166a54bd1440a00cd33f3061f80eb1
 MISC metadata.xml 546 BLAKE2B 7b28ca7beb4fec57e6d4fc942b30afe505dc3b1f7c9034509bb9980d15429565220421d5edfcab76608386fb8cfbc086486beffcf53c814cfb0c09bf29e753ee SHA512 aaaca41cb5e43f8d382087760352e09e7fe0c18c6474399c4d6cd228ea0e2982b876f2f3d9c1c1bd11de1495679d3458bfb2a092c1f35df7ab8d5950bdfeadb2
diff --git a/www-apps/gitea/gitea-1.10.3.ebuild b/www-apps/gitea/gitea-1.10.6.ebuild
index 473b669f45b3..473b669f45b3 100644
--- a/www-apps/gitea/gitea-1.10.3.ebuild
+++ b/www-apps/gitea/gitea-1.10.6.ebuild
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 1ac2d5aaf26b..8cb92cc41e65 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,12 +1,8 @@
 AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e871a86738f21b8b3ee68caf1e2b437343f739564dac5ef91db5dcb6b2f31b49a936f9d4e6a62cca4 SHA512 13b9868a4c0a5a7209e6f4aa1206a93a0fb33b0234c4c0a6942bdab9d1cf139049181c066e01c49f639165ea422259fa7cab9e0bdf21537b3722bd86691d9b2c
 AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743e94fc59f76ef77220610d2fd02950ad0157b9ebbfd8380a489cd0da33b5b25102fbaa936c1212e2f SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
-DIST grafana-bin-6.3.6.tar.gz 58756037 BLAKE2B cdc7aaf9fe33ac271ca3a942e4dd9d33e8f6125db239a6b83ae33232730c44a8aa6395ebeaf60ed1d862912ba84c36347481c78d89150b32ae325926145037a5 SHA512 2c230c510a7e480aa9d972fc6648a4748fb5587830078a86b7a228f6abd1e8f4b1eb20f5ffb5d166ce07b43ac602e01af6c0574e3f8b276dde856ae6ac437067
-DIST grafana-bin-6.4.3.tar.gz 59643330 BLAKE2B 721a32cb8b6a876fab8d1f9fd2d8ef0b5ffb142c9b35cf7d854a8f740c74a295eab84eb84a7404edcd7f2cb0e2a830f5cf701ad52b1d771c74623dabcb5dd4de SHA512 fdad6394fd050094a878da77a349b1c35320214b5ff522fe106a97bfd4e03267e4638e395fe19d69bcf1c5b6ba924907661d9549692a02a0463c641253dab6aa
-DIST grafana-bin-6.4.4.tar.gz 59693249 BLAKE2B 9a4a408e938475cee0154b3b49a2e6a10eec76effc2fda428c64449b74ce2ed3e939ce9ee35ff5aa21580e4b8b2410a199157107ef62852445df72536050390f SHA512 096abffb6a31ea9cfcbf3732f61b007a5cf0da77b681ebbad6d1b844d9a80fba725f18732cfba713b5b559eac748790dd1302088e51a917d141d1dd5dca6b5a9
 DIST grafana-bin-6.5.3.tar.gz 61041681 BLAKE2B 624abf5fa31271eb81182bd36377eef0e643a4fda2c6ecc00545d941318ecf4b526fa4753ab6e3cc820fb22b1bf3768cdec946fd13483ef7137f1672aa7b63b6 SHA512 4f672c0fc4a74fff904bd3b297e40c06c616157bb9d3e2783950339d20c551f580dea7a59fb0ff58480010047d34088c51c3ec3175039b9510acb0a18ef52546
-EBUILD grafana-bin-6.3.6.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
-EBUILD grafana-bin-6.4.3.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
-EBUILD grafana-bin-6.4.4.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
+DIST grafana-bin-6.7.2.tar.gz 65075053 BLAKE2B 80a92ec55820363dfd56048db81a5be448ccdba6e0396e22b7b68dff3eb11d4d0c11c35d540c607eef7ef7ddba74a9ac147b6e7edce5fc34894b090a3042a5cd SHA512 ec46a5f9ce39c807f50ee93eda0ddb19bf58d5fb3d3dc188250dfe09323bf10108088cd79ee7787c77e88244b239b5dbb6e50f5e4c69c6d099d5f20dc6bafa7c
 EBUILD grafana-bin-6.5.3.ebuild 1969 BLAKE2B b871590d26c2be2d591be5a35c4b06ed5f3a820315f9661bbe1da3fe4f6c369987b7a51afc73456fcd10c08e26aee07bd5116b69075add4ddb07bb76a9f289a3 SHA512 c7091e34535a4fbedda19751d7a8ce7497ba6c00a5957d85130c6eed881d57a2d40ff0188aa3b632c1c42ac9b6ba9ebe6a9a073f2be6c4f20c401c4e5c592f2e
+EBUILD grafana-bin-6.7.2.ebuild 1969 BLAKE2B b871590d26c2be2d591be5a35c4b06ed5f3a820315f9661bbe1da3fe4f6c369987b7a51afc73456fcd10c08e26aee07bd5116b69075add4ddb07bb76a9f289a3 SHA512 c7091e34535a4fbedda19751d7a8ce7497ba6c00a5957d85130c6eed881d57a2d40ff0188aa3b632c1c42ac9b6ba9ebe6a9a073f2be6c4f20c401c4e5c592f2e
 MISC metadata.xml 218 BLAKE2B 2189d142b4baed0b8edb49fcc98f7397610a257a4cb5f87873272b284f84290420f0950c8b41d1d050ca7a1e0486c6e00344672a3f0479d1d382c14bf7f18485 SHA512 882f7787b97aa780dd3ba4112b9e1dcc84986e2a17704cba9a557ec3a3f9211bcf93532b92d42f60157b56b457ee9ee17e5409066230e54d48931b91bd6786cd
diff --git a/www-apps/grafana-bin/grafana-bin-6.4.3.ebuild b/www-apps/grafana-bin/grafana-bin-6.4.3.ebuild
deleted file mode 100644
index ed520bacd97a..000000000000
--- a/www-apps/grafana-bin/grafana-bin-6.4.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user systemd
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_beta/-beta}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	media-libs/fontconfig"
-
-QA_EXECSTACK="usr/share/grafana/tools/phantomjs/phantomjs"
-QA_PREBUILT="usr/bin/grafana-* ${QA_EXECSTACK}"
-QA_PRESTRIPPED=${QA_PREBUILT}
-
-pkg_setup() {
-	enewgroup grafana
-	enewuser grafana -1 -1 /usr/share/grafana grafana
-}
-
-src_install() {
-	keepdir /etc/grafana
-	insinto /etc/grafana
-	newins "${S}"/conf/sample.ini grafana.ini
-	rm "${S}"/conf/sample.ini || die
-
-	# Frontend assets
-	insinto /usr/share/${MY_PN}
-	doins -r public conf
-
-	dobin bin/grafana-cli
-	dobin bin/grafana-server
-
-	exeinto /usr/share/grafana/tools/phantomjs
-	doexe tools/phantomjs/phantomjs
-
-	insinto /usr/share/grafana/tools/phantomjs
-	doins tools/phantomjs/render.js
-
-	newconfd "${FILESDIR}"/grafana.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd.3 grafana
-	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
-
-	keepdir /var/{lib,log}/grafana
-	keepdir /var/lib/grafana/{dashboards,plugins}
-	fowners grafana:grafana /var/{lib,log}/grafana
-	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
-	fperms 0750 /var/{lib,log}/grafana
-	fperms 0750 /var/lib/grafana/{dashboards,plugins}
-}
-
-postinst() {
-	elog "${PN} has built-in log rotation. Please see [log.file] section of"
-	elog "/etc/grafana/grafana.ini for related settings."
-	elog
-	elog "You may add your own custom configuration for app-admin/logrotate if you"
-	elog "wish to use external rotation of logs. In this case, you also need to make"
-	elog "sure the built-in rotation is turned off."
-}
diff --git a/www-apps/grafana-bin/grafana-bin-6.4.4.ebuild b/www-apps/grafana-bin/grafana-bin-6.4.4.ebuild
deleted file mode 100644
index ed520bacd97a..000000000000
--- a/www-apps/grafana-bin/grafana-bin-6.4.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user systemd
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_beta/-beta}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	media-libs/fontconfig"
-
-QA_EXECSTACK="usr/share/grafana/tools/phantomjs/phantomjs"
-QA_PREBUILT="usr/bin/grafana-* ${QA_EXECSTACK}"
-QA_PRESTRIPPED=${QA_PREBUILT}
-
-pkg_setup() {
-	enewgroup grafana
-	enewuser grafana -1 -1 /usr/share/grafana grafana
-}
-
-src_install() {
-	keepdir /etc/grafana
-	insinto /etc/grafana
-	newins "${S}"/conf/sample.ini grafana.ini
-	rm "${S}"/conf/sample.ini || die
-
-	# Frontend assets
-	insinto /usr/share/${MY_PN}
-	doins -r public conf
-
-	dobin bin/grafana-cli
-	dobin bin/grafana-server
-
-	exeinto /usr/share/grafana/tools/phantomjs
-	doexe tools/phantomjs/phantomjs
-
-	insinto /usr/share/grafana/tools/phantomjs
-	doins tools/phantomjs/render.js
-
-	newconfd "${FILESDIR}"/grafana.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd.3 grafana
-	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
-
-	keepdir /var/{lib,log}/grafana
-	keepdir /var/lib/grafana/{dashboards,plugins}
-	fowners grafana:grafana /var/{lib,log}/grafana
-	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
-	fperms 0750 /var/{lib,log}/grafana
-	fperms 0750 /var/lib/grafana/{dashboards,plugins}
-}
-
-postinst() {
-	elog "${PN} has built-in log rotation. Please see [log.file] section of"
-	elog "/etc/grafana/grafana.ini for related settings."
-	elog
-	elog "You may add your own custom configuration for app-admin/logrotate if you"
-	elog "wish to use external rotation of logs. In this case, you also need to make"
-	elog "sure the built-in rotation is turned off."
-}
diff --git a/www-apps/grafana-bin/grafana-bin-6.3.6.ebuild b/www-apps/grafana-bin/grafana-bin-6.7.2.ebuild
index ed520bacd97a..58b22b14471e 100644
--- a/www-apps/grafana-bin/grafana-bin-6.3.6.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-6.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 256b0f9cae89..3a3fbc6fb63b 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -9,14 +9,14 @@ DIST kibana-7.2.0-linux-x86_64.tar.gz 213198521 BLAKE2B 64ce95baa14107c3789d4aff
 DIST kibana-7.3.2-linux-x86_64.tar.gz 236654252 BLAKE2B 0e851e372e628d72670f161569ac6dea09ee34dfe07dcb0c383709534f1495bb35c1853c1e3610c92aa320d62e784537597af7d8dba210f9e9eaf153de6568bc SHA512 23a496cf55cebeebdc67577c966f9f19de36fd7fe2d05597687047b0e7f6b52a41395a0e750e245b04f9881ea99381ff3104fd18bc19593a2db520100874bf0e
 DIST kibana-7.4.1-linux-x86_64.tar.gz 252517864 BLAKE2B 18337665a86d54cedda2f3a6e03294d69a8fe25a445ec07b2df838872fd66cc96d095d0b1d496426c7e4ae3c6dec8ff2b4f78ec98225c64192aeac779d9e907c SHA512 9fbb5b754cd94599ab50c794df7b8337c8fa9f11ba810e3edf1cd12c60de40f91dbf4dbbc7178b35495b67a588a9fbec4333ab73df41deaab8bc1d907565ac14
 DIST kibana-7.5.2-linux-x86_64.tar.gz 238726293 BLAKE2B 845a6df316c1fb03b70bdb01572167ca430990e13fa10a85db55f5708fb201cd32ddc37057f1ea6706c193d47c8268cfb3d922f6202f1c3ae3a4271ca654f2b4 SHA512 7717eabe15a2ccd50cdc2acce592fc60af303516af2337145ab59be901d781e6545503a969ff7147e71e7189404ecbc870898daa92292e42002390f65e7cae41
-DIST kibana-7.6.0-linux-x86_64.tar.gz 249467327 BLAKE2B 87701ab1b43878cf6a8df449a07ab5ea18462b71e5a1b449c60734aaffb07ab3a6c11d3553f8402ead62a78cf0e3c1ce322f78cecb3e767da75a8b24d7fe073b SHA512 296416b9697ae66b20aae37ada855d7212fc5151055a35cc81e7c3cfef589758f10f600b382e9f4b419fcd327ff605d8da23a25e867f6a1e4d3bd133e0317b72
+DIST kibana-7.6.1-linux-x86_64.tar.gz 249498863 BLAKE2B ec2011e601dda84f8f6de63e89d73e6c9ef0da645218845fd0215084c2daf6c26312bc553c894b7bfcbe9b795208b43db7e40a6a10174dcb4e8168dd921a4232 SHA512 9739e9521f699dcade3c3ae548fe1b9325de0d94856b7c1ff1426bd58a70db8eb7d25b128d8b8ade68f9797b873c827263ea7678aba48eb384394302606db688
 DIST kibana-oss-6.7.1-linux-x86_64.tar.gz 62807564 BLAKE2B 8fec550769f4a2a88a4fab72b0ecb49d81d25d2f13d365cfefce2f70ed5c088a72f750a0b5807d729621a78c7fe393a5f9875012b6559aa82bb049083eaff5bf SHA512 309c25a16d535b1c5f0853ea89b7b69b61e3472afdabdd6f60a86fabba4c76c034b620cbe3d7f988cc78d21e5ed058b4f97e4995d868876a55fcc30769822882
 DIST kibana-oss-6.8.4-linux-x86_64.tar.gz 65407401 BLAKE2B a58bb44227a861c83342168b189cb133be93976a8f89ad7d29b0684d47621d6b4fe561a503abb896fb4d9325cbdf1a05bdc7da7063c4cadb62859563a4ff1398 SHA512 7d751eef44d669b8a989079a15e987535d6185f04ec8929c63cd2374aba9bd86a4f2301f13ee26308c769096b78f409b99b925f6125cef8f598dd7ffd587eedc
 DIST kibana-oss-7.2.0-linux-x86_64.tar.gz 82672623 BLAKE2B 770e35f8025fb65513e51cb6a582dfe456e348efc7493c3710f2fa8ee49207392494aa437d7fe2d7115e5f607926e185264b6f92dacdc202331aab3d8ab10254 SHA512 ea735ecd18fc4441f29adcd7fd5a08a61e8bf1e82170219f598edf4a7726a11166e16b36f125edbfecafb6ed2c7cf003880d428960765861868e22cf55542e6b
 DIST kibana-oss-7.3.2-linux-x86_64.tar.gz 87456219 BLAKE2B acfc04f9b4afc582d7959ba394487747b0e82f9e12c3b783add91b36155fe74620c067cad1a85898e74ba22b0ba7d66c124f1f8a1e29ae7291de74c048a8d8ef SHA512 a54d0ad3dafd69661762ee8d59021d955253389fb0d228f61f58b522d0644684f57ff96a4bda84d51cf39ecded4ade6c21923bc8e20d6ec9e61305fb6c0b2e32
 DIST kibana-oss-7.4.1-linux-x86_64.tar.gz 84250969 BLAKE2B 3975a3a4f3ccdbf360316e225d86a08cd90736660ffd7b149d16da59080e6c54ad9aadfb77ff5d6695b5133e865318df69575ce9f8a0a39cf8d98c83da83f9b5 SHA512 fd439967b50fd43cd0bb065b8d9eaf1591baa158317c06e200b50511a92cfaf4ccbadb708b5585b8f7ce14fd1982e4d20cf49546829d67880435a5e694e8dc9e
 DIST kibana-oss-7.5.2-linux-x86_64.tar.gz 84048258 BLAKE2B bbe82c125e530c28f531bd1d94eae106bc0622dea252eb77cbe7d4d4107098fbd0296f61ee3f6866567681a650c94bcd533e1465a92590798750f887d88bcd40 SHA512 cbab66b5dbede14566143ba2e4e51c9ae1f59355c1d0899a8f61e70e81415e3d284d205a98b7b7d27b829a89003902c3eb5ef4c0bf65278ceabfa34fc97ed8c4
-DIST kibana-oss-7.6.0-linux-x86_64.tar.gz 102195665 BLAKE2B f96c90e0d51db1028a026cd76094f083e8adda21c9f61f06b175d415d7a13b0df231a1ad7eff2633cd20e0940052c8996529379521765c438c571ba3821670fe SHA512 d72008da7c938c07c163e728044f3dde39cc6bd53fe47682d3602ccf817c7c1e873241b273ed19491c8777fa0ac62e8ec1a26a39546620b8d9eac49c883ba1b3
+DIST kibana-oss-7.6.1-linux-x86_64.tar.gz 102240842 BLAKE2B a3a7ded76f06b2e3a1ef0e758770e82def85bad97fc7371cd1e8b2f38fb6c53b08d90ac3d93844783744e49ba17770bf0c2cda0c5dbcf8b6dbfbd35a11830b50 SHA512 13360740f0b0f4ee399d2b919e982c6004f31e412b488aaeb916bd9d6f36737d860ac5d6c0e0972926ed32010d7496d0ab8f815e2784be13048d10e681408f42
 EBUILD kibana-bin-5.6.16.ebuild 1684 BLAKE2B 7f2226c849036d14b3d9226902237a456251b1ed7d765394e4dc9cb969d98b9d12abb5a065858e46b074c588242e8612e5ed81b3e40e0fe92007b6106029d772 SHA512 35b7685abc2aac386fcfbad7f7685534967bc2d34c4aab7b39dbe0642428bf61ea3c5dd9aa49f82f6393f786b7389a60b7ddf4c543c5cfdd9689b15dced7cf04
 EBUILD kibana-bin-6.7.1.ebuild 2508 BLAKE2B f3fb5262c8c37518909ed910b33ac5407d2314b54ebe1411d47924571994e0488767781fa52e826680276c56217b2f641a7b7c948ccfc78ac703277e3cf7288b SHA512 4454a2cca319cd23a6ee6b5cbf2e9019163c61fc30df07eee83e98a0f02420e548a398e6dd624a3fbd2c51bb8c22898bd3f0eed47e5a9be94f6ceedf6130cdcb
 EBUILD kibana-bin-6.8.4.ebuild 2503 BLAKE2B 8c91e450ba90a593e1f6f13b9a628d16f4735dfb0a301bd11a6bdc8006ffd7cb6783f02f6babd6c85c027379ca279d4a36241d9112b38239aae238a138a1cdbc SHA512 9f21a0332a7a7d4515d96480045d6ead3977ae80f01fbce2fb584ddb4f9fd54fc1d70c772aa5d5a2dd4ba811340d7e21f19787f2bd80bedba557d0fa211447fc
@@ -24,5 +24,5 @@ EBUILD kibana-bin-7.2.0.ebuild 2575 BLAKE2B a5adfc1d6e352420452ec8aa16cb72b5189a
 EBUILD kibana-bin-7.3.2.ebuild 2570 BLAKE2B 8d83a83d8f9c05a87540de774d2699b019e6cc40051fc8daca9e787a6479864314d1044ce5d146948a75e0c5eeea287f49024028b76c53c68fff44a8263f42b4 SHA512 8ab38932951a799d4635219e9f64fd6227b271e2ac07303ab7a3b0fc5cdb5337e3c238399fbbd2bc3135dfdd4e3863bdc5989db777b820ede2d26901e92cc01f
 EBUILD kibana-bin-7.4.1.ebuild 2570 BLAKE2B 8d83a83d8f9c05a87540de774d2699b019e6cc40051fc8daca9e787a6479864314d1044ce5d146948a75e0c5eeea287f49024028b76c53c68fff44a8263f42b4 SHA512 8ab38932951a799d4635219e9f64fd6227b271e2ac07303ab7a3b0fc5cdb5337e3c238399fbbd2bc3135dfdd4e3863bdc5989db777b820ede2d26901e92cc01f
 EBUILD kibana-bin-7.5.2.ebuild 2570 BLAKE2B 2cf2dbcea4c06739ad78b62ab5e3e57b951ff9e7c65b92f5bec0154915f937f33fbc6010d64ba4751a3eb86264b2206c55a8bbca7a3153ba373354caa609c832 SHA512 71080bb99fbd54f61f46712ecc596dd4a93ff5d6e8388088afb5c9f5dbfd372ef367df17f20bc3c8c888bb7574102b3f18506454e2d3dbc489ac7cd0b05bd76c
-EBUILD kibana-bin-7.6.0.ebuild 2564 BLAKE2B 578c12f20b535ffaf7ee03a9c2661fd2091563be978dc5f59892c38ccc414c82c644f851cf76d9b517913e358f0db0ace42fb59e4043bb95330f67b32f028ec3 SHA512 4b57683047dfd03b60c52aa1c42af078e98e17fc5c3532a8f88d14f769fd351091d5c24a1ba3ac16044b645b6b01feee5f4f32478b86a8d0696f8869b2fc4932
+EBUILD kibana-bin-7.6.1.ebuild 2564 BLAKE2B 578c12f20b535ffaf7ee03a9c2661fd2091563be978dc5f59892c38ccc414c82c644f851cf76d9b517913e358f0db0ace42fb59e4043bb95330f67b32f028ec3 SHA512 4b57683047dfd03b60c52aa1c42af078e98e17fc5c3532a8f88d14f769fd351091d5c24a1ba3ac16044b645b6b01feee5f4f32478b86a8d0696f8869b2fc4932
 MISC metadata.xml 538 BLAKE2B 649a05badea8d1116854565d09820a8ce623c733d9d0d1cbded145fdc0dfcac2478273d99f686119adab16126149ad4da8f6feb0c7be9499f5721f31a259ec34 SHA512 f0e65883a644eeb57f2d11d0871631142665e74bf8820431ac8333a1cf3e40a0b517b5cca747adba173c7eab20b70311b7bd8de6c4fb5cee4982e044189e5256
diff --git a/www-apps/kibana-bin/kibana-bin-7.6.0.ebuild b/www-apps/kibana-bin/kibana-bin-7.6.1.ebuild
index 0c312d1ff10f..0c312d1ff10f 100644
--- a/www-apps/kibana-bin/kibana-bin-7.6.0.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-7.6.1.ebuild
diff --git a/www-apps/klaus/Manifest b/www-apps/klaus/Manifest
index e313380e00b6..d9c3359998a3 100644
--- a/www-apps/klaus/Manifest
+++ b/www-apps/klaus/Manifest
@@ -1,5 +1,5 @@
-DIST klaus-1.4.0.tar.gz 36879 BLAKE2B 8a621338514e3be143c5b64a0a486d47edc7e7a14c839bc135e7c1693fd09ddea1529b5b2e1d8e0bb70f152629d7bff288f9221ae4243dac01995da4d00e5848 SHA512 8e596590fe29c62eeb823047780f747a0f4908f926dad8ff54000469dca013fcfcbaf7b53c0555db095fef71e4d9056e9b6e959005550bdfccc338f1ee3a5d2c
 DIST klaus-1.5.1.tar.gz 37563 BLAKE2B 164971626cab61d49e662fd356e0954e6ce8c1028d2452d661b3fdc386d835408e5aaaf83f14ec8851b7482e5a848086c6f15765811454ecf16628c01ba154b8 SHA512 a2244973ff93dbb00f5771755704fe7c6d5ee7f4f47189643f27cc114216a9b14327fc537b5c934c7ed8a08df52727600761402da0d492ffa5d5ba6c5f24af56
-EBUILD klaus-1.4.0.ebuild 911 BLAKE2B fac3bf89c501e5ad8250324a3f4e996548f3f7869835f4eb406fa06b40e23aa0e3bb4f7a965af08f54dca8df3c3d57f1e27b95c8f6d917e0dda5e9a6d3d7fa75 SHA512 915cad70176d471709dc8e72411d5c689c3f95c0d1a0d477857229461fc3f6b2acd88517d9de54606b5456cf6fb59a0d0a4d962f835903346aef73ca46d5225e
+DIST klaus-1.5.2.tar.gz 38168 BLAKE2B 4bcaf91ce641ca1f937d8b1b46367caf0ac7e9130fe222c820ded7cca8a708d1374142b09ae511da2695a64b3f2b67be69645d05602779c05081081b29494d9d SHA512 6423bfbef83f09b9abe4a1150d096ae72fc058a81c60fac585796918fa7c12b9a81c4d5808cf2e18acda5f6b891eaf93ed72a2e229b5b8d6ab5f060ea3230932
 EBUILD klaus-1.5.1.ebuild 911 BLAKE2B fac3bf89c501e5ad8250324a3f4e996548f3f7869835f4eb406fa06b40e23aa0e3bb4f7a965af08f54dca8df3c3d57f1e27b95c8f6d917e0dda5e9a6d3d7fa75 SHA512 915cad70176d471709dc8e72411d5c689c3f95c0d1a0d477857229461fc3f6b2acd88517d9de54606b5456cf6fb59a0d0a4d962f835903346aef73ca46d5225e
+EBUILD klaus-1.5.2.ebuild 913 BLAKE2B aee8f26009b3208c1c493410ebe53b77fb14368c3844a1dbefe25fe2ad8311c14b75367136718f53435032527bf82fb109cbb97c74aeb92d5b53f73f80347fea SHA512 e159ac7977e10fcdbf85958960d0d80b8a76be31cb6329ecc385e4f386fada45ec8ed75f4e04b9e474cfcd4c5bb57f0e1e968a42a5070440fdb8621bbf37709a
 MISC metadata.xml 684 BLAKE2B 3fd97f5f66e03afef819feddd1995814e607f188ca87ce5a294f3a10f794fdbcba2fdea691bca7e100d0b853925fd1248fea7eafc37cc947d31454a01c070af2 SHA512 37f5386826bc762dda625012e6016f65d0dd3d1ed4b88f62341cb4ed7b2876cc2a819550faed8fbcb939796d6d76f6d4dcca8f0559be329cc9f8f583c188d5e1
diff --git a/www-apps/klaus/klaus-1.4.0.ebuild b/www-apps/klaus/klaus-1.5.2.ebuild
index 5293ee80373c..351c5e29721b 100644
--- a/www-apps/klaus/klaus-1.4.0.ebuild
+++ b/www-apps/klaus/klaus-1.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index 3bea8a794844..5f47afd6d22e 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.34.0.tar.gz 40344724 BLAKE2B 899620db50337aeb6189dbf33ba54e06aae68923c43022f6590e46380907e884d9ab606b69cef5087e1b2f273a2fa962883f4e6524682db28b4be350f8d77410 SHA512 b6b1aeec26a1c114eeec0bdf18d4b3160fe02dac2920a39a045acb74e62aa8f8a28e6a81c01fedba7976e4dd0c96463e0f1badfddd3015eef9197b01586a236d
-EBUILD mediawiki-1.34.0.ebuild 2360 BLAKE2B 17b4411c0ba994d1b9864a69d540478ac9e9cf77810aa0a484afd6288d66cceb37a100cef3e79fd1e47be7c3fcec9ec852b5042db40ded8e68c7c253a0fcb2bd SHA512 a6074fb4648e15e108a94ed4ba4000ee8056dd9bbd8fb6e7f1c27aa25e2cae0b4bbf6c82eb8b1a23dccf52d96da10cddf9bcacb5c86a3e137788b039647a9748
+DIST mediawiki-1.34.1.tar.gz 40346153 BLAKE2B 394c23e7d507aef6e47971e265b70826046e954b7f694f32a94d7c5358775e0ee8a17188de1f395fbb19457267650eaffd3586c0f73df8cfad721560d563cbfd SHA512 3a03ac696e2d5300faba0819ba0d876a21798c8dcdc64cc2792c6db0aa81d4feaced8dc133b6ca3e476c770bf51516b0a624cb336784ae3d2b51c8c0aa5987a0
+EBUILD mediawiki-1.34.0.ebuild 2331 BLAKE2B 402a0948b5e00fc8be08109a0156a1c2e6a0b75443f394de2f9f00d6f4b380d8d4c8c02111a03fe3055ed525bef630ba94145e0712d1b4ab5178e999cb41f675 SHA512 738f6c00380ef79f38b8ff07eecabda9a89c76a30e78c460f208d76773be1f8e9e51c327471eff17bfd221ffadddbe4100c26340bc875efb4c3060c621d7b411
+EBUILD mediawiki-1.34.1.ebuild 2315 BLAKE2B 1a7420b1f2fa0e3be3b9e256cd83d8947bc802bbe6cb5499de504b5e3c11974d64274483a6f14a7df154564629af1be318b5d9e66d403f6498056d409f47bfc6 SHA512 012694d132f48d9be9fd66405d79fa7e28ce4a19c8c02fffa01f664e97949f3edb482eea2eb8f6e94ec92255a3ce89d63ae9cf2fbfb13b34c9a3d5551f9147f9
 MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
diff --git a/www-apps/mediawiki/mediawiki-1.34.0.ebuild b/www-apps/mediawiki/mediawiki-1.34.0.ebuild
index 7b3c6904caee..cb3c0f49ef7e 100644
--- a/www-apps/mediawiki/mediawiki-1.34.0.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.34.0.ebuild
@@ -20,7 +20,7 @@ RDEPEND=">=dev-lang/php-7.2.9[ctype,fileinfo,iconv,json,mysql?,postgres?,session
 	sqlite? (
 		dev-db/sqlite[fts3(+)]
 		>=dev-lang/php-7.2.9[pdo]
-		|| ( dev-lang/php[sqlite] dev-lang/php[sqlite3] )
+		dev-lang/php[sqlite]
 	)
 	virtual/httpd-php"
 
diff --git a/www-apps/mediawiki/mediawiki-1.34.1.ebuild b/www-apps/mediawiki/mediawiki-1.34.1.ebuild
new file mode 100644
index 000000000000..550d710e49b3
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.34.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 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"
+
+RDEPEND="dev-lang/php[ctype,fileinfo,iconv,json,mysql?,postgres?,session,ssl,unicode,xml,xmlreader]
+	imagemagick? ( virtual/imagemagick-tools )
+	!imagemagick? ( dev-lang/php[gd] )
+	sqlite? (
+		dev-db/sqlite[fts3(+)]
+		dev-lang/php[pdo]
+		dev-lang/php[sqlite]
+	)
+	virtual/httpd-php"
+
+need_httpd_cgi
+
+RESTRICT="test"
+
+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 RELEASE-NOTES-${PV:0:4} UPGRADE"
+	dodoc ${DOCS} docs/*.txt
+	docinto php-memcached
+	dodoc docs/php-memcached/*
+
+	# 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 ca12c7dedbc8..09d3cfe84413 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -2,12 +2,12 @@ AUX config-r1.php 1780 BLAKE2B 1d80339f97771f5f4cce03f49d055598269fd50832d6f98d5
 AUX config.php 718 BLAKE2B b12392f83a9feaaad4ad5ac7c7e3ff27670b9aad959db5528900472cc6cd10f19c9a371c17f0412b7c0c985f4ba1bcf39ecea8c7ef9e0a8ed50012cc64f4b72b SHA512 38347d3a275397074abe3cc8cd1521c7fe2deb45f4702d7a8a3e3c30ab6e2c1c51fa2c1f58d7fc99f0b72f2dcd243b8dcfdd7b3641c22c41399705aab6b59479
 AUX postinstall-en.txt 6524 BLAKE2B 68262eaf6318780a468d9e6f98c3b2cce43164964de6ea6626da43b1ac481b6edea6d0314cc4038adb511c4354a8f18dfd9da9145901d26665f84e746ab14e9b SHA512 bb3e5187db6be49707801cfde15ebced065f2d4b8c1a04fef2f4ced0a67dab2440b8e79d110685056cad84647f8ebb587c697452df8e2b0eab07b015d01b92cf
 AUX postinstall-nodb-en.txt 171 BLAKE2B ee2aa857cf365815b705b5e60c5b2fef0cdb0bcd8acef0375e0173f13c004e336df9b2dbc6cac376bea939e8fe73a72f06d52961500d05ee2137a8fea82286b1 SHA512 b0cf4787351f904caf06573c5bc50275b6a11361170b4006acc24224f44efde69cfe3a9b6340d6787c5805c605dc89f07072bf992b0ee255c97fba90e5d5617e
-DIST moodle-3.5.10.tgz 46764236 BLAKE2B 493e8bd73c01e5b5bded42270e41a822820695c8f52c809cc39ed5f15b091f3969d16f25d3bd0489d0c72f571e4875f69c9faf7cfc5cab342745d3a0ca2d4635 SHA512 5a5752a10a5507f79077c86ca73d540ef0827dbded0509962be09c5af63f19b8f9ea84943151e3055a00d574107ec8a222e332425def7162ce44fd7a91c4b582
-DIST moodle-3.6.8.tgz 47819466 BLAKE2B 2462019c3a42a55a71d388ff22d2bea5a665a544b7abd65ea48b7bf91ea6e410055468f3f69a973c5224e677786b1fa69e44799610cba4b97c2706545214dc8e SHA512 0c5b849790cc63d2fa12a94fe38e3bb1a161d673a817d48907af161c1547fdb7e4832c06067286abc96435ec6313a9cb916a921b9bea71f2263dd70f45f28ed8
-DIST moodle-3.7.4.tgz 45809161 BLAKE2B 37a850036adeca6f18706b0c5ce1cb5957d5232d0580fc122fabc0b00e805c348940f29db8361eb8163d2cf621fcf39459e1e70d7eae68a4108b5b6c0b2a775f SHA512 113bbdb09526b2d058ccc6c4c5b38f23de7c2bd18c7785f8f81fb57f96ed97fb3e0749e440531abdef415b4fa255036cb7b527afe768d15cf3b06fb6e93bca1a
-DIST moodle-3.8.1.tgz 53138166 BLAKE2B 8083bc3d1c9a72eeb4dd753586120ba95cff44eea4ec0b948e4d301684c69b1100db5db9aff4adc67181a2bcbf55685adda91ce1782708ffcb6d18fb33e63a8c SHA512 bec050a92f682cee03cb70abfc350b7741522898dd21f5b5847f5c2ddfdd785ad404f6f06ed17b31bfa031aebe42bd35e3a205de686bd8627e92b9a919addb4c
-EBUILD moodle-3.5.10.ebuild 2804 BLAKE2B c0c5a3cfad7ec424d26d203a3c4cd5655179c95302788b7f76b4ba3d3cf5494513aaa6a62077f0e18375e0a4030fa6492dc4330be468c6a9aa68b2c7482506d9 SHA512 84e08f8a998fe6b0e5de20cfcbcd1b60b16e4f76f1d1172c74604460878607b132b5e919fef7ac80c4b9b8c2b4998847041b259d7df054c49e65ac042bd94d4b
-EBUILD moodle-3.6.8.ebuild 2804 BLAKE2B c0c5a3cfad7ec424d26d203a3c4cd5655179c95302788b7f76b4ba3d3cf5494513aaa6a62077f0e18375e0a4030fa6492dc4330be468c6a9aa68b2c7482506d9 SHA512 84e08f8a998fe6b0e5de20cfcbcd1b60b16e4f76f1d1172c74604460878607b132b5e919fef7ac80c4b9b8c2b4998847041b259d7df054c49e65ac042bd94d4b
-EBUILD moodle-3.7.4.ebuild 2804 BLAKE2B d718ac5a657b5cf35c3203e397977c1efa321cbae1da14833eb8f7629706ed14176d332f37f1f79abe97945ebcd66b83a5ab682ecc72387310e0eb3893c3dc66 SHA512 8edc5f1e449195324ee3861c68c5b187d7eb9668a51fedd953f034832034ce3de400b6aae484d429ab8e002eadea6675444b39c983bc52bb83016ef76add3691
-EBUILD moodle-3.8.1.ebuild 2804 BLAKE2B d718ac5a657b5cf35c3203e397977c1efa321cbae1da14833eb8f7629706ed14176d332f37f1f79abe97945ebcd66b83a5ab682ecc72387310e0eb3893c3dc66 SHA512 8edc5f1e449195324ee3861c68c5b187d7eb9668a51fedd953f034832034ce3de400b6aae484d429ab8e002eadea6675444b39c983bc52bb83016ef76add3691
+DIST moodle-3.5.11.tgz 46764593 BLAKE2B 0b397b18747c4a1d817ae0664175a64041a28eb30d45ac423a7fb1c3befeab68ed9054dade2715b4b43cd811b9bde67a081fc802b15684417d49fb7e8d783299 SHA512 c85ec2567bff64b9d304d3de3ed92c24d3a83abb34b92ecdc5bb2ea31a4e3964c1739815322f5d5743e500e8f39ad455cb63b4de447557084e40e463a5cba9fd
+DIST moodle-3.6.9.tgz 47830473 BLAKE2B ddf50ae51eeec62837eee86871a74fe6fae7e26e427f68a555c1d1f9b0c3deeb496215a841e5ded374d2f3786b686591a19f1867fd8343928d18ca0acfe88b5f SHA512 4024cec6c98607544de5a2f7ffdf38e2e739b94056a50a695eed90ab84c7b7e9373d72b55db9081741ced902d5036f156367ddb279e5371a8dc77056157a1aac
+DIST moodle-3.7.5.tgz 45830443 BLAKE2B 8edd5a6de29b3d2a12837dc374c18c9f4678517f0707ff1d810928d771aedb157899dee0f7f8b1e1637a714d23afffe3985e364279a5a72c9feaf92ff4036b84 SHA512 9e54277da9a3da92195516c69b020f3dd32b27dd88eeb385d441d79c8415dd8863a831f679ebb8dc671c32a160bc84ab56c74c8cbd5b1a32da58fc65c8a137d2
+DIST moodle-3.8.2.tgz 53178996 BLAKE2B 440c93730ebe3a37c0d0deb8c4e53bf171c9a0d183fd5c6ddeb0a246fd7c941d351bdcded47e0c72c02004ac7b9341bdb429bc29f4c5195f6a2c7e66bde8fa39 SHA512 c6261195d086c2a6f04b1853bf70cd24ed4449976b11316eee19961bcf0c8fc8b7cac3497598e3606da48ec5286ca8c83bbef2074e90bda957a96672cf3c4599
+EBUILD moodle-3.5.11.ebuild 2804 BLAKE2B c0c5a3cfad7ec424d26d203a3c4cd5655179c95302788b7f76b4ba3d3cf5494513aaa6a62077f0e18375e0a4030fa6492dc4330be468c6a9aa68b2c7482506d9 SHA512 84e08f8a998fe6b0e5de20cfcbcd1b60b16e4f76f1d1172c74604460878607b132b5e919fef7ac80c4b9b8c2b4998847041b259d7df054c49e65ac042bd94d4b
+EBUILD moodle-3.6.9.ebuild 2804 BLAKE2B c0c5a3cfad7ec424d26d203a3c4cd5655179c95302788b7f76b4ba3d3cf5494513aaa6a62077f0e18375e0a4030fa6492dc4330be468c6a9aa68b2c7482506d9 SHA512 84e08f8a998fe6b0e5de20cfcbcd1b60b16e4f76f1d1172c74604460878607b132b5e919fef7ac80c4b9b8c2b4998847041b259d7df054c49e65ac042bd94d4b
+EBUILD moodle-3.7.5.ebuild 2804 BLAKE2B d718ac5a657b5cf35c3203e397977c1efa321cbae1da14833eb8f7629706ed14176d332f37f1f79abe97945ebcd66b83a5ab682ecc72387310e0eb3893c3dc66 SHA512 8edc5f1e449195324ee3861c68c5b187d7eb9668a51fedd953f034832034ce3de400b6aae484d429ab8e002eadea6675444b39c983bc52bb83016ef76add3691
+EBUILD moodle-3.8.2.ebuild 2804 BLAKE2B d718ac5a657b5cf35c3203e397977c1efa321cbae1da14833eb8f7629706ed14176d332f37f1f79abe97945ebcd66b83a5ab682ecc72387310e0eb3893c3dc66 SHA512 8edc5f1e449195324ee3861c68c5b187d7eb9668a51fedd953f034832034ce3de400b6aae484d429ab8e002eadea6675444b39c983bc52bb83016ef76add3691
 MISC metadata.xml 355 BLAKE2B 68d10d39dd24da3d570f13edec9c4adae89b7620bb455c1c30377c3cebe56c4961d1548360adedc96fce780067b308193fdb7560478a60ab56c364b774b1984a SHA512 f02e5404a714cb20207e494f635fb0e98870576c4b5f6affc4dc27fccfcabdd1af1c7411a83cfd4e01b51ecc24d11944d1e612757ff45ab4405f6099ed9b1278
diff --git a/www-apps/moodle/moodle-3.5.10.ebuild b/www-apps/moodle/moodle-3.5.11.ebuild
index c06e0951f7f5..c06e0951f7f5 100644
--- a/www-apps/moodle/moodle-3.5.10.ebuild
+++ b/www-apps/moodle/moodle-3.5.11.ebuild
diff --git a/www-apps/moodle/moodle-3.6.8.ebuild b/www-apps/moodle/moodle-3.6.9.ebuild
index c06e0951f7f5..c06e0951f7f5 100644
--- a/www-apps/moodle/moodle-3.6.8.ebuild
+++ b/www-apps/moodle/moodle-3.6.9.ebuild
diff --git a/www-apps/moodle/moodle-3.7.4.ebuild b/www-apps/moodle/moodle-3.7.5.ebuild
index bf58747413fe..bf58747413fe 100644
--- a/www-apps/moodle/moodle-3.7.4.ebuild
+++ b/www-apps/moodle/moodle-3.7.5.ebuild
diff --git a/www-apps/moodle/moodle-3.8.1.ebuild b/www-apps/moodle/moodle-3.8.2.ebuild
index bf58747413fe..bf58747413fe 100644
--- a/www-apps/moodle/moodle-3.8.1.ebuild
+++ b/www-apps/moodle/moodle-3.8.2.ebuild
diff --git a/www-apps/nanoblogger/Manifest b/www-apps/nanoblogger/Manifest
index e1843c5d3555..32d6f9429963 100644
--- a/www-apps/nanoblogger/Manifest
+++ b/www-apps/nanoblogger/Manifest
@@ -1,4 +1,4 @@
 AUX nb.bashcomp 1275 BLAKE2B 0e6fefe950988c1f290f442781eb284f4c762365387cc58e67502558291e0ef77557adb7af57346ee5a1a0438c0307fa2c6956fb63a621f7bdb4b1c7684800c7 SHA512 004db772c4f97870ebdbe378adc26f70ce42f8f28b68bed53fcbe2df4d95ce38e4a2608fee94ae17b1f057c28859a321cceb6cdd4f849845b5902ad048541c8e
 DIST nanoblogger-3.5-rc1.tar.gz 131833 BLAKE2B d5918e406d0b5c6d82b466b43ed84b413fc539651baa568eacbd70b47eae4b382a4f621c8195631b47ef2039d6a4e0b569596a6d601881b195b1db5f7098d90c SHA512 03a590b1bdf3adb9969e2ce6fda89ece99f33def9f46e1028d2c0724a86f47696c703a5a3bb3c4b1c34418b841702a15bae527cc94eba377ee2003203582de2f
-EBUILD nanoblogger-3.5_rc1-r1.ebuild 2215 BLAKE2B 2913958b71b2786211694ed553b169570c7d545ad31448b8f59b0dc5b240ff74f66c85f508156c4bca6ef5578108dbcf91c0c8572e841eebf0b391b36efff480 SHA512 457d55bd27dc2dec0f123dd8b7b1aa8a4bdce063656757e6a134f41f2295a64267b016c489692c39aa5219831e05faf043f9487b125475f9e6593456040ecc57
+EBUILD nanoblogger-3.5_rc1-r1.ebuild 2216 BLAKE2B 1b8207a0468f6a119a75f61ae32b6e5bfc152c3fb174005ce0fdda40a5a497fe84aa3b8f02ddb3c430af444fa73da225fd0258fa126c5ec2eb9bb5f5fed86d25 SHA512 ac4fd5153f821fb92b6e7ccacf2d04102f23b6f3709352b4a974b3be0eebbb98471731c889a92711578fab84a674fba48d7515c115907291deced11133a0949f
 MISC metadata.xml 1158 BLAKE2B 0b261c973a5196c38ce880dd3f3ce99e368b86ca909190bf4934a50d94ebf1ccce9e01f99cd7812702dc1fcde47a5d9c91fdd5411599e46454f38cfb3831c9d6 SHA512 51fefdaaa979d1625c710655dcd2cf6bb2f1f0143f533b2b2ce1ee8022b6bfac20c9cc92dbd125aac5b19878df28e735f70653f75331c86f7152c194d37994f5
diff --git a/www-apps/nanoblogger/nanoblogger-3.5_rc1-r1.ebuild b/www-apps/nanoblogger/nanoblogger-3.5_rc1-r1.ebuild
index 7317da5b6b3b..04e12bba745f 100644
--- a/www-apps/nanoblogger/nanoblogger-3.5_rc1-r1.ebuild
+++ b/www-apps/nanoblogger/nanoblogger-3.5_rc1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ppc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc x86"
 
 RDEPEND="app-shells/bash"
 
diff --git a/www-apps/netbox/Manifest b/www-apps/netbox/Manifest
index 7b8a8c001e4e..e9d503c6c57c 100644
--- a/www-apps/netbox/Manifest
+++ b/www-apps/netbox/Manifest
@@ -16,6 +16,8 @@ DIST netbox-2.6.6.tar.gz 2414895 BLAKE2B b27e1bd5bf810627a4ec563b2eb5dbd7c86bf3d
 DIST netbox-2.6.7.tar.gz 2416096 BLAKE2B 9c9744b60c3999fa7c3336539937cc20eebac67559444a4512cc4d69e8d38babc147254fd1fc49b8515203a8fd4411bc61c4c30aa3313e1ffe0d0e86abd8c9bb SHA512 63ed6a95a1f33ee5dd19dc2e43fc5c6aa09979c6f6856b28060992a8aaee956363caf20c48e72884adb84d260669d828311c0cf0d143fc0e58fed9677baf76db
 DIST netbox-2.6.8.tar.gz 2416523 BLAKE2B 1624415302696f47f799f8bd42b827bfdac7866e750ad71cca84a3c095aa39e403036d82257c864f0e4ecc1725087cc1253c73fa26928915e2c53213c3a3852a SHA512 12a094434c66f954cdd356a41123d5e6c2df8ba9aa846731ee439fd0bf330a003ca4b96c8889aef7be2e551c1d518e96c83182168049a76e9cf4ca3104533280
 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.5.11.ebuild 4242 BLAKE2B 48a241e73c060680f375513f59df15bd95ee1c6e1e2f37c9c33999984bc5a1658e685d70106eb715c933572e8144c95d2ae395adf96e9bbae167dff458437d23 SHA512 ddaaf41fdb5b9f78d838e3d297623d3fc1620c6e64ce62c45055c73d0c9124584f224c41dd3183d06b986c03803332856064e76886e5b876fc1813ebf398d869
 EBUILD netbox-2.5.12.ebuild 4242 BLAKE2B 48a241e73c060680f375513f59df15bd95ee1c6e1e2f37c9c33999984bc5a1658e685d70106eb715c933572e8144c95d2ae395adf96e9bbae167dff458437d23 SHA512 ddaaf41fdb5b9f78d838e3d297623d3fc1620c6e64ce62c45055c73d0c9124584f224c41dd3183d06b986c03803332856064e76886e5b876fc1813ebf398d869
 EBUILD netbox-2.6.1.ebuild 4449 BLAKE2B 24567d71dfaeeea03349cfa21ce894eedf2ef5ee982163d2e1b26fd589fd57ab8861284f7a3bd0e67e22d276c380e5d3afccc34eb542334c801797bb29e48dc6 SHA512 673f8f45083827a69f5997affc1d688d5e907e7946a5ec9bb91d339735b3f6fb05333ed02d43e5d08c5bbe4ee6cdb1ee5893f0440b7c1ebd62433b0153cda79e
@@ -26,4 +28,6 @@ EBUILD netbox-2.6.6.ebuild 4464 BLAKE2B 4c1322abab0988fbfb1a6ff7a765401eb29d5dff
 EBUILD netbox-2.6.7.ebuild 4457 BLAKE2B ca5c253c76db4596ac10d782f4d6e51f479e67a4db4417282c6a8d8e976df9930f1724eb5a38bd1d91a2afff8cc10ea76ac71178caf95bfef007e808e657d36c SHA512 dd70ecd8158c2dd8fadc2efe44f8f90cd38bdecbbc229cd299019cd7ae9203b9f3882383f338a7bbc188b97b0ea53a9a4b6e9d7211cf1f72c62791949f16252c
 EBUILD netbox-2.6.8.ebuild 4464 BLAKE2B 920519600bd479d04b245dd011397acfb994a400af5d1bd4de443eddada71dadd681bf76dc682f381159509327f1440a81764efe22ca27f25178bbbfb9946769 SHA512 76003344da3f5d981f688889a7f83670ae4e1acf3cec631bf58493f0260ca194d3160cb22f39a598e8596d7001ca018d5364c76fc6c80681f144f40ae84df55e
 EBUILD netbox-2.7.2.ebuild 4425 BLAKE2B 667e32b5e472a4e48d70dc784701911836b1ec52057f5d245d1e5cb7def4350379d0dacf9b39be03d424845d6b06de671f5a5fde25e1cd6f64bde4121dede8de SHA512 9a5d44bd4d2efaac8a7f2c13b7c11f9db3caa300ed8f609c6b9874c7507e9d000f055945c853d01625270ad2adf49b8b6f42d2e18de1ebddaa8f354da9e3fc17
+EBUILD netbox-2.7.6.ebuild 4425 BLAKE2B 667e32b5e472a4e48d70dc784701911836b1ec52057f5d245d1e5cb7def4350379d0dacf9b39be03d424845d6b06de671f5a5fde25e1cd6f64bde4121dede8de SHA512 9a5d44bd4d2efaac8a7f2c13b7c11f9db3caa300ed8f609c6b9874c7507e9d000f055945c853d01625270ad2adf49b8b6f42d2e18de1ebddaa8f354da9e3fc17
+EBUILD netbox-2.7.8.ebuild 4485 BLAKE2B 9042ae90733096d06a97eea263b7fbe846efaa9f88cccc3f0598c7efe0ea8357f06b9a6730782f010b409d3c5744c519037770f143ef43975c77c8ce219c74b1 SHA512 526b1fb059ca62952a828f77bd56639b28b457a94753dcca5ae70925e24b7a6954a6e5a0f6ab7e186e2bf0853576e92cf64a50ce7ede8b86926984db2ddd6e25
 MISC metadata.xml 328 BLAKE2B 03603c5bca97aae6d5753f027154ac8bb824639f9f4cae14feb0d50136673e67d1baf0a85d69a09babccd01ba4c48cea035f3f56d11a225ac80daf40ea647c10 SHA512 b40d38d175604c9039a2f3aa2ef3fcdbb626f75ca8128efe16112e03f5bab8d32775e56ad67fb6d20024149b95624cd487703a23726fb904770aa3ad00119c43
diff --git a/www-apps/netbox/netbox-2.7.6.ebuild b/www-apps/netbox/netbox-2.7.6.ebuild
new file mode 100644
index 000000000000..5039bddd8d7e
--- /dev/null
+++ b/www-apps/netbox/netbox-2.7.6.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 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
new file mode 100644
index 000000000000..46d1a0314d0f
--- /dev/null
+++ b/www-apps/netbox/netbox-2.7.8.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 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 25a96fdd08c7..7741cab75a06 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,9 +1,7 @@
-DIST nextcloud-16.0.8.tar.bz2 62583505 BLAKE2B 07a228833eca7174722a2264eba5fb26d0cbd3329b3a2bc52df118897f59f535416fae39ebfc8be54f1936fd2546f144ce9775c77c224059934fda0966d7767c SHA512 7f1dc29a318ad456d0f46358bf85128abd916274f90df381b7470be69cc94894fc878b9da59cd93971c2c9f97d22ed54f33a59db1d39f3ca64929011f559d2d2
-DIST nextcloud-17.0.3.tar.bz2 65974151 BLAKE2B 08e5e4c02fa970d9dbb5baa7bfdace73dfef19269db8d30306e6c6e8b537ed8c38c27f062afd886edd5346199d6d0a607b2e28fa5aedab57fb9d3870c482d0d9 SHA512 1d139d4ad2072d4195e5a6be15a814370d1df94e7c82a4759fc18d9dc36cf48ab8e96eb7276c82bd449cd8045d3c52a23b18eed9d937cd5fdbd9bbc516a2740c
-DIST nextcloud-18.0.0.tar.bz2 85867628 BLAKE2B fd070bf259f4f087146707c4c2242fa7e0d587979576bbab0241ffc119afd7402f1afe93dba7ada6a1c272b483567bf08193b4ed9aab775aff846813da1365c4 SHA512 c6a3b2bb2abed416fdebecd0c35b2547298370ef8a3a2cc884da877b39ab4a03d205653d94b20fdc0660fa355966771f65a7c0aa1c2117bb5abc85d2f091d4f7
-DIST nextcloud-18.0.1.tar.bz2 85827287 BLAKE2B 97e73a1c349e5a1086e7f2ec905fe4a22fcd24043938ef8d8a76d6ed2117d7accefbe4294422e1ea973f8609ab05d6831dcd34b660a6cce1a7f7e16b16bb458f SHA512 b2ce36bb230d5b7e3212be91a8fa26c6f24d1fa02d50f0f5ac702566095645aaea4e365574c7af49edcfbce66b76e5a0f120653e39f680ba181dc971846a3ced
-EBUILD nextcloud-16.0.8.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
-EBUILD nextcloud-17.0.3.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
-EBUILD nextcloud-18.0.0.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
-EBUILD nextcloud-18.0.1.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
+DIST nextcloud-16.0.9.tar.bz2 62595192 BLAKE2B 8594d49bd8913e6a826b55390398d97733619469c10c817a1263d0e1f4fcadf9b0cbe459c6a415c2078fe6678898f7dcec511ebe4be8254226358c11d8491239 SHA512 5787bf73575e10f5bd204ca797f367eff27d47d45f87765f313481b5f47f295c8ce730371809d02a84a02b8c68b87f6529c315b739b8a8b48c2d2512aeafa2c4
+DIST nextcloud-17.0.5.tar.bz2 66618876 BLAKE2B 9d7aabafadc768e72f90180fb0763a16188f09e0ab657fcfea762fffa53af87c5ed546f0176852346973164ecd42edac8acd6120392ce075e96658f70e2c1740 SHA512 b6b5ddd85666ca6542ba945adb4bd0196997d815aa0d232b83fb5e29be2b3cdef891d3fb349c86d2aeef7356fd71c234bcf4b569ce41b0082f86a909148930a1
+DIST nextcloud-18.0.3.tar.bz2 86636651 BLAKE2B ad73d397dfd8ceaa5b1edc42031a350560fd80c0c55500cff5e394f3a0ffedc0c02a5a0bbdb4579fba2765fe542cae6e8c835c2f6e07755ec368556d207cdecd SHA512 b1f433dee2e7eea800de8cd8131332530050b6194460a397081a134f63b236f65e33758c60cd8e97a43570d0b6a1baac9e0503535d85a9a34cd63abd50041292
+EBUILD nextcloud-16.0.9.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
+EBUILD nextcloud-17.0.5.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
+EBUILD nextcloud-18.0.3.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
 MISC metadata.xml 363 BLAKE2B 4da5b0e27af01e94e1e68b98274da6c9cacbe59ed1d85413038bccfa530af8fd479a7edd89f4d7633dfb07afbad4736cb6c075e021db7dc9761c273ec1256500 SHA512 60195d5859a8b175346a1cd533dbb6496d2787c1ff501d9233b2b1794670ae344c6f9f4cac4fbf86b24686a83692cff27513d05243947e2921e554e065696721
diff --git a/www-apps/nextcloud/nextcloud-16.0.8.ebuild b/www-apps/nextcloud/nextcloud-16.0.9.ebuild
index de1b7898efdf..de1b7898efdf 100644
--- a/www-apps/nextcloud/nextcloud-16.0.8.ebuild
+++ b/www-apps/nextcloud/nextcloud-16.0.9.ebuild
diff --git a/www-apps/nextcloud/nextcloud-17.0.3.ebuild b/www-apps/nextcloud/nextcloud-17.0.5.ebuild
index de1b7898efdf..de1b7898efdf 100644
--- a/www-apps/nextcloud/nextcloud-17.0.3.ebuild
+++ b/www-apps/nextcloud/nextcloud-17.0.5.ebuild
diff --git a/www-apps/nextcloud/nextcloud-18.0.1.ebuild b/www-apps/nextcloud/nextcloud-18.0.1.ebuild
deleted file mode 100644
index de1b7898efdf..000000000000
--- a/www-apps/nextcloud/nextcloud-18.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 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_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-18.0.0.ebuild b/www-apps/nextcloud/nextcloud-18.0.3.ebuild
index de1b7898efdf..de1b7898efdf 100644
--- a/www-apps/nextcloud/nextcloud-18.0.0.ebuild
+++ b/www-apps/nextcloud/nextcloud-18.0.3.ebuild
diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index fd475a752da4..56c17c6ccaac 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -1,7 +1,7 @@
 AUX nikola-8.0.4-setup-py.patch 1340 BLAKE2B 7eb27b287eaf588dfc50b21b4be27ec7239a745c2d61ee665d0c4578de4bdbcd5050ae38a2376d2fe7caae0fd41ed62e3e3e0e0bd67ac71a3b66c71c00dd6a6d SHA512 b3d16bd453192bc14208c55d0502192a24577b422fc9ca865512a5693544e238bf15d0bf79ca67bf279a4259e2f70894579f81e3b8ea1914f09bccdcd467b366
 DIST Nikola-7.8.15.tar.gz 4131518 BLAKE2B ea3dca9340852a68b668de82e5deeaa0ecf7bb8597f311721b27409fe0cf820919c79f6e631b030bd3ea4571dd8480c862c607d0b9e6015a8b03023de5a9b93e SHA512 b441ae014539b948d007183ceb574243b89a498be265da7245095f67510d4d7c109c4935e0f9765b4144e82f788a1b66a0eacfba1477a89ce6c2645cb77102d7
 DIST Nikola-8.0.4.tar.gz 4137494 BLAKE2B 04db8b83f34ca9b3cee785c5eed9d0421d27acf750c4f17dc3bec0df6fd4f462af52a65c0c97a07777922da3bf3fa855d58d546479b19bfb152e8190d2f74524 SHA512 eb6774d11be4eab81fbe41115d80e5d0d38694b734431d5d6355fcd3e3d8ae5ff4a02114c5dd0dbbc9e1ea5a625e9ac2b6b91e82f6e017b4376e4ca8d56cfec7
-EBUILD nikola-7.8.15-r1.ebuild 2310 BLAKE2B e06c418bb41204e0fef07348829e762472f51e572c6bf93800a8fe090dc0f1f50bedd011f1dd3059dc9238458546dead07ce62f84a476dc4d87363a4c798e58c SHA512 59b3cb56629185eb7ab9d3713318d54b443622c0a5c6a9cf93892c752a9cd3e53428989c018869476b5180b148d049ea4d7778ae8fa9f30b8d867f0b00233f10
-EBUILD nikola-7.8.15.ebuild 2434 BLAKE2B 66d90061f9679ee9738861c1a7e0b5cb95aac9954aba8cbdd39ad27468f539391d567f86332ad869e2e2635b10e444a254a37ce473fd13f84f54fceeeff4aa8b SHA512 3cbef0fab73ef77fcd4dfc331e251c86c88d5146d094ce516f019e5efe9bdf34f82c8f6ddf9bd3f9f26c426b85f4bed465d070454f3b49de9005b6a191a59e29
-EBUILD nikola-8.0.4.ebuild 2358 BLAKE2B 9e7285413dd8ac344ffcd670edf947bf53294ebbd57991ba155fbb5792a7fcd9fc844db088797d09d420b275b09711a504aaddc061e1c2078a3607a7a5e846df SHA512 36a184844520c54b1e74c42c0c19d574af5070e5516af8c644f51ecd45261c4aa79eabb44d682a47324893ce0ffa57bd0b07d678ed20e6c732f18151a72efb06
-MISC metadata.xml 1360 BLAKE2B 694323edda02eec1a835c4c8a68a74c960a290ee44d1c95a59b5814fc6a8f6b248aec961ce69519da1a33970fba2868df81ed87155cd3c60193f79e8165c99d2 SHA512 ea8f610d5c5d7d568e29340e12701d652136a344f8aeb32c1df9a6909dc48180c5e9a7a91935c73e4d7df4f13cff82794e301d6a659262c52d8c88773e3b9697
+EBUILD nikola-7.8.15-r1.ebuild 2308 BLAKE2B 8255869559c71596870d46e963fd9e62f11dd01d4bc4078b82de8603b6a139e44de8eb3684cb3c1e02c1fa92911bbf5f968b080ae994ddd73709b6d3ad53b4a7 SHA512 6ade40546b0eb338b59fad069070761a09ca8e98217727a7561cc7e78d7e1368c1f1845316267fe1834c755384ca0cdf372069cdbd8defe52b37a5804753d5a5
+EBUILD nikola-7.8.15.ebuild 2396 BLAKE2B e7990b3c204afc29ba7d6f2cc2dc5818dde75c2fe27bbc26bd9b8a56f8660f6203cfb1de37f3e13856795ef4fee277ee60c9bf8828fd3f75e8a6b405f447b1b2 SHA512 202047d568d8549c313d9584ada3a59cddcae3a80fdb663e91101b21d159b1ec997233ef7d869f69254cb999022ea0fc8a231d31991b854eab7ffb3cdb153076
+EBUILD nikola-8.0.4.ebuild 2356 BLAKE2B 96e4d7fa29d2306746af735cb0f3ea8a7140f5190d29749fe2f3cee75f20531e97ec22844e191c43d9667ada2d35ca127ff4a8654dd8b997479691532c80fe26 SHA512 8450b7a9d9cf10ff6339e2c33325e70a3d23dc445cdf1d69ef27543bb4a3a305d4121d4fc1696de26819b8063f9a245bbb9e4c4e8dfced054fbf24c6db55c37b
+MISC metadata.xml 1368 BLAKE2B b24365e67cddf550d9f73f2e4ac933ecae46032690ec1427573a1fa664603c1774ba6cc1dd6771672ecedac32ff815fe786b05ba843dd20b05443895a47af79f SHA512 cf68437e746e5f35fd861be6c4d8bb501489a219fe4e98b725721c81a9c5c3304432d0375130fd8d392b492c25c5196ff7bb402ba6ecba15503641694a818c7d
diff --git a/www-apps/nikola/metadata.xml b/www-apps/nikola/metadata.xml
index ebc3277c3d9f..929eafbf40bf 100644
--- a/www-apps/nikola/metadata.xml
+++ b/www-apps/nikola/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
+  <maintainer type="person">
+    <email>whissi@gentoo.org</email>
+    <name>Thomas Deutschmann</name>
   </maintainer>
   <use>
     <flag name="assets">
@@ -14,7 +14,7 @@
     </flag>
     <flag name="ghpages">
       Add support for direct uploading to github pages thru
-      <pkg>dev-python/ghp-import</pkg>
+      <pkg>dev-vcs/ghp-import</pkg>
     </flag>
     <flag name="hyphenation">
       Add hyphenation support through <pkg>dev-python/pyphen</pkg>
diff --git a/www-apps/nikola/nikola-7.8.15-r1.ebuild b/www-apps/nikola/nikola-7.8.15-r1.ebuild
index f7d523787787..fc0f51979b56 100644
--- a/www-apps/nikola/nikola-7.8.15-r1.ebuild
+++ b/www-apps/nikola/nikola-7.8.15-r1.ebuild
@@ -40,11 +40,11 @@ RDEPEND="${DEPEND}
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
 	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
 	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
-	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
+	ghpages? ( >=dev-vcs/ghp-import-0.4.1[${PYTHON_USEDEP}] )
 	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
 	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
 	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
-	watchdog? ( ~dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
+	watchdog? ( >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
 	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
 	websocket? ( ~dev-python/ws4py-0.3.4[${PYTHON_USEDEP}] )"
 #	typography? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] ) # needs smartypants
diff --git a/www-apps/nikola/nikola-7.8.15.ebuild b/www-apps/nikola/nikola-7.8.15.ebuild
index c3e5967f0229..bb3a947bd8d4 100644
--- a/www-apps/nikola/nikola-7.8.15.ebuild
+++ b/www-apps/nikola/nikola-7.8.15.ebuild
@@ -41,12 +41,10 @@ RDEPEND="${DEPEND}
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
 	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
 	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
-	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
+	ghpages? ( >=dev-vcs/ghp-import-0.4.1[${PYTHON_USEDEP}] )
 	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
 	ipython? (
-		$(python_gen_cond_dep '
-			>=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}]
-		' -3)
+		>=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}]
 	)
 	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
 	watchdog? ( ~dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
diff --git a/www-apps/nikola/nikola-8.0.4.ebuild b/www-apps/nikola/nikola-8.0.4.ebuild
index abec5ee581f6..903eb3874a75 100644
--- a/www-apps/nikola/nikola-8.0.4.ebuild
+++ b/www-apps/nikola/nikola-8.0.4.ebuild
@@ -40,11 +40,11 @@ RDEPEND="${DEPEND}
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
 	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
 	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
-	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
+	ghpages? ( >=dev-vcs/ghp-import-0.4.1[${PYTHON_USEDEP}] )
 	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
 	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
 	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
-	watchdog? ( ~dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
+	watchdog? ( >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
 	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
 	websocket? ( ~dev-python/ws4py-0.3.4[${PYTHON_USEDEP}] )"
 #	typography? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] ) # needs smartypants
diff --git a/www-apps/novnc/Manifest b/www-apps/novnc/Manifest
index 791fd56ecd7c..619700e2aa9d 100644
--- a/www-apps/novnc/Manifest
+++ b/www-apps/novnc/Manifest
@@ -2,8 +2,10 @@ AUX noVNC.confd 104 BLAKE2B da90c8f2ae649e65bbbcd8c894581d0dd187bfbb8bbb20393eb6
 AUX noVNC.initd 697 BLAKE2B 18032906a808e14944dfae2eddc6bbdb22dbbf620ec307a892e077e818a2e4e4c056c05c7cf8bae6d8ce0818dc8c48a6ccc4c42972a5b47862b96933d8536c7a SHA512 8b131686c5add6e7ea859ba433a325ff7f0b9a5c9a11199f0d4025229e56e2c5e725ebfa2cde146f5df4b8bd4b71cdde1f08e87d0217d61bb18b683221b4595a
 DIST novnc-0.6.2.tar.gz 600675 BLAKE2B f9779a9f03ba653f77090639112cd0c967ff5925d2f9897da6508fd077fb79a2f543467e32210572935a642e06fbbcac4a44c34b4342474f54ef7ec7a9bdbf4f SHA512 245d205f8935c82722a55d6cfcd2cea1825176c0cd695fd0eec34aa19cdc3b766fed62e741ff41b0a8c4a3b3cbabc5a39dfa6ad8ffa6169f5b88420a4a845a7c
 DIST novnc-1.0.0.tar.gz 1551574 BLAKE2B 58bd63eb0480b3f20ed16907725e0abcf8c699671614dc195f46a363d6ab9cdb5b0b033ba0ba16bbe39b16437fb94f64a741acd69d1c3c3957a0e60353d78a89 SHA512 97a86be5f10f382e2ed641360f5f6c3b22998f68f980c78138aca900ef6a011c1f6aa9cbdd8cd07afd4884e8c65af30d65487e87bb34e524c10f16cf4cd116a3
+DIST novnc-1.1.0.tar.gz 1034997 BLAKE2B 0cb920cac99c3567cbf1c6a58e12649d4bca211d552a472a73ac1089d7c8a18d9478dcfeb558b6302c0c74d321b62575c35a492b02717dc4721b6a9b42f54415 SHA512 9c736912f5a3051027efe779fc64b182f523b9378ff412d78202e52665772678846d97fe3cc5ac18f5c29dd83d5ff2a2dd915e5eadf9af3573fe871db2e7821e
 EBUILD novnc-0.6.2-r1.ebuild 991 BLAKE2B 8a4b47a198513cb0856ac4b99053afd019e422dbddba555d2a4c664a920207e81ff3d309bb99cb7f65a96f372a36bcf0065675c358771bb92c6448f34ec42180 SHA512 1e9fc9f941265ec4d9ea64aa7f3c6bf577ecd6a1e839358632bb30e15dd191d179d3f9d8cb5796142caa521145d0bcd6ff942a88ed337b72dec986e6a6dfefa2
 EBUILD novnc-0.6.2.ebuild 1281 BLAKE2B 16b0c9ef78683cbfefa5218b77a191cfb20fa7abcc21bba7a38366ce2fc3679b138aeab19b6a85b87e217b34f959cf117256b0d2fbc14a1f53d0517fe118d3c5 SHA512 180fe3d50d42842654eea4b6d4b759b6a325383a5b7ccbcebfe87ed244b1ffd339863b5f2846ab155067f427d46fd28285acbb629af77872f80984b9cd44a019
 EBUILD novnc-1.0.0.ebuild 1034 BLAKE2B 50a1ff242ad4631de546c4467d8966ddb7101c596dcd3c73226fc20bb9f659d28d7e86e14e24533649567f90bf87c1f30a9a162598681037aa27c0666f2adbf3 SHA512 f685a561f3b4775528f1f3627457f2a4a58bf6ab8d61ae0a4312a0168982c2040e26cc76c47d2af8c1679fc4fea61eadfdb26846a0641b539fd91b78933a1c39
-EBUILD novnc-9999.ebuild 1008 BLAKE2B 50ebdc6bd49389c46d41a0ae58630183cc7620864432f5f1c039cc86313f62bc9f7c18c2fdb40b844c26aa3104d35846047fcde1c5056675c0a2356809568e69 SHA512 ab6df82ec5a68dd9583c673f064d60e10f4867662af97eaf1c9ce3a96473f893933fa5ff3a2495656101a65f48d0cc6b6c50faaa7eb6f39c8a0075cfc27888f1
+EBUILD novnc-1.1.0.ebuild 1079 BLAKE2B 7fd735a9152a25fabcbe6c66f11fe7604d33d92b4ca8eb35a7a27e599390801716548ab8425ae05978e44f02e4bffadd55a4a720a773416dc025e846c5a802d7 SHA512 675a07c11d7283cb5952b9c1c2aa40f4994b755539e7cdb20f362384e143d121f014116aa9b094570f7b5b492c2ebc98d54ffde7696902b9ba722bb23c7dd5c0
+EBUILD novnc-9999.ebuild 1079 BLAKE2B 7fd735a9152a25fabcbe6c66f11fe7604d33d92b4ca8eb35a7a27e599390801716548ab8425ae05978e44f02e4bffadd55a4a720a773416dc025e846c5a802d7 SHA512 675a07c11d7283cb5952b9c1c2aa40f4994b755539e7cdb20f362384e143d121f014116aa9b094570f7b5b492c2ebc98d54ffde7696902b9ba722bb23c7dd5c0
 MISC metadata.xml 341 BLAKE2B 11a60501b1f7725f315055b98ecda3928e1755ad88983b8c7c4900ba053325ecb030b68e70e453c2860e67ec13337918da68422cb5c5cd432fda06b2a8027c70 SHA512 a41f01affc9fcb0cf61dba100f01ffe730a1278218c120f6a7d2c699a13d24868b6f7936c8ed5a28625e7c68a646e99556e745cead53c676037a5acbc92ffba8
diff --git a/www-apps/novnc/novnc-1.1.0.ebuild b/www-apps/novnc/novnc-1.1.0.ebuild
new file mode 100644
index 000000000000..734f516e33b9
--- /dev/null
+++ b/www-apps/novnc/novnc-1.1.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="noVNC is a VNC client implemented using HTML5 technologies"
+HOMEPAGE="https://kanaka.github.com/noVNC/"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/kanaka/noVNC.git"
+else
+	SRC_URI="https://github.com/kanaka/noVNC/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/noVNC-${PV}"
+fi
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-python/websockify[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]"
+
+python_compile() {
+	:
+}
+
+src_install() {
+	exeinto /usr/share/novnc/utils
+	for f in utils/*; do
+		[[ ! f = utils/README.md ]] && doexe $f
+	done
+
+	dodoc README.md LICENSE.txt
+
+	insinto /usr/share/novnc
+	doins -r vnc.html vnc_lite.html app/ core/ vendor/
+	dosym vnc_lite.html /usr/share/novnc/vnc_auto.html  # for compat
+	dosym ../share/novnc/utils/launch.sh /usr/bin/novnc
+}
diff --git a/www-apps/novnc/novnc-9999.ebuild b/www-apps/novnc/novnc-9999.ebuild
index cf6e775ac58d..734f516e33b9 100644
--- a/www-apps/novnc/novnc-9999.ebuild
+++ b/www-apps/novnc/novnc-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1
 
@@ -16,6 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/kanaka/noVNC/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/noVNC-${PV}"
 fi
 
 LICENSE="LGPL-3"
@@ -28,7 +29,7 @@ RDEPEND="${DEPEND}
 	dev-python/numpy[${PYTHON_USEDEP}]"
 
 python_compile() {
-	echo
+	:
 }
 
 src_install() {
@@ -41,5 +42,6 @@ src_install() {
 
 	insinto /usr/share/novnc
 	doins -r vnc.html vnc_lite.html app/ core/ vendor/
-	dosym /usr/share/novnc/vnc_lite.html /usr/share/novnc/vnc_auto.html  # for compat
+	dosym vnc_lite.html /usr/share/novnc/vnc_auto.html  # for compat
+	dosym ../share/novnc/utils/launch.sh /usr/bin/novnc
 }
diff --git a/www-apps/owncloud/Manifest b/www-apps/owncloud/Manifest
index 8334f339413f..7c4e8c02510c 100644
--- a/www-apps/owncloud/Manifest
+++ b/www-apps/owncloud/Manifest
@@ -1,5 +1,7 @@
 DIST owncloud-10.3.1.tar.bz2 19715056 BLAKE2B 5e6026dc1ca9d7e1469e4a592b05807e4cc6ed83293eb3ad94b13d8aefd8eaf2b79e3aa9fca2e28dbc5b6c8d93a19c50d358a4fa7e393e0aaa00307c1652545d SHA512 4f3e60409c199f8075987aa5716a8f2736e875c045349562b79d2c785b9e99bc7d01d17e110b9c768b410f261e7a81904feb1dccffd6da11d4daca82b7201e14
 DIST owncloud-10.3.2.tar.bz2 19828724 BLAKE2B 6619c83fd247889a83e6c7d574b9d0e4fc8e3e5782671e280a4f1b2500ac1b82c8514fb587114e08c4ed8fae47d70769fc0813593a5cf6bd6c6e4d1ec5ce7710 SHA512 d2a1903c52e26f4518e91035e940999ff7955f9f955c71c4e6457a267137df5f61ed02227e5dcc97c3d21d46a017206fb60e9b430a73006fd8fc503e2d20d2d7
+DIST owncloud-10.4.0.tar.bz2 20426453 BLAKE2B 7affb3b3ec0d4db810199ef40f96c897c3c0d5d4c1e6e66f6014294dff61226a0d062c1ac70c6d23f377179adebec9c8b9b8afaa5628c7776ea32826f25d373b SHA512 3d95cb0795a33238fc5e3a051699ae831b861a2a9d41111b10fa8347fd06f6f8a3f6b810a2896c81a4de7af4301c6cccda8cad41fcfedb9659ed1ae227e15b20
 EBUILD owncloud-10.3.1.ebuild 1259 BLAKE2B 3b4c68b1944852eeb1770db91466c12f697076057d58db461bce021757548f4d2daf1901dc444bb93ac536ac8942672b64a740f86a1239fd8dc87d5719ec5046 SHA512 e416a9d252fcb98e6af9faec401904afbcc4be00731b3e1ea431074785ba36e8f5732e96dc0bbd02cacebb3d18b9bc51f54d8babd854f6f67b25f174127bc59b
 EBUILD owncloud-10.3.2.ebuild 1252 BLAKE2B a715a1e52f6d2b4a77424b96cabca7ecf3b99f9e7193fd29afac0752a5307e8c99c48dfa3a5b7b85da0826434f9ce1e8073b4e62d8727775c09ef9c2a65e014a SHA512 8394a7272db2d38e34b204a38ae38951594066a5c03cf2f596e7fa4dff57027663d94f0754abd179fdd645522d6ed9957f78a3e489b930ef9add126a82be64f2
+EBUILD owncloud-10.4.0.ebuild 1252 BLAKE2B dd9416b52088aa52cc04173536140cd8107c1aa3be3527ddd588d1f38449808b7656b95bf428769c6584f83f53ca3b19c454128b526563792d6a6e3a26ead32a SHA512 3345000e2391005d884272d488c00474058987fdc69b7c8d2c4399a97810cd180dd862a78437ee2f15654f18b28e49fcebeb1f9062da9ba15a72fabfe66fafe8
 MISC metadata.xml 362 BLAKE2B 966b48f98107fc73bd40f9c602962f2c876c1be1f074943452cfb5bbf60eb1c2ca08153294ce4166442da85beebd41395ca9bbe9c98d7832665fa16419db374d SHA512 64c690c6fa8bc6861f673b465e0519d5c5e945d76b66a2d9e7422cbfaa967624e7da287626bd12edbf347f0d0b5296fb9719ede93d15f073542367f5fecf5e99
diff --git a/www-apps/owncloud/owncloud-10.4.0.ebuild b/www-apps/owncloud/owncloud-10.4.0.ebuild
new file mode 100644
index 000000000000..97ad6449db05
--- /dev/null
+++ b/www-apps/owncloud/owncloud-10.4.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+DESCRIPTION="Web-based storage application where all your data is under your own control"
+HOMEPAGE="https://owncloud.org"
+SRC_URI="https://download.owncloud.org/community/${P}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND=">=dev-lang/php-7.0[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
+	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_src_install
+}
+
+pkg_postinst() {
+	elog "Additional applications (calendar, ...) are no longer provided by default."
+	elog "You can install them after login via the applications management page"
+	elog "(check the recommended tab). No application data is lost."
+	webapp_pkg_postinst
+}
diff --git a/www-apps/ownpaste/Manifest b/www-apps/ownpaste/Manifest
deleted file mode 100644
index d2931ad09b2e..000000000000
--- a/www-apps/ownpaste/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ownpaste-0.2.2.tar.gz 22030 BLAKE2B ba8085f989399297acc5214cb81b22c574f30604fd60999cad6bec20041522ecb3dc576e3fe3efc6a8464979d5009a96fb0e9338f9a7a26266752d16a75c29ce SHA512 2a55e89e00e7530aafab427e7e2e4015391a68a8c7b8843cdd5b1010f492a4ecb6f28f33b2a92812a7072a35f3437f08ac1635867b492903256e92dabcb9beaf
-EBUILD ownpaste-0.2.2-r1.ebuild 1303 BLAKE2B 16534e93c8f16aff41fe8a15891e6872eaf0d9a74d307bcd81e008f0bd48451346e1a88e4fd1b7b017ab22830dee5856b743feb67065971ba99bce5a0c2f8380 SHA512 31516102e571acb7dafde0a5b3a902ce96a82869e1cd9b97d5417da6b1a4a47630004110ce70a786191a6491b61cef84d4a5139d199ae8a5cd9dd1eedd2c9362
-EBUILD ownpaste-9999.ebuild 1303 BLAKE2B 16534e93c8f16aff41fe8a15891e6872eaf0d9a74d307bcd81e008f0bd48451346e1a88e4fd1b7b017ab22830dee5856b743feb67065971ba99bce5a0c2f8380 SHA512 31516102e571acb7dafde0a5b3a902ce96a82869e1cd9b97d5417da6b1a4a47630004110ce70a786191a6491b61cef84d4a5139d199ae8a5cd9dd1eedd2c9362
-MISC metadata.xml 452 BLAKE2B df7c63bba798ac5ef1449db0a7c3039641afbeca091ad3f05098b6ea9432cb8cf976fbb96e2c4cf622e771af591cf29014be02c3c2c2b43ef58997ffa75305b6 SHA512 a40bf5d6d52d1bfb10b01367bc1bfc7520349699ea3b8218619d93c052cb9c6425cb4bdf2415b48c428007a83d8a1e4344fbc7cd59fed75822083cd50ee1b4bb
diff --git a/www-apps/ownpaste/metadata.xml b/www-apps/ownpaste/metadata.xml
deleted file mode 100644
index e02a6833f99a..000000000000
--- a/www-apps/ownpaste/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>rafaelmartins@gentoo.org</email>
-		<name>Rafael G. Martins</name>
-	</maintainer>
-	<upstream>
-		<maintainer status="active">
-			<email>rafaelmartins@gentoo.org</email>
-			<name>Rafael G. Martins</name>
-		</maintainer>
-		<remote-id type="pypi">ownpaste</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/www-apps/ownpaste/ownpaste-0.2.2-r1.ebuild b/www-apps/ownpaste/ownpaste-0.2.2-r1.ebuild
deleted file mode 100644
index f1855793873e..000000000000
--- a/www-apps/ownpaste/ownpaste-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-HG_ECLASS=""
-if [[ ${PV} = *9999* ]]; then
-	HG_ECLASS="mercurial"
-	EHG_REPO_URI="http://hg.rafaelmartins.eng.br/ownpaste/"
-fi
-
-inherit distutils-r1 ${HG_ECLASS}
-
-DESCRIPTION="Private pastebin (server-side implementation)"
-HOMEPAGE="http://ownpaste.rtfd.org/ https://pypi.org/project/ownpaste/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-fi
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
-	>=dev-python/flask-script-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-sqlalchemy-0.15[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.6[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	if use doc; then
-		einfo 'building documentation'
-		emake -C docs html
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/www-apps/ownpaste/ownpaste-9999.ebuild b/www-apps/ownpaste/ownpaste-9999.ebuild
deleted file mode 100644
index f1855793873e..000000000000
--- a/www-apps/ownpaste/ownpaste-9999.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-HG_ECLASS=""
-if [[ ${PV} = *9999* ]]; then
-	HG_ECLASS="mercurial"
-	EHG_REPO_URI="http://hg.rafaelmartins.eng.br/ownpaste/"
-fi
-
-inherit distutils-r1 ${HG_ECLASS}
-
-DESCRIPTION="Private pastebin (server-side implementation)"
-HOMEPAGE="http://ownpaste.rtfd.org/ https://pypi.org/project/ownpaste/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-fi
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
-	>=dev-python/flask-script-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-sqlalchemy-0.15[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.6[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	if use doc; then
-		einfo 'building documentation'
-		emake -C docs html
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/www-apps/piwigo/Manifest b/www-apps/piwigo/Manifest
index 2725f7144e6b..9bd21d48d247 100644
--- a/www-apps/piwigo/Manifest
+++ b/www-apps/piwigo/Manifest
@@ -1,3 +1,3 @@
-DIST piwigo-2.10.1.zip 17155920 BLAKE2B 2f25d6c4488d9208bd37ad98b2ddfa302d23600442165d5513c8b21c72d017c17ef1c10357009110ba79259ee5a4f0a9495a423235c98cd8d5003ba83bd9b980 SHA512 9ca1119db13f312d16a7a3f04564562b26abd45b6ee731cd2280192fff14384add077a3a14a139f7b5301008c6c702a302de76a3a23873b835ec8417127aa77f
-EBUILD piwigo-2.10.1.ebuild 1146 BLAKE2B 286eeac654aa9a145153de1a4f53a9c6fbcb4cffcb7b3f089be7e66745ebb4600e30446ff33d1d64b427c142a43b4de7f4249ee87e4952775a4d8814d8b408b0 SHA512 437b6be210cbe39616136a9439e75a912e4a04ab11ec0e754549668143062bc6e97ede7bf92a901ffe838c2703684c23a6a47500e3d542d59bb8653dff4a03b7
+DIST piwigo-2.10.2.zip 17391322 BLAKE2B 9982b398b8f3ead6bb5e70b34508d868e2a7440c1fe2d066f659d1a04e90f3239af0b63c2bcdc2fa250edab216acd155d5201d2634c30b275008f25bd0a5e7d0 SHA512 b75359a5ca1fd863de766eaf46dee64fc36482162fd1013bb95fd98553ae1135f9eafd584929a8d0f4dd074e9231978e84917e557de328786c6060098ab3734b
+EBUILD piwigo-2.10.2.ebuild 1146 BLAKE2B 4a47a7efcbd4dfc2615b37d6c68abf800b8c09a04ac4aaee1c2e92512ecc280d3e59dfdd2ac652e588c5fe669ed5006161d7420dbf9b6c8887ef11d43ba57d3c SHA512 01eef0e9659d5c689972fc29e5247f54c654b378c1ae3bd2a9f03ff8618b3b260c7b104385b68c6609a4eb7d4735ab70d13eab571f94c0f68e6bb609cd42aedb
 MISC metadata.xml 1022 BLAKE2B 88bca793744995b53bf2c0a5061d47798d4f2b42a8025f7bc2f1cf7dc11234d5a8c5df9ed08b9d63b99465e06015bd5dcefaa87d1daf39f8b795ab89e264a563 SHA512 8d011157201c6e25b0252239cf6bc87f596a414a37fbf990c44dfc419b5bb28b4796b4a0c9e00d78154bdbb5dd7e6f0e99b99df56fa4736a7cc55a6ccecdbf09
diff --git a/www-apps/piwigo/piwigo-2.10.1.ebuild b/www-apps/piwigo/piwigo-2.10.2.ebuild
index 208eb4ede249..c8dbcb4fbb88 100644
--- a/www-apps/piwigo/piwigo-2.10.1.ebuild
+++ b/www-apps/piwigo/piwigo-2.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
index 57fa28517667..a538699e1e17 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -2,8 +2,6 @@ AUX postinst-en.txt 1331 BLAKE2B 45313107abc05238160eeda67db0aab4917d18ee0e4d788
 AUX postupgrade-en.txt 665 BLAKE2B a504090cabc4d8645c31d1aecc7419059b84b8ba9a7b42331f53fe1953d3e5bb44ed0327411acbc711eb31a06e4bc83b7577d6d7d054ee74bfbccfadb58685ea SHA512 bc4684dff491d6140d7d97a1de6cc2773d5f834054bc3d8c122c5d6777f543a08f93e4142c50dcbda862d75ba5c19ffd49ca37876e57df4ee19869099a346a4f
 AUX tracd.confd 359 BLAKE2B 5bf14f9828f3eb22c39a27dd20da219032cc3157d45b16a54a0a6530923c694f7a424c08c09458fdf9e422a3819a7e30619a1c82966ac5aafa2355528e666e3f SHA512 38a961fe59b690eb91e20143aaea6aa1becda8c2afa103599d14ff86c7aae88f06b57b342302de1f067dac5d99024b9cc72896a84349e09b3ff40c9a20f97bb1
 AUX tracd.initd 823 BLAKE2B 4325de1322cda7885539859c2b2ea3d27acaf636bde728c50fcc4c769acec308e6b56d3449109171ce9bdd2bdda9f9364f93c7069debd0a0ecb1009ce0bbf29b SHA512 88a2c92fc1f947d794e68b158db1786cd9c2891de5d3d0d5b738e1245f35998e17741176ecd2a9562d21058f480668cfa61628c7a7b4bccf62e1373728db5be6
-DIST Trac-1.0.9.tar.gz 3642845 BLAKE2B de0a6fdfc59c5c3f1e795a7e0a006e724491d1d084c9fefcc35185a40430e06ed781c94cf9190d394b943064fd87a34a6fffea7f57c3d4b55b591a6aab5a83ad SHA512 af429db720049ab344ce3c3b430dcf0ab7530013f59ccd2334633de9babc3f31b14829b9b5aa48aa05f614ca72d1d557953c58bbfb93faae2267afeac72e6304
-DIST Trac-1.2.1.tar.gz 6212917 BLAKE2B 6445ec515b295d0fdd3a75e93da853d136f19083b6e87cbe9c856e2502d217c433bfd7f885d8ff45556882e8c99a7d6e966761027f72e32e675278ee83a67eb6 SHA512 0ee008ce0d890873eb6db7eca60e362760c4a4857dd74bda67c30e566dcb5bd64ccd6d5e7317da904e8dcfb7d4a017004d3bb794dd405936c94803b2fcc4829f
-EBUILD trac-1.0.9-r1.ebuild 2960 BLAKE2B 265020873a4d0e48615176c67b69b5c014bafd64daa1f83015455fc7bd7b772dc1fec63e49a318f6718dd49d857ddd145f611eb32b77143352c333afd03f2b46 SHA512 bc93908766ba71b15df748971a430ea4727147e110a4dca45a8f5ba77346f9fd7a0ac4fb6569b04c3d237b67d3d90738531584d4b5e501dfd9752e1d0d6fcf45
-EBUILD trac-1.2.1-r1.ebuild 2635 BLAKE2B 03e604c12440fc7c8f55d0c2599ce3a361839e599ef672ce7fbac2d2a46580087a9af54c6bbf6dcb00270ea69986c84b85291e6d545ede1382553e39951e225e SHA512 052b5e79aaf4932fc77476715e7962a20d61dc08f10694b216701316e41f4b460984f49b695260d7e9b187fb5ce75f71db194fccab72ed953af5410c2feba487
+DIST Trac-1.2.5.tar.gz 5333965 BLAKE2B 51a58773fc037db66b748abddc4905738f2766c3aef87913cb2acd66cc6fcff14be288322ed1bc92435a7a7ab8de6020259a3363459ef1363518cdacf1ac4c0e SHA512 ee8faa6950f5148fe8adca9381f3228dc9f198457b2c44fad8331ca87a1e3ab15906b25c7b01fa8face4e93a366fdf12c27843198db6a9642481820e7456a76c
+EBUILD trac-1.2.5.ebuild 2673 BLAKE2B 48eccc6077daa1c2d7aa7aec6b9b5f9ddc51c736c7e20b54fabf005196750fb6c1c49e12de2155962c2df529a6e46c84b436b58ad08192703438041b07872af3 SHA512 915a038309ca53e97705d51cdb095bef792aea56f1350c36d44c0ab457d7e93b9b594441815dcd7acd4ba6507a2dd0adeddbfcabcd8dfa23be41042f9edb1775
 MISC metadata.xml 506 BLAKE2B 4b408bc9a05c2bddccf9c733ea9f58c6f2be64f3dc8b04f4a3f3330b3ac21157f3468144a62f6473c253e8e8019c759a3d2bfbd1ad36633c3097bc061b88a8b4 SHA512 06c8b9589b20dfa824822b3129d7f62bc2aaad12f37b16e735604469a94ed51c6c8b57cce53efb1e81d748bae56ae90d74837d60667a4826ac53044e2afdf048
diff --git a/www-apps/trac/trac-1.0.9-r1.ebuild b/www-apps/trac/trac-1.0.9-r1.ebuild
deleted file mode 100644
index 92856efa6ec7..000000000000
--- a/www-apps/trac/trac-1.0.9-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='sqlite?'
-
-DISTUTILS_SINGLE_IMPL=Yes
-
-inherit distutils-r1 eutils user webapp
-
-MY_PV=${PV/_p/.post}
-MY_P=Trac-${MY_PV}
-
-DESCRIPTION="Enhanced wiki and issue tracking system for software development projects"
-HOMEPAGE="http://trac.edgewall.com/ https://pypi.org/project/Trac/"
-SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
-		dev-python/genshi[${PYTHON_MULTI_USEDEP}]
-		dev-python/pytz[${PYTHON_MULTI_USEDEP}]
-		i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_MULTI_USEDEP}] )
-		highlight? (
-			|| (
-				dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-				app-text/silvercity
-				app-text/pytextile
-				app-text/enscript
-			)
-		)
-		restructuredtext? ( dev-python/docutils[${PYTHON_MULTI_USEDEP}] )
-		cgi? ( virtual/httpd-cgi )
-		fastcgi? ( virtual/httpd-fastcgi )
-		mysql? ( dev-python/mysql-python[${PYTHON_MULTI_USEDEP}] )
-		postgres? ( >=dev-python/psycopg-2[${PYTHON_MULTI_USEDEP}] )
-		sqlite? ( >=dev-db/sqlite-3.3.4:3 )
-		subversion? ( dev-vcs/subversion[python,${PYTHON_MULTI_USEDEP}] )
-	')
-	"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-# Tests depend on twill, a broken package
-RESTRICT="test"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	webapp_pkg_setup
-
-	enewgroup tracd
-	enewuser tracd -1 -1 -1 tracd
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	distutils-r1_src_test
-}
-
-python_test() {
-	PYTHONPATH=. "${PYTHON}" trac/test.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_test_all() {
-	if use i18n; then
-		make check
-	fi
-}
-
-python_install() {
-	if use cgi; then
-		python_scriptinto "${MY_CGIBINDIR}"
-		python_doscript contrib/cgi-bin/trac.cgi
-	fi
-	if use fastcgi; then
-		python_scriptinto "${MY_CGIBINDIR}"
-		python_doscript contrib/cgi-bin/trac.fcgi
-	fi
-	distutils-r1_python_install
-}
-
-# the default src_compile just calls setup.py build
-# currently, this switches i18n catalog compilation based on presence of Babel
-
-src_install() {
-	webapp_src_preinst
-	distutils-r1_src_install
-
-	# project environments might go in here
-	keepdir /var/lib/trac
-
-	# Use this as the egg-cache for tracd
-	dodir /var/lib/trac/egg-cache
-	keepdir /var/lib/trac/egg-cache
-	fowners tracd:tracd /var/lib/trac/egg-cache
-
-	# documentation
-	dodoc -r contrib
-
-	# tracd init script
-	newconfd "${FILESDIR}"/tracd.confd tracd
-	newinitd "${FILESDIR}"/tracd.initd tracd
-
-	for lang in en; do
-		webapp_postinst_txt ${lang} "${FILESDIR}"/postinst-${lang}.txt
-		webapp_postupgrade_txt ${lang} "${FILESDIR}"/postupgrade-${lang}.txt
-	done
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-}
diff --git a/www-apps/trac/trac-1.2.1-r1.ebuild b/www-apps/trac/trac-1.2.5.ebuild
index d80396e3d00d..4ab68e7395e5 100644
--- a/www-apps/trac/trac-1.2.1-r1.ebuild
+++ b/www-apps/trac/trac-1.2.5.ebuild
@@ -1,25 +1,25 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='sqlite?'
 
 DISTUTILS_SINGLE_IMPL=Yes
-
+DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1 eutils user webapp
 
 MY_PV=${PV/_p/.post}
 MY_P=Trac-${MY_PV}
 
 DESCRIPTION="Enhanced wiki and issue tracking system for software development projects"
-HOMEPAGE="http://trac.edgewall.com/ https://pypi.org/project/Trac/"
-SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
+HOMEPAGE="https://trac.edgewall.com/ https://pypi.org/project/Trac/"
+SRC_URI="https://download.edgewall.org/trac/Trac-${MY_PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/www-apps/venus/Manifest b/www-apps/venus/Manifest
deleted file mode 100644
index b8c39b644686..000000000000
--- a/www-apps/venus/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX postinstall-en.txt 192 BLAKE2B e64917b92cc44853bca099f672be29b78a58679490dd8f5a2619fe3861484030c1372cdd2496208521942d5291d942aa5c60e030f660fae32007b8c32c473589 SHA512 6185dc665439d4d5d877501a60566f04bc40bf43e568ab158a20aec68902104662129e945129d7914bfcb20e804b0484686893d11deb2310fcc9f097bc7cd2ee
-AUX venus-bsddb3.patch 1366 BLAKE2B a764ee9447dd8034f9b3b50ee4d0fb0e977edb006f861b20a114a1589c38672bb7a16abfc895d64ecb3c9cde6e0ea9f4a8f52adfa879031d27e9675c6da7b32d SHA512 cb3cca0415a9d12356dd85aa1434270612e09153c443a2f207af8d0be53c64e8a87bdd10b3e89b4d5a3fa56334cc691f3c44221078fbe2931c99b6215fc1925d
-AUX venus-xml-utf8.patch 4058 BLAKE2B 03d24dd8265754e006e5083b3aff7c4894fd4cf039c8b7177ff3a25b6529e4da42e1b031837490e1c9af480106b1c4f02297bbee2167f6d07067bcf06d4c2e81 SHA512 1466ec1fabaef90b7907cc7587ff994a8a9d8935eed77c725ebb65b9b86f3daa15d6e0da907ce84ce7090d14c82e1c96739b3a4a7c862bcc22af60cb74e0ad6c
-DIST venus-20100911.tar.bz2 349639 BLAKE2B 386b6b7381b9dbf9515fdad03179a844dcf884a928d291b8a7b3a1897b4f67bec9418e2fec5373f640b5eab7c028671e28ff92e08461f779869b81c0388fd54b SHA512 516a503e1e43e4bf694f007382603d6415bf508f79feb8db55dba533ca9b8b367f922ede84b2ef4ec74684f81ad17919ba754abfe5e79aac51da732ceb8c2897
-EBUILD venus-20100911-r3.ebuild 1636 BLAKE2B 8356d1ef984737bdf87be28a1b1ee371dcdd2ea661981a3befb72d1d88201a877928b66fe097306ffcefb4ac952611c871abd4c53ab527d4e3ee123e1943a7fb SHA512 b56a6dbf8b77e477cdaf8eb4760b32f1102f0c7c4c15acda60a2ffae9c34db52058a3bb706b37cbceb59f94fd32df59bb42b053364519b92c98580a520a8c6cd
-EBUILD venus-20100911-r4.ebuild 1688 BLAKE2B 7605112b1e5fbae391d0d8f2ca9ab2c14e836b4206ae7a40ef7d387f4b65922d84444f2a502f356cf441c0251e01c875bc8fc904b81c3864e3fff5b178e580ac SHA512 d141b55ea1f46e7924c299b531f1864a6fb4c6ada1d33c3a0b022e5f5bd2448750af0412af5cc5dba1d78d31baebd53914df97f492aa1cd41498bd4dccd41fee
-MISC metadata.xml 480 BLAKE2B 997ccc6bcd7147a44d4928d558f82170bbb032c57b0dd4d9a7daf5584cbdd66f3733e6bf2d5c5711a843b199552d82f00a4508586ee1de7fb922cdccaeb95db1 SHA512 0caa5f4788096b3eaaa02c6cbc2f0685975e25f95ce1775e330acae28c708a0cf1bf38f31c8384068da0258948ada6ce09c6c864dac680753fb83a0d272d3bc9
diff --git a/www-apps/venus/files/postinstall-en.txt b/www-apps/venus/files/postinstall-en.txt
deleted file mode 100644
index 37427c4a8d5a..000000000000
--- a/www-apps/venus/files/postinstall-en.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-INSTALLATION
-
-Installation instructions can be found at:
-
-http://intertwingly.net/code/venus/docs/
-/usr/share/doc/\${PF}/html
-
-Example configuration files can be found at:
-
-${VHOST_ROOT}/conf
diff --git a/www-apps/venus/files/venus-bsddb3.patch b/www-apps/venus/files/venus-bsddb3.patch
deleted file mode 100644
index b57499c23698..000000000000
--- a/www-apps/venus/files/venus-bsddb3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Use bsddb3 instead of deprecated python[berkdb]. Patch by Arfrever.
-
---- a/planet/idindex.py
-+++ b/planet/idindex.py
-@@ -13,8 +13,8 @@
-         cache = config.cache_directory()
-         index=os.path.join(cache,'index')
-         if not os.path.exists(index): return None
--        import dbhash
--        return dbhash.open(filename(index, 'id'),'w')
-+        import bsddb3
-+        return bsddb3.hashopen(filename(index, 'id'),'w')
-     except Exception, e:
-         if e.__class__.__name__ == 'DBError': e = e.args[-1]
-         from planet import logger as log
-@@ -35,8 +35,8 @@
-     cache = config.cache_directory()
-     index=os.path.join(cache,'index')
-     if not os.path.exists(index): os.makedirs(index)
--    import dbhash
--    index = dbhash.open(filename(index, 'id'),'c')
-+    import bsddb3
-+    index = bsddb3.hashopen(filename(index, 'id'),'c')
- 
-     try:
-         import libxml2
---- a/tests/test_idindex.py
-+++ b/tests/test_idindex.py
-@@ -67,8 +67,8 @@
-         self.assertEqual(12,len(doc.getElementsByTagName('planet:name')))
- 
- try:
--    module = 'dbhash'
-+    import bsddb3
- except ImportError:
--    planet.logger.warn("dbhash is not available => can't test id index")
-+    planet.logger.warn("bsddb3 is not available => can't test id index")
-     for method in dir(idIndexTest):
-         if method.startswith('test_'):  delattr(idIndexTest,method)
diff --git a/www-apps/venus/files/venus-xml-utf8.patch b/www-apps/venus/files/venus-xml-utf8.patch
deleted file mode 100644
index f7c29782ff46..000000000000
--- a/www-apps/venus/files/venus-xml-utf8.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -Nuar --exclude '*~' venus.orig/themes/common/atom.xml.xslt venus/themes/common/atom.xml.xslt
---- venus.orig/themes/common/atom.xml.xslt	2010-09-11 06:41:53.000000000 -0700
-+++ venus/themes/common/atom.xml.xslt	2017-03-17 17:24:51.668976850 -0700
-@@ -1,3 +1,4 @@
-+<?xml version="1.0" encoding="UTF-8"?>
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-                 xmlns:access="http://www.bloglines.com/about/specs/fac-1.0"
-                 xmlns:atom="http://www.w3.org/2005/Atom"
-@@ -7,6 +8,7 @@
-                 xmlns="http://www.w3.org/1999/xhtml"
- 		exclude-result-prefixes="planet xhtml">
- 
-+  <xsl:output indent="yes" method="xml" encoding="UTF-8"/>
-   <!-- strip planet elements and attributes -->
-   <xsl:template match="planet:*|@planet:*"/>
- 
-diff -Nuar --exclude '*~' venus.orig/themes/common/foafroll.xml.xslt venus/themes/common/foafroll.xml.xslt
---- venus.orig/themes/common/foafroll.xml.xslt	2010-09-11 06:41:53.000000000 -0700
-+++ venus/themes/common/foafroll.xml.xslt	2017-03-17 17:25:01.477165384 -0700
-@@ -1,3 +1,4 @@
-+<?xml version="1.0" encoding="UTF-8"?>
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
- 	        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- 	        xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-@@ -8,7 +9,7 @@
-                 xmlns:planet="http://planet.intertwingly.net/"
-                 exclude-result-prefixes="atom planet">
-  
--  <xsl:output indent="yes" method="xml"/>
-+  <xsl:output indent="yes" method="xml" encoding="UTF-8"/>
- 
-   <xsl:template match="atom:feed">
-     <rdf:RDF>
-diff -Nuar --exclude '*~' venus.orig/themes/common/opml.xml.xslt venus/themes/common/opml.xml.xslt
---- venus.orig/themes/common/opml.xml.xslt	2010-09-11 06:41:53.000000000 -0700
-+++ venus/themes/common/opml.xml.xslt	2017-03-17 17:26:20.930692531 -0700
-@@ -1,9 +1,10 @@
-+<?xml version="1.0" encoding="UTF-8"?>
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-                 xmlns:atom="http://www.w3.org/2005/Atom"
-                 xmlns:planet="http://planet.intertwingly.net/"
-                 exclude-result-prefixes="atom planet">
-  
--  <xsl:output indent="yes" method="xml"/>
-+  <xsl:output indent="yes" method="xml" encoding="UTF-8"/>
- 
-   <xsl:template name="rfc822" xmlns:date="http://exslt.org/dates-and-times">
-     <xsl:param name="date"/>
-diff -Nuar --exclude '*~' venus.orig/themes/common/rss10.xml.tmpl venus/themes/common/rss10.xml.tmpl
---- venus.orig/themes/common/rss10.xml.tmpl	2010-09-11 06:41:53.000000000 -0700
-+++ venus/themes/common/rss10.xml.tmpl	2017-03-17 17:26:18.558646942 -0700
-@@ -1,4 +1,4 @@
--<?xml version="1.0"?>
-+<?xml version="1.0" encoding="UTF-8"?>
- <rdf:RDF
- 	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- 	xmlns:dc="http://purl.org/dc/elements/1.1/"
-diff -Nuar --exclude '*~' venus.orig/themes/common/rss20.xml.tmpl venus/themes/common/rss20.xml.tmpl
---- venus.orig/themes/common/rss20.xml.tmpl	2010-09-11 06:41:53.000000000 -0700
-+++ venus/themes/common/rss20.xml.tmpl	2017-03-17 17:26:16.718611577 -0700
-@@ -1,4 +1,4 @@
--<?xml version="1.0"?>
-+<?xml version="1.0" encoding="UTF-8"?>
- <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
- 
- <channel>
-diff -Nuar --exclude '*~' venus.orig/themes/common/validate.html.xslt venus/themes/common/validate.html.xslt
---- venus.orig/themes/common/validate.html.xslt	2010-09-11 06:41:53.000000000 -0700
-+++ venus/themes/common/validate.html.xslt	2017-03-17 17:26:58.275410251 -0700
-@@ -1,8 +1,10 @@
-+<?xml version="1.0" encoding="UTF-8"?>
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-                 xmlns:atom="http://www.w3.org/2005/Atom"
-                 xmlns:xhtml="http://www.w3.org/1999/xhtml"
-                 xmlns:planet="http://planet.intertwingly.net/"
-                 xmlns="http://www.w3.org/1999/xhtml">
-+  <xsl:output indent="yes" method="html" encoding="UTF-8"/>
-  
-   <xsl:template match="atom:feed">
-     <html xmlns="http://www.w3.org/1999/xhtml">
diff --git a/www-apps/venus/metadata.xml b/www-apps/venus/metadata.xml
deleted file mode 100644
index 1f74e9175222..000000000000
--- a/www-apps/venus/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-   <email>web-apps@gentoo.org</email>
-   <name>Gentoo Webapps</name>
- </maintainer>
- <use>
-   <flag name="django">Support for django template style to config files</flag>
-   <flag name="genshi">Support for genshi style to config files</flag>
-   <flag name="redland">Enable support for Redland RDF</flag>
- </use>
-</pkgmetadata>
diff --git a/www-apps/venus/venus-20100911-r3.ebuild b/www-apps/venus/venus-20100911-r3.ebuild
deleted file mode 100644
index 228801836103..000000000000
--- a/www-apps/venus/venus-20100911-r3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit webapp python-single-r1
-
-WEBAPP_MANUAL_SLOT="yes"
-
-DESCRIPTION="A feed aggregator application"
-HOMEPAGE="http://intertwingly.net/code/venus/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="PSF-2.2"
-KEYWORDS="amd64 x86"
-IUSE="django genshi redland test"
-RESTRICT="!test? ( test )"
-SLOT="0"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/bsddb3[${PYTHON_MULTI_USEDEP}]
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-		dev-python/utidylib[${PYTHON_MULTI_USEDEP}]
-		django? ( dev-python/django[${PYTHON_MULTI_USEDEP}] )
-		genshi? ( dev-python/genshi[${PYTHON_MULTI_USEDEP}] )
-		redland? ( dev-python/rdflib[redland,${PYTHON_MULTI_USEDEP}] )
-	')
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}"/${PN}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	webapp_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/venus-bsddb3.patch
-	eapply_user
-	python_fix_shebang .
-}
-
-src_test() {
-	"${PYTHON}" runtests.py || die
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc AUTHORS README TODO
-	dodoc -r docs
-
-	python_moduleinto venus
-	python_domodule *.py filters planet
-
-	insinto "${MY_APPDIR}"
-	doins -r themes
-
-	insinto "${MY_HOSTROOTDIR}/conf"
-	doins -r examples
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-	elog "Installation instructions can be found at /usr/share/doc/${PF}/html/
-		or http://intertwingly.net/code/venus/docs/index.html"
-}
diff --git a/www-apps/venus/venus-20100911-r4.ebuild b/www-apps/venus/venus-20100911-r4.ebuild
deleted file mode 100644
index cd6f9036e379..000000000000
--- a/www-apps/venus/venus-20100911-r4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit webapp python-single-r1
-
-WEBAPP_MANUAL_SLOT="yes"
-
-DESCRIPTION="A feed aggregator application"
-HOMEPAGE="http://intertwingly.net/code/venus/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="PSF-2.2"
-KEYWORDS="~amd64 ~x86"
-IUSE="django genshi redland test"
-RESTRICT="!test? ( test )"
-SLOT="0"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/bsddb3[${PYTHON_MULTI_USEDEP}]
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-		dev-python/utidylib[${PYTHON_MULTI_USEDEP}]
-		django? ( dev-python/django[${PYTHON_MULTI_USEDEP}] )
-		genshi? ( dev-python/genshi[${PYTHON_MULTI_USEDEP}] )
-		redland? ( dev-python/rdflib[redland,${PYTHON_MULTI_USEDEP}] )
-	')
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}"/${PN}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	webapp_pkg_setup
-}
-
-PATCHES=(
-	"${FILESDIR}"/venus-bsddb3.patch
-	"${FILESDIR}"/venus-xml-utf8.patch
-)
-
-src_prepare() {
-	default_src_prepare
-	python_fix_shebang .
-}
-
-src_test() {
-	"${PYTHON}" runtests.py || die
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc AUTHORS README TODO
-	dodoc -r docs
-
-	python_moduleinto venus
-	python_domodule *.py filters planet
-
-	insinto "${MY_APPDIR}"
-	doins -r themes
-
-	insinto "${MY_HOSTROOTDIR}/conf"
-	doins -r examples
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-	elog "Installation instructions can be found at /usr/share/doc/${PF}/html/
-		or http://intertwingly.net/code/venus/docs/index.html"
-}
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 5cc05784f597..512bd4b5b3db 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,7 +1,5 @@
 AUX postinstall-en.txt 1285 BLAKE2B 09a372660022bda4064f2b298e6409be4d8f8943fd06d672e15c6126029acf2551b2eb0447f378a7c9287f757a820787ab6e592556e5cf199b0d8c0dd8f98f18 SHA512 8fa41aa39a1dfead723c87e6b16f979839dd5c585b9f9bb14a8a1ef556b69f9dcab113622b56c24890d1414df045b055b6997be02364ab4d5c7c06db2e4c12b2
 AUX postupgrade-en.txt 963 BLAKE2B c08e2ecca3d462d544549c80fb11abde670251002257d75fa8dd41d890f1327b08f1796c54125663fd35aca999f63b89035b610bdeedc32396c35d9d9b92ce4d SHA512 dbc86a1cf3b5280137322794a344818be8cfc137153f0e634e7bbd856ccb7ac589199353f2ccd5c28a8aa7d35cc2e041137bfc5d812fc6267efc758a1113c2d4
-DIST wordpress-5.3.1.tar.gz 12388850 BLAKE2B bc1158f5573fb601361eec27dfde9239b2387b6faaba307e33b13f93c08b81768ebed0f6a4a59f503f5c959cc14c689ecb528f79cf2ae4b31c92f4e7b6104d88 SHA512 97a3297305ae23bf0d1d295a3df1516dcafc1486a63974357bfc46963cecf0bfd982edc68efd60a0ceb4014fdcdde9fc71e7257a5f5d011922d8dfce280e1a9a
-DIST wordpress-5.3.2.tar.gz 12389281 BLAKE2B 54222e9bfd5e5ee874845bab5a7e2a9d0677bbc97c70bd3b72bf2109683933116cbce2b5323f51236df68137be6987f9937b41a004feaaa5da13007b114135d6 SHA512 d766d485d9a6a6efb2b92ffaec2ba1f773e55a6e018759bb6b196469b73db2857c34a3dfca1ac406e2b7066072a35c070c99f24b285a47b050e3d21317785198
-EBUILD wordpress-5.3.1.ebuild 1368 BLAKE2B f5b45626e424d308eae0e46b4d403d9b8e26cac04b9d882d30806c7ec2cb450b85a39fb04fa543ae98b799d4b5513505f3e4f8f6d745f9670e45e0a770442658 SHA512 705fd916adf648b921e531e075f532421220505106f8a2fe644440f959d5a7e4fe75b8f81a6b7ec79ef750cdef348c56c1937554cafe4d6bbd275ecdf2053370
-EBUILD wordpress-5.3.2.ebuild 1368 BLAKE2B f5b45626e424d308eae0e46b4d403d9b8e26cac04b9d882d30806c7ec2cb450b85a39fb04fa543ae98b799d4b5513505f3e4f8f6d745f9670e45e0a770442658 SHA512 705fd916adf648b921e531e075f532421220505106f8a2fe644440f959d5a7e4fe75b8f81a6b7ec79ef750cdef348c56c1937554cafe4d6bbd275ecdf2053370
+DIST wordpress-5.4.tar.gz 12230487 BLAKE2B bced3e3eec1179b4c52190b24626632b3d0899f3dc33112374f316421ec6287b58d6c8684c85e743f5c92c2278e3e1408091dede6bacbc9b9be093350ed061c8 SHA512 0d2ae85bd0d0d1aeda6bc371d6357660233b604e46d764f2955abc88ccecd8bfb76f9b8d7fac788a3f8d9abb2a10b8ae60cee74ddcbe483136f0fd7ba0b842d8
+EBUILD wordpress-5.4.ebuild 1368 BLAKE2B 45194566d2baf141dc52ed370456ae5bc84e94e0b8424f38093617652224603ec715bb490f992a32d4b3372320e8faa7905e821eeba792168b22e9e59ec59bc7 SHA512 224639d9d5827afab6aaf1f9e9808bb4a064da1cc7f686c5ef3818717f900280b8ded7161c9ae718ce14793f21e4591695a0deae718a54e751881e0bcd3a44cb
 MISC metadata.xml 392 BLAKE2B 736fb06bba21342a9cdd29ce815b1325098bc11798675534a4d299bcbaeb29f46d1eab8bebd90e2539187e82294510d06827ac068611797ad441e7c024bee6b8 SHA512 f63f0ac7c836f4f8c21d69b021d6e4d6f4257f80fd1995f180509379c7ab82028a89d1be22a381e36aad34b21d94e29c2471b48d6b31dd1a634150991e7b6c33
diff --git a/www-apps/wordpress/wordpress-5.3.2.ebuild b/www-apps/wordpress/wordpress-5.3.2.ebuild
deleted file mode 100644
index 5a8f16d8897e..000000000000
--- a/www-apps/wordpress/wordpress-5.3.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Wordpress PHP and MySQL based content management system (CMS)"
-HOMEPAGE="https://wordpress.org/"
-SRC_URI="https://wordpress.org/${P/_rc/-RC}.tar.gz"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="virtual/httpd-php
-	|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )"
-
-S=${WORKDIR}/${PN}
-
-need_httpd_cgi
-
-IUSE="+akismet examples +themes vhosts"
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc readme.html
-	rm readme.html license.txt || die
-
-	if use !akismet ; then
-		rm -R wp-content/plugins/akismet/ || die
-	fi
-	if use !examples ; then
-		rm wp-content/plugins/hello.php || die
-	fi
-	if use !themes ; then
-		rm -R wp-content/themes/*/ || die
-	fi
-
-	[[ -f wp-config.php ]] || cp wp-config-sample.php wp-config.php
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/index.php
-	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php
-	webapp_serverowned "${MY_HTDOCSDIR}"
-	# allows plugins update if allowed within WP
-	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/includes/file.php
-
-	webapp_configfile  "${MY_HTDOCSDIR}"/wp-config.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/wordpress/wordpress-5.3.1.ebuild b/www-apps/wordpress/wordpress-5.4.ebuild
index 5a8f16d8897e..6fc0786bf3b1 100644
--- a/www-apps/wordpress/wordpress-5.3.1.ebuild
+++ b/www-apps/wordpress/wordpress-5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /www-apps
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)