gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /www-apps
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
82 files changed, 756 insertions, 1298 deletions
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 8b3372ec22c2..b303d71799b1 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/blohg-tumblelog/Manifest b/www-apps/blohg-tumblelog/Manifest
deleted file mode 100644
index 4c27f24416b6..000000000000
--- a/www-apps/blohg-tumblelog/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST blohg-tumblelog-0.2.tar.gz 11046 BLAKE2B ffad48daca84f939fd7f57b149add91f7dbc3a9c74dfc94377a02c27216592699a222758ca741935eeb52a4b16c972b53d10f7686193ceff86db1546909e5afd SHA512 c9819c503751f4b6dc5f53b2f16206912424fe51eee4c76da5331e1ee1847066f4c758e98ec6fae98b0e0dfe33d5a37ce5f4ea2ea3abba0fd276cde242489792
-EBUILD blohg-tumblelog-0.2.ebuild 729 BLAKE2B bc62df0ea9c7da53c0641bbebdba868994742a44966f365440bba58a4a3bb6501e1478dfcda2caebe37f9d41803732a43e7c495b9179bca78907eeedfb096695 SHA512 00c5aeaeb7de931e51ffc6992c6a820a20a0ec603551c1d6b9a525bf505569cfb53b0ab1a8454a59aee1f0f8b6a5793dfa2507f487d4f762cd7d9c80cf615242
-EBUILD blohg-tumblelog-9999.ebuild 729 BLAKE2B bc62df0ea9c7da53c0641bbebdba868994742a44966f365440bba58a4a3bb6501e1478dfcda2caebe37f9d41803732a43e7c495b9179bca78907eeedfb096695 SHA512 00c5aeaeb7de931e51ffc6992c6a820a20a0ec603551c1d6b9a525bf505569cfb53b0ab1a8454a59aee1f0f8b6a5793dfa2507f487d4f762cd7d9c80cf615242
-MISC metadata.xml 698 BLAKE2B 56717a255a71ed0ba1c8c0b1bbd769c0fb912bc81e64fed27a8946483fe97740f0b9469366a3a08474f8dbdbfdfd1bb053346b35fe6a89f5748d1431accc9ca4 SHA512 e5ad3685e16d39735bd93af2c071eb3a924ca78c873f9cdae9803a8038b1291b54d0f01e4dce3b6fa55107a05afbd92e4ed9309a3d21e845e54a24ea23761938
diff --git a/www-apps/blohg-tumblelog/blohg-tumblelog-0.2.ebuild b/www-apps/blohg-tumblelog/blohg-tumblelog-0.2.ebuild
deleted file mode 100644
index 068364304c3b..000000000000
--- a/www-apps/blohg-tumblelog/blohg-tumblelog-0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A blohg extension with reStructuredText directives to run a tumblelog"
-HOMEPAGE="https://github.com/rafaelmartins/blohg-tumblelog"
-
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=
-	KEYWORDS=
-	EGIT_REPO_URI="https://github.com/rafaelmartins/${PN}.git"
-	inherit git-r3
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	>=www-apps/blohg-0.12
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pyoembed[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/www-apps/blohg-tumblelog/blohg-tumblelog-9999.ebuild b/www-apps/blohg-tumblelog/blohg-tumblelog-9999.ebuild
deleted file mode 100644
index 068364304c3b..000000000000
--- a/www-apps/blohg-tumblelog/blohg-tumblelog-9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A blohg extension with reStructuredText directives to run a tumblelog"
-HOMEPAGE="https://github.com/rafaelmartins/blohg-tumblelog"
-
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=
-	KEYWORDS=
-	EGIT_REPO_URI="https://github.com/rafaelmartins/${PN}.git"
-	inherit git-r3
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	>=www-apps/blohg-0.12
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pyoembed[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/www-apps/blohg-tumblelog/metadata.xml b/www-apps/blohg-tumblelog/metadata.xml
deleted file mode 100644
index f8048e3efc32..000000000000
--- a/www-apps/blohg-tumblelog/metadata.xml
+++ /dev/null
@@ -1,20 +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>
-	<longdescription lang="en">
-		A blohg extension with reStructuredText directives to run a tumblelog.
-	</longdescription>
-	<upstream>
-		<maintainer status="active">
-			<email>rafaelmartins@gentoo.org</email>
-			<name>Rafael G. Martins</name>
-		</maintainer>
-		<bugs-to>mailto:blohg@librelist.com</bugs-to>
-		<remote-id type="pypi">blohg-tumblelog</remote-id>
-		<remote-id type="github">rafaelmartins/blohg-tumblelog</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest
index 98fb7efad257..5b6a6518529a 100644
--- a/www-apps/cgit/Manifest
+++ b/www-apps/cgit/Manifest
@@ -1,7 +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 git-2.18.0.tar.xz 5102264 BLAKE2B 94a8469a0e489d517136233301f1af622a3e612967316620800a771721f4e558dfb9159f158ddd07d294fce3ceb256038483f5a8c1fe6a84f661710857945dce SHA512 db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46
-EBUILD cgit-1.2.1.ebuild 2284 BLAKE2B dca480c29683c5909cd6791be4faff85e7cb6dc507f5b42462e7b4afec30befe00a615c2a7c07e32baf00fb7a5baf2ada8142c91c3e8bba38cf69e35fc491342 SHA512 a1fcb3931edd869a003c23ba68ef936f9ee846e735b81a03087acee9722690bd70eae414b7370449dc016903b886aae1c7e310f233149ec0590fff86d5e1fd10
-EBUILD cgit-9999.ebuild 2189 BLAKE2B c29b3a481dc0ec96edce1c059bce6b8079885fa3be83c1f62ae66031b7e0d37b70495fb7bb0ea0e10b7c63b614046de4881cc047a6e59989e7528bffe68417a0 SHA512 f047236db2917cab9f9d315e89036ff373c7aae04ab27d09181b88b47601de912edcf0ae523cba93613e80a516ff4f8f3549c6e0b0a17f1f7efefe0dbfa8c32f
+DIST git-2.25.0.tar.xz 5873532 BLAKE2B 7e9e54677ac3c4d3295e9f92ba7e3f7f5b33620d6d0fb8105d5e57d609fe3ee499d1c1bc4a6d8832927a28f4948f4466a6ca4edf996b8a324279f91d25627660 SHA512 8bbada0451fe0a3314e1b9a43a74135115449aa41f5b3e7f960279e4a7fe6069c36e78825fc4b60d06806e3a6fa8158f327cb8a3801686ac22a35e3704244191
+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
diff --git a/www-apps/cgit/cgit-1.2.1.ebuild b/www-apps/cgit/cgit-1.2.1.ebuild
index 6b78500479ad..04dc11ed32ec 100644
--- a/www-apps/cgit/cgit-1.2.1.ebuild
+++ b/www-apps/cgit/cgit-1.2.1.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=5
@@ -19,15 +19,16 @@ 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 +lua +jit"
+IUSE="doc +highlight libressl +lua +jit"
 
 RDEPEND="
 	dev-vcs/git
 	sys-libs/zlib
-	dev-libs/openssl:0
 	virtual/httpd-cgi
 	highlight? ( || ( dev-python/pygments app-text/highlight ) )
-	lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua ) )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua:0 ) )
 "
 # ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
 DEPEND="${RDEPEND}
diff --git a/www-apps/cgit/cgit-1.2.2.ebuild b/www-apps/cgit/cgit-1.2.2.ebuild
new file mode 100644
index 000000000000..a74743dfbc30
--- /dev/null
+++ b/www-apps/cgit/cgit-1.2.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+WEBAPP_MANUAL_SLOT="yes"
+
+inherit webapp eutils multilib user toolchain-funcs
+
+[[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
+
+GIT_V="2.25.0"
+
+DESCRIPTION="a fast web-interface for git repositories"
+HOMEPAGE="https://git.zx2c4.com/cgit/about"
+SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz
+	https://git.zx2c4.com/cgit/snapshot/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc +highlight libressl +lua +jit"
+
+RDEPEND="
+	dev-vcs/git
+	sys-libs/zlib
+	virtual/httpd-cgi
+	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 ) )
+"
+# 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 )
+"
+
+pkg_setup() {
+	webapp_pkg_setup
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	rmdir git || die
+	mv "${WORKDIR}"/git-"${GIT_V}" git || die
+
+	echo "prefix = ${EPREFIX}/usr" >> cgit.conf
+	echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf
+	echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf
+	echo "CGIT_DATA_PATH = ${MY_HTDOCSDIR}" >> cgit.conf
+	echo "CACHE_ROOT = ${CGIT_CACHEDIR}" >> cgit.conf
+	echo "DESTDIR = ${D}" >> cgit.conf
+	if use lua; then
+		if use jit; then
+			echo "LUA_PKGCONFIG = luajit" >> cgit.conf
+		else
+			echo "LUA_PKGCONFIG = lua" >> cgit.conf
+		fi
+	else
+		echo "NO_LUA = 1" >> cgit.conf
+	fi
+}
+
+src_compile() {
+	emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+	use doc && emake V=1 doc-man
+}
+
+src_install() {
+	webapp_src_preinst
+
+	emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" install
+
+	insinto /etc
+	doins "${FILESDIR}"/cgitrc
+
+	dodoc README
+	use doc && doman cgitrc.5
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+
+	keepdir "${CGIT_CACHEDIR}"
+	fowners ${PN}:${PN} "${CGIT_CACHEDIR}"
+	fperms 700 "${CGIT_CACHEDIR}"
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	ewarn "If you intend to run cgit using web server's user"
+	ewarn "you should change ${CGIT_CACHEDIR} permissions."
+}
diff --git a/www-apps/cgit/cgit-9999.ebuild b/www-apps/cgit/cgit-9999.ebuild
index a6df9326558d..1d737f2e39fd 100644
--- a/www-apps/cgit/cgit-9999.ebuild
+++ b/www-apps/cgit/cgit-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=5
 
 WEBAPP_MANUAL_SLOT="yes"
 
-inherit webapp eutils multilib user toolchain-funcs git-2
+inherit webapp eutils multilib user toolchain-funcs git-r3
 
 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
 
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-libs/openssl:0
 	virtual/httpd-cgi
 	highlight? ( || ( dev-python/pygments app-text/highlight ) )
-	lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua ) )
+	lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua:0 ) )
 "
 # ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
 DEPEND="${RDEPEND}
@@ -41,9 +41,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	git submodule init || die
-	git submodule update || die
-
 	echo "prefix = ${EPREFIX}/usr" >> cgit.conf
 	echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf
 	echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 4e5024765031..d546145bb581 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,17 +1,8 @@
 AUX postinstall-en.txt 1595 BLAKE2B 9b5c237befcf415d0f769052c9634da830326ff57da1a1db538059138780c8ebf8d0666908fb6bb3eba99fee5d5869cd12042f0d276b560b51db60803e46c146 SHA512 6a0a5388d40b3c49f3c685a6a7986c2a9efe3e6d7c5115fbb3110ebe4c19c605a4ff785447a20c0296f3cb16811a8a6e77f2439d58253a011603709c9dd9b760
-DIST drupal-7.67.tar.gz 3312764 BLAKE2B bb7f21e80ca192ff3e37f917c1fa43dcd8d3cd8b60ff012d1fe22e279ffd674e08be6aef6328d0c5b7c50a106592bde299300fe9ccb0c4c1ffc1aca57c3ca6ad SHA512 0e4f60010b1395183cea19424e8c2849f93fb7285a081bf7d0c774b8e82f403083533059f58c3831950cc06dfa8117d443db52b66a521301ceac10b1b333aa28
-DIST drupal-7.68.tar.gz 3314177 BLAKE2B 915369e8b1af0676347d326ae5a23194a6643a079b89c83c12c93edccabc0f4eecd472d0007007f9c58ae8ecec0b9850eb8f0ea3488398d7bbccd105d1246aa5 SHA512 b6e9cd1ac002cf5b633b3bc5431e4159a1e49530860f60137960cf102a04b00cbd8bfe0687b98524348ef48e1f24f858808caf9d3305c973e24bd0d92479ba2a
-DIST drupal-8.6.16.tar.gz 17151378 BLAKE2B 2bdd14ff7a5f898af2d322a6b2862643899dfbe2ad05c99b85f036161612cccfc2c25105c8eef37311634a2aa03ed792db8de3e625aed5adb94cd8f644557fcb SHA512 34f260d780bce286a0a61b710c340d2622cb857aa92a2bdaad63737303ef2f4f1751edc3f415daaa14b9cb483757e367e639136d03f571cba5165129bba31e12
-DIST drupal-8.7.10.tar.gz 17894144 BLAKE2B cf20860bc11ca65a7ff0808e533f5c3aac39d4f5b0f9052601d1bf510cdc28bb5fca99d14d78badc61158f06742e1fb6addfc4145ad17720095631f7258b0cd7 SHA512 c614a64efd86c529d89f4411d4418731ae85cf0af5a236dd3a475f68dd4d408fb7c6d378477897e2ce68c71cc287f218dab2d45cc3d96967a75a6500e0161716
-DIST drupal-8.7.8.tar.gz 17882836 BLAKE2B 8a521c5c615356548eea8a64ee81e31082e3b9c5ed37c66fef7f2f3c426c7339e4848b90306cfccae1005c5c6d8fe8d7964662012da66c9c6754c6052d102173 SHA512 cc68e6318ebc162cd50fe19046a992ae2ca338f9da564a12a88954edb2c0cecaa56b0ded22903f67f305ab1fee48dd8a2bbf8b65a9efda2e1ce50d11b97bab28
-DIST drupal-8.7.9.tar.gz 17888541 BLAKE2B 958779c7ae8fa1527ae91d3174c19afc311682c4bbceacd6592796abf781b4e52b0e1ad5f020bd79d2d55508a954bf969076121d703f69959afd6b7a87b6e9b9 SHA512 6181af0e096974e1eb7d5a046d8f34372725891937fcce7d9c0b6b1dffebc0d6fc3519f16df6edbea35c081231c9f8411166f66586cb932de1e6aadebfa78cb1
-DIST drupal-8.8.0.tar.gz 19404952 BLAKE2B 4cdad86e3668f80c45a3cff79ca0d245e36e2239d0a97f06ebe05cf125a0665e16eb75410fccb0ac5cae5a7a5e909ec67649fc4ec5e14e78b887c6b8981e7f77 SHA512 26a2f064c951b712a944ef68903070c51262f6886482429b893809ee2b2a3a58974937e9c9a698d1476eb17c38c532ede73ba4cc4ff3e2d80e989ae6cd188664
-EBUILD drupal-7.67-r1.ebuild 1546 BLAKE2B 35cdab15e35337c9f7afd5188883ae89c4729ef0616de25fafe42d0252a517771fe1a075255239b3c7f1290a411490ddc6d4a64c66c67f1a25c09f06e0fc3d9a SHA512 bddd764fb0eeec6170b936829aad59cb7fe20dffef37eea6df80dd3ce05a13ee36710ab7b36975a450ee310ec94f0362763cb5541f6c721a5054b961c665a42d
-EBUILD drupal-7.67.ebuild 1758 BLAKE2B 52959ae6dc48617ec80e22ce74324e138897f01ed9e2c489d481554188825ce917a9461b79d07a7c77049cd4458d51329f19feb68a18949afd4517a0da40040f SHA512 2aabe685ca2fd5ff1f29c8e575f22b7c1030b830afadeefe3a591b3316410a97b3e7640690bc28fca4e22f6b816f8b898c2e15c22c2cb3557032f46ce2320609
-EBUILD drupal-7.68.ebuild 1546 BLAKE2B 35cdab15e35337c9f7afd5188883ae89c4729ef0616de25fafe42d0252a517771fe1a075255239b3c7f1290a411490ddc6d4a64c66c67f1a25c09f06e0fc3d9a SHA512 bddd764fb0eeec6170b936829aad59cb7fe20dffef37eea6df80dd3ce05a13ee36710ab7b36975a450ee310ec94f0362763cb5541f6c721a5054b961c665a42d
-EBUILD drupal-8.6.16.ebuild 2296 BLAKE2B 65b24cb2396a5b9a80da6c1e89fc1cf860fd6c02e2dd10e0795f9dc142d0b618444471859644e6cb0f2996d0edddfe55cb89f023359a5cef864d2ae2f8051e37 SHA512 fdc26580fb94ee1b936789ac75b7a4439020c6dcf0e0f55dc3bf2acadc6d798107796747f1bbd0c2b7832f11d2e180771a8a86c7d2404ee8948b3687f7fab47e
-EBUILD drupal-8.7.10.ebuild 2084 BLAKE2B 11f1dfac694f10e65ef501c4e8d6306c005115ff7c617e97ba9b37480f5d7d6792e2f84114197388ee8a94b9d3b0bf5dc9f3e84a5e70e11a2c6aa3f357714d78 SHA512 2a81cb1142d338d34b0c9d0bad5cc6a6b0b48879ac20e3e3fb18434aa29f8e9428b406790d591ce397337af5e69d0ad52d5859a92ec79d7d3c5edf24c41b0063
-EBUILD drupal-8.7.8.ebuild 2308 BLAKE2B 9b49ed1062c78c37eb9ce3bab96f63fbe288756166a9f3168844c59a9ab71830a7150714d9db77e0a268f4d81fd16165b8272a38afe1fba472cb28eee4969b8d SHA512 2cd254d70d6d715bf2f7ee79ad63a5df5e0c8d9881476998b8d496293663341b00a1e5ebe50beab17cdf056f6cec43d80bda559c5d794f37de99e99543857f13
-EBUILD drupal-8.7.9.ebuild 2308 BLAKE2B 9b49ed1062c78c37eb9ce3bab96f63fbe288756166a9f3168844c59a9ab71830a7150714d9db77e0a268f4d81fd16165b8272a38afe1fba472cb28eee4969b8d SHA512 2cd254d70d6d715bf2f7ee79ad63a5df5e0c8d9881476998b8d496293663341b00a1e5ebe50beab17cdf056f6cec43d80bda559c5d794f37de99e99543857f13
-EBUILD drupal-8.8.0.ebuild 2084 BLAKE2B 11f1dfac694f10e65ef501c4e8d6306c005115ff7c617e97ba9b37480f5d7d6792e2f84114197388ee8a94b9d3b0bf5dc9f3e84a5e70e11a2c6aa3f357714d78 SHA512 2a81cb1142d338d34b0c9d0bad5cc6a6b0b48879ac20e3e3fb18434aa29f8e9428b406790d591ce397337af5e69d0ad52d5859a92ec79d7d3c5edf24c41b0063
-MISC metadata.xml 419 BLAKE2B 3652ed012764eeebfd813e1979965e76caf500aea8a29bf8652c56f145e62e5ac8c5ae233919a0be123878cccdbab5fa52a4c02ed7367099862407487ca0b8b9 SHA512 3610c6151b6bbbb452a9c599d04d28a18c3e535c0976e425778e8b138bb03637bb28900acef2ef405ec10176390db33e997ba5d789f8a0fc49564538194fc8a1
+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
+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
+MISC metadata.xml 350 BLAKE2B 6142fb739e77e5ea96afb08fc4874d79efcac28348eb84333b77010fe74286d2939e160ad4ae0bbc7ca1630a73683d6d956ea1dc804b602f7fb925fff3e4b814 SHA512 10953373bc06435a35f07b9f0950c7e930c6c23cd3e6d35393eb98e581a3daeecf9b6c1f26bf1343e9ff4be84b7db3a6967c5c61bae78dc5cc7a8b786a93d6c4
diff --git a/www-apps/drupal/drupal-7.67.ebuild b/www-apps/drupal/drupal-7.67.ebuild
deleted file mode 100644
index d4e239ac142c..000000000000
--- a/www-apps/drupal/drupal-7.67.ebuild
+++ /dev/null
@@ -1,74 +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
-
-DESCRIPTION="PHP-based open-source platform and content management system"
-HOMEPAGE="https://www.drupal.org/"
-SRC_URI="https://ftp.drupal.org/files/projects/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
-
-RDEPEND="
-	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
-	virtual/httpd-php
-	accelerator? ( ||
-		(
-			dev-php/xcache
-			(
-				>=dev-lang/php-5.5[opcache]
-				dev-php/pecl-apcu
-			)
-		)
-	)
-	uploadprogress? ( dev-php/pecl-uploadprogress )
-	mysql? (
-		|| (
-			dev-lang/php[mysql]
-			dev-lang/php[mysqli]
-		)
-	)
-	sqlite? ( dev-lang/php[sqlite] )
-"
-
-need_httpd_cgi
-
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt INSTALL.mysql.txt INSTALL.pgsql.txt INSTALL.sqlite.txt UPGRADE.txt "
-	dodoc ${docs}
-	rm -f ${docs} INSTALL COPYRIGHT.txt || die
-
-	cp sites/default/{default.settings.php,settings.php} || die
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	echo
-	ewarn "SECURITY NOTICE"
-	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
-	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
-	echo
-}
diff --git a/www-apps/drupal/drupal-7.68.ebuild b/www-apps/drupal/drupal-7.68.ebuild
deleted file mode 100644
index da5fce8597f4..000000000000
--- a/www-apps/drupal/drupal-7.68.ebuild
+++ /dev/null
@@ -1,58 +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
-
-DESCRIPTION="PHP-based open-source platform and content management system"
-HOMEPAGE="https://www.drupal.org/"
-SRC_URI="https://ftp.drupal.org/files/projects/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+mysql postgres sqlite +uploadprogress"
-
-RDEPEND="
-	dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml]
-	virtual/httpd-php
-	uploadprogress? ( dev-php/pecl-uploadprogress )
-"
-
-need_httpd_cgi
-
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt INSTALL.mysql.txt INSTALL.pgsql.txt INSTALL.sqlite.txt UPGRADE.txt "
-	dodoc ${docs}
-	rm -f ${docs} INSTALL COPYRIGHT.txt || die
-
-	cp sites/default/{default.settings.php,settings.php} || die
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	echo
-	ewarn "SECURITY NOTICE"
-	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
-	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
-	echo
-}
diff --git a/www-apps/drupal/drupal-7.67-r1.ebuild b/www-apps/drupal/drupal-7.69.ebuild
index da5fce8597f4..da5fce8597f4 100644
--- a/www-apps/drupal/drupal-7.67-r1.ebuild
+++ b/www-apps/drupal/drupal-7.69.ebuild
diff --git a/www-apps/drupal/drupal-8.6.16.ebuild b/www-apps/drupal/drupal-8.6.16.ebuild
deleted file mode 100644
index 364116f1197a..000000000000
--- a/www-apps/drupal/drupal-8.6.16.ebuild
+++ /dev/null
@@ -1,84 +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="+accelerator +mysql postgres sqlite +uploadprogress"
-
-RDEPEND="
-	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
-	virtual/httpd-php
-	accelerator? ( ||
-		(
-			dev-php/xcache
-			(
-				>=dev-lang/php-5.5[opcache]
-				dev-php/pecl-apcu
-			)
-		)
-	)
-	uploadprogress? ( dev-php/pecl-uploadprogress )
-	mysql? (
-		|| (
-			dev-lang/php[mysql]
-			dev-lang/php[mysqli]
-		)
-	)
-	sqlite? ( dev-lang/php[sqlite] )
-"
-
-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.7.10.ebuild b/www-apps/drupal/drupal-8.7.11.ebuild
index 945c43dcf134..945c43dcf134 100644
--- a/www-apps/drupal/drupal-8.7.10.ebuild
+++ b/www-apps/drupal/drupal-8.7.11.ebuild
diff --git a/www-apps/drupal/drupal-8.7.8.ebuild b/www-apps/drupal/drupal-8.7.8.ebuild
deleted file mode 100644
index 904bdb363546..000000000000
--- a/www-apps/drupal/drupal-8.7.8.ebuild
+++ /dev/null
@@ -1,84 +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="-alpha ~amd64 -ppc ~x86"
-IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
-
-RDEPEND="
-	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
-	virtual/httpd-php
-	accelerator? ( ||
-		(
-			dev-php/xcache
-			(
-				>=dev-lang/php-5.5[opcache]
-				dev-php/pecl-apcu
-			)
-		)
-	)
-	uploadprogress? ( dev-php/pecl-uploadprogress )
-	mysql? (
-		|| (
-			dev-lang/php[mysql]
-			dev-lang/php[mysqli]
-		)
-	)
-	sqlite? ( dev-lang/php[sqlite] )
-"
-
-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.7.9.ebuild b/www-apps/drupal/drupal-8.7.9.ebuild
deleted file mode 100644
index 904bdb363546..000000000000
--- a/www-apps/drupal/drupal-8.7.9.ebuild
+++ /dev/null
@@ -1,84 +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="-alpha ~amd64 -ppc ~x86"
-IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
-
-RDEPEND="
-	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
-	virtual/httpd-php
-	accelerator? ( ||
-		(
-			dev-php/xcache
-			(
-				>=dev-lang/php-5.5[opcache]
-				dev-php/pecl-apcu
-			)
-		)
-	)
-	uploadprogress? ( dev-php/pecl-uploadprogress )
-	mysql? (
-		|| (
-			dev-lang/php[mysql]
-			dev-lang/php[mysqli]
-		)
-	)
-	sqlite? ( dev-lang/php[sqlite] )
-"
-
-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.0.ebuild b/www-apps/drupal/drupal-8.8.1.ebuild
index 945c43dcf134..945c43dcf134 100644
--- a/www-apps/drupal/drupal-8.8.0.ebuild
+++ b/www-apps/drupal/drupal-8.8.1.ebuild
diff --git a/www-apps/drupal/metadata.xml b/www-apps/drupal/metadata.xml
index 0283916c75f4..6f66a1a35712 100644
--- a/www-apps/drupal/metadata.xml
+++ b/www-apps/drupal/metadata.xml
@@ -6,7 +6,6 @@
 	<name>Gentoo Webapps</name>
 </maintainer>
 <use>
-	<flag name="accelerator">Add dependency on a php accelerator</flag>
 	<flag name="uploadprogress">Install <pkg>dev-php/pecl-uploadprogress</pkg> package</flag>
 </use>
 </pkgmetadata>
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 794e74798015..172f95a01aff 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,12 +1,8 @@
-AUX app.ini 67 BLAKE2B 4ec7b8217486047b419202b3a8a7172ac21ae0e5ad9224cd4f010be730ac5cda9d05bf06dcba2d06f8809900094b3b007ef98dd4ea20a125fb7d3db279f53e4a SHA512 93f6f7cf49dd1ece56f7da711adbb58cc38a503527aeea140837d74456ee6f550a089e897d9cb94382e1eb3f5a5cbe4a61362534463eada08a91f314da0f2108
 AUX gitea-logflags.patch 4568 BLAKE2B 280697f7ca87c3c985aef0462f63f431860411ad7c39e462e5a63607ef076b116c27d2090f894095193dad33918f1fad1767489d45ae80f9699dddf65141ceb9 SHA512 aa09b233402ecb450cab13ed08786c1b8dc72a944efe69792bcf95d6109dd41b73abae95c3048bf339c8bb7849b3a20edb473388c052d32e00f7fb8b9381138d
-AUX gitea-mod-vendor.patch 1273 BLAKE2B 3067b17a972b92d0c402af4336ee41daa2f09d389a6e8bf218d33b103230bf8bb4b7003977447cc00293f8941f5002676398d4d755548e114e59cbb3840af8cc SHA512 12d8e0d2cb0998d31f8077f1498205bfee07e0df74926251f1ca38b9824c11246c07e413fc20beaed9ae49cac3d329468432f3fd2d5b25292c5bd656a88c7cc8
 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.1.tar.gz 30146802 BLAKE2B d566e58bc8031c6ff2741861c93deb1cc0bbe2236cfa8d1f054e1453d39b294ae55bd3bae46373efa39cd0b5bc9dfc248ecc0c64642eb4df68fb01042ef1c692 SHA512 d7baea6ac9aca3a3226d36325000c71c886d560eeecb2fdbed924b4924db34882cdd82d07120e3c7175a6d87140a1f63cc575c3be44513e08f8e557856b39acd
-DIST gitea-1.9.5.tar.gz 25355286 BLAKE2B 8b733651de64fcafa7b41a6fc812fcad8ac7311a7e7acc679ec7dab759175ec13a096902aece209a3fef31eefd3a99493e13f7c9792e1e41b5a1c3376680d3ca SHA512 f7a04d3bb37a33da15290355f3f02ff4c1b737e8458cf65f731c870ac9e452243b1fdacc5f74accf963fb00cdd200dd31191058eb1d6dda8b1033846a961c7d3
-EBUILD gitea-1.10.1.ebuild 3427 BLAKE2B 8fbe625027b261ae19c50b1d51eae847530dbf2c9e973d95718083f7799fc71e16f7d7ce13b6b2f421d2dc47a1dfb171da434ea39f16df8ede6ae1ea086288c5 SHA512 548c4e072a0797ae6920050f6105d015bb6670d5f1fccce0fcf4c7561a12cfb4de5e1208826add8fdb13083532406c0c2ab7a11f6b181daae39588959e477356
-EBUILD gitea-1.9.5.ebuild 3107 BLAKE2B 35944719b504c0a9acba5c7c73eef3af11bea31cea72a4910a1b0176ba77031a52b0c03514de849d564e93a78154cf973dfe4f4e9802819e3e8df72de0d41932 SHA512 2985dd8aa4ae893cb1f98becc612f2738d39bb166ac29e8b9bfbe3cdb354c858523780db299e4fe5936ea07d1689e32ab8775072d517d05688cfa60b10bc6781
+DIST gitea-1.10.2.tar.gz 30141486 BLAKE2B b6797a6bff7ec8a174f49bf9606cbab65ae5d3fe96ad6be381ea708cd73b6664588b5d80b2f6114ae09a9a202a606b4b4be6b3f224fdf2ea31c42e44b9f29813 SHA512 b378d02f27bb03ffd1a8ace2da8d827e07e023a02de4b1b4b354659316539ea38bf2735aa01fb1f997b05f7bb557394d0b6d15a1974747d86826ec1af02efb27
+EBUILD gitea-1.10.2.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/files/app.ini b/www-apps/gitea/files/app.ini
deleted file mode 100644
index 5dd998f60ee2..000000000000
--- a/www-apps/gitea/files/app.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[log]
-MODE      = file
-LEVEL     = Info
-ROOT_PATH = /var/log/gitea
diff --git a/www-apps/gitea/files/gitea-mod-vendor.patch b/www-apps/gitea/files/gitea-mod-vendor.patch
deleted file mode 100644
index c501e20adb94..000000000000
--- a/www-apps/gitea/files/gitea-mod-vendor.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 796a0e3..2c6a6ef 100644
---- a/Makefile
-+++ b/Makefile
-@@ -97,7 +97,7 @@ vet:
- 
- .PHONY: generate
- generate:
--	GO111MODULE=on $(GO) generate $(PACKAGES)
-+	GO111MODULE=on $(GO) generate -mod=vendor $(PACKAGES)
- 
- .PHONY: generate-swagger
- generate-swagger:
-diff --git a/modules/options/options.go b/modules/options/options.go
-index 723dd54..62e8c04 100644
---- a/modules/options/options.go
-+++ b/modules/options/options.go
-@@ -5,7 +5,6 @@
- package options
- 
- //go:generate go run -mod=vendor main.go
--//go:generate go fmt bindata.go
- 
- type directorySet map[string][]string
- 
-diff --git a/modules/public/public.go b/modules/public/public.go
-index 8362b42..df70275 100644
---- a/modules/public/public.go
-+++ b/modules/public/public.go
-@@ -18,7 +18,6 @@ import (
- )
- 
- //go:generate go run -mod=vendor main.go
--//go:generate go fmt bindata.go
- 
- // Options represents the available options to configure the macaron handler.
- type Options struct {
-diff --git a/modules/templates/templates.go b/modules/templates/templates.go
-index e7fe3b2..af6bf01 100644
---- a/modules/templates/templates.go
-+++ b/modules/templates/templates.go
-@@ -5,4 +5,3 @@
- package templates
- 
- //go:generate go run -mod=vendor main.go
--//go:generate go fmt bindata.go
diff --git a/www-apps/gitea/gitea-1.10.1.ebuild b/www-apps/gitea/gitea-1.10.2.ebuild
index ebc72d5057b0..473b669f45b3 100644
--- a/www-apps/gitea/gitea-1.10.1.ebuild
+++ b/www-apps/gitea/gitea-1.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/gitea/gitea-1.9.5.ebuild b/www-apps/gitea/gitea-1.9.5.ebuild
deleted file mode 100644
index 5b022012714d..000000000000
--- a/www-apps/gitea/gitea-1.9.5.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit golang-vcs-snapshot tmpfiles systemd
-
-EGO_PN="code.gitea.io/gitea"
-
-DESCRIPTION="A painless self-hosted Git service"
-HOMEPAGE="https://gitea.io"
-SRC_URI="https://github.com/go-gitea/gitea/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="+acct pam sqlite"
-
-BDEPEND="<dev-lang/go-1.13"
-COMMON_DEPEND="
-	acct? (
-		acct-group/git
-		acct-user/git[gitea]
-	)
-	pam? ( sys-libs/pam )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	dev-vcs/git"
-
-DOCS=( custom/conf/app.ini.sample CONTRIBUTING.md README.md )
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-PATCHES=( "${FILESDIR}/gitea-mod-vendor.patch" "${FILESDIR}/gitea-logflags.patch" )
-
-gitea_make() {
-	local my_tags=(
-		bindata
-		$(usev pam)
-		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
-	)
-	local my_makeopt=(
-		DRONE_TAG=${PV}
-		TAGS="${my_tags[@]}"
-		LDFLAGS="-extldflags \"${LDFLAGS}\""
-	)
-	GOPATH=${WORKDIR}/${P}:$(get_golibdir_gopath) emake "${my_makeopt[@]}" "$@"
-}
-
-src_prepare() {
-	default
-
-	local sedcmds=(
-		-e "s#^RUN_MODE = dev#RUN_MODE = prod#"
-		-e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
-		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"
-		-e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#"
-		-e "s#^HTTP_ADDR = 0.0.0.0#HTTP_ADDR = 127.0.0.1#"
-		-e "s#^MODE = console#MODE = file#"
-		-e "s#^LEVEL = Trace#LEVEL = Info#"
-		-e "s#^LOG_SQL = true#LOG_SQL = false#"
-		-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
-		-e "s#^APP_ID =#;APP_ID =#"
-		-e "s#^TRUSTED_FACETS =#;TRUSTED_FACETS =#"
-	)
-
-	sed -i "${sedcmds[@]}" custom/conf/app.ini.sample || die
-	if use sqlite ; then
-		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.ini.sample || die
-	fi
-
-	gitea_make generate
-}
-
-src_compile() {
-	gitea_make build
-}
-
-src_install() {
-	dobin gitea
-
-	einstalldocs
-
-	newconfd "${FILESDIR}/gitea.confd-r1" gitea
-	newinitd "${FILESDIR}/gitea.initd-r3" gitea
-	newtmpfiles - gitea.conf <<-EOF
-		d /run/gitea 0755 git git
-	EOF
-	systemd_newunit "${FILESDIR}"/gitea.service-r2 gitea.service
-
-	insinto /etc/gitea
-	newins custom/conf/app.ini.sample app.ini
-	if use acct ; then
-		fowners root:git /etc/gitea/{,app.ini}
-		fperms g+w,o-rwx /etc/gitea/{,app.ini}
-
-		diropts -m0750 -o git -g git
-		keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
-		keepdir /var/log/gitea
-	fi
-}
-
-pkg_postinst() {
-	if [[ -e "${EROOT}/var/lib/gitea/conf/app.ini" ]]; then
-		ewarn "The configuration path has been changed to ${EROOT}/etc/gitea/app.ini."
-		ewarn "Please move your configuration from ${EROOT}/var/lib/gitea/conf/app.ini"
-		ewarn "and adapt the gitea-repositories hooks and ssh authorized_keys."
-		ewarn "Depending on your configuration you should run something like:"
-		ewarn "sed -i -e 's#${EROOT}/var/lib/gitea/conf/app.ini#${EROOT}/etc/gitea/app.ini#' \\"
-		ewarn "  /var/lib/gitea/gitea-repositories/*/*/hooks/*/* \\"
-		ewarn "  /var/lib/gitea/.ssh/authorized_keys"
-	fi
-}
diff --git a/www-apps/hiawatha-monitor/Manifest b/www-apps/hiawatha-monitor/Manifest
deleted file mode 100644
index 991159aabe9d..000000000000
--- a/www-apps/hiawatha-monitor/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST monitor-1.6.tar.gz 622470 BLAKE2B 79813f162dae9a72b9e62550e58b737b878e69d1eb6ce348f62dd9d8c4309529b9dd77eeba6876fec90d0db6c3894aea5c62ada940a17d53bb8cba876ec31855 SHA512 4983638bfa0bfbe3f391b2319cf2f5ba63527cddc8c667618aba001929140453c8058f35d83bedb53f4dc0e5d5139d3a33dd7d9bac46f94e32dff81e65d53f5e
-EBUILD hiawatha-monitor-1.6.ebuild 659 BLAKE2B c01cb2ee90f04d2e555cdeb364d4defa1cbe69d65cfda691f21fdade0c97eada188072500877b58a5f048c16001dc0347990f6f799513362afd82d816f921673 SHA512 1de850cccf438c939f3759338dc00211d06b83470a66bffa3815f3a4954469cde6d9acb3b202d41cae0198d387f9d3c8d4f3fb38120e58c67729a7fc4a0b7348
-MISC metadata.xml 249 BLAKE2B 78cf5de7cc4f9c49b514c40b2d0f5fed411e2e0db2949740f1fd94a3a030e7d71f3399943c3bfe3a01a5fffcb47d27c81e246eeb2f1f371f372fd0a516a6e409 SHA512 c6ce77692bce0084c97651da1c6ecbe2859ce92244618f128c0e74a3ff918b38a29563d40c5d1ddd8beacc17ea306d62f536dd4587f0538158b1e283172a3f74
diff --git a/www-apps/hiawatha-monitor/hiawatha-monitor-1.6.ebuild b/www-apps/hiawatha-monitor/hiawatha-monitor-1.6.ebuild
deleted file mode 100644
index 8444fca6d85a..000000000000
--- a/www-apps/hiawatha-monitor/hiawatha-monitor-1.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="monitor"
-
-DESCRIPTION="Monitoring application for www-servers/hiawatha"
-HOMEPAGE="https://www.hiawatha-webserver.org/howto/monitor"
-SRC_URI="https://www.hiawatha-webserver.org/files/${MY_P}-${PV}.tar.gz "
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/php-5:*[mysql,mysqli,xslt]
-	virtual/cron
-	virtual/mysql
-	www-servers/hiawatha[xslt]"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( ChangeLog README.md INSTALL )
-
-src_install () {
-	default
-
-	rm -f ChangeLog README.md LICENSE INSTALL
-
-	insinto /usr/share/${PN}
-	doins -r *
-}
diff --git a/www-apps/hiawatha-monitor/metadata.xml b/www-apps/hiawatha-monitor/metadata.xml
deleted file mode 100644
index c69fcf398c82..000000000000
--- a/www-apps/hiawatha-monitor/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">hsleisink/monitor</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index 9fea8679ae28..9a0cfee64273 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -1,74 +1,5 @@
-DIST github.com-BurntSushi-locker-a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a.tar.gz 2112 BLAKE2B 3b3a6de509b7e9a2f925252a28a93e4d94e68f81e10b6a39bcb8066984ceff1e2d898c0f726b85a6984a396e88b382f5b7488c79a1d8bf6ddb7bf6eaae3d889d SHA512 b6eaa606660ab6fd2a952a8ef727c830db859658636ee7b214014f2b4a1ec3c671d85745f94ed118ed9d2cc9909a15d26c6be72baed5b6e13eccb5cfe20e58bd
-DIST github.com-BurntSushi-toml-a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz 42256 BLAKE2B 65fba0e39dbd7d9ffc5707379629ba9e8d91f186214afeb6b5f5960bd7d4b0f233247ecc1b23bff9c4ea8572f00b106ce5b833f88d975be5ffb29778fc18dcee SHA512 8a54f8b1f2fb9b5882d3c1498376c15aaf00eb8d9379090c38b03a6a291215923637dae9f36db1cca700687169cb08911e515222cd72fc153a5082ff4ddb5573
-DIST github.com-PuerkitoBio-purell-v1.1.0.tar.gz 11653 BLAKE2B 34d1028a6d47261d7952d6c06eb9e753d6a9fe421fa56c84885acaa397b9840e5f9ef872ed5302ac56fd57b475271d90a67ef2a59e6264f7698921db965f0221 SHA512 17e734a28ece431657fa9c7c1a492185d8d0a976ad4bd17285b038144252dc3ff595e54b3924408d80ed02cb2f6e99b72c05490fe23f88dcb338f358a6cda7f5
-DIST github.com-PuerkitoBio-urlesc-de5bf2ad4578.tar.gz 6799 BLAKE2B 8e27467b05093ef6af830c07a3a5a9fcfbd158c75893c6e0279538b02d70ed8ed48981ed1369aa1472903bec16c48b020a7949759dce625f6fa5cb8fe6fc4e03 SHA512 a7c80ad1cb51be792f92dd34fec99dd1d3f11e5762e196e8f2d126afaf7e62548f3355dcb2616a989d0e4afc4cd7f559a0bf528ca0e20b0d1013b27498308a30
-DIST github.com-alecthomas-assert-405dbfeb8e38.tar.gz 71099 BLAKE2B 2894bc0568c3d114aff71724dade89c604d9f0528cbe8f5c644c4a850941f146eec9a862886cb3241b75212c6f2272efc50a6923166eeb571be26c8aded40e0d SHA512 182f141d83bb9b1d7d94cf3b1beb2e7c4074f9be3bd0250e3423fe64e6182f34b54b36e517397aa88440e42fe116973ed435bde6b8343df299db6ebb32591331
-DIST github.com-alecthomas-chroma-v0.5.0.tar.gz 317226 BLAKE2B 62bf9c802fb5868ccbda6c9e89985dabbc86aa28b5edf0c883701c1073622c0b1c7c8f3828054312cfc13702bc8e2d8e3ac61fad47ff877bc386be10b60d90a8 SHA512 bdab62d9a99cf5362248a703080e99187cc463052dacfda931d8acb07e70ac800750171abb7b3739b43af443cb29a2178a9bdd4d249264299c0882b2d7047cba
-DIST github.com-alecthomas-colour-60882d9e2721.tar.gz 3483 BLAKE2B e4ecc9503cc8c6053adb66f87ddaf1e9fb66fa18060c07a0e26c1fd8fa1b143d48345ea73c399571f787b8104a7522672a945d885f5e24dcf0718a995d6567f0 SHA512 e428ba9fdc2fcf097ec9892241cbca65631924dfe66a08ec4131e7cfba24125145600f03b753b7bc4452b06f0c7380560d9165ebeb7dddb30d35db512c825796
-DIST github.com-alecthomas-repr-117648cd9897.tar.gz 4657 BLAKE2B 20c54d3bde5f39e757e97c75d8ef597e7cfe5173b15bf266460d009d5b690f381c47fa4fa2fe9bd9ca1df2ccfd84f8230d04438b2114cc85fdc2c516ae474994 SHA512 ab72cb6de632f56893424993c44534118b1993526cb57489c62ca13b6c5eb36f1d0344fb618220dd75022af419174b305d76921783b3c8ce0f895e191eb70780
-DIST github.com-bep-debounce-v1.1.0.tar.gz 3496 BLAKE2B ac77ccd7b96afc289f0fd7ada9dbd17a8cfcb5ff7dd0f83d06b4061717c0ec8267bf5dbfbe219796fd1f1a3f4d0faac64dc25633d37375048b38934121da1e56 SHA512 bb74d56cd460af55f95c95f47b5a00998d9294db2bc36aa3029263623714ee3db83664392dae0b2eb0b475f4b84448abd42e81405f2dee8da2a123449252f572
-DIST github.com-bep-gitmap-v1.0.0.tar.gz 4590 BLAKE2B cf1a7961e2ca3c4d6ccd3de7030f0e6ecb49a77fbd07fe8c355d47574f94dca873894c889e3469673c04adabaf8a8927df6fdd735fb125d13f9d6c4c7cefd6da SHA512 b0b1e53db59111cc4d6d452de69d1c3ba3304871e91c7a8b3ac03c0e3ddfe3ff21204f1f7a9455517f31173080e4413a2bd6306d666a090adc6db89e62860375
-DIST github.com-bep-go-tocss-v0.5.0.tar.gz 5370 BLAKE2B 6076247b45ba7fd99c7df9778e20468925504cf0223410341753550dfe89470dccebb9b0cc78e5e61422bbafc5b8c938e1b4eee1581fa55b8cf045f4bb40872b SHA512 df9c08241a0223bbb6b37b5da576a186152554ddc442cd0568a2f9bf7898e668587fe393c03f41e2b1cc994a3cd19d54c39fcf0e69e168451aff690883f42376
-DIST github.com-chaseadamsio-goorgeous-v1.1.0.tar.gz 34320 BLAKE2B ef4549194ded8dc2e1e04a587b43e2ed699cf9b2b8ae0d4951c8240179eff4e09765ecac30ff63b94018e272a33459e6568499dad2d8deecd2c15611deb08196 SHA512 f1ca5faf707ce4f6e5bce53d111a44708c97a7ce5e8ae614eea0624523a85e5c61d5a423bb12f5873e02d067bca5a9655560b8adf65ac3d4632656a2e0d204ed
-DIST github.com-cpuguy83-go-md2man-v1.0.8.tar.gz 79284 BLAKE2B c6bf5c1507f0e7e6393c08592bf56e6423157f265a2f26b10f262c00b15c855e99c022d9e4b465247997b0c9d667ed71c727d03735af6214ec20ca30583235aa SHA512 4c52e01c9b07582b5d55d1e94935378a676bd284a3e8230a8a191d4678b1b6ae92b704a249117c542832170069a70c649e58a1752fb2973709259b5bc108db91
-DIST github.com-danwakefield-fnmatch-cbb64ac3d964.tar.gz 4952 BLAKE2B 92a7cfe2f3c07bdf2c61b445e35531150869dc181138d3438d7173ee38130d411a0de770ba40958471ea61d9aebe8881b51eb0ca9340deced89fd94df267e299 SHA512 5904008003ac80d34581dd1d33130fef27c6a523196aafef1231a2e63c5296cd30f8c3c517090b6b4c7ebb6a57d24bb0bff10cc40876e3fa1c9e74b65bc13154
-DIST github.com-disintegration-imaging-v1.5.0.tar.gz 1886547 BLAKE2B d4ddab92c06f5a2cd5b3d3940ff5aa66f736f511fe0b8c1b4b8686d85d0b276d5128c3910657a816537550dd62bf2b8c665d1fa3995c402e3ccbd38a557c4202 SHA512 8fdc5ec93ee16cd15ff4c569116d3ccfe0cb7ea0b6c30d07701386fc0feada49795f2be23ff336fa74b481892f53e0e88b4c1b4f6fe78998b67f49d31b802fee
-DIST github.com-dlclark-regexp2-v1.1.6.tar.gz 203691 BLAKE2B 0895b0565b0b427d54831384dbb5421ec848f93927ac7243b4f08f5274b9ce5880b40e9096c73e58091cb7205204af3fb21119110fa89f16cdebd8f5b7c146ea SHA512 300b5214d7691b5d34f15f0cf7822e8b49a860d6467417ce896432d68559a6652ee083d14240f105807b5b4ddf7ba47f25318d9486de66e3e3b076f8b7104eba
-DIST github.com-eknkc-amber-cdade1c07385.tar.gz 22594 BLAKE2B bd6a8fb8b08c4435bea6c649f4dac2c3d2d5c12a26f94a68dcc4b0e6115a85fcfaca8b42ab2338bf9c6ec3bebfe26b2bdac869cd6b0d0b46fe6ef9935229cd12 SHA512 945ce07fc5528a85796f944be9a5393b167d0dfade8ca801f20f23c2486ae0362ef4edf47f5ce4e691e00419f2353e3fa7d9b97bee4a153182fdbf0704075486
-DIST github.com-fortytw2-leaktest-v1.2.0.tar.gz 4644 BLAKE2B c30b4df3e5bdca47e9b9b89914ef9d02f4b3dd9b8c21998cd3da7fbf60443ae346393253171d978015ba2543d96942a2a1aa85bd8f3fdab5a5764aa991f70231 SHA512 082fb0cfdb1ef8bec811bd5eb3bb40850353839fa7987f0249bd8f277dc19fbae371a515ff3deaca2e4a693a2932f2d0ebf5296a8ee0f9271765000d2318301c
-DIST github.com-fsnotify-fsnotify-v1.4.7.tar.gz 31139 BLAKE2B f2d0aaabfad525fb640beba78991a858ad23203a557a69fc15d2f017b2a693c64c244de435682b1cd9d59e89a97e4ba60c7f95fa99a6145a9dea73b0f334936e SHA512 840943043c49c837641f04b976f2ba610fc03bd31030ca6442744d51fa9241da1905730ea11466e249a5bd37437f1e2a433a012a64ce872a1562c941bd5bfcbf
-DIST github.com-go-check-check-788fd7840127.tar.gz 31594 BLAKE2B c97dd0f24c42ac32ac9534de280ec9f5ab12e7d91ccd6ad9233b4145c9797c28362c44242faa95fb9f051ade1d5457b7938def97019ea98e337c57d396aa6c86 SHA512 3b0a79ee3dd9e4c321a549ff8b08788ea1bfad34c29cdf42976e955716f2139b3ba7c40e8bf36d8dac01711d590fb2ab26767a06222fe4645856a401219a481b
-DIST github.com-go-yaml-yaml-v2.2.1.tar.gz 70217 BLAKE2B 4ba34bd9432699ec60348d13d8b95498abf751a922f782bf177695e6854faf907c1728d1dc13ad1cb63215fe3a86366cd99068247d15c726ba77bd0cf434b9c6 SHA512 d49267ee361196b0a1e1b9ad6f6cfa903627ccf7925fc3acc8d1bd214b64d362a9dcee10ba524fb8887226235c5baa2c8812a9f62adc7e6719d4ed84baa4ce4b
-DIST github.com-gobuffalo-envy-v1.6.4.tar.gz 5310 BLAKE2B e50266574cd74a6f4637471adf68db3063f52886064a84e7b6874c89854927e68597a9cd6248c22dd8aa88d087db42ed35519b0c5fc3a0ecc392c3766d9e7fce SHA512 480c2a9c116e060226b06983c01e4236d835ff76c17f694d5b0b144761beecdf57be3d327d08dad24528a03850048dbc17f05e0d0359ef063730dcea353f0243
-DIST github.com-gobwas-glob-v0.2.3.tar.gz 25962 BLAKE2B edc7e7ea8db6312690989d007d2a292f197a22c6efa7b5737cd925c2608e4a0ee38571082bb0dca57088d4531bb5b1dfad6341b09cd7fd4bbb57943640d9b441 SHA512 b91b27389e1f172d7c2c181f19ebc27d566e6bd6397cc6ad924ecf5f2ace98ecca639e020e05c9e281fb8549f9065610f7eb6070c63e3f9e7c6fd190c457e42b
-DIST github.com-golang-image-c73c2afc3b81.tar.gz 4817727 BLAKE2B 3aa6cf33838805db5f87d78cc64d2efc568c62ae5a173ffc056ce51cd930d7597c0af6f5c2dd641c9ecc68f6354b8b3ecb6994a2673949c55fe2213f8635e393 SHA512 56375c89b4a6860caabfef1adbc5fd1031c780980669be78b8e58117301975d336e46143e4767ce26f7152b924d1f4a8001f863c93489ab7b2198c2e14352750
-DIST github.com-golang-net-161cd47e91fd.tar.gz 966276 BLAKE2B bda75b8f79d021f4671f9215b9173fe6330c4771bba5604896bcacdfdd519073d0262a177cf0a9b38165c6586b2894551b3a981372178a36d6cdb65ee5f48f8a SHA512 80bf270f094dd431e44e736f79c6f1ae14c7bb116f69164a9f25fc9a400b75f6c71ec8dd0e99c6dbde04fd58b5ae3aa19e895becd80181721e33a899ca1e7a64
-DIST github.com-golang-sync-1d60e4601c6f.tar.gz 16326 BLAKE2B d214c190a03006b726b4e5daa8320aa2f664572db46ac6a57545ccd3e98529c63fd5d9296e2afe0af0b781fcced4af52127d8079e72d116e0310688465e1882e SHA512 dc67de045513305edb3239b412b9154b44b6f408eace3cbbcf400c08d68322cec7090b9e6b22d63bcfaaec459e221d0e3f2c057aa19ae9b35a4a134dd72475c5
-DIST github.com-golang-sys-d0be0721c37e.tar.gz 1077564 BLAKE2B a856ed49f5b9b7b04fce08f4671454ca2bc134faf8cbcd84b321fbea0d2c46b75d7a49afc1cb4a99d30fe18b70e017917d4bd4d7e80b31198ab08ec212d62483 SHA512 519363642d937ad91ce72a94c6599b1ad33c839484b28ef396994282dae2767c58e627ec9fef4143c511facd86969f6279cd326c8d1c36db919cdc57aa69f20c
-DIST github.com-golang-text-v0.3.0.tar.gz 6102619 BLAKE2B c92e68014a8c157d76741c02acd708771d66bd3dda5b19285f5aa3e073e0fe3fccb9054744d35ea62b681ae4421bb7489238d6868f9314fb26f88e002287abe8 SHA512 bd60dfaa7d9dbfca171a3ba40b51f5663c01257cf3b12b618d35689a97ab2212d316d5716ff09681bf40b099f7e20a0e0df8cfc065699cb6a07ad1dc2e2bc189
-DIST github.com-gorilla-websocket-v1.4.0.tar.gz 50228 BLAKE2B d79c4828ea72139b1fad5f39b5d711536a3ccf1cbe0c284f7b4626611cc4ed4801e759ff2970de785c968b10f56497d6fc67b1b72669a40466f6496544c44d07 SHA512 c358358d8c081e32eb06bde901c1d060de7ca08c2a60541dc06f70936a94de3d6a8ae26dd86ebceeeef6c2b75f9c79a0c4a1f8fc6ee84f5ed7ec9fe6f9c7dee4
-DIST github.com-hashicorp-go-immutable-radix-v1.0.0.tar.gz 19305 BLAKE2B a5f482b5694305fb7d2cf767135737a4b16c1d9e248c71a5c24f0d9439319f1d7a1a939683cc9bde84333010d050116b41ad99631170b90d05da075024093d37 SHA512 93c71dd8d1682b9d4f7940c1189e3569f16629bb8c4cfc25c2309bff933b8830168be320a3e6754355e885a681e61c7748f635d9930d6f1e8166630e4e5f4f80
-DIST github.com-hashicorp-golang-lru-0fb14efe8c47ae851c0034ed7a448854d3d34cf3.tar.gz 12907 BLAKE2B 8c9abac355ad96db8511807b8ad01f62a0748801328e004d90776f3a3093d7ad08ec07f4fcf48d801f3bd233df3e13dc179fc74736bce0b8a201407cdd7abd68 SHA512 ad1b89546de54da93c81648b8bce3cf6dbb0b4595df670ea569f2f5fc9e297c6465f280e6ef443cafdb09430767fad70d4020069b512b496d6157f72499a697c
-DIST github.com-hashicorp-hcl-ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz 70427 BLAKE2B 3b699fd5923ce6c823bed429fdbaecd0ea3f1a7518e37d7b4698b2b112e24c049a90994c1651fc66f0def3958865b88374ebb39e03618c09a49a5795661d3498 SHA512 d56f15b28e89c638d2d5c4f7859d3612ae7c7f981a6950ea59bb87987ac4db6a3582b00680ccd4f9e579b3d2c5e53958d89941270366e159772959a4c5b1e96f
-DIST github.com-inconshreveable-mousetrap-v1.0.0.tar.gz 2290 BLAKE2B bd46103e50dd916bad41aafbf8c1945d835222c131a88f4d3fba35feb4b11ae83c900280c9dafc6f0ef92f71b6a3ba02996dcb31d67eb49314b29d23fda2c8b8 SHA512 6f68bd6b7b1c7aa6651fe83b5230b6c8398b85561b01ca6a36ee638e186c325cc70444818de7a569db240159ba5840ed24f212e0defdf9f9890803a7641285d9
-DIST github.com-jdkato-prose-v1.1.0.tar.gz 4569644 BLAKE2B 32a5742fb26a6179947659ef3e0d727f7ef89990ba0953ff2895ad653381e6be35a130f28e220f0c4a7f48b162587f45dd207fc088bae7b410360970ccd82b3f SHA512 bffe8bb40613c3d136c3705cf06b251eed21373415c30eb7b5ae3b8821310d24f5e7ad941d0ce2733ad874f706ab3ca86cf89a028834dc272a089c31059ded6e
-DIST github.com-joho-godotenv-v1.3.0.tar.gz 9941 BLAKE2B e97625d790a1bca0a86b3720261f34a7defdb01a769d2517a29a45dcb5aa00e5b3dfbd0c597084d3fcbfe36c91f5a82056c9ccc7f1d5a2bcd373ef84550a4b78 SHA512 75635c2b354237674c8b0022bfbb0ba2b6efd2892be9a8e68ef6035b4380dda5a7e5d6ce3774f59176a2e27cf2261f2521ee4743843d5a9262f6f19a7244e2f8
-DIST github.com-kr-pretty-v0.1.0.tar.gz 8550 BLAKE2B 210bbedee436b225b678ccbc363a2feb09b6903bf459e34d0d6950333dc273db5713a828b003ad0b52da0718de38aa3665ff7be6c99b865a7766998e37e55fb9 SHA512 7a367c317043d40cfbf7fac631a286c0bbb8b45a716fe7388d6271431e354b3913505398b8ccf7ffbb01abf71f04216738936a4282c3c9645e26c51b7692e820
-DIST github.com-kyokomi-emoji-v1.5.1.tar.gz 35792 BLAKE2B d361a8ed6e1e6dbc4dcb662b8a0692e192f63141fea6ae2193d5adf7efa66959eab500212836f58c520552c7251b70b9447f90b44200abc9785389176f38b864 SHA512 68005e9e457e71d122fc5ddc5b215c56bf8f7b5b4500a5e52d4872e3a119173ab44b1a4c6ce18b8a07e2f46470fb5b60602812148991f4b60b588db399bc3df2
-DIST github.com-magefile-mage-v1.4.0.tar.gz 8758220 BLAKE2B b7e02ee4e53b721b910259c106f2794c3d71ede3acaf73576bbbadb0e3267514645c9b64db623edbe40f1caa72de8e7a8d6fbbf509f0bc21b415f20d824b0cb1 SHA512 eeb9ce38c4ad69f9183d98e219ac49eba98a5b54abd68ad6386d72f23610c9231eb66b95f2619db64be8e57950253b2e0d3ab229f5f1a52b6765285a7f928878
-DIST github.com-magiconair-properties-c2353362d570a7bfa228149c62842019201cfb71.tar.gz 29495 BLAKE2B f394e50ce58dfb59db8e8ef6364cdf494604cec2e042009a8a72250908102ce31bac173291f9c75ad585cc570fb7635b7146b1ec85daf01899945b5bbe1be621 SHA512 fe3e521365758b42df60acd8d582a080eb4828ef56cd20da57b6041074bc4b7673f01a6ee83d8271abf60609efd0c200149ccd7564da1b3a40bbf3e2c9967e66
-DIST github.com-markbates-inflect-v1.0.0.tar.gz 13366 BLAKE2B 302a05affcf627466f4d1ac663abbd5b2088e3f4285d684d823b7ab9979ace04742e0ee46c0b058acebad3bd1511ecac64b13eb9733896ca13ebef5fcdecd700 SHA512 0856d0468ae8c49c944f0daa96ad77534bedefccf446d4549e590aa97238724d4488d3dd503a5f9c8720010e20ec20faae3e4cd721b882fb01624b36fe9a1fa9
-DIST github.com-mattn-go-isatty-v0.0.4.tar.gz 3377 BLAKE2B 3d24124c57c5a7d888014555ddd221790ee1c281e083f39595f0b28f7485065f3e7c25d6503df291dd09ad5a17b10fcc3d3e5018f846bc141f2e9b1bae44fb0c SHA512 3021fa12e408b5f0dee7cf6b04be48db5de032e7226fe07d6ba77aa1ac54ea8531b7fe14ef7fcb41d2df15ff14f524594a21859693623cb1e937d58578c4fb67
-DIST github.com-mattn-go-runewidth-v0.0.3.tar.gz 22961 BLAKE2B 1b7756229969e6df4037db05a0126dc0720d16714d72f82a34689b295d3fea9f7e705eb9560ac1a6afe07cd3e89aaafc608162ad2af5c61e0765545931afb09e SHA512 de2b8a037fdcb2bf405417fd7a817a8d3d4b7d60966e82beffc1f2d5fb60ff7660b0cca445ea991c9d7378f21f698a23676e3fac164ad037467e847eb0ff98e9
-DIST github.com-miekg-mmark-v1.3.6.tar.gz 198696 BLAKE2B c41c8d869f9bd091c5bbf614f98a72db0c48155ee7773946f658f5afcd493f389ebcccc0ccec155060b8748d25f55fc9e6a44d3ecbeabc0b11a027366b1fb2be SHA512 38f668c54de18eb134ddf19840d00102ea6c7e8d11d971db4562bceb7f039c9fe94f181edb49cbd95de08f4e1cb28c6d7c0bccbdcf9faeb2a07767812b15c4e8
-DIST github.com-mitchellh-hashstructure-v1.0.0.tar.gz 6507 BLAKE2B ae7f4e449f2f01adabc0163dde5b403d5fd4e18d247aa9296f4b65fdd6b0f05240b05b25cef3a1389430d63ac8bbfcbccf4c3af300a61ba0494e312d5e282a52 SHA512 a2b0688cb9e352c3ade1a928ad6c3bb9feeb066703af4b125789f045537677898544b97610272edab1476894c261c558ba6ca95e32a894f5471dfb055cf88265
-DIST github.com-mitchellh-mapstructure-v1.0.0.tar.gz 18841 BLAKE2B b1ee258e1d1c68d0d555c2c36c6df92d9d2b7695150e48f391978e1f2c2d1907a40ce6aac7a5e3e14974a0659426979712ce5c3ab9f7169106e36a48f8701e8a SHA512 a95d34b74823e7a9a368c60f95a5ee8e1032c0b6bd6b002559a5e048e405c9ca54f8751a58f2c5a3a9f9e005575f9a17ad14723dc10b85974102df5d59b0da16
-DIST github.com-muesli-smartcrop-f6ebaa786a12.tar.gz 448097 BLAKE2B fc3d3963959f7a611bae7e6492f11fbbc3787de2b9302c2f739c754a9efa7215bf3c3edfa10f6a10bc504700ed5b4ffd29a8c427f6b0d998a23edc91eef388e6 SHA512 04b38117087f540a03f9da9070a16010d7ef4cb6c321c94df3d3dc95faf57dc3a44f5e36055ce0a6a1c3d924ba01d8bdee40b0c1b457e6f03c650f91663c91cb
-DIST github.com-nfnt-resize-83c6a9932646.tar.gz 12464 BLAKE2B db340707937eb569121ac7b71b315ff218e14c54c62d8ff4824477660b90427aa0b17f7b14e10e85fa16d53d4e5d4bd1db9ab93faf83627293af9d936d413b0a SHA512 658fe80affcdf5df30009daeb3879406e42c7beb40267a8f3fd55e0522d701cb6db794018fbdd6fb04fc6ee7e464ba612d0aa691867fa6dbe297e29e26b8b298
-DIST github.com-nicksnyder-go-i18n-v1.10.0.tar.gz 39648 BLAKE2B cec34c78ab56dfe56e0da769534b2737708a75e21e047bc2730e74c97e15349df5477006ec8e95ea0fcce00eeaa896ba6b854f2d2c0dbda585f46309df947f86 SHA512 b9dd6f64066cd2184dcbd9d5795b8c7e8c296cb889bd264580bfc5981e9e11fe9b91189991c3c7a005c957bbe1ab1e8c8ef52a00fab24bd25d8056d467e41cae
-DIST github.com-olekukonko-tablewriter-d4647c9c7a84.tar.gz 17378 BLAKE2B 23cf5e288d72278f082e1b533ef8324abc268a317b7c11772af89f964e646b22fa246833eff4d0307a89dc89c0c304e3dcb3e37ac1f3252f7213655acdf887b6 SHA512 9418d06e67a72089f0b35f9f7eb1d0da68ee8c433e4577b798a6ba428233b2f9c3bec5723ed6620c5ed257ccb1a1f32262394f21d4d781c3d56e8b2034ac7111
-DIST github.com-pelletier-go-toml-c01d1270ff3e442a8a57cddc1c92dc1138598194.tar.gz 57491 BLAKE2B a870b1a5e2340956a5af41c1dfd218aeabcc0a10edc1cf0fa975bd32254412e846213ca85de2c11d29f028336e4bab66284e8b2f381cf0d7db46646a85a81349 SHA512 b5f9daa6b95962130a691b5b634586efce81c33a1660466da7fdf4b88a2593b03374a84651c9b8941f71ed257574b7168253c3b196cd5563f02422b3431b370a
-DIST github.com-pkg-errors-v0.8.0.tar.gz 11344 BLAKE2B 50fd44e65872bc2c365f649b79784f1f88adf5101c9654f632fc0f96cde67ce0a839dd799b7f195f056f8cb12bbdcfa3167a54b6ffc107575d32f97e6705eb5b SHA512 82055b10c02f13a8ce497388729568ddde7ae61e9fb2592b9acb11c61dfe94d5554432aee168e7c7adbd8345511c3e4ce0ba4c1b23cf253480e199a95316c443
-DIST github.com-russross-blackfriday-46c73eb196ba.tar.gz 75364 BLAKE2B 966d2fb61206a0659d1b1c081936d2b16ec2af1091bb21e571fcdfedf5c52c9b90245c5790498454c58a6ddedc10bb6733a998ce67e50f62d16305395b0dc81e SHA512 60ce18f58a78a7e16bcf8c9b8378deebe9da35397f718c9972140512d31dbdba88d46224353ac10211f4daf63ef77743ba4d7cfa8ba5f5cb79cffaaa43161984
-DIST github.com-sanity-io-litter-v1.1.0.tar.gz 8785 BLAKE2B d6725f1102d39991e7309c3e9e37a9164f66baf7a3756a7923da81cd87e9860e69cd7162c38c0b1398ecaa5dff4b8ba79c2e75791d252fadd2ff92d18818994d SHA512 1ee8d80f94f25d9df5c65dd18a4dfe387cc32036028974bf0f04ecb68519dd17459409552c1be88007698127f5502226636b3a0f253efb1dd97f8e4c4dd313b8
-DIST github.com-sergi-go-diff-v1.0.0.tar.gz 41609 BLAKE2B d45904bd26757c0b81310debfecc35fc20de2bc28bba487324dfd348e9f53369dc40cdc5f25cf8d07f6d8462fae5f41df606b79f28b28bbc7fc53bd5af8469e1 SHA512 aed012908610c75dbf7141ee5652d6b1b21ebf6e6a72ed88cbe32213ad8ca6ccdbfe1d42815eb8cbd98276acf75306aef21b729237746d30e24ac6dbc36552b0
-DIST github.com-shurcooL-sanitized_anchor_name-86672fcb3f95.tar.gz 2057 BLAKE2B 511fd36413822251b5a0aa08d632ca1e1564e4f6f9b49172a571e373c05298e24cf4720dc7005821ce94ce338a066b32e9e6cb19b70b2b2a652da3e9c91b5748 SHA512 1d53a83a293157ea42d4e1c7a1eb30c87eaa32cdc88521ebcfa3f94fa4ddcf35d1b839a16ccd00043ee59c113596d5048f88e5cf5f9e6ce6003c9d8faf837ad0
-DIST github.com-spf13-afero-v1.1.2.tar.gz 45309 BLAKE2B 0de6a204590f40cda8e80495bf57f55827aec4fb0fff58e0ae7d03b25d297edf530af4c8da94f11ad9bd25eb148fb72b083c75d513b8c4802e8d1a557386f101 SHA512 2ea3773346086d7f0e499653649ef9cbe71b5c0ea488b7650630f4262c13fa426522c9f9556ab127c7b8aa2aa97ff0b34cf3a9eba8b7c753ed200292a50a314e
-DIST github.com-spf13-cast-v1.3.0.tar.gz 11085 BLAKE2B f46ad23efac14d599ef7268c033c5f244ea7976982fee02b4d83ae65f91a72150bef359eb24b8c868f8a42ea8a0aeae839dcf82a7646648bf482f2a520704e09 SHA512 4cd15f59860fddbb67055beb15dfb8114ecaad5999a8fb46fbbbdea1cf78eaa094a4893c10b97efc7d2f95509920688659d609623135bf9871e6229043452194
-DIST github.com-spf13-cobra-v0.0.3.tar.gz 101526 BLAKE2B 8613eccdd5bbd31429b7aa8260ee9367e34a5cc78075b394b09db91a97445ed1dadfb53a86105b55cb6ea3b4c2f9d50553e9198d64dfb6033dd1db2805984a2c SHA512 c38db9432a168f913b41a1e1b11d84bedfade82ff70791be9d343a6cc86b8a05b18bae344d67ebd8bae4c98662db7ac664a9dc86fa9b9ad4aa5c96cbf0178efb
-DIST github.com-spf13-fsync-12a01e648f05.tar.gz 4845 BLAKE2B 2bd822d543af68ed3fe3a2c6982282f638fc2cc3a3307b315a14ca99650fbf1cf9f3d89b697d6edbd4bda3bec4730539447803b3ec0495d2515de044d19e2e92 SHA512 62c62aa2090ca0dd4aa24b4ba452a8635d5d6ee89740ab34178fb1b7665de515e65dd38504498156f183c0362953ea3ae8aa6ab1c6385f8bdc1c38e6e258448e
-DIST github.com-spf13-jwalterweatherman-94f6ae3ed3bc.tar.gz 6867 BLAKE2B 73b245a46aa7c64151625b1dcd7f0989cca049201f053bf323a28e99a925466ecf7d205e076476f166eeac49b9f686358e119289b134a1cd8aee6011c9ab3be5 SHA512 960829b25973b7359deb7a85bb3b7d0fca69faf1ccecbea771772330db4fc1331921d03268378a06f350403de6ff6f749de729fefa90af5c489a4a0313f5f398
-DIST github.com-spf13-nitro-24d7ef30a12d.tar.gz 6750 BLAKE2B 1aa0bd5f0b7e82d8031fbf81f690eeb985f14682c7a4ff73bb6aa3cfe4d26baff283ffae82fb4862e8dcf1b1c2fa149f24083cd74a503d65ff1e286bbe8d1bcd SHA512 53bc9164ee928b29f32158c3249b22822ff905032a8a726f91093066f18559e52d2f6e8d364ea38bce10515284a8b8c624e4030ee67ef58791d7e3e0c811cf7a
-DIST github.com-spf13-pflag-v1.0.2.tar.gz 44042 BLAKE2B 157fa6c2b1efa594abebd76ff03121050187974d62475b1aa66af325a2198ea64105655597703c37f25e22c4a07864d9fc31a6a29ba9233fdeefcceef400d5e5 SHA512 fd3cefd683329316eda4ec660193a970e38435515c16805190235e2c969c8d65a6f602fdc7c2f7cf3d9740c5a321ee5be5e8034bd6cd7c05c12722cf64d1e8ae
-DIST github.com-spf13-viper-v1.2.0.tar.gz 34451 BLAKE2B c95e0d93a095e0dce4e2d0562cc742f146bbe1428fb4c066c7ce276e8c29539420df8ed70f9790d046ca18e3049065744f8042a1872a3c917445a0dd843c2f22 SHA512 9d9a98c9f058a297271475de87f0d3d9425bbd2b435664ce6f013fdd55a0268c2ec0c63e0ea2c1ee87790c598e94fa10f2408baaf0b56513e0e6db233b1896f0
-DIST github.com-stretchr-testify-f2347ac6c9c9.tar.gz 101786 BLAKE2B 39c89290b8cea2c5b2bd026b0ef6b78797eb027bb8fd925a383903ef252b65c244e1510242a65f750702cd2c657c527200aa32d020ac8e01be7cb9fd145e4b74 SHA512 0d6687f86933266607e479fe647fef2736eba9d0def5f35f3982aa13b7b9e0276fab6fcd7852de918ab7602849ab22994ed6f2635f101a88ebb28bffaa08f45f
-DIST github.com-tdewolff-minify-v2.3.6.tar.gz 2124420 BLAKE2B 253955f11563fe588df77b9a4ef30de8b1fdaebb8112a9c88741fe8583b4d2820410059532e9f4fd8026950c48508281e3fe53286fee8b33e111010dcff7e76f SHA512 a06d06a9988f8e3a91cab9d0c6fb16d641ad5cc7ada4cbc51b711584f394d78c387a99f5830d5fab52224c840c0746fc465b5cac9263760bdf20dc91e964fd23
-DIST github.com-tdewolff-parse-fced451e0bed.tar.gz 75048 BLAKE2B efa01a80382263b5fe64cfe3cac8f7b774a91f1857ed164e876e4c04a90af4b2c3438b8a69a2b29030652f6dbf85fb94b8d2888bca1dfcb443e016d395fdab1a SHA512 4e22f2f6dfcebb0541c811dab419ddcc0f1f4ad1ac5194d81e54b67d5700cc9ec494ade9a074e60e2732bd6bfb2c4be78d9c688d353db5f84ab4f47b37573400
-DIST github.com-tdewolff-parse-v2.3.3.tar.gz 73560 BLAKE2B 89b5be102d21156a16198913934ebf4f0150e01f801fe64dcde99e769259aa9efe23934476025c88a07d166cee90d75fa36705934081d914c8847f153f55686d SHA512 bc477cbf8c5d96f21ea1dc02f35e6fe320cbd0db1eb00311110e2f371e9e979356eb346b7b5cc3d4f673148f9ba45e505b4c3a3ffc108a28d506dbac4936fc08
-DIST github.com-wellington-go-libsass-615eaa47ef79.tar.gz 333495 BLAKE2B 3f2e909feb68f0f673ef378890548dad3585fddb9e40bcc8b97418123a268ec875e0ffcd50b5fd83b4dac68431f24a2be471d416624c165b15bf64f2f7843821 SHA512 a3413cb8b861eb2f05ba01c6735722b68dbaec5d8a646faa7d6175de9c8831d7409e602f72e64fa305fb3f49056a237ce8219c24d149b5e27dc60e5d94a87ee5
-DIST github.com-yosssi-ace-v0.0.5.tar.gz 23277 BLAKE2B 6720498744342dcef520d5af05a889e1abc07b77eb64ff5a2e38ae6b2c0c239363a66275f7a37f50f4a0073e232f39c09be894e1f8cf8a0639bb787023136469 SHA512 1bc93544fb64088271ffca5c2ec4bd136a18527968b4341c2108c6b7156d78292e6d0c5c50fe80cda24bcd17c2d1204af597c0c3281248c3842d1fdc4838b54f
-DIST hugo-0.50.tar.gz 19943257 BLAKE2B 0c6d31c0ab94655d45bce9c42a41bbdfa3011322bf03860b3970ad94ebcedc67f0c32a805442f9f7666fc14054d75eb744e004a9feef6f93bcb50d4052cc024b SHA512 0cb48f30ea008382ee7c90d28713999014153d930ffad72a910cd25bdd868f9f9bb91d5825b8eebc967680a33736a69ed71b93699ca629618ae6fdbf669ca661
 DIST hugo-0.58.3.tar.gz 35274155 BLAKE2B 5f60a49ebdba3a1f259f0670b53eee011c8145d774ab5ab58773420adc00020bfd2c666284f069e25d5274b9e10959ba40a4dd3d65e2091880f03e34ca5177c7 SHA512 b51a83a3853e985dbd79f681198f2c41621ad4253b1b04359264cd9bc5037fffe2fafc4bffafd47dd44bb8880b3f6b3e32ea72e4e352099c08c392f5ab1ebe2e
-EBUILD hugo-0.50.ebuild 3999 BLAKE2B 0721a86b4782ab90262d5f7bf0f542a9c7dde4d20a97b8e6420512e61c7b2d97c79a02ad3e8a07342cf92a18a40c7a2e819010c8cb2c5d75dfc026e7174f4695 SHA512 bf64355b641cc0e2b2de78ce3509d08529d186cfce1728918c83233847b67c460897c574fc6cba4460e75f25fb21e81bdf450fce46386ce61ad315bd9c4da5b7
+DIST hugo-0.62.0.tar.gz 38685967 BLAKE2B b9e9723e910570f757108aa5e608d45ecb846c10b35449379a48fa68384aec9ae4f89c4e168005c3b27f533554f6de62067c68849f31be1a93722f95cbae0a74 SHA512 773244c1d174fef9af26ca89bc818d09bcf19dab13b9222ff949d812e7b6e5eead6a214af8cc19dd6de258b36c272fb606cdac41f553a29f561d7cd0af0c3ffb
 EBUILD hugo-0.58.3.ebuild 1030 BLAKE2B c1e13d64c945c931552a7dd436713c83d8b5c2c8459f5881a2a8b59ac042be7fef387096c6663d22edd213073e9a0b6fe3a760c9833221ef3ba656902894bcca SHA512 58c1f02d102dfac2b39cc8c1dcaa3cad37fe510f66c807153592698c4722eff4db2f6cbb3647b538a907e7a573da13614fc160ef055b722e412aa3121bb31a79
+EBUILD hugo-0.62.0.ebuild 1125 BLAKE2B 697ea1a84116cc746df4286bac36599ff639df4c216c24ed760972edcbed8cb2cf67aa8ee74108d6ab9874baf987316a4abd91dab8efd73e384e0021cbfe4b29 SHA512 80581d401915d189551363c0544c39739189c553b6c4b53ecc23d3515efc5df8124475bc2de529506a6328f11eed95c3a60266d21ef40eb6aecb7a9cbe9dbf71
 MISC metadata.xml 779 BLAKE2B fa33257581b3507e4d3b740460de5887a4d8aa2dbfe712c5e0ef4d33baee126d00233ada01230044b43785556aa8a3cca656e38ef65b0c3dbe6521b3a45acc28 SHA512 8abc6f63a7a2bea20a6a5b93475d08f34468480deb831296e8c0ce2455d960889a1cbd1ebe0a94fe8e7d98932ccb828dbf968c70c166053545255b85dbc28d71
diff --git a/www-apps/hugo/hugo-0.50.ebuild b/www-apps/hugo/hugo-0.50.ebuild
deleted file mode 100644
index bf71cce65ae9..000000000000
--- a/www-apps/hugo/hugo-0.50.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGO_VENDOR=(
-	"github.com/PuerkitoBio/purell v1.1.0"
-	"github.com/PuerkitoBio/urlesc de5bf2ad4578"
-	"github.com/alecthomas/assert 405dbfeb8e38"
-	"github.com/alecthomas/chroma v0.5.0"
-	"github.com/alecthomas/colour 60882d9e2721"
-	"github.com/alecthomas/repr 117648cd9897"
-	"github.com/bep/debounce v1.1.0"
-	"github.com/bep/gitmap v1.0.0"
-	"github.com/bep/go-tocss v0.5.0"
-	"github.com/chaseadamsio/goorgeous v1.1.0"
-	"github.com/cpuguy83/go-md2man v1.0.8"
-	"github.com/danwakefield/fnmatch cbb64ac3d964"
-	"github.com/disintegration/imaging v1.5.0"
-	"github.com/dlclark/regexp2 v1.1.6"
-	"github.com/eknkc/amber cdade1c07385"
-	"github.com/fortytw2/leaktest v1.2.0"
-	"github.com/fsnotify/fsnotify v1.4.7"
-	"github.com/gobwas/glob v0.2.3"
-	"github.com/gorilla/websocket v1.4.0"
-	"github.com/hashicorp/go-immutable-radix v1.0.0"
-	"github.com/inconshreveable/mousetrap v1.0.0"
-	"github.com/jdkato/prose v1.1.0"
-	"github.com/kr/pretty v0.1.0"
-	"github.com/kyokomi/emoji v1.5.1"
-	"github.com/magefile/mage v1.4.0"
-	"github.com/markbates/inflect v1.0.0"
-	"github.com/mattn/go-isatty v0.0.4"
-	"github.com/mattn/go-runewidth v0.0.3"
-	"github.com/miekg/mmark v1.3.6"
-	"github.com/mitchellh/hashstructure v1.0.0"
-	"github.com/mitchellh/mapstructure v1.0.0"
-	"github.com/muesli/smartcrop f6ebaa786a12"
-	"github.com/nfnt/resize 83c6a9932646"
-	"github.com/nicksnyder/go-i18n v1.10.0"
-	"github.com/olekukonko/tablewriter d4647c9c7a84"
-	"github.com/pkg/errors v0.8.0"
-	"github.com/russross/blackfriday 46c73eb196ba"
-	"github.com/sanity-io/litter v1.1.0"
-	"github.com/sergi/go-diff v1.0.0"
-	"github.com/shurcooL/sanitized_anchor_name 86672fcb3f95"
-	"github.com/spf13/afero v1.1.2"
-	"github.com/spf13/cast v1.3.0"
-	"github.com/spf13/cobra v0.0.3"
-	"github.com/spf13/fsync 12a01e648f05"
-	"github.com/spf13/jwalterweatherman 94f6ae3ed3bc"
-	"github.com/spf13/nitro 24d7ef30a12d"
-	"github.com/spf13/pflag v1.0.2"
-	"github.com/spf13/viper v1.2.0"
-	"github.com/stretchr/testify f2347ac6c9c9"
-	"github.com/tdewolff/minify v2.3.6"
-	"github.com/tdewolff/parse v2.3.3"
-	"github.com/wellington/go-libsass 615eaa47ef79"
-	"github.com/yosssi/ace v0.0.5"
-	"golang.org/x/image c73c2afc3b81 github.com/golang/image"
-	"golang.org/x/net 161cd47e91fd github.com/golang/net"
-	"golang.org/x/sync 1d60e4601c6f github.com/golang/sync"
-	"golang.org/x/sys d0be0721c37e github.com/golang/sys"
-	"golang.org/x/text v0.3.0 github.com/golang/text"
-	"gopkg.in/check.v1 788fd7840127 github.com/go-check/check"
-	"gopkg.in/yaml.v2 v2.2.1 github.com/go-yaml/yaml"
-	"github.com/joho/godotenv v1.3.0"
-	"github.com/gobuffalo/envy v1.6.4"
-	"github.com/tdewolff/parse fced451e0bed"
-	"github.com/BurntSushi/locker a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a"
-	"github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895"
-	"github.com/hashicorp/golang-lru 0fb14efe8c47ae851c0034ed7a448854d3d34cf3"
-	"github.com/hashicorp/hcl ef8a98b0bbce4a65b5aa4c368430a80ddc533168"
-	"github.com/magiconair/properties c2353362d570a7bfa228149c62842019201cfb71"
-	"github.com/pelletier/go-toml c01d1270ff3e442a8a57cddc1c92dc1138598194"
-)
-
-inherit go-module bash-completion-r1
-
-GO_DEPEND=">=dev-lang/go-1.11"
-EGO_PN="github.com/gohugoio/hugo"
-GIT_COMMIT="456f5476cf9bf96c558448372058130fee1f9330"
-KEYWORDS="~amd64"
-
-DESCRIPTION="The world's fastest framework for building websites"
-HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	$(go-module_vendor_uris)"
-LICENSE="Apache-2.0 Unlicense BSD BSD-2 MPL-2.0"
-SLOT="0"
-IUSE="+sass"
-
-RESTRICT="test"
-
-src_compile() {
-	mkdir -pv bin || die
-	go build -ldflags \
-		"-X ${EGO_PN}/hugolib.CommitHash=${GIT_COMMIT}" \
-		$(usex sass "-tags extended" "") -o "${S}/bin/hugo" || die
-	bin/hugo gen man || die
-	bin/hugo gen autocomplete --completionfile hugo || die
-}
-
-src_install() {
-	dobin bin/*
-	dobashcomp hugo || die
-	doman man/*
-	dodoc README.md
-}
diff --git a/www-apps/hugo/hugo-0.62.0.ebuild b/www-apps/hugo/hugo-0.62.0.ebuild
new file mode 100644
index 000000000000..6662f194949a
--- /dev/null
+++ b/www-apps/hugo/hugo-0.62.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module bash-completion-r1
+
+# The fork with prefetched vendor packages using `go mod vendor`
+EGO_PN="github.com/g4s8/hugo"
+GIT_COMMIT="6608f1557054a7d0230dff260c1b66bc19e65ec8"
+KEYWORDS="~amd64"
+
+DESCRIPTION="The world's fastest framework for building websites"
+HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0 Unlicense BSD BSD-2 MPL-2.0"
+SLOT="0"
+IUSE="+bash-completion doc +sass"
+
+RESTRICT="test"
+
+src_compile() {
+	mkdir -pv bin || die
+	go build -ldflags \
+		"-X ${EGO_PN}/hugolib.CommitHash=${GIT_COMMIT}" \
+		$(usex sass "-tags extended" "") -o "${S}/bin/hugo" || die
+	bin/hugo gen man --dir man || die
+	if use bash-completion ; then
+		bin/hugo gen autocomplete --completionfile hugo || die
+	fi
+	if use doc ; then
+		bin/hugo gen doc --dir doc || die
+	fi
+}
+
+src_install() {
+	dobin bin/*
+	doman man/*
+	if use bash-completion ; then
+		dobashcomp hugo || die
+	fi
+	if use doc ; then
+		dodoc -r doc/
+	fi
+}
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 179b09e71ef0..07f38f34e610 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -8,15 +8,18 @@ DIST kibana-6.8.4-linux-x86_64.tar.gz 188306376 BLAKE2B 6b94b5c3c3c557d7e23a2a4e
 DIST kibana-7.2.0-linux-x86_64.tar.gz 213198521 BLAKE2B 64ce95baa14107c3789d4aff748310cacd41cdabe227cb3fedab4bdd5d65d86d4bc8883dd7f8fbced3fda2ed25ed294ce49a8f28311fcbcfcae3c7bdc960c4ac SHA512 78368be3c55ef09cfed6903cc6556edb1a77f9e548614535b261d13c3190052ee9571cbb686470662f5563c564f1256e3a31ca233a26e8b734f3df44ab5a97f0
 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.1-linux-x86_64.tar.gz 238481011 BLAKE2B 72827c946ad007a77809262977351f61a7e27c0775b3f484470f115e893e9ec7cd6102564cac19d4344fa966d443061389532cb6b7edea91e4ef4cdb9de05a63 SHA512 73dbd31651ffe33cd0600f8cd157cb38c2943472666aeba97aed393caef454968fabdc0a19a5f70f6ae87e5f9fc7b39bcf89228f7c9cd3a92aaeb0d7729a4e37
 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.1-linux-x86_64.tar.gz 83813542 BLAKE2B 713c0b03a8367d062ff422f02922385449f9770ba58bc23d88eaa7d65a6082364e2fcb5662e89835b026213cf71c3ec3f21cee8b6aae5f03eabce25eafa66bd8 SHA512 bf81d3827ee537e2d4105b76eb7d600f98967bb6969bbc9ce83fe7d0246e96077f0c44d16640c5c443c160b2a72d28b6e8b8493c69c1b3949e595a553295f06d
 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
 EBUILD kibana-bin-7.2.0.ebuild 2575 BLAKE2B a5adfc1d6e352420452ec8aa16cb72b5189aebf640c20be06fcb9e5f64b54ec81ed601cfaa6b5121695e65ea282bbd030ec231d567aae346c6683123c18c6919 SHA512 c51939d86d84c6df489c8c9dfa5827dd64b3a484bdb71a0e6c996387cc0274e58f3701618f3c6c2e68f8f2fbc2141024315345d2040eba312bb71f82ee354aca
 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.1.ebuild 2570 BLAKE2B 2cf2dbcea4c06739ad78b62ab5e3e57b951ff9e7c65b92f5bec0154915f937f33fbc6010d64ba4751a3eb86264b2206c55a8bbca7a3153ba373354caa609c832 SHA512 71080bb99fbd54f61f46712ecc596dd4a93ff5d6e8388088afb5c9f5dbfd372ef367df17f20bc3c8c888bb7574102b3f18506454e2d3dbc489ac7cd0b05bd76c
 MISC metadata.xml 538 BLAKE2B 649a05badea8d1116854565d09820a8ce623c733d9d0d1cbded145fdc0dfcac2478273d99f686119adab16126149ad4da8f6feb0c7be9499f5721f31a259ec34 SHA512 f0e65883a644eeb57f2d11d0871631142665e74bf8820431ac8333a1cf3e40a0b517b5cca747adba173c7eab20b70311b7bd8de6c4fb5cee4982e044189e5256
diff --git a/www-apps/kibana-bin/kibana-bin-7.5.1.ebuild b/www-apps/kibana-bin/kibana-bin-7.5.1.ebuild
new file mode 100644
index 000000000000..d3b7a9b09cba
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-7.5.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+MY_PN="${PN%-bin}"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Analytics and search dashboard for Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/kibana"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RDEPEND="
+	acct-group/kibana
+	acct-user/kibana
+	>=net-libs/nodejs-10.15.2
+	x-pack? (
+		dev-libs/expat
+		dev-libs/nss
+	)"
+
+S="${WORKDIR}/${MY_P}-linux-x86_64"
+
+src_prepare() {
+	default
+
+	# remove empty unused directory
+	rmdir data || die
+
+	# remove bundled nodejs
+	rm -r node || die
+	sed -i 's@\(^NODE="\).*@\1/usr/bin/node"@g' \
+		bin/kibana || die
+
+	# move optimize/plugins to /var/lib/kibana
+	rm -r optimize plugins || die
+
+	# handle node.js version with RDEPEND
+	sed -i /node_version_validator/d src/setup_node_env/index.js || die
+}
+
+src_install() {
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	rm -r config || die
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
+
+	newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
+	newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
+
+	insinto /opt/${MY_PN}
+	doins -r .
+
+	fperms -R +x /opt/${MY_PN}/bin
+
+	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
+	keepdir /var/lib/${MY_PN}/optimize
+	keepdir /var/lib/${MY_PN}/plugins
+	keepdir /var/log/${MY_PN}
+
+	dosym ../../var/lib/kibana/optimize /opt/kibana/optimize # Bug 667214
+	dosym ../../var/lib/kibana/plugins /opt/kibana/plugins
+}
+
+pkg_postinst() {
+	ewarn "Kibana optimize/plugins directories were moved to /var/lib/kibana."
+	ewarn "In case of startup failures (FATAL Error: Cannot find module...),"
+	ewarn "please remove the optimize directory content:"
+	ewarn "rm -r /var/lib/kibana/optimize/*"
+	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
+	elog "Node.js 10. Some plugins may fail with other versions of Node.js (Bug #656008)."
+	elog
+	elog "To set a customized Elasticsearch instance:"
+	elog "  OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}"
+	elog "  systemd: set elasticsearch.url in /etc/${MY_PN}/kibana.yml"
+	elog
+	elog "Elasticsearch can run local or remote."
+}
diff --git a/www-apps/klaus/Manifest b/www-apps/klaus/Manifest
index 76841a0eae6b..4187e8ccb3b9 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 919 BLAKE2B 1a598db00725e56a879816336f06392335aaf2317316a5f3015b99bde856b8f0bff4929f5d2aaa6a4f9c8981a72cbc06170730b36fae630dd69d5334d1c0ffbb SHA512 7e3c5ed3f5fe46ffd85bdcbde573f985d0b68aa53b5d4e65973e69fa65299dc6eb41c8c383ba1fa1e769591a6fc244e17aff35efa1b4dcc6da2eb4939a8f7277
-EBUILD klaus-1.5.1.ebuild 919 BLAKE2B 1a598db00725e56a879816336f06392335aaf2317316a5f3015b99bde856b8f0bff4929f5d2aaa6a4f9c8981a72cbc06170730b36fae630dd69d5334d1c0ffbb SHA512 7e3c5ed3f5fe46ffd85bdcbde573f985d0b68aa53b5d4e65973e69fa65299dc6eb41c8c383ba1fa1e769591a6fc244e17aff35efa1b4dcc6da2eb4939a8f7277
+EBUILD klaus-1.4.0.ebuild 917 BLAKE2B 3df20f77ddf240417afff4cd576fa4405d90c5848b6ac98d064d65abd084f5af1713d9ea5a050c97a3d903e1885ca9db069465512c5800fafa6b6b2f481ae615 SHA512 0f89b312fa490af3c9e49312fbe9dff1272b61b36e2ada7ee8961f0b65ed0c5bacbb01e3be6758f2cec554bf548e359c3537836a909f50c163ae2d8e5337ff22
+EBUILD klaus-1.5.1.ebuild 917 BLAKE2B 3df20f77ddf240417afff4cd576fa4405d90c5848b6ac98d064d65abd084f5af1713d9ea5a050c97a3d903e1885ca9db069465512c5800fafa6b6b2f481ae615 SHA512 0f89b312fa490af3c9e49312fbe9dff1272b61b36e2ada7ee8961f0b65ed0c5bacbb01e3be6758f2cec554bf548e359c3537836a909f50c163ae2d8e5337ff22
 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.4.0.ebuild
index 1966b9410b74..88fc4b726a3f 100644
--- a/www-apps/klaus/klaus-1.4.0.ebuild
+++ b/www-apps/klaus/klaus-1.4.0.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=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/www-apps/klaus/klaus-1.5.1.ebuild b/www-apps/klaus/klaus-1.5.1.ebuild
index 1966b9410b74..88fc4b726a3f 100644
--- a/www-apps/klaus/klaus-1.5.1.ebuild
+++ b/www-apps/klaus/klaus-1.5.1.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=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index 70c4e4efcaaf..49f049a27e0a 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,5 +1,9 @@
 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.33.1.tar.gz 37863816 BLAKE2B 2f4ce62c3b46738d31af9fcfde61a9521a0bb838c035ef539f4263e61b7fe5db59597a3142a6f942fabaad1bb97c7058a21df654588e6a60023fa5fad5e4d88d SHA512 0cf786872714546fb13843bc5f8b851bfcc665f7459a0326a3fb77efb0d1976b618d4e2206d3fb0852a60b7fa375e98aa0b5600b03209ce9eabd9e3dc5db7d1a
+DIST mediawiki-1.33.2.tar.gz 37866372 BLAKE2B 1aac64cccf17bf8a890e40cdef85c209fc489e812ba8c8f158f9d9a7d50c5389c40f5ff251ea9a76620cf4d88e0e21942b5be52a60d0f3c682a365ea50078c01 SHA512 bdbdd508360ab84a611dc1c57b1504fa5591d08ac24c511430bdb802999f8c7f7e323f1a9a2dd7a405291889f4bff8ca7a8b8911bfed0bd460444bfae52b271c
+DIST mediawiki-1.34.0.tar.gz 40344724 BLAKE2B 899620db50337aeb6189dbf33ba54e06aae68923c43022f6590e46380907e884d9ab606b69cef5087e1b2f273a2fa962883f4e6524682db28b4be350f8d77410 SHA512 b6b1aeec26a1c114eeec0bdf18d4b3160fe02dac2920a39a045acb74e62aa8f8a28e6a81c01fedba7976e4dd0c96463e0f1badfddd3015eef9197b01586a236d
 EBUILD mediawiki-1.33.1.ebuild 2429 BLAKE2B 8bb74e2af72ad74283b19e1e233181de5186e62dde63c6731c3a80123bb1d80ff97f8fd34132e6c6ab1918af84186caa1bcefcd61c222af961d00e1ead37c9e1 SHA512 5b222928ee037a1087ca48cf5603bcddad1b41b6020574116274e155f0d7aa548943cf9c7d6acbec4c64405c408d3ac74026a44eff5483d27f9f8a067f2c307b
+EBUILD mediawiki-1.33.2.ebuild 2432 BLAKE2B fd1ec71f6a4d766708b13e279c0d54449b50574ce019313ae9815e20732c00053b31fb28cf9e89084444e1afe6dfca9d8f135e0693b7487f740386aeea4bb97a SHA512 96a7da76578eae6a2dc5c408e4bfeb279a318d87182506c665df0be27a3269d1150e6bde51ba110456124920e639fb4dbdfa5dc8cb783c409a1b322880fe6cca
+EBUILD mediawiki-1.34.0.ebuild 2363 BLAKE2B dd69717c7d1dffd399d2374a035930134c030274e77f4b1cbdaee98818decdc69536493f8a68a9a1dce37831d41836b75204e5b861d1432aa9c52a7f57dd88e0 SHA512 289906b96aadc3dd4bd35a075fed652ab0ecece647d2d06fe98e76675a38a6831956e574e6afa4bab14d92ab8c0e3c0aabbe4cf051375f1ffc3008f5f5a18d53
 MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
diff --git a/www-apps/mediawiki/mediawiki-1.33.2.ebuild b/www-apps/mediawiki/mediawiki-1.33.2.ebuild
new file mode 100644
index 000000000000..bed5bd82992b
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.33.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2019 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-7.0.0[fileinfo,iconv,json,mysql?,postgres?,session,ssl,unicode,xml,xmlreader]
+	imagemagick? ( virtual/imagemagick-tools )
+	!imagemagick? ( dev-lang/php[gd] )
+	mysql? (
+		|| ( >=dev-db/mariadb-5.5.8 >=dev-db/mysql-5.5.8 )
+		)
+	sqlite? (
+		>=dev-db/sqlite-3.3.7[fts3(+)]
+		>=dev-lang/php-7.0.0[pdo]
+		|| ( dev-lang/php[sqlite] dev-lang/php[sqlite3] )
+	)
+	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/mediawiki/mediawiki-1.34.0.ebuild b/www-apps/mediawiki/mediawiki-1.34.0.ebuild
new file mode 100644
index 000000000000..15845b96fee6
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.34.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 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-7.2.9[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-7.2.9[pdo]
+		|| ( dev-lang/php[sqlite] dev-lang/php[sqlite3] )
+	)
+	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 76246eb2bf36..ca12c7dedbc8 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.9.tgz 46748268 BLAKE2B 41c1b9f47f088438fddaa3bbf913091610d8b5aece8413944d79ba67381a50c510c257eab56c8a41f755335417549107c4e349134f3d0c39579329efd04cee34 SHA512 262449f3c424655d86746c13548187e412575ba4abe5d4bac2bcd64aa8f2ce4ea3fd3663bba8a61c10c9bd9192d5fb1ee19d75484340972a909284bc5d923a2c
-DIST moodle-3.6.7.tgz 47805595 BLAKE2B 567d179d3f2c600960c979dc54a92de9bf95e0710de20f6dcb304d8d6a528d929b60183f56e707a3254a2c98060c2c3ced62272360912716d8a1cf2fa7bd3b98 SHA512 b406fccb8ea572cf14cb8c06e746778b1ce92a170537ed4cd17e1a0977d30e5b8711a7cb36f7d845acc1af31a348faf7cf3b8beca815c1caa8ac0b2c2cf48ae4
-DIST moodle-3.7.3.tgz 45782119 BLAKE2B 2732e0269d65f213b71e32231f7fff8ba06f2456466f8fa00f9e7f204f0f7160b3552763c555f952a35cbb9344c9494e7122bd9a6f9ecea8b9ca18a8a9d90e07 SHA512 e9cb7d633be57ed9a66f54f33d2b2827a0ee18d3e7d48f463e8526b817e470d9d1930dbef557f84d94c1dc20a2543874e3bbbae4ac89eeda62217ac2bbddb14d
-DIST moodle-3.8.tgz 53109307 BLAKE2B 833160d06cb1068eda5474a4bba5bfb05a80b857c32a92eea2c92eb1bd6fec91fd1098f7172d643a9f0a8a7c567afda395f91d884446ff8c5113eac1d441e79a SHA512 c67803b62d25d3031ea58afea8820d746da144b0ef5c41f659fe0d9a99aeef5f287c4582b3766ec28452495bea03aed78509acd71a203edf990328d31f185bf3
-EBUILD moodle-3.5.9.ebuild 2804 BLAKE2B 0e176684ae1e2682448bbeb4f3d11f4888b5cda74eb2399839199e629ea01d35b1296450b90003a4ec78ba94bdddefccd982b8afaf79e8f5c0eb2ee5ad13475d SHA512 261e6dcf491af3a2d04d28a1a8d45e634b88f0a20d2510e0928a9a8c22824f5cfe2065fcc24e42cd918492a62e638e65bcaf7ef75de2ff0bbb1cf66ee9996f4f
-EBUILD moodle-3.6.7.ebuild 2804 BLAKE2B 0e176684ae1e2682448bbeb4f3d11f4888b5cda74eb2399839199e629ea01d35b1296450b90003a4ec78ba94bdddefccd982b8afaf79e8f5c0eb2ee5ad13475d SHA512 261e6dcf491af3a2d04d28a1a8d45e634b88f0a20d2510e0928a9a8c22824f5cfe2065fcc24e42cd918492a62e638e65bcaf7ef75de2ff0bbb1cf66ee9996f4f
-EBUILD moodle-3.7.3.ebuild 2804 BLAKE2B 985d48d4fa7a008d1175ad60d47f9212eb486017bace234589cd444e615b2df4d17b2bd00945d2ccbf66cd2c83a0c3ccce4cea9227f68ffd6dd6b2dcb6ccb2a6 SHA512 f370c9419da9ac3fd4bcdf92025ca7ae3998be18bb1be73b9fd26edb00c95d690c885d7fcf4d17532f222dd029224826a3a319864603471ec57642e640384430
-EBUILD moodle-3.8.ebuild 2804 BLAKE2B 985d48d4fa7a008d1175ad60d47f9212eb486017bace234589cd444e615b2df4d17b2bd00945d2ccbf66cd2c83a0c3ccce4cea9227f68ffd6dd6b2dcb6ccb2a6 SHA512 f370c9419da9ac3fd4bcdf92025ca7ae3998be18bb1be73b9fd26edb00c95d690c885d7fcf4d17532f222dd029224826a3a319864603471ec57642e640384430
+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
 MISC metadata.xml 355 BLAKE2B 68d10d39dd24da3d570f13edec9c4adae89b7620bb455c1c30377c3cebe56c4961d1548360adedc96fce780067b308193fdb7560478a60ab56c364b774b1984a SHA512 f02e5404a714cb20207e494f635fb0e98870576c4b5f6affc4dc27fccfcabdd1af1c7411a83cfd4e01b51ecc24d11944d1e612757ff45ab4405f6099ed9b1278
diff --git a/www-apps/moodle/moodle-3.5.9.ebuild b/www-apps/moodle/moodle-3.5.10.ebuild
index 07dbb6d2bb56..c06e0951f7f5 100644
--- a/www-apps/moodle/moodle-3.5.9.ebuild
+++ b/www-apps/moodle/moodle-3.5.10.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/moodle/moodle-3.6.7.ebuild b/www-apps/moodle/moodle-3.6.8.ebuild
index 07dbb6d2bb56..c06e0951f7f5 100644
--- a/www-apps/moodle/moodle-3.6.7.ebuild
+++ b/www-apps/moodle/moodle-3.6.8.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/moodle/moodle-3.7.3.ebuild b/www-apps/moodle/moodle-3.7.4.ebuild
index f9ed8bfdb6fd..bf58747413fe 100644
--- a/www-apps/moodle/moodle-3.7.3.ebuild
+++ b/www-apps/moodle/moodle-3.7.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"
diff --git a/www-apps/moodle/moodle-3.8.ebuild b/www-apps/moodle/moodle-3.8.1.ebuild
index f9ed8bfdb6fd..bf58747413fe 100644
--- a/www-apps/moodle/moodle-3.8.ebuild
+++ b/www-apps/moodle/moodle-3.8.1.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/netbox/Manifest b/www-apps/netbox/Manifest
index a3567a867620..9697648f7e65 100644
--- a/www-apps/netbox/Manifest
+++ b/www-apps/netbox/Manifest
@@ -13,6 +13,7 @@ DIST netbox-2.6.4.tar.gz 2408970 BLAKE2B 47fa3473e893e8443aace8b587df0065a3024a3
 DIST netbox-2.6.5.tar.gz 2408180 BLAKE2B d119a1bf8256e0d6265eda7122a1d436ecb0e8e640acd12890d242c2c93768b21b5f8ebdbaecdfa31c0eaab0150edf52f08a1f424102fd940dd359bd8eafd4af SHA512 0b76e5bc3f56effbf7493680d10d549caf36e7769e21a2c24449cbe329379369f3428354c228d0cbbbc153dc62efb5c0e56c4a0d71c99f3267acd2446f48fb8a
 DIST netbox-2.6.6.tar.gz 2414895 BLAKE2B b27e1bd5bf810627a4ec563b2eb5dbd7c86bf3d98e52555e511ee16492fd96a6cb7604dce8f5954120ab8b3a48d6acf7878721005bcfd2bd9e3880294dfbcd4d SHA512 9b44442cea1f76cdecb37faee8fe32012b869ff63c1b0bc678d2bb8624851941e9296854a9d85abea24e49a75fd5b31b968e4adbd56e5bc03a1c9f28fc8b846e
 DIST netbox-2.6.7.tar.gz 2416096 BLAKE2B 9c9744b60c3999fa7c3336539937cc20eebac67559444a4512cc4d69e8d38babc147254fd1fc49b8515203a8fd4411bc61c4c30aa3313e1ffe0d0e86abd8c9bb SHA512 63ed6a95a1f33ee5dd19dc2e43fc5c6aa09979c6f6856b28060992a8aaee956363caf20c48e72884adb84d260669d828311c0cf0d143fc0e58fed9677baf76db
+DIST netbox-2.6.8.tar.gz 2416523 BLAKE2B 1624415302696f47f799f8bd42b827bfdac7866e750ad71cca84a3c095aa39e403036d82257c864f0e4ecc1725087cc1253c73fa26928915e2c53213c3a3852a SHA512 12a094434c66f954cdd356a41123d5e6c2df8ba9aa846731ee439fd0bf330a003ca4b96c8889aef7be2e551c1d518e96c83182168049a76e9cf4ca3104533280
 EBUILD netbox-2.5.11.ebuild 4066 BLAKE2B ed0de78a0382a8bf4695f73787c85aead88e12498c668b5d902ec9a1a876f8e4f69bcba69d4e2da935ff6c792c5dd84bfccddf5361364efc79bba31795f57722 SHA512 7d0dab9d6fa2b347b4bee9037fe03e1e3798871997d6f19a99252934013147796fa72a9da05c9a6efd24285aec41b536f4cbfabc7a44e531c362e2c16c34ef37
 EBUILD netbox-2.5.12.ebuild 4066 BLAKE2B ed0de78a0382a8bf4695f73787c85aead88e12498c668b5d902ec9a1a876f8e4f69bcba69d4e2da935ff6c792c5dd84bfccddf5361364efc79bba31795f57722 SHA512 7d0dab9d6fa2b347b4bee9037fe03e1e3798871997d6f19a99252934013147796fa72a9da05c9a6efd24285aec41b536f4cbfabc7a44e531c362e2c16c34ef37
 EBUILD netbox-2.6.1.ebuild 4245 BLAKE2B 8e04b1ee274fa82d7db31627c12c7fe7038dfd7f79640d2c737dd6a6c9cfed6c1c0eb67b355bd6e96f62a1c7840329adfe86c793efb2fd97a2c71f9e485914fd SHA512 a6d53f3b1fd03b6ee2a6e1eb7cf3da083922277350f21d20ff319d4ff09f8e5692e5f2dcc16e8ac85c198a52be1bba0cd6dc53779fa96241679e7ce1e3c36597
@@ -20,4 +21,5 @@ EBUILD netbox-2.6.4.ebuild 4253 BLAKE2B 4eafb9fe1d6784f8560911f6a3de0e991e1e31be
 EBUILD netbox-2.6.5.ebuild 4260 BLAKE2B bbba31a097e8405b52069fdd92098782f0478bbc67ff01bbe0ae3034c6797dbb32266ade0e4ba3a3e9f64e4d4e2cc4c05c27e44f9be122bdb00e774a7b3052e2 SHA512 4f8e434d048bff36029485337ef847f44c54333bc50418a3c9b3faa5870642082aff65fb5937801cf975e93c794b00062bc8473672bce79a5a9068e877060756
 EBUILD netbox-2.6.6.ebuild 4260 BLAKE2B bbba31a097e8405b52069fdd92098782f0478bbc67ff01bbe0ae3034c6797dbb32266ade0e4ba3a3e9f64e4d4e2cc4c05c27e44f9be122bdb00e774a7b3052e2 SHA512 4f8e434d048bff36029485337ef847f44c54333bc50418a3c9b3faa5870642082aff65fb5937801cf975e93c794b00062bc8473672bce79a5a9068e877060756
 EBUILD netbox-2.6.7.ebuild 4253 BLAKE2B a7bc7d7cc3043236a63973544d2ac7051d474b4b4e2e6cb44e617c20bb61e2abe58ef148fc68b715a0d6513f9a89cc734f527eb1aebbbe94457fd0118b270f35 SHA512 025be51114549859ba406276c1af6cd16ac668cb0982d1bd3cbd0ed87a852a3cef6d16ff9a864b4b7fca7e4be442556702ff8e3e985109f2bc4021efd7886d5e
+EBUILD netbox-2.6.8.ebuild 4260 BLAKE2B d97a4b11d73c392787c116c059e14ff6f7f353e312f29db2e3ff4fe5ac9f9b3ed04f5bf0063cf99db1c2c7e491155925f463d5d6d3404b9f9017a06c1d873513 SHA512 87dd3997a6e9bebc80462c9dc3ad2a50b96f869a47f1cb990b5f223db74ba9cc6ed678f067029bae091c32bcbd4828710c034b0b1299aced6b2be81bbf79be84
 MISC metadata.xml 328 BLAKE2B 03603c5bca97aae6d5753f027154ac8bb824639f9f4cae14feb0d50136673e67d1baf0a85d69a09babccd01ba4c48cea035f3f56d11a225ac80daf40ea647c10 SHA512 b40d38d175604c9039a2f3aa2ef3fcdbb626f75ca8128efe16112e03f5bab8d32775e56ad67fb6d20024149b95624cd487703a23726fb904770aa3ad00119c43
diff --git a/www-apps/netbox/netbox-2.6.8.ebuild b/www-apps/netbox/netbox-2.6.8.ebuild
new file mode 100644
index 000000000000..62bd2ebdc375
--- /dev/null
+++ b/www-apps/netbox/netbox-2.6.8.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 )
+inherit python-single-r1 user 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 webhooks"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/django-2.2[${PYTHON_USEDEP}]
+	>=dev-python/django-cacheops-4.1[${PYTHON_USEDEP}]
+	>=dev-python/django-cors-headers-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/django-debug-toolbar-2.0[${PYTHON_USEDEP}]
+	>=dev-python/django-filter-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/django-prometheus-1.0.15[${PYTHON_USEDEP}]
+	>=dev-python/django-tables2-2.0.6[${PYTHON_USEDEP}]
+	>=dev-python/django-taggit-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
+	>=dev-python/djangorestframework-3.9.4[${PYTHON_USEDEP}]
+	>=dev-python/drf-yasg-1.16.0[${PYTHON_USEDEP},validation]
+	>=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
+	<dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
+	>=dev-python/pillow-6.2.0[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2.8.3[${PYTHON_USEDEP}]
+	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.8.2[${PYTHON_USEDEP}]
+	www-servers/gunicorn[${PYTHON_USEDEP}]
+	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
+	webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_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 or webhooks, set the
+appropriate use flags when you emerge netbox to install the
+dependencies.
+
+Once that is done, you should be able to add the netbox service to the
+default runlevel and start it.
+
+If you have webhooks turned on,  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/
+"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+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}
+	use webhooks &&
+		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 bb5af654125f..509ee192efda 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,15 +1,19 @@
-DIST nextcloud-14.0.14.tar.bz2 54774735 BLAKE2B 41016b45f3a07081daafeca39267f78cea5e04dcbebad62a73764f88749e628f6399929e07c2438c8cea2971891241d8b7ba066b1d02673c5827c0cd1d2429c6 SHA512 8efdcafb9cb1b52964cb6a8319e7bbdd633fa7a65b497b3cabd1a58763c88ce5de9f09eee0b9b6916f4c9c6aec86cd3df5c617c33120bf6280c43cfdfd789164
 DIST nextcloud-15.0.12.tar.bz2 56765490 BLAKE2B 6e0c7c00ff419f0041cf271f747003e40ed641ddb7a71345e49ed2e09a61a872f4bf0b978bb78b9426691c221db4f25d484f9b068dec5da1c4bfe8c1d67f1105 SHA512 0f30b45cc33ba3a0afccdb14f7c1ca171ee63f5a3deae98973ef48806b2b2418a52422b0ed33db1e1b455ddcc4d35169f355418c85e847c8b7b7371ea3da296f
 DIST nextcloud-15.0.13.tar.bz2 56983967 BLAKE2B 2a062df7426cf47a4872eced8e2eff664b16d39a60d6ed962d0720ce56a1ed2e526b6b7b414145ee9e429965076b6e9b0531316c702566a0be7eecca18a89f91 SHA512 638c73e971fe08951f6abf3f5b8d53feecfa0dbeaf57ff5ed9805e1e12d75ac62131af6e2c7b6c91d2c59a55a0722a836e2896a202952d51345897ef5b17e2bb
+DIST nextcloud-15.0.14.tar.bz2 56873105 BLAKE2B 07a733796856d835b800c58f85966afb820fb9b729e0b57242b6ff6e0648372c0633df8f9fcd2141d3ceaca5061c7938c6748a35121a18f6a762a96e0465d114 SHA512 7de64811bc64b13c09e12b69d5e514759047ee94f1d0339a2214ad2373024175d8c32f6b5eaf86489635222b1ae4b454a06df8fcc0b148ef529651e95cdbe401
 DIST nextcloud-16.0.5.tar.bz2 62129676 BLAKE2B 733729f3d36f133cb7fb31e73690a56d8a4507a2fb12437d2061d62194ae8fd437777c32bd6fb0dd652a3a1ce3065b9aec2bdcbd89c2fdc07ea391cdc7f98435 SHA512 ace0e3fa343838e89dba0e1c9411b98c851498107bb34b38376e1f4970a3c1efd6b0c15e2ddceca13c00923c868a5c917aa8d5fd25d61b31f1ab9752e9b65622
 DIST nextcloud-16.0.6.tar.bz2 62110436 BLAKE2B f0cdd447507a6cd5f02718d16604f0a3a77662aebb1909a1f1dbfc33f7b7dcf46e17bb22ae954ccc348f3601c314bc75b43dd627aba5bc28d7b1e205c8c99967 SHA512 7716f6365123162ea106a3d7d80cc4f436f8f1e02d2bcc3ed2e42723bc83040a3d80aa7e9e589bdf7db052c0bf4720f4775e066bcfd84a5c2e7d404d08a8620e
+DIST nextcloud-16.0.7.tar.bz2 62297342 BLAKE2B 0e6724007987a07f66d6be27c55bcc8a6b04da0ad70bc28e16f92e9b39bc1d0f72b59f536aaec8ef1d027d61ce67f8e59f43cd4b44c8dcad2dc572a34a69b189 SHA512 5f45f70f45d1293b3eeaae858ec8dd26f491d5822b918de971d467f3dc10b89b39be61ffebe5e5e5301c95defb50072f675d300cc01a2cff7a269ee777c28445
 DIST nextcloud-17.0.0.tar.bz2 64500339 BLAKE2B 91fdd182347816e69f668dc6558e519556aae38abee1e86230610f6c935e82aaec5f003359c5744aa5d4c4b8299cdeaf2b58736124d3c9fe32b07445a6f4e609 SHA512 d271d6220c72473f0ccc1ca776fb883e0d2cf4e338a7aa0143cce8d8ffeecf825eb5e41d42467d22922995dc6adb2751831158923e0dea29405dbb11bea85b04
 DIST nextcloud-17.0.1.tar.bz2 65252188 BLAKE2B 4f9a675636da18ed10d1b92844612e868a4884abf13b15f956bbee0bfc214989840e3d1a135b399fea3a6a5993f638c180363291543f337d6eba572eed514a33 SHA512 74974cd5d19650ecd3f94a397ecce58fea57d62ab0205f87a108f0a57b5745fbe37d5bf272004d5aefef7c17a43558c219afb5304fb14c569beaa8a5fc5fe00d
-EBUILD nextcloud-14.0.14.ebuild 975 BLAKE2B 9e4f38aefdb61c239954600a6f00c841c2e958f7efc55f1e403e4b5bf771fd40e5e7082ddeef976213ae3e11f84e1c95ec61b3f09afa2a022f9b2815c1075af7 SHA512 5fcc09902cc47085d42fcefeffe0c75188aeddc42b72b3cf416aa41c38f2e97594040993f6f89e353ef1e1f30a0d4a00d14f7dbf9733d52bf81301bbe426beb3
+DIST nextcloud-17.0.2.tar.bz2 65475747 BLAKE2B 5d51998e57652b7fb3aebd5486dbb51ad689bcf68cacde0901a8fec854e5f19eac1291d9e2348aa3168b08c33ed13f42ae310c66e38b5d230fa13c26c9861d1b SHA512 ea3788958b37e68c88e03d8a39c0284f14fb82e1e4e20f59df1d6acbdd2eb8a50f791ea48abbe2a91f9fa59de93237763f19ded441973bc2834a64721a210aa1
 EBUILD nextcloud-15.0.12.ebuild 1027 BLAKE2B e713c9841b423fe5d6ef280f1bf8a19d4bd34aac47dc9f404b68c0ffc5db703aec1b150800f78c102a5bbc8f5c8b108e40200e4ea263b2253b19b30b07a0d7b0 SHA512 ba52a4071c91c35bed74cd845cf239f2732ffd29d85af2a4b7ebbfa322b192af00048fd0c052ceca9cd262ff003a5debfa44acfeb04710cb572dd802a4e46f92
 EBUILD nextcloud-15.0.13.ebuild 1027 BLAKE2B e713c9841b423fe5d6ef280f1bf8a19d4bd34aac47dc9f404b68c0ffc5db703aec1b150800f78c102a5bbc8f5c8b108e40200e4ea263b2253b19b30b07a0d7b0 SHA512 ba52a4071c91c35bed74cd845cf239f2732ffd29d85af2a4b7ebbfa322b192af00048fd0c052ceca9cd262ff003a5debfa44acfeb04710cb572dd802a4e46f92
+EBUILD nextcloud-15.0.14.ebuild 1020 BLAKE2B e3e55ba5589caba6cba6fabf928e57056acee24ca9ab5b2e4ee5f19d6fe027e116da32090427767be5fcebbee12a08ad8ff442562e583e257231357f12cbc720 SHA512 8abfdc3f53e29ab4d6c7db03c3b28a4761ce7764d85944e2134a64109b00bb006ac23695df07436f7dfe7ed79a60568c264372279de9081abf390dacc8819def
 EBUILD nextcloud-16.0.5.ebuild 1027 BLAKE2B e713c9841b423fe5d6ef280f1bf8a19d4bd34aac47dc9f404b68c0ffc5db703aec1b150800f78c102a5bbc8f5c8b108e40200e4ea263b2253b19b30b07a0d7b0 SHA512 ba52a4071c91c35bed74cd845cf239f2732ffd29d85af2a4b7ebbfa322b192af00048fd0c052ceca9cd262ff003a5debfa44acfeb04710cb572dd802a4e46f92
 EBUILD nextcloud-16.0.6.ebuild 1027 BLAKE2B e713c9841b423fe5d6ef280f1bf8a19d4bd34aac47dc9f404b68c0ffc5db703aec1b150800f78c102a5bbc8f5c8b108e40200e4ea263b2253b19b30b07a0d7b0 SHA512 ba52a4071c91c35bed74cd845cf239f2732ffd29d85af2a4b7ebbfa322b192af00048fd0c052ceca9cd262ff003a5debfa44acfeb04710cb572dd802a4e46f92
+EBUILD nextcloud-16.0.7.ebuild 1020 BLAKE2B e3e55ba5589caba6cba6fabf928e57056acee24ca9ab5b2e4ee5f19d6fe027e116da32090427767be5fcebbee12a08ad8ff442562e583e257231357f12cbc720 SHA512 8abfdc3f53e29ab4d6c7db03c3b28a4761ce7764d85944e2134a64109b00bb006ac23695df07436f7dfe7ed79a60568c264372279de9081abf390dacc8819def
 EBUILD nextcloud-17.0.0.ebuild 1027 BLAKE2B e713c9841b423fe5d6ef280f1bf8a19d4bd34aac47dc9f404b68c0ffc5db703aec1b150800f78c102a5bbc8f5c8b108e40200e4ea263b2253b19b30b07a0d7b0 SHA512 ba52a4071c91c35bed74cd845cf239f2732ffd29d85af2a4b7ebbfa322b192af00048fd0c052ceca9cd262ff003a5debfa44acfeb04710cb572dd802a4e46f92
 EBUILD nextcloud-17.0.1.ebuild 1027 BLAKE2B e713c9841b423fe5d6ef280f1bf8a19d4bd34aac47dc9f404b68c0ffc5db703aec1b150800f78c102a5bbc8f5c8b108e40200e4ea263b2253b19b30b07a0d7b0 SHA512 ba52a4071c91c35bed74cd845cf239f2732ffd29d85af2a4b7ebbfa322b192af00048fd0c052ceca9cd262ff003a5debfa44acfeb04710cb572dd802a4e46f92
+EBUILD nextcloud-17.0.2.ebuild 1020 BLAKE2B e3e55ba5589caba6cba6fabf928e57056acee24ca9ab5b2e4ee5f19d6fe027e116da32090427767be5fcebbee12a08ad8ff442562e583e257231357f12cbc720 SHA512 8abfdc3f53e29ab4d6c7db03c3b28a4761ce7764d85944e2134a64109b00bb006ac23695df07436f7dfe7ed79a60568c264372279de9081abf390dacc8819def
 MISC metadata.xml 363 BLAKE2B 4da5b0e27af01e94e1e68b98274da6c9cacbe59ed1d85413038bccfa530af8fd479a7edd89f4d7633dfb07afbad4736cb6c075e021db7dc9761c273ec1256500 SHA512 60195d5859a8b175346a1cd533dbb6496d2787c1ff501d9233b2b1794670ae344c6f9f4cac4fbf86b24686a83692cff27513d05243947e2921e554e065696721
diff --git a/www-apps/nextcloud/nextcloud-14.0.14.ebuild b/www-apps/nextcloud/nextcloud-15.0.14.ebuild
index 668f4664c06a..0748d546dffc 100644
--- a/www-apps/nextcloud/nextcloud-14.0.14.ebuild
+++ b/www-apps/nextcloud/nextcloud-15.0.14.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils webapp
+inherit webapp
 
 DESCRIPTION="Personal cloud that runs on your own server"
 HOMEPAGE="http://nextcloud.com"
@@ -11,11 +11,12 @@ SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
 LICENSE="AGPL-3"
 
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl mysql postgres +sqlite"
+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}
diff --git a/www-apps/nextcloud/nextcloud-16.0.7.ebuild b/www-apps/nextcloud/nextcloud-16.0.7.ebuild
new file mode 100644
index 000000000000..0748d546dffc
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-16.0.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 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="http://nextcloud.com"
+SRC_URI="http://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-17.0.2.ebuild b/www-apps/nextcloud/nextcloud-17.0.2.ebuild
new file mode 100644
index 000000000000..0748d546dffc
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-17.0.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 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="http://nextcloud.com"
+SRC_URI="http://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/nikola/Manifest b/www-apps/nikola/Manifest
index de3066c362be..28072ac626a9 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -1,4 +1,4 @@
 DIST Nikola-7.8.15.tar.gz 4131518 BLAKE2B ea3dca9340852a68b668de82e5deeaa0ecf7bb8597f311721b27409fe0cf820919c79f6e631b030bd3ea4571dd8480c862c607d0b9e6015a8b03023de5a9b93e SHA512 b441ae014539b948d007183ceb574243b89a498be265da7245095f67510d4d7c109c4935e0f9765b4144e82f788a1b66a0eacfba1477a89ce6c2645cb77102d7
-EBUILD nikola-7.8.15-r1.ebuild 2342 BLAKE2B 1b07256f3a69d002e45cbf720f1540374aa22e4e76bb3621404aa2fa7c9876fb8247b78e2dd52d4ae06a193f3c6837d481f5536d4be4b1ff4d412d0ed97f0a51 SHA512 4bda732817fd23e2bac698aabde65bd3346f1a31b5b1bf174ccfe270099cd8debfe8cca8e4d52ec51d133573d57b441a87d7b2c6327e9044f1238ee20b3fc93f
-EBUILD nikola-7.8.15.ebuild 2440 BLAKE2B e585b8867a7c7ef3adf4428899b0c10b38d5b21a938c3cfdad81635efdeb20f4758c8cd77954b3b305238d7a78d98fc82b1e922d96a10d624add3513f169bd8e SHA512 7432c7ea3a80244801f1308845a9b6576da4b89a9800b6440c12ea0abfb48407c4177eff35e9155d7d5f640e9bb2fc8bb577e19f866b849785630dac0f3a93d4
+EBUILD nikola-7.8.15-r1.ebuild 2336 BLAKE2B 06a8f34a515ae6399a6e0877aea8f12f099da43241c569e923595c18e876468f7c5e5aa939173ad870cb56dd2d73d4a579164fc46942ee47e4284f98d8b5c048 SHA512 4a6d2ea1f357080fc2faf18a2ebe33e058864771caabfc6d603adb8c7240a58e3ec204a4977f5a975dbfb751e732580fc3854deab78d5b0cef7e49427236cc44
+EBUILD nikola-7.8.15.ebuild 2434 BLAKE2B 66d90061f9679ee9738861c1a7e0b5cb95aac9954aba8cbdd39ad27468f539391d567f86332ad869e2e2635b10e444a254a37ce473fd13f84f54fceeeff4aa8b SHA512 3cbef0fab73ef77fcd4dfc331e251c86c88d5146d094ce516f019e5efe9bdf34f82c8f6ddf9bd3f9f26c426b85f4bed465d070454f3b49de9005b6a191a59e29
 MISC metadata.xml 1360 BLAKE2B 694323edda02eec1a835c4c8a68a74c960a290ee44d1c95a59b5814fc6a8f6b248aec961ce69519da1a33970fba2868df81ed87155cd3c60193f79e8165c99d2 SHA512 ea8f610d5c5d7d568e29340e12701d652136a344f8aeb32c1df9a6909dc48180c5e9a7a91935c73e4d7df4f13cff82794e301d6a659262c52d8c88773e3b9697
diff --git a/www-apps/nikola/nikola-7.8.15-r1.ebuild b/www-apps/nikola/nikola-7.8.15-r1.ebuild
index c58fbd3a0807..c989d8059c4f 100644
--- a/www-apps/nikola/nikola-7.8.15-r1.ebuild
+++ b/www-apps/nikola/nikola-7.8.15-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/www-apps/nikola/nikola-7.8.15.ebuild b/www-apps/nikola/nikola-7.8.15.ebuild
index 4ae53a855542..c3e5967f0229 100644
--- a/www-apps/nikola/nikola-7.8.15.ebuild
+++ b/www-apps/nikola/nikola-7.8.15.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/www-apps/novnc/Manifest b/www-apps/novnc/Manifest
index 5e1b38d0e756..f219e068225f 100644
--- a/www-apps/novnc/Manifest
+++ b/www-apps/novnc/Manifest
@@ -2,8 +2,8 @@ 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
-EBUILD novnc-0.6.2-r1.ebuild 1005 BLAKE2B ffac0e2bbf87cce2ad41afad246385ffb33afc27e76fd52cef7fbc5b13e97153eee1b1062262504977ea8abe9c452ce1258f4058032a2d8b91ad7dc455fa112c SHA512 d2aa3f0687c1561b4f4f2082fa45f96c8cf17dd27ca2e769a4c42f08e56183f516341d1eaf80fdbd0df337fddb8df4ccd68cc9c6d02582b6c881c1b440cd3294
-EBUILD novnc-0.6.2.ebuild 1295 BLAKE2B 5a268147618fad0fe7991e81e491fbdfa9cd38d4e020a93d300999189251a19c8d214a556f08f51146ee136e523cdc8e1dd0b71f37da357486b75f29505c6ce7 SHA512 efe2273627600f82f38bb7bf33a5815fa2a97249cffb04d0ef2a32d1d8a7e323c487c69b28125e5e6cc9eaa98a09d9b9a69a5aa868d793fb3d0f0e44cc3f0d86
-EBUILD novnc-1.0.0.ebuild 1048 BLAKE2B 2e1e57d3ad3152a6a3fa4cf78e4d597d424c94b1f0d6cf95eced23066554c20fa1dc7e1e03efcbd27f0446b5f2ce4a1036ccce8c6849a67d707e147d339fca76 SHA512 3cf6e611ffe8fc143f04791391c8a38fd00b57bf2c2fcb31d786924c08820a136b4b64409ea742f309d0b00604bb2d13c549684130520cbcb45e93c2a6876f9d
-EBUILD novnc-9999.ebuild 1022 BLAKE2B 6a04bc03d38f3f979de226d9802225225f451e08913cb3b47931941a391ddd6fbe55ca8357708b6f23b2731d8a82ca0362dd43c7c65d73a296e90f49ee361b6b SHA512 bb76bccfee688e20639b6b6f95e1fd253a021f4eb0ba886bd5de68ecd77fc01f5e4bfab0156171b2c50a2c37ec892c485d786285f3496e17aa66ebe9d25e8777
+EBUILD novnc-0.6.2-r1.ebuild 1001 BLAKE2B 51bc7fe17e17635ddfb475b4ecc92fb742a88039cd37e2489cec5f2ea77d7b9f82794049b82c5b77f9e6821b736d8117e75f07b7be134652c7dc8996d8710187 SHA512 ae39605ca00ffba6accfed68b70ed80f42f338e3d61918960cb9e1ff66872dc4e65755f4fd23d034dff171bcd9e8e910ba467d4e597e4482b53e0e3b76b80673
+EBUILD novnc-0.6.2.ebuild 1291 BLAKE2B a2341756f763c7e7a8ec3f96aded7ffba68e94a5a54178e8d6380388b554a00f6f32e9e3210331901e52c60182207c0a2aaef88683bbbe9a6f5847332e12c58e SHA512 529fab97529a2dbfdd09e17317c1518acdcd2c581bde23b98cf00106f5b070c7bab4d59cc0ad675f925e09152c75334fff8de2a1059fdc2c7b8a0760cef3aec3
+EBUILD novnc-1.0.0.ebuild 1044 BLAKE2B 04cce1187f9d0aac7ecb233c664312b05c0a2b4db6d304b1f691cab7f1c67651c3ee8e25159d2cc57e7fc92c4a97330886a9b007a770833ada25d5fe67ddfd94 SHA512 9c39e293005916dc04f8df16f0e6a7ef3b5268e153f35b3ac4b2473ec1970ef973d016218adf1be91ecae9049d585275c7c2d91afef57a553d940d32692304c9
+EBUILD novnc-9999.ebuild 1018 BLAKE2B 9abb000bc4946f975e616ed9a037a4d4b0d8033b3bd56a001c6a7c1205881de84ef7d931b4e402a3ea48ed11deb7b37a598b508db131a173ff5ef8befd821010 SHA512 0c7a5055a6627f44f8158ef578c6a843bc5026342a16da71dab43af626c61cb494b57cc1dbba97bee67a27f0d88d26fb0477992c75c5146dc6fdd2ae70d562d3
 MISC metadata.xml 341 BLAKE2B 11a60501b1f7725f315055b98ecda3928e1755ad88983b8c7c4900ba053325ecb030b68e70e453c2860e67ec13337918da68422cb5c5cd432fda06b2a8027c70 SHA512 a41f01affc9fcb0cf61dba100f01ffe730a1278218c120f6a7d2c699a13d24868b6f7936c8ed5a28625e7c68a646e99556e745cead53c676037a5acbc92ffba8
diff --git a/www-apps/novnc/novnc-0.6.2-r1.ebuild b/www-apps/novnc/novnc-0.6.2-r1.ebuild
index c5b78549582c..490c9a544929 100644
--- a/www-apps/novnc/novnc-0.6.2-r1.ebuild
+++ b/www-apps/novnc/novnc-0.6.2-r1.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
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/www-apps/novnc/novnc-0.6.2.ebuild b/www-apps/novnc/novnc-0.6.2.ebuild
index d5c59a640c6a..4492a06893d5 100644
--- a/www-apps/novnc/novnc-0.6.2.ebuild
+++ b/www-apps/novnc/novnc-0.6.2.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
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/www-apps/novnc/novnc-1.0.0.ebuild b/www-apps/novnc/novnc-1.0.0.ebuild
index 1a7845372ce0..79da613d152c 100644
--- a/www-apps/novnc/novnc-1.0.0.ebuild
+++ b/www-apps/novnc/novnc-1.0.0.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
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/www-apps/novnc/novnc-9999.ebuild b/www-apps/novnc/novnc-9999.ebuild
index f2f5e348f93d..05e26ffb9485 100644
--- a/www-apps/novnc/novnc-9999.ebuild
+++ b/www-apps/novnc/novnc-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=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/www-apps/piwigo/Manifest b/www-apps/piwigo/Manifest
index c146768deffa..2725f7144e6b 100644
--- a/www-apps/piwigo/Manifest
+++ b/www-apps/piwigo/Manifest
@@ -1,7 +1,3 @@
-DIST piwigo-2.10.0.zip 17155586 BLAKE2B 55610ff7714ccb50c15460edae37f0720bd7217a2e6034e844e978002ac0f1a90e1893bed0bf1132ee742ad68f810aac99345d9134787ef0ab9a6cdbc9591327 SHA512 665bdd45b5bd178fcc7c2133e9d1e3e81746eb3f877d0ef1253a74b3ec219ceda8fa4b4ec1d9d82302564170023f503b62f1c288f6c1226a4a32ca2e733cc9fa
 DIST piwigo-2.10.1.zip 17155920 BLAKE2B 2f25d6c4488d9208bd37ad98b2ddfa302d23600442165d5513c8b21c72d017c17ef1c10357009110ba79259ee5a4f0a9495a423235c98cd8d5003ba83bd9b980 SHA512 9ca1119db13f312d16a7a3f04564562b26abd45b6ee731cd2280192fff14384add077a3a14a139f7b5301008c6c702a302de76a3a23873b835ec8417127aa77f
-DIST piwigo-2.9.5.zip 7870527 BLAKE2B 6a61f97125d3594d1672d3e9dec29716dff62417c07f0803c576c2cd9636273425342791e97abd7abc8f50dac56ebc4b7843435d75cbb3fd8c29e9723f9a32c7 SHA512 d211a86b40f3a20f406a4bbce87c094bc155b664fe7fb5ec5ab4de6e0bb0228c0c0aa30a04437469ea2360bc72b9e76b265b2811d77aad857fd85eeccb4d30c2
-EBUILD piwigo-2.10.0.ebuild 1121 BLAKE2B 1f64b9af80585ae554f6298d155f68c52c9892d251ad2fd8d8353ab1f7bfba3c953e4743d40a1ae5e7f47379c7097c1afa09f556b8e69d4385fc41206c64a1e6 SHA512 55a8f58f161d29f2c53e520147f13dd6d3b25e4f0dbafc42c8e6f3c57a8498ff6084e59bdb3594fd282e6d1567f3375fee3ad90cd2384707a29990904b75df08
-EBUILD piwigo-2.10.1.ebuild 1121 BLAKE2B 1f64b9af80585ae554f6298d155f68c52c9892d251ad2fd8d8353ab1f7bfba3c953e4743d40a1ae5e7f47379c7097c1afa09f556b8e69d4385fc41206c64a1e6 SHA512 55a8f58f161d29f2c53e520147f13dd6d3b25e4f0dbafc42c8e6f3c57a8498ff6084e59bdb3594fd282e6d1567f3375fee3ad90cd2384707a29990904b75df08
-EBUILD piwigo-2.9.5.ebuild 1121 BLAKE2B 1f64b9af80585ae554f6298d155f68c52c9892d251ad2fd8d8353ab1f7bfba3c953e4743d40a1ae5e7f47379c7097c1afa09f556b8e69d4385fc41206c64a1e6 SHA512 55a8f58f161d29f2c53e520147f13dd6d3b25e4f0dbafc42c8e6f3c57a8498ff6084e59bdb3594fd282e6d1567f3375fee3ad90cd2384707a29990904b75df08
+EBUILD piwigo-2.10.1.ebuild 1146 BLAKE2B 286eeac654aa9a145153de1a4f53a9c6fbcb4cffcb7b3f089be7e66745ebb4600e30446ff33d1d64b427c142a43b4de7f4249ee87e4952775a4d8814d8b408b0 SHA512 437b6be210cbe39616136a9439e75a912e4a04ab11ec0e754549668143062bc6e97ede7bf92a901ffe838c2703684c23a6a47500e3d542d59bb8653dff4a03b7
 MISC metadata.xml 1022 BLAKE2B 88bca793744995b53bf2c0a5061d47798d4f2b42a8025f7bc2f1cf7dc11234d5a8c5df9ed08b9d63b99465e06015bd5dcefaa87d1daf39f8b795ab89e264a563 SHA512 8d011157201c6e25b0252239cf6bc87f596a414a37fbf990c44dfc419b5bb28b4796b4a0c9e00d78154bdbb5dd7e6f0e99b99df56fa4736a7cc55a6ccecdbf09
diff --git a/www-apps/piwigo/piwigo-2.10.0.ebuild b/www-apps/piwigo/piwigo-2.10.0.ebuild
deleted file mode 100644
index 56866abb3045..000000000000
--- a/www-apps/piwigo/piwigo-2.10.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit webapp
-
-DESCRIPTION="a photo gallery software for the web"
-HOMEPAGE="http://piwigo.org/"
-SRC_URI="http://piwigo.org/download/dlcounter.php?code=${PV} -> ${P}.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+exif +gd imagemagick"
-
-DEPEND=""
-RDEPEND="
-	imagemagick? ( virtual/imagemagick-tools )
-	dev-lang/php[ctype,exif?,gd?,filter,iconv,json,mysqli]
-	>=virtual/mysql-5.0
-	virtual/httpd-php"
-
-REQUIRED_USE="|| ( gd imagemagick )"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	# Local configuration, and parts that can be updated
-	webapp_serverowned "${MY_HTDOCSDIR}"/_data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/galleries
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/language
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/local
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/plugins
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/template-extension
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/themes
-	webapp_serverowned "${MY_HTDOCSDIR}"/upload
-
-	webapp_src_install
-}
diff --git a/www-apps/piwigo/piwigo-2.10.1.ebuild b/www-apps/piwigo/piwigo-2.10.1.ebuild
index 56866abb3045..208eb4ede249 100644
--- a/www-apps/piwigo/piwigo-2.10.1.ebuild
+++ b/www-apps/piwigo/piwigo-2.10.1.ebuild
@@ -18,6 +18,7 @@ RDEPEND="
 	dev-lang/php[ctype,exif?,gd?,filter,iconv,json,mysqli]
 	>=virtual/mysql-5.0
 	virtual/httpd-php"
+BDEPEND="app-arch/unzip"
 
 REQUIRED_USE="|| ( gd imagemagick )"
 
diff --git a/www-apps/piwigo/piwigo-2.9.5.ebuild b/www-apps/piwigo/piwigo-2.9.5.ebuild
deleted file mode 100644
index 56866abb3045..000000000000
--- a/www-apps/piwigo/piwigo-2.9.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit webapp
-
-DESCRIPTION="a photo gallery software for the web"
-HOMEPAGE="http://piwigo.org/"
-SRC_URI="http://piwigo.org/download/dlcounter.php?code=${PV} -> ${P}.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+exif +gd imagemagick"
-
-DEPEND=""
-RDEPEND="
-	imagemagick? ( virtual/imagemagick-tools )
-	dev-lang/php[ctype,exif?,gd?,filter,iconv,json,mysqli]
-	>=virtual/mysql-5.0
-	virtual/httpd-php"
-
-REQUIRED_USE="|| ( gd imagemagick )"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	# Local configuration, and parts that can be updated
-	webapp_serverowned "${MY_HTDOCSDIR}"/_data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/galleries
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/language
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/local
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/plugins
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/template-extension
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/themes
-	webapp_serverowned "${MY_HTDOCSDIR}"/upload
-
-	webapp_src_install
-}
diff --git a/www-apps/postfixadmin/Manifest b/www-apps/postfixadmin/Manifest
index e9e602b28da5..5bb187205f4b 100644
--- a/www-apps/postfixadmin/Manifest
+++ b/www-apps/postfixadmin/Manifest
@@ -1,6 +1,6 @@
 AUX postinstall-en-2.3.txt 1827 BLAKE2B 49402566ddf6981cf0226f6a963fdd2c482957903583807f5c42731dfd5b4aea56de7d1ebd47ab6909f12492bd5e7a788322e0b2d80e15d883483a080f8fe11c SHA512 59e304d63830227b1619ed1299e9b61f5b6e534cb03da4d3a0e35a0fe727ccf2d994a034bd12d515bba4f8a6a8ca513cf2131c031fa63f85906639aca159993a
-DIST postfixadmin-3.1.tar.gz 1279224 BLAKE2B f37fd9e34e5eb88a82c10a0b80d5593a7451f407948454a064209ba9150192b7026645774b97b0482488814d6abeb25b6a800c2f7fe12a7a768e711919b94852 SHA512 a3e1ecb3ac4ff4d604533bce532694bcc304b9b3d3e1b1ec840be6d007027705113f067393486f58908dd3846332ecf59c9c3c1a5123d03aa088f47593a75812
+DIST postfixadmin-3.2.3.tar.gz 1330423 BLAKE2B 95aeb1a5f3b1dca2ce60e3e6a974f59b8c0e649c185149adb5d1259477cfe113b59c06f825cc9e1a38741260f111eaa3eef5a26ca44260aea2277b16f1f54543 SHA512 d44addb9a3ca830caf55b603363054df561d659957f21cab7523465ebf02ca18abe7fcf298fe718d957d0b7bf5613e2dde69c78c26e0f7f6f595d79b28fe08ab
 DIST postfixadmin-3.2.tar.gz 1324335 BLAKE2B 39fe9174f9085b35a58cacac1e99cc1a9209dbb029c903dbbab4fc68f041687e94327ea379e11c6967810d786bae0758f77f5cc2359d82720bb8edada61717d5 SHA512 eca4903dc3a22e56585c6f1b028a0f93d2422574faf9458b369b071880af55b36cd52c5ff9b0438c2c129a561404414b5d1f926043b40700fb5e31bffffe6ec7
-EBUILD postfixadmin-3.1.ebuild 2770 BLAKE2B 0515ec76d9cabdf0861c568ea3a2b2490a4dd385834638942fdda279f7a5a28868663e9936c6b6a9d5df006ddb78dd9e0a552eff51f8cc333f348d0e6b87b7e8 SHA512 7190fe45e795bf803a7ad1ba5ab5f45af065a1b6e3680476e0bcc13df2426b1040a014958fedc57a68b972c367f9145161d40e63d015bb94d783f8fc8518db1c
-EBUILD postfixadmin-3.2.ebuild 2735 BLAKE2B 20355240a654ec71d14a7595b0e11f3449e2ac0c95acab3f7d888b75dec70c7bb400ae6f6b2e200e99e44de85f0e853f361af937e53db50a81b05051b2c02e73 SHA512 aa0d855a181eb5b7f7fa660ba882a5773b6ffdc1bd7ee7af35a5f25ac350b5f90b603597747589ebb18d841f683bad3dc2e86c41128927826813b898fc03ce55
+EBUILD postfixadmin-3.2.3.ebuild 2770 BLAKE2B 1bf903c27562ec4f4fed7ddd072513d7de0e124cd352d69440da3940ba6d65bb9e0ecfd0acfde51ef238852d6b28c82dba5cb56f39b2ab8531b4db3dc75c71f5 SHA512 f0bc5a023e67253a63594ea9a819703e1f79ab6d0de463f2c322bc5bcd450143ee97310111b733591d56b7d1373917418d94868591be61b0d28423b996035f3d
+EBUILD postfixadmin-3.2.ebuild 2737 BLAKE2B cf0db4e97f27a0d367cb61d2aaf58703d7f37130782b13489358adefde70faa77ba52f0833c8cadb0c6cbc4a94d6fc4d428f975fe1cf4dc3b317ffd5a0f55ebd SHA512 57c0288e7228b35bb928f699aa170e60dd3cdcdef6a48c5abac7e3b673dc81d5ba857a0c1dd6dedf65b976b003fcc6d79bd35cfb5e1ff2afbf4f2aa6856358d6
 MISC metadata.xml 536 BLAKE2B 0ec01f47f106656e1b98ca14d8b531597a34cfb2fd261c93c775d7dd3b0a08155e9e912a20a2330946697418898ed08d9be6f8409edb5e1ef6009cafddde2437 SHA512 4657f3ae892ad55572ac39f23cebcef58480d4ff608150c75d2cf3f0046b5e0a2861f9bf8dfffd45aef580675feae11a05297a7a99f63997d43ab703372ddf4a
diff --git a/www-apps/postfixadmin/postfixadmin-3.1.ebuild b/www-apps/postfixadmin/postfixadmin-3.2.3.ebuild
index 5cb58aab877a..b998b917d863 100644
--- a/www-apps/postfixadmin/postfixadmin-3.1.ebuild
+++ b/www-apps/postfixadmin/postfixadmin-3.2.3.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit user webapp
 
 DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users"
 HOMEPAGE="http://postfixadmin.sourceforge.net"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz"
+SRC_URI="https://github.com/postfixadmin/postfixadmin/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="+mysql postgres +vacation"
 REQUIRED_USE="|| ( mysql postgres )"
 
@@ -18,22 +18,22 @@ DEPEND="
 	dev-lang/php:*[unicode,imap,postgres?]
 	vacation? (
 		dev-perl/DBI
-		virtual/perl-MIME-Base64
-		dev-perl/MIME-EncWords
+		dev-perl/Email-Sender
 		dev-perl/Email-Valid
-		dev-perl/Mail-Sender
 		dev-perl/Log-Dispatch
 		dev-perl/Log-Log4perl
 		dev-perl/MIME-Charset
+		dev-perl/MIME-EncWords
 		mysql? ( dev-perl/DBD-mysql )
 		postgres? ( dev-perl/DBD-Pg )
-	 )
+	)
 "
-
 RDEPEND="${DEPEND}
 	virtual/httpd-php
 	mysql? ( || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) )"
 
+S="${WORKDIR}/${PN}-${P}"
+
 need_httpd_cgi
 
 pkg_setup() {
@@ -54,12 +54,12 @@ src_install() {
 		fowners vacation:vacation /var/spool/vacation/vacation.pl-${SLOT}
 		fperms 770 /var/spool/vacation/vacation.pl-${SLOT}
 		dodoc VIRTUAL_VACATION/FILTER_README
-		newdoc VIRTUAL_VACATION/INSTALL.TXT VIRTUAL_VACATION_INSTALL.TXT
-		rm -r VIRTUAL_VACATION/{vacation.pl,INSTALL.TXT,tests,FILTER_README} || die
+		newdoc VIRTUAL_VACATION/INSTALL.md VIRTUAL_VACATION_INSTALL.md
+		rm -r VIRTUAL_VACATION/{vacation.pl,INSTALL.md,tests,FILTER_README} || die
 	fi
 
-	insinto /usr/share/doc/${PF}/
-	doins -r ADDITIONS
+	docinto /usr/share/doc/${PF}/
+	dodoc -r ADDITIONS
 
 	local docs="DOCUMENTS/*.txt INSTALL.TXT CHANGELOG.TXT"
 	dodoc ${docs}
diff --git a/www-apps/postfixadmin/postfixadmin-3.2.ebuild b/www-apps/postfixadmin/postfixadmin-3.2.ebuild
index 45f2da12339d..75b569837248 100644
--- a/www-apps/postfixadmin/postfixadmin-3.2.ebuild
+++ b/www-apps/postfixadmin/postfixadmin-3.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="6"
@@ -10,7 +10,7 @@ HOMEPAGE="http://postfixadmin.sourceforge.net"
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="+mysql postgres +vacation"
 REQUIRED_USE="|| ( mysql postgres )"
 
@@ -26,7 +26,7 @@ DEPEND="
 		dev-perl/MIME-EncWords
 		mysql? ( dev-perl/DBD-mysql )
 		postgres? ( dev-perl/DBD-Pg )
-	 )
+	)
 "
 
 RDEPEND="${DEPEND}
diff --git a/www-apps/prewikka/Manifest b/www-apps/prewikka/Manifest
index 8e94dc254270..5c9474af8293 100644
--- a/www-apps/prewikka/Manifest
+++ b/www-apps/prewikka/Manifest
@@ -1,9 +1,9 @@
 AUX prewikka-4.1.5-fix_rule_error.patch 1207 BLAKE2B 0c2b4400c1f463c0acd1ee19ad797abac57e0de5af86e1f7fded068f6aa62f9954fea08849a06d5fc42b41b6406a1b28007178ccb24e81fa73c66b445d8436aa SHA512 97d0c518fb4a941e0611d00d1ed4050c65f878998656731be449339f4796e29530381e55a712838b58e56271ff33cbadfc90b511022a4c10b32e19bc770b6b6e
 AUX prewikka-4.1.5-fix_siteconfig.patch 618 BLAKE2B 44c24ebff3d06d50ef17d9b429918223dcdcf9bb3fed0f0f86d083e3619c3c4922ff322c2024584a0217aaad0214aa0a24f5695b1bfe0173846d27975d0b38ed SHA512 70412631cccd13495fd611f0623ab284e99151cfd8502924cb3c7f556e4216d1b8829bce52a504b08f0a398e59882369caa4628149853cbf1067f57c6752b233
-DIST prewikka-3.1.0.tar.gz 1349193 BLAKE2B b87021ecec490b44f080dfd7a29b301ec55c1e6316fbaa385edfd9a9c586c8eb964bd8aa637041eda3fff3b7d3463845de207bc9e6cb6a209d3c15c8c661daaa SHA512 7321e7383d6205f18dffd00a23d07e9154dd79e35eb58d04a6af77bc9f70e476b67a953eb5d09685b4a7c386ecdb9111d40c77bf3b570ffc27a1c90b612a4803
 DIST prewikka-4.0.0.tar.gz 1365985 BLAKE2B 2248c80bebccf4a5f4b99f46d3af6f2aff433c19105e02dfa6c8570a6e41436a9f74971774f3963cbec9abcf70a2bf52b04cd99d930f3e193033aeb1246d1a18 SHA512 01e69b89543cac6b7a694a48cb184759641d37a5987530ce5b738a287a9cd72cc37f6bb85a621d6eb973e957730a6cb438fd302a33f2324359232e4325970bb6
 DIST prewikka-4.1.5.tar.gz 1432885 BLAKE2B aa899eae92b7eee10c4e80544fc02c80fce403dd808464ef3ca21a6d8ddb052730314bd4b83970c684401c53f8398df0f9ca5180c946999e08a2faf9eb7b94f4 SHA512 f68fb6c893727e1bfc2611ef8e3327e6c44d24ea36239fb998675d0e8102dd9849990dbd344c9f584a045f9ed6b4208c3a9928c952ed6248e691687827677dd3
-EBUILD prewikka-3.1.0.ebuild 899 BLAKE2B 853a9c2b942c25e3e32a6012656099a104bebf078b6c739b2b8bf736452d8805c6f0357b47762497c0f7528022b1a69a1aac7f5e10a298c3f78342cbba1e61f5 SHA512 7acd6f07af3f6a4124a5ecc2d569793c2fcb6a60e6768836f36bf8a2639a06288ca811941e9d275f3d9ab4c40eb618c010558d1e8c74e294fb23ce8ba479e003
+DIST prewikka-5.1.1.tar.gz 1662093 BLAKE2B a4057ee35bb2dbc55ee86c4f41c32074d20712e79fe62b4a409fb0c842ee6aac06418aeace8d11d3c74c99b6787a2e507d0e424180849b4acb3296ebc6c785f0 SHA512 97ac557964fc7a3a633d879830dbda1a263061acc7d943798638686a67db46f08371af081b07eded60dc9856dd47641fae5df50603e190f36acb71a45ee6089a
 EBUILD prewikka-4.0.0.ebuild 964 BLAKE2B 4c87378418b75c9ccfd46f3a1089442fe427584cf337a3ba41b93f4e7d0c06e9cbfc48e608c0a9bed50a60f9d17c3504ed180156aaef2e75f66e0bccb966b305 SHA512 cad0bac73833ff273de437a0a8443bffd745437c4464381e16e86832de75cff5ece23642875189c0ae0422dba79ee9cf2b1bd6e3d9cfbd1159e27874b54e6a0b
 EBUILD prewikka-4.1.5.ebuild 1112 BLAKE2B e00144a87aa4c9cba29a312ada04a7104f4081b60caad52d466a3a39fcb4291fbd8da75c441fcf5c8b23482d15904c6cf0b76e224b9487a1516d55d128ea1529 SHA512 a7ff9fc01016b30dcffb6b01409a43a23b2b9b626cbffde6e16628b304590eebca1b5d8f329b108658b979edb725cee6f92e0c8313127532e59eb14d8c9f9341
+EBUILD prewikka-5.1.1.ebuild 1232 BLAKE2B 75e65f8ec0b5c3c1f57afd24db9c5ea99db5356d05185d7901dbc39adb3ac50407b32d9a632eccb2df82b8a53ca49ae2b8a017365e586386a4ccc5d0b5a93e18 SHA512 877ad958b4760a2bda4ddb58aaab2e2e346dbc1e40a5b4bb00af3aa919f32bf87cab0603f77d651233318d1a67c42a014c32976657523af8b10bce4fea318181
 MISC metadata.xml 789 BLAKE2B cd4566869293a5c7d48ec9ebe94116da4c1955242e7d09eb2cb9c71a4251d05c44ad1b11a26c70b5e2abadee72fe642dd4aa1a8bd354253126bcd546735aeea8 SHA512 a5c66025685b64102ef46cb970be45a7f06dfc823ce9f5dfce3eb412060ac7fd56c6e3bc81522a51a6a35ae33dd5c07e4a91bb9ca4e86d34d97efdc7a342238e
diff --git a/www-apps/prewikka/prewikka-3.1.0.ebuild b/www-apps/prewikka/prewikka-3.1.0.ebuild
deleted file mode 100644
index 708a8bd0e991..000000000000
--- a/www-apps/prewikka/prewikka-3.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Graphical front-end analysis console for the Prelude Framework"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="adns"
-
-PYTHON_REQ_USE="ssl"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/lesscpy[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	dev-python/cheetah[${PYTHON_USEDEP}]"
-
-RDEPEND="dev-python/Babel[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	adns? ( dev-python/twisted-names[${PYTHON_USEDEP}] )
-	media-fonts/font-xfree86-type1
-	~dev-libs/libprelude-${PV}[python,${PYTHON_USEDEP}]
-	~dev-libs/libpreludedb-${PV}[python,${PYTHON_USEDEP}]"
diff --git a/www-apps/prewikka/prewikka-5.1.1.ebuild b/www-apps/prewikka/prewikka-5.1.1.ebuild
new file mode 100644
index 000000000000..b15b4998aaef
--- /dev/null
+++ b/www-apps/prewikka/prewikka-5.1.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="ssl"
+
+inherit distutils-r1
+
+DESCRIPTION="Graphical front-end analysis console for the Prelude Framework"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/5.1.0/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-libs/libprelude-5.1.0[python,${PYTHON_USEDEP}]
+	<dev-libs/libprelude-6[python,${PYTHON_USEDEP}]
+	>=dev-libs/libpreludedb-5.1.0[python,${PYTHON_USEDEP}]
+	<dev-libs/libpreludedb-6[python,${PYTHON_USEDEP}]
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/croniter[${PYTHON_USEDEP}]
+	dev-python/gevent[${PYTHON_USEDEP}]
+	dev-python/lark-parser[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/voluptuous[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	media-fonts/font-xfree86-type1"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="dev-python/lesscpy[${PYTHON_USEDEP}]
+	sys-devel/gettext"
+
+pkg_postinst() {
+	optfeature "Asynchronous DNS" dev-python/twisted[${PYTHON_USEDEP}]
+}
diff --git a/www-apps/radicale/Manifest b/www-apps/radicale/Manifest
index 7dbbb4b93f4e..8f93e029111e 100644
--- a/www-apps/radicale/Manifest
+++ b/www-apps/radicale/Manifest
@@ -4,6 +4,6 @@ AUX radicale.init.d 564 BLAKE2B 370d68329a2507c4b96766597851f1c5de13df492422212d
 AUX radicale.service 546 BLAKE2B 6d43e9b9aec713a944259e6323442f6796068ede3da5399f9081692b55fa0edc7ec72b35d190ec68f14972374c4da23178e84c7f4ff6df611c1f82e1e0b3029d SHA512 94705c36ddd4de14b608fa71cb8ee4fff3f4f12cf90cfeb3863c334e98ac5d19b34134d26c319d5d05b61efba8370addb87b8b6a6ad7005a17f8bfb35ff9013b
 DIST Radicale-1.1.6.tar.gz 48280 BLAKE2B 38d3047d473fad24188b597a57d3e1f0e34df03f00f6806b86c447ed731be074bf0b5f6dfb951c8a9f627993bf0763792150bc06532414a658e4d306123fcdd6 SHA512 3fed85fc5fa2b041277112870b8b508a22cc85ec0680dd1cf9411e73715e18a9b0ddd651eafb0c9529bd308e7fd87ae44ecdd82935f4062050919780301d56d9
 DIST Radicale-2.1.11.tar.gz 76490 BLAKE2B 35578b693a32d4a77f8ff1c93cbb8fb63fd8dabf9fde79cd928d4afa6e059fe836840ca6a33621c13e9421a69bfb25cbb59688ba83bed62003ef3b56b54804b1 SHA512 e85f12664d3db6b911dd534eaddd15c498ca4f641cc15523644300aca8b1ef3f6fd4d9645857235502f03a7903111905537b04f9a6fdbde1a60fbb720d377733
-EBUILD radicale-1.1.6.ebuild 1677 BLAKE2B fced589ac78477c3f90aea11ea8fba51030d71873dbfbce79fce2dab6010d9606931e314684a6dfb218bbc4e3a48675b062cdac714e1d4e757698b9f14d12313 SHA512 e00842709f8f6f5e298ff23c56c8f1fa8a30756e4dd9446c7da88fb92cbf0a2a8f8f88c707755922467e4c57e3f13123e7206524783aa49e185017a482211a02
-EBUILD radicale-2.1.11-r1.ebuild 2749 BLAKE2B 220d06b187c22e258144bf4dbf26bdb414a43814a255d520d1644a3faa27103a12bb8b648fd2728504c2706808fc6b4b25a0694ce63265eb875b112fd735f8db SHA512 1d3203a101d3158b22b8db9c6abaa16decdf230b0c000b1876ad9562e7b2e12cbbf405b48da76bc96bc3f7737c4484aa6f7f079c515266938ba673faf815b0c2
+EBUILD radicale-1.1.6.ebuild 1671 BLAKE2B 916e0963de31d2a4a409cd179b5693b02854c4f6df033427624a37a25f6e71dc99d5909c21c93a6f93ff9c4a4602bfec00b8aa173904f1ba9f189a8908cb762b SHA512 633e039bd007ae070548a1dc79d7874c31317ceb2e38b39dadfdf2b06baa56f5ac0c43798cf795d0b94a60fbf66e894f4b42c9e03ffb81fe8eb6304ce26076f5
+EBUILD radicale-2.1.11-r1.ebuild 2748 BLAKE2B fbd545452fbd55315d156719c2da39788a9c1249bc1d29cd0f382333bc36e1f4ec2f6eefcf035dabfdedcda5ecc4f6a2efd6316021a15ab287247deee933d379 SHA512 a237308ae89e3dad0205611ca98c8e0cdfdd853e065a5650b85241a8769937323e29ad1e1561d256967bae6698243e68db94c202f82a216aedae635991af75d8
 MISC metadata.xml 472 BLAKE2B dad26ff5abb5fb50a0016f23a03f33bf2e6dc536ed92fe30a587824f8b85789ae16a44d362df683c2b62c9db73175f0cbb06b26a6a6d4b3d544fdefb30613690 SHA512 309c2abddb4150357ffbfd35d8dd153592b4e7426b61728a25f7a2a8eb6a97ab8c3e4042eb5e333d4524977ec7f30e6793b33a6a2a70eff1f1c555d7f9f706e2
diff --git a/www-apps/radicale/radicale-1.1.6.ebuild b/www-apps/radicale/radicale-1.1.6.ebuild
index 406bded924ba..7b955b0ebf31 100644
--- a/www-apps/radicale/radicale-1.1.6.ebuild
+++ b/www-apps/radicale/radicale-1.1.6.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"
 
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils distutils-r1 user
 
diff --git a/www-apps/radicale/radicale-2.1.11-r1.ebuild b/www-apps/radicale/radicale-2.1.11-r1.ebuild
index 0c6b68c8229d..881d37248fc7 100644
--- a/www-apps/radicale/radicale-2.1.11-r1.ebuild
+++ b/www-apps/radicale/radicale-2.1.11-r1.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"
 
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 eutils user systemd
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+bcrypt"
 
 RDEPEND="sys-apps/util-linux
diff --git a/www-apps/rutorrent/Manifest b/www-apps/rutorrent/Manifest
index 081c825176ae..3b5e88ea63f4 100644
--- a/www-apps/rutorrent/Manifest
+++ b/www-apps/rutorrent/Manifest
@@ -1,7 +1,4 @@
-DIST plugins-3.4.tar.gz 674444 BLAKE2B ccbd132c5868684b3c25357d85e6aaa27b3e871730b6b64a1fe4dec765a9548be282a1aa98a39efc6b63df0fe1ebcf01ef7b74ea1ca293a636813684f8887406 SHA512 85d9ada4bd07cd50fdf88f4ae1a1bc682b6e54d5600356be73481094111cc21fad6fb2acac4b854ba815f986b3859caf824bc55c5bbac68872db8920e0c5fd9f
-DIST rutorrent-3.4.tar.gz 241253 BLAKE2B 7ff5423b36cd9a237b9cb656f65696948f31c1978460d4c17874a5fab6e7f1adf6bf7f5e1f165936913f79350aa6de81dffd929d0c7f406c7f125d36f2f0db43 SHA512 2fee5dd21e0d63fa9059c96ad3e8d09f3ce556adbfd1cb148224af998edcdb82c2fe05cb56daac0cdb8c3d50346536611d019fddb1833b06fa2ebc30cd884a0a
 DIST rutorrent-3.8.tar.gz 1241643 BLAKE2B c432e8691d35447cd0698eee8edeee4060238dc39cc8cbb178c1169f166fa1d483493181ce0d2f468106ae01dd0f58d4fbb2f334de393fabb2b0aa73363e2b7f SHA512 ea3dfa74234a1eafcbc9e71d6c6d953a46fdf8e189237b8df0ec58cf46ac30404f7a15bb783ec7567ab6f28daa3987ee219039dd360e3c48d16aea244263c9b6
-EBUILD rutorrent-3.4-r1.ebuild 1343 BLAKE2B ea3ad97ae6495029caf170574f2a2211e08ec5e9b56b1531d053ea97642c9055dec8985ed651a310b089c463f7fa668314764da4bdab0c7eab9d012ae3717f93 SHA512 d83f9819f2f479dad57aa23359b77665d9a8f0fd615874831f49a606fcce0ada83921def3d800f0ac0baa1a01053af51f5b8d57068ea8bfdeb39263a034c1175
 EBUILD rutorrent-3.8-r1.ebuild 1459 BLAKE2B 579dc77ea961e691dbca5832ef86aab583d4fa94ff2242e04206cf0290be60e3f487c217d15baeba102826074f3af7362563bf47e4063497f613dbbbe5c10f9d SHA512 815ff584b0d4f633cc4f9b354cfa3015fb4ea94d543a9da61d022f5480061119550c1ac47aeec833856092937dbaa2e2ce3b9c35682f2f8cf5920c7a88ba74d5
 EBUILD rutorrent-9999.ebuild 1467 BLAKE2B ec857f6942731695b6ddfee49e6934fda166810cc55cc5c7f67c5d3a284db6db804abc796d1b63b3017b7f31d68b7ffe7349e7fc006080fa62fa1064cbf48375 SHA512 8201bc55f8ad87d40f69be72b171c587606f6ea6ff73751cef531e1b8334efd8276b02aa1a7a53b094be044fca4eeae90a61bdbb47831d32f365b2da65653b9d
 MISC metadata.xml 384 BLAKE2B e147aafe9fb919ad4bab6c3acb9ae2bdd7bf04a8f5744c79561e074c38435ea1f5e0389735a83e2c9cf7f14cdbd9f3e1de043b464bb04d06805ee619f4768a4a SHA512 4ce6c3cdef62943df6a9071634912c9686317111dae1936fa765aba03808b286e90bb69ca3f79a263dc6a9913399645890481131bfe5071eb3bd7f7d6c7c42d3
diff --git a/www-apps/rutorrent/rutorrent-3.4-r1.ebuild b/www-apps/rutorrent/rutorrent-3.4-r1.ebuild
deleted file mode 100644
index 6aebd9832c59..000000000000
--- a/www-apps/rutorrent/rutorrent-3.4-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit webapp eutils
-
-DESCRIPTION="ruTorrent is a front-end for the popular Bittorrent client rTorrent"
-HOMEPAGE="https://github.com/Novik/ruTorrent"
-SRC_URI="
-			https://rutorrent.googlecode.com/files/${P}.tar.gz
-			https://rutorrent.googlecode.com/files/plugins-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE=""
-
-need_httpd_cgi
-
-DEPEND="
-	|| ( <dev-lang/php-7[xml,gd] <dev-lang/php-7[xml,gd-external] )
-"
-RDEPEND="<virtual/httpd-php-7"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	mv plugins rutorrent
-	cd rutorrent
-	doins -r .
-
-	chmod +x "${ED}${MY_HTDOCSDIR}"/plugins/*/*.sh \
-		"$ED${MY_HTDOCSDIR}"/php/test.sh || die "chmod failed"
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/share
-	webapp_serverowned "${MY_HTDOCSDIR}"/share/settings
-	webapp_serverowned "${MY_HTDOCSDIR}"/share/torrents
-	webapp_serverowned "${MY_HTDOCSDIR}"/share/users
-
-	webapp_configfile "${MY_HTDOCSDIR}"/conf/.htaccess
-	webapp_configfile "${MY_HTDOCSDIR}"/conf/config.php
-	webapp_configfile "${MY_HTDOCSDIR}"/conf/access.ini
-	webapp_configfile "${MY_HTDOCSDIR}"/conf/plugins.ini
-	webapp_configfile "${MY_HTDOCSDIR}"/share/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/trac-accountmanager/Manifest b/www-apps/trac-accountmanager/Manifest
index a92068c02f48..1622e3d37c3f 100644
--- a/www-apps/trac-accountmanager/Manifest
+++ b/www-apps/trac-accountmanager/Manifest
@@ -2,4 +2,4 @@ DIST TracAccountManager-0.4.2.tar.gz 157706 BLAKE2B 79efaff9b70c4800dc308df147e4
 DIST TracAccountManager-0.4.4.tar.gz 157666 BLAKE2B 85688076847e681c9090eb77f010ec6921bda745b24e306961db3c28d6caa3c148cb7c2d63effd3f45f1b07b6af88faad85d9fd5aab16f77bb50cfede640ba38 SHA512 622e011c5cd956c3e32fe578b60d0cc060b109893a6bbd5ea12dea36373a9a47a8a226ae6a297d69a22f9d1d1deae686ccdf2258623877ee794febb99c9a99e4
 EBUILD trac-accountmanager-0.4.2-r1.ebuild 533 BLAKE2B c464f57524c5cd6533ff85587b662e9c1402636c54b6dbc923a1a649664afb114062d54c4b76c54263a7f1ce494515588706a36a5ab413d958ee97297d007c92 SHA512 09b18fe054486d0b7cf3c4a8b7e701114911e2ea17f5da10edba745ac33099af602dd31ce8ee8924b626b728b7ad5518f1172a48c99fec961b8c6991b446961d
 EBUILD trac-accountmanager-0.4.4.ebuild 533 BLAKE2B d4f32b357bab9648fdfe8295d8a8d76d7b39801919c1be64be50933b4b9c062b13c956a1e84e8393688024e2e4e38ac2a2f5d8d06e010232949b0956714d98c8 SHA512 ec9319060b7b405ddf30fa9431751252ce484ab2ee0a01b3410248d749058cb8d64854bb182effa581504847c7975174a5afe1b9c0af06a455c4957caf66e5bb
-MISC metadata.xml 669 BLAKE2B d69384e966988c756157ef1cff4d9f22e5180e271fb9981c9c47855861d90dd1da86dace95756b0998ebc3b3764688e01acfeae84727a7f113c3a4e796aca678 SHA512 d121b051a295cecb74d6d7be1f2e9a29edaed80511614aa42cf771bc49e02b99e0020df2edeec53db0da2620639bbe691d9cca5ae9a5288569beff8707f980d3
+MISC metadata.xml 574 BLAKE2B f987a5d529e55b9b7eebe0193cae649ba2476e6aede095da391702517ece9e246a0d57f01938f7f96a449ecd7f9847d5febc6e9f83e930b542cd226c71db6798 SHA512 77db2a3fc962abaea7f3cad255b496368530a2f9206f74096f013da474294f7273029e0e6fa23363230adfb733c8b91f6e6f7b3e647d5f4d2bd09498f7acc725
diff --git a/www-apps/trac-accountmanager/metadata.xml b/www-apps/trac-accountmanager/metadata.xml
index 78b3261059ae..265d9a787dd3 100644
--- a/www-apps/trac-accountmanager/metadata.xml
+++ b/www-apps/trac-accountmanager/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>rafaelmartins@gentoo.org</email>
-    <name>Rafael G. Martins</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription lang="en">
     The AccountManagerPlugin offers several features for managing user accounts:
 
diff --git a/www-apps/trac-mercurial/Manifest b/www-apps/trac-mercurial/Manifest
index d14a04706198..5a8f651a21bd 100644
--- a/www-apps/trac-mercurial/Manifest
+++ b/www-apps/trac-mercurial/Manifest
@@ -1,4 +1,4 @@
 DIST TracMercurial-0.12.0.29dev-r10899.tar.gz 26248 BLAKE2B e9734b7fcce215c7929869bd1f857e3bc07026a275c3eee34cd0bddbe06811ee8c190b95934ca118d6680ffe3e7bcd45454ffb3e50a236e406454ba17ff1dcd1 SHA512 bc2ea9676dadc926cb9caf65219924953e36ccdfd2d4a6a8f1fdedc05486578b16972f4cb66bf948737e08160ebe366193a5071f293927f573c940c92fa7e31d
 EBUILD trac-mercurial-0.12.0.29_pre10899-r1.ebuild 598 BLAKE2B 12d2229351cf539f0137d7c2a96f8e48e7196f958ca5144aa34bbb05144a1716dde888630f8cab83298d22877ea5e5ad9f1efd13ee7b522c2ba38e0b31d298f7 SHA512 b0f59a6abefec46871fd52b429a0d9133d1fb5a1d48d283a247449a999463e3513b39aac2351c36e3392694598932b6f0eac7b2bcd39c2f0dbc7815c1aa7b733
 EBUILD trac-mercurial-1.0.0.3_pre20130206-r1.ebuild 626 BLAKE2B 3be90007bd24258b6efd77712461b54fc115bff82f02138bb93734bb330b01e1a05d3c0c2a06671ea2681877bcc4687325456057253e4023fa5996e6d5830a46 SHA512 7661e92f7579a02436748716d2f22ddfa3a2ff90f98dd857441a9a491e43807a73626e6faefa9ace633c9e7293777efeb71964b770fdcda91de90ce43909662c
-MISC metadata.xml 263 BLAKE2B af55396bce11af3d9650b5f7bbedbb0e99d539f0d83162cc9b56ce3755b2a2e373943bc08c7048d016d5ffd05fa38a7f57ff6211e3bfb0d5b41b01bd25b11c5f SHA512 cf4145b49583a7ebcd1c698cf499f89db8afbcfbb8edcb6a28ba361b1427f68c20cf3b673c4cbd5bed97e799be988e2cac67be72e8ac54052d68ceda5c270708
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/www-apps/trac-mercurial/metadata.xml b/www-apps/trac-mercurial/metadata.xml
index c194f2fc320f..1b2becffa26c 100644
--- a/www-apps/trac-mercurial/metadata.xml
+++ b/www-apps/trac-mercurial/metadata.xml
@@ -1,8 +1,5 @@
 <?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>
+  <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/www-apps/trac-tags/Manifest b/www-apps/trac-tags/Manifest
index e8ede184833d..02181df84271 100644
--- a/www-apps/trac-tags/Manifest
+++ b/www-apps/trac-tags/Manifest
@@ -1,3 +1,3 @@
 DIST trac-tags-0.6.zip 50426 BLAKE2B 843dbf8be57ec04015151368545d0893e2dcdaa9811082d079c34de9ed74270b14144faa53ac661a329e6c06d59ed530e15fe2880667f74d081cb5a2ba5eff02 SHA512 7fb82a5eeaf267defaac24a1b886b0f4be00ee78c39120a4e3703d78aa41a9328a483682826d74ec87bde897d269ed0e96d37ca07c0fe96abd79bdae59ac763b
 EBUILD trac-tags-0.6-r1.ebuild 668 BLAKE2B f78c89969a2b4194e886f35e8fffd003256c1f1b57552b770c8836dd5240a83d6ffc618e0f25d37fde624aafe0b3154bd14aaeadf85c66261dad39a60fe82785 SHA512 c2d37bc4ddd51fce6d7584d2bd7e2a9cbebc0bfd9d65f28f33e6f149dce421ce94b36f4b075b418062feda0456927bdc3c420e43389c6389ad57d3d9c23193e1
-MISC metadata.xml 263 BLAKE2B af55396bce11af3d9650b5f7bbedbb0e99d539f0d83162cc9b56ce3755b2a2e373943bc08c7048d016d5ffd05fa38a7f57ff6211e3bfb0d5b41b01bd25b11c5f SHA512 cf4145b49583a7ebcd1c698cf499f89db8afbcfbb8edcb6a28ba361b1427f68c20cf3b673c4cbd5bed97e799be988e2cac67be72e8ac54052d68ceda5c270708
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/www-apps/trac-tags/metadata.xml b/www-apps/trac-tags/metadata.xml
index c194f2fc320f..1b2becffa26c 100644
--- a/www-apps/trac-tags/metadata.xml
+++ b/www-apps/trac-tags/metadata.xml
@@ -1,8 +1,5 @@
 <?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>
+  <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/www-apps/webmcp/Manifest b/www-apps/webmcp/Manifest
index f1de6cf3068b..080443033931 100644
--- a/www-apps/webmcp/Manifest
+++ b/www-apps/webmcp/Manifest
@@ -1,4 +1,3 @@
-AUX webmcp-1.2.5-gentoo.patch 5020 BLAKE2B bee0281373658a94379f88c0d8e8d4b144c5c622c2e651bda5ef49bfc44d702605483b21077031d7c1fb851ee37af8fa4a1c7f249817f8d06c89d158a5ceec0c SHA512 91b3b2679b2254b78120d3ec360d2770aaff82a21c8aa0fa00190d4dd215d4c9d837682c3562332e24ef079fd147618c7727ba721dc4e1302c6c71c875307a60
 AUX webmcp-1.2.6-gentoo.patch 5143 BLAKE2B f4b8ca3ec283f3b4e7149cb746adc889099ac90ffaf5265670ae9446d55135fcd73907e84525f44d0d20a312a6e4033fd503c48caf884c6b106a6c1a054f5c85 SHA512 da2b68d8a7adf787dfb42f2b3f9a73dcbdf256ba1eb665bdf41e19a1e4bfadeb138067abea53d07fa851ec4daa70ab198c9c3ca829ed406ce0dda2796518ae10
 DIST webmcp-v1.2.6.tar.gz 132283 BLAKE2B ed5539b91eeb809a1e19b98f2dc8888c055ec547c95c53c0ea9232531bf9b8432ba6a0ad566a1d2fecbdcc056a52e42e99b973741fc44f923ea88369393c5ade SHA512 a233c312f85851c690f9b020e5df1fffb548c708199279021f384a36cf6e2b73a9b7bc2343c886ccc0e18aecf6d205e2a699fa2398b9bf0da587bc4f8a8f8556
 EBUILD webmcp-1.2.6.ebuild 1414 BLAKE2B 23deebc5359c15f31d9a76b8b2cca925451f8e753385eab93ab7e7e27a6d17a521e2495c56c0742f8eb8dafb22f86dbe7f779ddc4f7e13669a9e02e499d191c2 SHA512 04de52cf954b54031cf41f56dbd10ee655b778688543e5c490c1aa6beb2f357409a71702dcb49ba5a94316f7c10218cdfb7320b335247c65b04f0d892147574a
diff --git a/www-apps/webmcp/files/webmcp-1.2.5-gentoo.patch b/www-apps/webmcp/files/webmcp-1.2.5-gentoo.patch
deleted file mode 100644
index 2cd506583e6b..000000000000
--- a/www-apps/webmcp/files/webmcp-1.2.5-gentoo.patch
+++ /dev/null
@@ -1,141 +0,0 @@
---- Makefile.old	2013-03-12 21:49:03.976676966 +0100
-+++ Makefile	2013-03-12 21:50:02.888103540 +0100
-@@ -1,11 +1,11 @@
- include Makefile.options
- 
- all::
--	make documentation
--	make accelerator
--	make libraries
--	make symlinks
--	make precompile
-+	$(MAKE) documentation
-+	$(MAKE) accelerator
-+	$(MAKE) libraries
-+	$(MAKE) symlinks
-+	$(MAKE) precompile
- 
- documentation::
- 	rm -f doc/autodoc.tmp
-@@ -14,12 +14,12 @@
- 	rm -f doc/autodoc.tmp
- 
- accelerator::
--	cd framework/accelerator; make
-+	$(MAKE) -C framework/accelerator
- 
- libraries::
--	cd libraries/extos; make
--	cd libraries/mondelefant; make
--	cd libraries/multirand; make
-+	$(MAKE) -C libraries/extos
-+	$(MAKE) -C libraries/mondelefant
-+	$(MAKE) -C libraries/multirand
- 
- symlinks::
- 	ln -s -f ../../libraries/atom/atom.lua framework/lib/
---- Makefile.options.old	2013-03-12 21:54:27.245530485 +0100
-+++ Makefile.options	2013-03-12 21:55:45.756768247 +0100
-@@ -10,13 +8,13 @@
- # C compiler flags
- # TODO: check alternatives to -D_GNU_SOURCE -fPIC
- #       using libtool?
--CFLAGS = -O2 -D_GNU_SOURCE -fPIC -Wall -I /usr/include -I /usr/local/include
-+CPPFLAGS = -D_GNU_SOURCE
- 
- # additional C compiler flags for parts which depend on PostgreSQL
- CFLAGS_PGSQL = -I /usr/include/postgresql -I /usr/include/postgresql/server -I /usr/local/include/postgresql -I /usr/local/include/postgresql/server
- 
- # linker flags
--LDFLAGS = -shared -L /usr/lib -L /usr/local/lib
-+LDFLAGS += -shared
- 
- # additional linker flags for parts which depend on PostgreSQL
- LDFLAGS_PGSQL =
---- libraries/extos/Makefile.old	2013-03-13 21:49:19.710360750 +0100
-+++ libraries/extos/Makefile	2013-03-13 21:49:47.778096460 +0100
-@@ -1,7 +1,7 @@
- include ../../Makefile.options
- 
- extos.so: extos.o
--	$(LD) $(LDFLAGS) -lrt -lcrypt -o extos.$(SLIB_EXT) extos.o 
-+	$(LD) $(LDFLAGS) -o extos.$(SLIB_EXT) extos.o -lrt -lcrypt -llua
- 
- extos.o: extos.c
- 	$(CC) -c $(CFLAGS) -o extos.o extos.c
---- libraries/mondelefant/Makefile.old	2013-03-13 21:52:54.884250479 +0100
-+++ libraries/mondelefant/Makefile	2013-03-13 21:53:27.511932686 +0100
-@@ -1,7 +1,7 @@
- include ../../Makefile.options
- 
- mondelefant_native.so: mondelefant_native.o
--	$(LD) $(LDFLAGS) $(LDFLAGS_PGSQL) -o mondelefant_native.$(SLIB_EXT) mondelefant_native.o -lpq
-+	$(LD) $(LDFLAGS) $(LDFLAGS_PGSQL) -o mondelefant_native.$(SLIB_EXT) mondelefant_native.o -lpq -llua
- 
- mondelefant_native.o: mondelefant_native.c
- 	$(CC) -c $(CFLAGS) $(CFLAGS_PGSQL) -o mondelefant_native.o mondelefant_native.c
---- libraries/multirand/Makefile.old	2013-03-13 21:54:29.399328173 +0100
-+++ libraries/multirand/Makefile	2013-03-13 21:54:58.019048434 +0100
-@@ -1,7 +1,7 @@
- include ../../Makefile.options
- 
- multirand.so: multirand.o
--	$(LD) $(LDFLAGS) -o multirand.$(SLIB_EXT) multirand.o
-+	$(LD) $(LDFLAGS) -o multirand.$(SLIB_EXT) multirand.o -llua
- 
- multirand.o: multirand.c
- 	$(CC) -c $(CFLAGS) -o multirand.o multirand.c
---- libraries/extos/extos.c.old	2013-04-05 23:19:52.028115226 +0200
-+++ libraries/extos/extos.c	2013-04-05 23:20:14.819896253 +0200
-@@ -12,6 +12,7 @@
- #include <fcntl.h>
- #include <poll.h>
- #include <stdlib.h>
-+#include <crypt.h>
- 
- #define EXTOS_MAX_ERRLEN 80
- #define EXTOS_EXEC_MAX_ARGS 64
---- framework/accelerator/Makefile.old	2014-06-21 20:15:21.019918183 +0200
-+++ framework/accelerator/Makefile	2014-06-21 20:15:44.700471794 +0200
-@@ -4,7 +4,7 @@
- 	$(LD) $(LDFLAGS) -o webmcp_accelerator.$(SLIB_EXT) webmcp_accelerator.o
- 
- webmcp_accelerator.o: webmcp_accelerator.c
--	$(CC) -c $(CFLAGS) -o webmcp_accelerator.o webmcp_accelerator.c
-+	$(CC) -c $(CFLAGS) $(CPPFLAGS) -fPIC -o webmcp_accelerator.o webmcp_accelerator.c
- 
- clean::
- 	rm -f webmcp_accelerator.so webmcp_accelerator.o
---- libraries/extos/Makefile.old	2014-06-21 20:18:25.594611956 +0200
-+++ libraries/extos/Makefile	2014-06-21 20:18:50.457183029 +0200
-@@ -4,7 +4,7 @@
- 	$(LD) $(LDFLAGS) -o extos.$(SLIB_EXT) extos.o -lrt -lcrypt -llua
- 
- extos.o: extos.c
--	$(CC) -c $(CFLAGS) -o extos.o extos.c
-+	$(CC) -c $(CFLAGS) $(CPPFLAGS) -fPIC -o extos.o extos.c
- 
- clean::
- 	rm -f extos.so extos.o
---- libraries/mondelefant/Makefile.old	2014-06-21 20:19:58.218962359 +0200
-+++ libraries/mondelefant/Makefile	2014-06-21 20:20:24.527476578 +0200
-@@ -4,7 +4,7 @@
- 	$(LD) $(LDFLAGS) $(LDFLAGS_PGSQL) -o mondelefant_native.$(SLIB_EXT) mondelefant_native.o -lpq -llua
- 
- mondelefant_native.o: mondelefant_native.c
--	$(CC) -c $(CFLAGS) $(CFLAGS_PGSQL) -o mondelefant_native.o mondelefant_native.c
-+	$(CC) -c $(CFLAGS) $(CPPFLAGS) -fPIC $(CFLAGS_PGSQL) -o mondelefant_native.o mondelefant_native.c
- 
- test:: mondelefant_native.so mondelefant.lua
- 	lua -l mondelefant
---- libraries/multirand/Makefile.old	2014-06-21 20:21:36.950197127 +0200
-+++ libraries/multirand/Makefile	2014-06-21 20:22:04.967703944 +0200
-@@ -4,7 +4,7 @@
- 	$(LD) $(LDFLAGS) -o multirand.$(SLIB_EXT) multirand.o -llua
- 
- multirand.o: multirand.c
--	$(CC) -c $(CFLAGS) -o multirand.o multirand.c
-+	$(CC) -c $(CFLAGS) $(CPPFLAGS) -fPIC -o multirand.o multirand.c
- 
- clean::
- 	rm -f multirand.so multirand.o
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 2854df4645e4..5cc05784f597 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,7 +1,7 @@
 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.tar.gz 12372564 BLAKE2B a3cb1e76dd62ffe4e3689e9d3fdb1a96b8f787a763610684a0fbb0ae7fe9ad34252d1cb7119f3edf24c771bf50ca4a322e26e9b3894d12250ceb299f6fd3b019 SHA512 90a0df8a2b965c06ac10ba0dd3521b98bbd6040780bd2ccfa14a445bd2cbdb1311277563dd30f5cdc918a4177ec7c49e89260d95309fb08e271173f242fcfc07
+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.ebuild 1368 BLAKE2B f5b45626e424d308eae0e46b4d403d9b8e26cac04b9d882d30806c7ec2cb450b85a39fb04fa543ae98b799d4b5513505f3e4f8f6d745f9670e45e0a770442658 SHA512 705fd916adf648b921e531e075f532421220505106f8a2fe644440f959d5a7e4fe75b8f81a6b7ec79ef750cdef348c56c1937554cafe4d6bbd275ecdf2053370
+EBUILD wordpress-5.3.2.ebuild 1368 BLAKE2B f5b45626e424d308eae0e46b4d403d9b8e26cac04b9d882d30806c7ec2cb450b85a39fb04fa543ae98b799d4b5513505f3e4f8f6d745f9670e45e0a770442658 SHA512 705fd916adf648b921e531e075f532421220505106f8a2fe644440f959d5a7e4fe75b8f81a6b7ec79ef750cdef348c56c1937554cafe4d6bbd275ecdf2053370
 MISC metadata.xml 392 BLAKE2B 736fb06bba21342a9cdd29ce815b1325098bc11798675534a4d299bcbaeb29f46d1eab8bebd90e2539187e82294510d06827ac068611797ad441e7c024bee6b8 SHA512 f63f0ac7c836f4f8c21d69b021d6e4d6f4257f80fd1995f180509379c7ab82028a89d1be22a381e36aad34b21d94e29c2471b48d6b31dd1a634150991e7b6c33
diff --git a/www-apps/wordpress/wordpress-5.3.ebuild b/www-apps/wordpress/wordpress-5.3.2.ebuild
index 5a8f16d8897e..5a8f16d8897e 100644
--- a/www-apps/wordpress/wordpress-5.3.ebuild
+++ b/www-apps/wordpress/wordpress-5.3.2.ebuild
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /www-apps
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)