gentoo resync : 13.06.2020

29 files changed, 432 insertions, 266 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 079111d856bf..1fe10f183030 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 62f83b81d18c..c65d8cecab47 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,8 +1,12 @@
 AUX postinstall-en.txt 1595 BLAKE2B 9b5c237befcf415d0f769052c9634da830326ff57da1a1db538059138780c8ebf8d0666908fb6bb3eba99fee5d5869cd12042f0d276b560b51db60803e46c146 SHA512 6a0a5388d40b3c49f3c685a6a7986c2a9efe3e6d7c5115fbb3110ebe4c19c605a4ff785447a20c0296f3cb16811a8a6e77f2439d58253a011603709c9dd9b760
-DIST drupal-7.70.tar.gz 3319190 BLAKE2B 33f27c8c893d0a34ba953fbe9fae9a9552333328869da4d8627df018e3fc79d6e0cda3ae010c810ee113d87bbbfd2a9a7b12164cf2aede294de246d545eb3bcd SHA512 17d82cd8e4a519bccaf858447db76d7672ba0b9b6b4081f2b10842f22cf9cdb3a15df1dcc33a71be1476ba0df960812624938a0bdff594dd02b114521fd83b65
+DIST drupal-7.71.tar.gz 3323316 BLAKE2B a34a6f35912130719867d3a1e9262d25d558d1ecd220b73f662134c3e1238bfd9dbedd71f076332e4dfac3b1ed0bab24ddf7603a4ad78faf9db5c7317e273b66 SHA512 3ed0bd4e8f176bfda89e5032728b22351951062e476956b8f0242a5a2606be65c109bb31770815a1ee74f38a6aea20b3bd7697e714597da8eaff0bdfa9ba548d
 DIST drupal-8.7.14.tar.gz 17930775 BLAKE2B 0a25ea095d8431075bb2d6506237a270131cef0548b0be4d801721fc850b504d0ea1969410a4b7493f983d9a9e80e9e8e45fb553e821759505882bac96266de3 SHA512 0dc5ee0d21c6da019aae6cf93d16d938b5fcf3179b74278d03c75cb6fd78f7fa698bc98ccb4040553b010e7b529f8a37640147b928616348abbcfd3060d42995
-DIST drupal-8.8.6.tar.gz 19494446 BLAKE2B 201399953571903b174548aa46455fc247dc34b3c38953c82c8f30c3317875662744fea5574c3692a35d6859ce5479dcfe084c9347c20909b72a015ce44fa44a SHA512 7466b28c36b8eafe15f5c23ec89c59e0add945ead9b46421735efff304cb3dd563c7dc850725e6fdc517a9116756a5d118f763e7744cd05edeaf1cdcf827eca4
-EBUILD drupal-7.70.ebuild 1546 BLAKE2B 68d9ef0e5c84e8413ab72d8d1f7427316885419b1e19086d2d27d293a98fff1c4f7f889ae68decf1083d98e228dc6778794bf7e61d82f7d3002cd2a92ca0d844 SHA512 366ec13e1ae23222f5b5bbe04f2f3ee0fec8c70e68d542582bb01c67ed5fda76b28dd3ae0072bef3c19c76bbf85e34ce505986226edb76755092b2cc8d299a63
+DIST drupal-8.8.7.tar.gz 19504196 BLAKE2B 7414049a26fdb74d4dc5cde4d19cdd8f2631cfa1d2c97b87128f832efdafe734ef261a8423cdecad3c5ce56b6770806e2ca76a8b76fd71cfa5a056c6dfb75f6c SHA512 24608d809522878999f96c8e2fb561ee0f6e1460de54127570c75e08430a6ecfabdf080fe3f2177a70f12acdb0d1ef4c2f5f86f7304e69748eb1d82357034e74
+DIST drupal-8.9.0.tar.gz 19776103 BLAKE2B 3dc9ee0db667c370de2f686dc34b7b60797fe0a8ad80c2ca9dc08e1c096d6b3f9629e05af156c004a20fecba8958ca4283b45a21f67d212fed254feb03618b79 SHA512 4cb05a4352aa04ce94252a2614f1d16822400e45250d0d67962b8a3c7a891d323d102fc6c7c44a5d8caa16aa8857096958bb56899314c3871dece4e8647d5264
+DIST drupal-9.0.0.tar.gz 16833239 BLAKE2B 2202de1e352b181db3f85ba5ccf012987114b140afee055ba2475b63ae9738be9a669a534dc5470a3d41bf1e4eb81b269ccc34f4ac89ef5668396121d91ee1b0 SHA512 7a77a153f6e0b9f31c3d0e1350719b7677d8153a823b057efbe6e1cc21c59989755c96e497b1a4439e79361f35920eac13d1016019d4fd12dabc34c2c10d8244
+EBUILD drupal-7.71.ebuild 1546 BLAKE2B 68d9ef0e5c84e8413ab72d8d1f7427316885419b1e19086d2d27d293a98fff1c4f7f889ae68decf1083d98e228dc6778794bf7e61d82f7d3002cd2a92ca0d844 SHA512 366ec13e1ae23222f5b5bbe04f2f3ee0fec8c70e68d542582bb01c67ed5fda76b28dd3ae0072bef3c19c76bbf85e34ce505986226edb76755092b2cc8d299a63
 EBUILD drupal-8.7.14.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
-EBUILD drupal-8.8.6.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
+EBUILD drupal-8.8.7.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
+EBUILD drupal-8.9.0.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
+EBUILD drupal-9.0.0.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
 MISC metadata.xml 350 BLAKE2B 6142fb739e77e5ea96afb08fc4874d79efcac28348eb84333b77010fe74286d2939e160ad4ae0bbc7ca1630a73683d6d956ea1dc804b602f7fb925fff3e4b814 SHA512 10953373bc06435a35f07b9f0950c7e930c6c23cd3e6d35393eb98e581a3daeecf9b6c1f26bf1343e9ff4be84b7db3a6967c5c61bae78dc5cc7a8b786a93d6c4
diff --git a/www-apps/drupal/drupal-7.70.ebuild b/www-apps/drupal/drupal-7.71.ebuild
index 4fd21d3cac4f..4fd21d3cac4f 100644
--- a/www-apps/drupal/drupal-7.70.ebuild
+++ b/www-apps/drupal/drupal-7.71.ebuild
diff --git a/www-apps/drupal/drupal-8.8.6.ebuild b/www-apps/drupal/drupal-8.8.7.ebuild
index 50acdd30770d..50acdd30770d 100644
--- a/www-apps/drupal/drupal-8.8.6.ebuild
+++ b/www-apps/drupal/drupal-8.8.7.ebuild
diff --git a/www-apps/drupal/drupal-8.9.0.ebuild b/www-apps/drupal/drupal-8.9.0.ebuild
new file mode 100644
index 000000000000..50acdd30770d
--- /dev/null
+++ b/www-apps/drupal/drupal-8.9.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PV=${PV:0:3}.0
+MY_P=${P/_/-}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="PHP-based open-source platform and content management system"
+HOMEPAGE="https://www.drupal.org/"
+SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres sqlite +uploadprogress"
+
+RDEPEND="
+	dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml]
+	virtual/httpd-php
+	uploadprogress? ( dev-php/pecl-uploadprogress )
+"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
+		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
+
+	dodoc ${docs}
+	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
+
+	cp sites/default/{default.settings.php,settings.php} || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+
+	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	echo
+	ewarn "SECURITY NOTICE"
+	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
+	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
+	echo
+	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
+	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
+	echo
+	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
+	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
+	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
+	ewarn "reported by the setup."
+	echo
+}
diff --git a/www-apps/drupal/drupal-9.0.0.ebuild b/www-apps/drupal/drupal-9.0.0.ebuild
new file mode 100644
index 000000000000..50acdd30770d
--- /dev/null
+++ b/www-apps/drupal/drupal-9.0.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PV=${PV:0:3}.0
+MY_P=${P/_/-}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="PHP-based open-source platform and content management system"
+HOMEPAGE="https://www.drupal.org/"
+SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres sqlite +uploadprogress"
+
+RDEPEND="
+	dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml]
+	virtual/httpd-php
+	uploadprogress? ( dev-php/pecl-uploadprogress )
+"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
+		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
+
+	dodoc ${docs}
+	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
+
+	cp sites/default/{default.settings.php,settings.php} || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+
+	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	echo
+	ewarn "SECURITY NOTICE"
+	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
+	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
+	echo
+	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
+	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
+	echo
+	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
+	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
+	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
+	ewarn "reported by the setup."
+	echo
+}
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 76bba6468d34..1d1bd673f4d4 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -2,9 +2,7 @@ AUX gitea-logflags.patch 4568 BLAKE2B 280697f7ca87c3c985aef0462f63f431860411ad7c
 AUX gitea.confd-r1 243 BLAKE2B 87caa8371f53f52b0a85f720342f9f358dedec9240ab78998655a03df6bf3f301fe077afabdca1b1895dbcab2fa05748735d6f38f9b3ad53534fe8ae6e72db49 SHA512 485dc9d0b86d0a7b3ba958aac9de1129aa0ffbb47219419d38811f2accca2539e49dd93cc4a24b21f1c3802b024aa8449f54e320e8a16197f201532edeca6836
 AUX gitea.initd-r3 802 BLAKE2B 2e33e95f7d2762986184d45b0bbb250cc5e04fffc4e4b006233b28e5b57be69eef1d83441adebe2b94681585edaf77f9da4eb97930f91e75c1b1a5cd8d137633 SHA512 5ff2e653180a0601734fcd055dfffdfdc12363736ed2e56c8576c802398b90f4025b44002cbb9a3fd1e0c2d4c169f62d460381c6c549746d3390e55fc1c677d1
 AUX gitea.service-r2 734 BLAKE2B 84825b8198e9495e2803ca3702e6a631fb269c5c8fb4ff4246465a5bd7f7d796b0c3eaea72d0a25cef4f5d38d27a6c99a1b6d41f489749bef322a4ac93cfdd12 SHA512 287670f196bf6353dbdeb6ac37b4ac73693e16a6a3a83f57e7179ccb64364d1d85950a2ddd0a77238a3d218afdaacc8ba849c2810a7ba1238c7277074d1ebe39
-DIST gitea-1.10.6.tar.gz 30147860 BLAKE2B e41e226be820eb0a436783f49bf90a1149eef4e0dde00edc09bc76bb086ea53ff2856563e31ab261e1529a03753785e04c1fe8a02f72eef01a6de173df82098d SHA512 be64f73eb0819c28e444b9dae8d4baecd910aad790efeb515a981542125679257f48a5f4ab1c8453b5372a0c8b1e9b84275e61c89dcd2137d7f7cfe8c71f917b
-DIST gitea-src-1.11.5.tar.gz 68923871 BLAKE2B 99e189b4a95e9ef6079a5e8455c05209da742499ff1b18e9f5edab2620ff8deb64ca3b7cb59d456b6fe25558602be8e1f8376ec234229c6af7baf24cc6d15023 SHA512 b12bfb2fc13bd0ca5799d52c37b5d2988879041892aa1e160546f7c80e2faef086f76cd753de90f2468fe9f87af6eca64ca21df394db160fc347137fc9a0fd52
-EBUILD gitea-1.10.6.ebuild 3427 BLAKE2B bbbeac7a2b28d7cd601d9a3a2c8ef88165238933544ab95a9e7acf915b86164afc7f97b93a8e1f3f94b8bf526bf318e1d19eead4ca81c5e779e50c4b074b9d4f SHA512 8d09ae65094ab6403b61e7ef3fb045ac54d7f5e27184ea98b1a8da1618ef546bfec0787949faeb3b8c598d8868bcc08a62c3ed2a7288aaa696832478dec1c0ea
-EBUILD gitea-1.11.5.ebuild 3690 BLAKE2B 0ff7475081d352a4e7877639633d19e3ae9705a5c5525589d3e7168ce2a5b65cf88f5ee21e49158ae8d65a16020f3f437490a7227aed319dea62225e59390c24 SHA512 8e8fd381a2a47e204b3b5f1d60cb9c5b16550ee5b3e2a2e225332e8e6e55fbd21e45e2388560ca42135a40e0ccf862defdc2ad3a7610841dba751a2279411469
+DIST gitea-src-1.11.6.tar.gz 68915319 BLAKE2B 8d8fd34fe38e153aa4af932a83933d0b5ad81a63bf7b7b5be59e64dd82db3282072686979a41fafa3ac2e523f79d6926ed057b2ed18645040bf1c446c6ab04b2 SHA512 57d5214a5e05581c134d42e00ec29fe15f3245a75440fca26c7162937570affc5a2e4ba8e903cb7f15fcb271144183ce5aa473457245f36d52686ea9f1cc93b3
+EBUILD gitea-1.11.6.ebuild 3690 BLAKE2B 0ff7475081d352a4e7877639633d19e3ae9705a5c5525589d3e7168ce2a5b65cf88f5ee21e49158ae8d65a16020f3f437490a7227aed319dea62225e59390c24 SHA512 8e8fd381a2a47e204b3b5f1d60cb9c5b16550ee5b3e2a2e225332e8e6e55fbd21e45e2388560ca42135a40e0ccf862defdc2ad3a7610841dba751a2279411469
 EBUILD gitea-9999.ebuild 3579 BLAKE2B 8bd251e0fe851dc894dbb49aa476f20760f74c245de2df7d9bd026da36115a3f5fabaf7af00f0137ffb363566a2f35b93c2276f1bf6b9c69a2d821f439c79500 SHA512 75836046d9d6e04a438e9128bf5b2cb997ec12edb1f3be9591ceea89374b550317b185e8d5b4bf125de824b25a1e5dbde136521f4b17531f1e97084b0eaf8451
 MISC metadata.xml 639 BLAKE2B ded4337596780b55640ce8db682ac7fcd8b6624147d6f9cf6190d41212b98f77d752b98eb4f6af7e6bbc5472bff5f3eb6ab016325e68e3f2b2284c5b4294d5a3 SHA512 5e6a76f08e5d2161192c35371caeb38f8dc972f478aca0f3f1025852c482f54be9b7ca30dbb1365ac5c7a9902534d74b05d7dc0f21109a752f0446ff5b4191e1
diff --git a/www-apps/gitea/gitea-1.10.6.ebuild b/www-apps/gitea/gitea-1.10.6.ebuild
deleted file mode 100644
index 473b669f45b3..000000000000
--- a/www-apps/gitea/gitea-1.10.6.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} != 9999* ]] ; then
-	SCM="golang-vcs-snapshot"
-else
-	SCM="git-r3"
-fi
-
-inherit golang-base tmpfiles systemd ${SCM}
-unset SCM
-
-EGO_PN="code.gitea.io/gitea"
-
-DESCRIPTION="A painless self-hosted Git service"
-HOMEPAGE="https://gitea.io"
-
-if [[ ${PV} != 9999* ]] ; then
-	SRC_URI="https://github.com/go-gitea/gitea/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64"
-else
-	EGIT_REPO_URI="https://github.com/go-gitea/gitea"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-	has test ${FEATURES} && EGIT_MIN_CLONE_TYPE="mirror"
-fi
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="+acct pam sqlite"
-
-BDEPEND="dev-lang/go"
-DEPEND="pam? ( sys-libs/pam )"
-RDEPEND="${DEPEND}
-	acct? (
-		acct-group/git
-		acct-user/git[gitea]
-	)
-	dev-vcs/git"
-
-DOCS=( custom/conf/app.ini.sample CONTRIBUTING.md README.md )
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-PATCHES=( "${FILESDIR}/gitea-logflags.patch" )
-
-gitea_make() {
-	local gitea_tags=(
-		bindata
-		$(usev pam)
-		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
-	)
-	local gitea_settings=(
-		"-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
-		"-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
-		"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
-	)
-	local makeenv=(
-		TAGS="${gitea_tags[@]}"
-		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[@]}"
-		GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)"
-	)
-	[[ ${PV} != 9999* ]] && makeenv+=("DRONE_TAG=${PV}")
-
-	env "${makeenv[@]}" emake "$@"
-}
-
-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_test() {
-	if has network-sandbox ${FEATURES}; then
-		einfo "Remove tests which are known to fail with network-sandbox enabled."
-		rm ./modules/migrations/github_test.go || die
-	fi
-
-	if [[ ${PV} != 9999* ]] ; then
-		einfo "Remove tests which depend on gitea git-repo."
-		rm ./modules/git/blob_test.go || die
-		rm ./modules/git/repo_test.go || die
-	fi
-
-	default
-}
-
-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
-}
diff --git a/www-apps/gitea/gitea-1.11.5.ebuild b/www-apps/gitea/gitea-1.11.6.ebuild
index 44802e089f92..44802e089f92 100644
--- a/www-apps/gitea/gitea-1.11.5.ebuild
+++ b/www-apps/gitea/gitea-1.11.6.ebuild
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index b68f50edc07b..478d4666d6f4 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,6 +1,6 @@
 AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e871a86738f21b8b3ee68caf1e2b437343f739564dac5ef91db5dcb6b2f31b49a936f9d4e6a62cca4 SHA512 13b9868a4c0a5a7209e6f4aa1206a93a0fb33b0234c4c0a6942bdab9d1cf139049181c066e01c49f639165ea422259fa7cab9e0bdf21537b3722bd86691d9b2c
 AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743e94fc59f76ef77220610d2fd02950ad0157b9ebbfd8380a489cd0da33b5b25102fbaa936c1212e2f SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
-DIST grafana-bin-6.7.3.tar.gz 65083849 BLAKE2B b567885d58f4e28d2873feb4bdbfd364697d3c742039441d12df0f7a76ed8703ef2a08450125feeb576c539e7e2a84d193da92436cbd82601b65a5d42862a7a3 SHA512 15d02ed101088d845ed94fb88c629428f2a899a23dff509ec82cb148689bda07b56883765be145d5a5769ed0e3d3b9d98e50fc940c95a1074f5b5e3adac19f30
-EBUILD grafana-bin-6.7.3.ebuild 1969 BLAKE2B b871590d26c2be2d591be5a35c4b06ed5f3a820315f9661bbe1da3fe4f6c369987b7a51afc73456fcd10c08e26aee07bd5116b69075add4ddb07bb76a9f289a3 SHA512 c7091e34535a4fbedda19751d7a8ce7497ba6c00a5957d85130c6eed881d57a2d40ff0188aa3b632c1c42ac9b6ba9ebe6a9a073f2be6c4f20c401c4e5c592f2e
+DIST grafana-bin-6.7.4.tar.gz 65083442 BLAKE2B c619432325ac5254c78ec08579f048483dfd1b28fbf8a9b919517277ad887b238f953ba796366af5c9f29a53daeade160c55a2255cfe75bf767b4ddd57474f87 SHA512 fe412966558529f114b70a5cb42f82c37dce67b2b04739ddba0d9821a3e12a5f1e44757df19d283a9b486737a411ca759adab9beaca6d0f14259945675218df4
+EBUILD grafana-bin-6.7.4.ebuild 1969 BLAKE2B b871590d26c2be2d591be5a35c4b06ed5f3a820315f9661bbe1da3fe4f6c369987b7a51afc73456fcd10c08e26aee07bd5116b69075add4ddb07bb76a9f289a3 SHA512 c7091e34535a4fbedda19751d7a8ce7497ba6c00a5957d85130c6eed881d57a2d40ff0188aa3b632c1c42ac9b6ba9ebe6a9a073f2be6c4f20c401c4e5c592f2e
 MISC metadata.xml 218 BLAKE2B 2189d142b4baed0b8edb49fcc98f7397610a257a4cb5f87873272b284f84290420f0950c8b41d1d050ca7a1e0486c6e00344672a3f0479d1d382c14bf7f18485 SHA512 882f7787b97aa780dd3ba4112b9e1dcc84986e2a17704cba9a557ec3a3f9211bcf93532b92d42f60157b56b457ee9ee17e5409066230e54d48931b91bd6786cd
diff --git a/www-apps/grafana-bin/grafana-bin-6.7.3.ebuild b/www-apps/grafana-bin/grafana-bin-6.7.4.ebuild
index 58b22b14471e..58b22b14471e 100644
--- a/www-apps/grafana-bin/grafana-bin-6.7.3.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-6.7.4.ebuild
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index d5e3740eddd6..9e4ac8bb26bf 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,6 +1,8 @@
 DIST icingaweb2-2.7.1.tar.gz 8389123 BLAKE2B f5e469c1fde2b7bc2c22f898a5fb5370ca3788571501f070ed56b32afe8a155aafe70a06bbe09b77cd996725c3e176363aaf0fa885bc843102c56ddfa14da11d SHA512 0300e483e83699a79750dcfd4467a151fcfa95a1eb8735e8d0d8e5d59595ad252b630add3cb462fa4c115b2891f9ab904739ee36d5eb7fcdfb489c9d7658f1b6
 DIST icingaweb2-2.7.3.tar.gz 8388950 BLAKE2B 8d32f770020f72f1fbbf4c73de1935430976afe976c0b4497a1dd470aad286a9ec57d16dcd1f3f7354082206033d58b43966884c453fd8dd4106c13d8d3e8359 SHA512 eee3f81bb3eb29eeaeffe2f890639a12d75f9acf3b7c6649faaff3ab817ab2a5b6cd93b31637794969817f2d42ef5a46704fdc09488642caf6380f57c90d97cb
+DIST icingaweb2-2.8.0.tar.gz 8512745 BLAKE2B efcaa75c571b723b59d6d8d305ca541923499d4b083cfabf6f0ced116a6e47bd2e0ed512bdf9043ea47a7931f8e3f567a3b5ffca328076e90ed860ef84df2bfc SHA512 d9cf34284dcc924e758bafbe6169522193f935810b835d005b20d0b9af9c6bf7fd20475b7deea53a18067368e07e89656c7e75f51c5a5313d570836e50e3b638
 EBUILD icingaweb2-2.7.1.ebuild 2527 BLAKE2B 804935e74b5969090cd6caca25e16e0537ce9c467007fa72a56011b0b852b01920bb3592bba24da63a57767d3385229851749eb1a829e62523b6995ebbc6d9ce SHA512 7030468c78d304c7d745d95b3acbe1f8782b323126664449785ce9145fab750dccff5daf2c97e72179fb483790e9a978585ffc9d9e81c6723db337ba9fe96d1c
 EBUILD icingaweb2-2.7.3.ebuild 2527 BLAKE2B 804935e74b5969090cd6caca25e16e0537ce9c467007fa72a56011b0b852b01920bb3592bba24da63a57767d3385229851749eb1a829e62523b6995ebbc6d9ce SHA512 7030468c78d304c7d745d95b3acbe1f8782b323126664449785ce9145fab750dccff5daf2c97e72179fb483790e9a978585ffc9d9e81c6723db337ba9fe96d1c
+EBUILD icingaweb2-2.8.0.ebuild 2632 BLAKE2B f0e69a98d30df3b73703fa68b32169392af7cfd52acb5b91934d369feaa638f7cf5150cd92766eb8856dc20189b0dba43d7da04ffb0bcbd643254c8c9a1d9ff5 SHA512 f9372f4d37713a8cc5268904000764a83d5d1fd090129c6cc612864582a56a71f5ce9f94fe430601fcd4c0975684a59edaa260367834c186dd56cb4e68141ecb
 EBUILD icingaweb2-9999.ebuild 2529 BLAKE2B 49280ea2832b73adbbb3a246cbea7bb10871be65e2741a1324712727508f0f4d344217568e1f77a8f520cd1a490f614d44bb22c762c57103d98625c82f940e69 SHA512 7d4c16ee5dcf92a26096c8ec7ca084d5b36afa25652246d0c34207d1a53a83fef34d625377b0c44e2648df3573a7241c7d4f16a6356fbc17c1f0bd969d59f0ea
 MISC metadata.xml 530 BLAKE2B 855edf88f825a4c2f286068f7195264f1ca75f15aecf56d322a2e96b79ccdbea0b45c0a9a6cc4025dd2632cb0c97b60ffda3dd859adb7a2cfb35c0373c72bc0f SHA512 4ec6c57d7342dc1fa154f16e262f762374e37f6e4db09290c1b1188cc27ee605697d28b8349c51dee71fbfd5a90fd091e17b1dff4c9c9745bd6e69df8191897a
diff --git a/www-apps/icingaweb2/icingaweb2-2.8.0.ebuild b/www-apps/icingaweb2/icingaweb2-2.8.0.ebuild
new file mode 100644
index 000000000000..cff828cccc62
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.8.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit depend.apache eutils multilib
+
+DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
+HOMEPAGE="http://www.icinga.org/"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
+REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
+
+DEPEND=">=net-analyzer/icinga2-2.1.1
+		dev-php/pecl-imagick
+		pdf? ( media-gfx/imagemagick[png] )
+		apache2-server? ( >=www-servers/apache-2.4.0 )
+		nginx? ( >=www-servers/nginx-1.7.0:* )
+		|| (
+			dev-lang/php:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+		)
+		acct-group/icingacmd
+		acct-group/icingaweb2"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+
+	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
+	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
+}
+
+pkg_config() {
+	if [[ -d /etc/icingaweb2 ]] ; then
+		einfo "Updating existing installation ..."
+	else
+		einfo "Running first time setup ..."
+		einfo "Creating configuration directory ..."
+		/usr/share/${PN}/bin/icingacli setup config directory
+		einfo "Creating authentication token for web setup ..."
+		/usr/share/${PN}/bin/icingacli setup token create
+		if use apache2 ; then
+			einfo "The following might be useful for your Apache2 configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
+		fi
+		if use nginx ; then
+			einfo "The following might be useful for your NGinx configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
+		fi
+	fi
+	einfo "All done."
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins -r "${S}"/*
+	fperms -R a+rX "/usr/share/${PN}/public/"
+	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
+}
+
+pkg_postinst() {
+	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
+}
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 28a630d5200c..34180f485acd 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -2,12 +2,13 @@ AUX kibana.confd 72 BLAKE2B 786203cfc47132fedb989fbcaebc799ed566e15f2b0ced965798
 AUX kibana.initd 1022 BLAKE2B 8eb81203f713e75d3eead4eb25a7670c7fab8af67d1fbe749856959061feedf049caa234e58c1bd39bd4127a34c9d3de0bde0a3d41bd4856aa5176e6fd442158 SHA512 e4555584ab4f3980ec703edcfb8349ec8847cae0fb25ba2243ff3404d8d7058fb317bd4b06c2df7a8b369f733648422f0e0cb8db745844ce36d4ada3385a4f90
 AUX kibana.logrotate 186 BLAKE2B e0446247e29b474dcab5756ac26f10fd8f46300e144386ff54a4e25fc1c2678ce0d21196b7365b01417cd0304a3f1edd6841800256e931bdc10f7d4e0f4ccd49 SHA512 1e0a51a83798e30b3807f496245b5733bc60a7bd1a529d2548a187ff8d3fa56d60bc23abf516d239ef76a8e9b66358ed84c687040a7b04c7818ea63417d33a1e
 AUX kibana.service 511 BLAKE2B 2b0786bfaf37c26e061973f38adea0a55ac1b8bf771395242c0ed3b53c6586099c121c286b23f0a3be67dc481a3e95c6f87486cd1601df997126d3cfd14435c1 SHA512 0b7754ebfa7e3538e64843436d8abe32a6ce38a9ab5e252e52657a99d97fa1801777db4502c1af5ec6082d83f0b3a0613e074f6ebe28624832bd0c258a478899
-DIST kibana-5.6.16-linux-x86_64.tar.gz 53468981 BLAKE2B dda2aacad7043e4ed259c194de95da143cfc8f4fef624ff783eb8323f9053afe3a9857e358df7aa0b1fa26e9b452ff5afe7480b7befb5504af95d730c1deea53 SHA512 e3b8cd5911444be3c8f39d2060216d968456cae123a3ac47805bbf1e3d5ca581ecfd061988655926a5c6243df0ea2e127e5cf6fe35d336df570cd5b82cfd338f
 DIST kibana-6.8.8-linux-x86_64.tar.gz 189162738 BLAKE2B 63ff29f7b2cf8bed931a473c0c33a9b9a82bbbd95ede171ad964e5855d56bd113981065ec12c0eb48f5e010d003229f3c91d9578a520e5909e04de5e5a635662 SHA512 f2104d1f83595cacf9ba3ce4225dc7044a251255afb62e494a7e3224cfbd280e5f51755c6a5c3452f8208fd8566ec6a11d51cd4453dc66cb8a8b158876fb4eae
 DIST kibana-7.6.2-linux-x86_64.tar.gz 249555386 BLAKE2B e3db49bbf87de5c20dd8ae91a3835d27d10bcfa914b6cf6501eeddb229f896cdfbd78fa712c0ed63498a80a87ae48b0d2bac4218d8e1328c4c228f61e4c9b5d4 SHA512 5a7187f7fd1af3d4009053b904948fca08e171ea5eea36f8120019721d84b1649bdaf1bc606577ebad179bd4d24b014a1733c8221f67b1b7da2c756c68819311
+DIST kibana-7.7.0-linux-x86_64.tar.gz 278962064 BLAKE2B 80ff28fc67d6b5d3b492a957e4cd2847364a86850abd60c468cad7d366fbbd9c406a5fd5c5e40e61ba7b5b333f0ee8c71f7c16f0da3f12fed8c81e20dec620ce SHA512 ea6e7ca12c43be627c54691e365827a2e42458ab443dedeb948a2aa2e63d1506859554a0eaef4ccdb9c03de836d4f2b4afda7daf25a826748351df2d15309b8b
 DIST kibana-oss-6.8.8-linux-x86_64.tar.gz 66262509 BLAKE2B 76531791f024cf98c5ebe6840564f8f49cd3539370889f209ac0b89763ad71cfd23575789c7bdeb1ad0f6adff8ee555ece530e8fdcc6e51e0671e0a4ae0095c8 SHA512 64c839cf8c1bbddf776655f6674640bd01bbe97039b78f9fac0a95f425eea37825c5fa9a06b4e8bad4e8230db02424afa569a3adcd5d36164f3d6aada8b2f4e4
 DIST kibana-oss-7.6.2-linux-x86_64.tar.gz 102252121 BLAKE2B f0b6571733b7eb5379491b8a27ee3b0ab49c643c73fd9ba53b0446f70deb059f788abf789037b9988ff398013c46653570c5ed3e539e76dd424b3ea624280e1c SHA512 639119273e0184640cf25513dd29633939c4bdc173e6577d377d60503db68989980fe09829fad8ba0862695dd7f79fd7dbd0102c3c2f9eb5e762071579a3d424
-EBUILD kibana-bin-5.6.16.ebuild 1684 BLAKE2B 7f2226c849036d14b3d9226902237a456251b1ed7d765394e4dc9cb969d98b9d12abb5a065858e46b074c588242e8612e5ed81b3e40e0fe92007b6106029d772 SHA512 35b7685abc2aac386fcfbad7f7685534967bc2d34c4aab7b39dbe0642428bf61ea3c5dd9aa49f82f6393f786b7389a60b7ddf4c543c5cfdd9689b15dced7cf04
+DIST kibana-oss-7.7.0-linux-x86_64.tar.gz 138321105 BLAKE2B 148782533116a46bcaa529282ab0f8fe818789538ffac12187e95486db8757f030423e416a810c09ee20ca182e6ce80441208777e891d91961f8fc718926c975 SHA512 ed29806990a032abfeca747edcf9162f4704be5774bbe394bbe6b34c5614c97e27a900a64e9b6e7b242767bdf31729c34903c86e9708fb066f83d8df76966152
 EBUILD kibana-bin-6.8.8.ebuild 2503 BLAKE2B 1a7338d89c5e63e1610ec3f14f39ec76794e6a07b7f4b31b66106f088dd9eb802de7944a18fe59fed5a3eba8e310e2df383f7682be317828c9327e34f2318d74 SHA512 01efdec9efc4fe2ffe4eb6cff18747115aa4e02ac462aefa0c10bcee8d460c536a04b9be99503675a7adbd1abcc09bcc29959427ac7615fdac55f5525cf55bce
 EBUILD kibana-bin-7.6.2.ebuild 2564 BLAKE2B 578c12f20b535ffaf7ee03a9c2661fd2091563be978dc5f59892c38ccc414c82c644f851cf76d9b517913e358f0db0ace42fb59e4043bb95330f67b32f028ec3 SHA512 4b57683047dfd03b60c52aa1c42af078e98e17fc5c3532a8f88d14f769fd351091d5c24a1ba3ac16044b645b6b01feee5f4f32478b86a8d0696f8869b2fc4932
+EBUILD kibana-bin-7.7.0.ebuild 2564 BLAKE2B e0d08b65a68d61c5b8cc00b10fa9b24f1f4518a51375476c61a383e90be7aa069961f3cb6c3ea2c4375196e013805402ad520cf8921385434011b2f91796908a SHA512 85a7e2cfc48e8d570b6113fd9ce77efa009ef07eeca5805a7866bfa02a7a899e283e5f17ecdef640018e2f7298c14b2a507dfe3b8286a8ca1fe5c632246f3823
 MISC metadata.xml 646 BLAKE2B 761ac91ba7a5c8a1ebdaa4b85a6db083eaca8e26dd00cf753c6cd80daadec79dbf1624a26a601e7e8c1605d9e7c267dcc75455d591c658ac1ab403ac8955786c SHA512 905abb24126c45f0b170bc4073ceb3860bdb21752a2a0315e25c1c5b3baac175e228694e0d51022928d0f05cc48e261a7b5da5792c4faa06ecef16ac105f67cf
diff --git a/www-apps/kibana-bin/kibana-bin-5.6.16.ebuild b/www-apps/kibana-bin/kibana-bin-5.6.16.ebuild
deleted file mode 100644
index a5b43acbd70c..000000000000
--- a/www-apps/kibana-bin/kibana-bin-5.6.16.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user
-
-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="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-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"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=net-libs/nodejs-6.17.0"
-
-# Do not complain about CFLAGS etc since kibana does not use them.
-QA_FLAGS_IGNORED='.*'
-
-S="${WORKDIR}/${MY_P}-linux-x86_64"
-
-pkg_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 -1 /opt/${MY_PN} ${MY_PN}
-}
-
-src_prepare() {
-	default
-
-	# remove bundled nodejs
-	rm -r node || die
-
-	# remove empty unused directory
-	rmdir data || 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}
-
-	insinto /opt/${MY_PN}
-	doins -r .
-
-	fperms -R +x /opt/${MY_PN}/bin
-
-	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
-	keepdir /var/log/${MY_PN}
-}
-
-pkg_postinst() {
-	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
-	elog "Node.js 6. Some plugins may fail with other versions of Node.js (Bug #656008)."
-	elog
-	elog "Be sure to point ES_INSTANCE to your Elasticsearch instance"
-	elog "in /etc/conf.d/${MY_PN}."
-	elog
-	elog "Elasticsearch can run local or remote."
-}
diff --git a/www-apps/kibana-bin/kibana-bin-7.7.0.ebuild b/www-apps/kibana-bin/kibana-bin-7.7.0.ebuild
new file mode 100644
index 000000000000..b7064ff5a2e1
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-7.7.0.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.19.0
+	x-pack? (
+		dev-libs/expat
+		dev-libs/nss
+	)"
+
+S="${WORKDIR}/${MY_P}-linux-x86_64"
+
+src_prepare() {
+	default
+
+	# remove unused directory
+	rm -r data || die
+
+	# remove bundled nodejs
+	rm -r node || die
+	sed -i 's@\(^NODE="\).*@\1/usr/bin/node"@g' \
+		bin/kibana || die
+
+	# move 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/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index ce48d638188b..81f953989886 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,13 +1,15 @@
-DIST nextcloud-16.0.10.tar.bz2 63199839 BLAKE2B e030b9e99bf9573cdc0e5510394aa15473e3ced647049f7ace7a7c6400f002bf40e7b9965d48a938bacdf8f93d6a246828bd2fa304d79201f15e473c897a3df6 SHA512 295ef79bc8dfa4318c761f920ff145d40c41a89c1d410ca7bd33125ac835312dcf9123b19bb68b8cb3e20c08a7e233830702bfacf37f9e0815237b154d0563a0
-DIST nextcloud-16.0.9.tar.bz2 62595192 BLAKE2B 8594d49bd8913e6a826b55390398d97733619469c10c817a1263d0e1f4fcadf9b0cbe459c6a415c2078fe6678898f7dcec511ebe4be8254226358c11d8491239 SHA512 5787bf73575e10f5bd204ca797f367eff27d47d45f87765f313481b5f47f295c8ce730371809d02a84a02b8c68b87f6529c315b739b8a8b48c2d2512aeafa2c4
 DIST nextcloud-17.0.5.tar.bz2 66618876 BLAKE2B 9d7aabafadc768e72f90180fb0763a16188f09e0ab657fcfea762fffa53af87c5ed546f0176852346973164ecd42edac8acd6120392ce075e96658f70e2c1740 SHA512 b6b5ddd85666ca6542ba945adb4bd0196997d815aa0d232b83fb5e29be2b3cdef891d3fb349c86d2aeef7356fd71c234bcf4b569ce41b0082f86a909148930a1
 DIST nextcloud-17.0.6.tar.bz2 66599870 BLAKE2B dd4c66fcdb8c2aca978ebc1df52970cda189e56b3e48465e5a1ce9191a2e6499cc069910ef894699d9e888206335e5ac59cc813b0f2108cd585e776f88f0e333 SHA512 e97f74d2890815742654af8c3248ae8378f7d8fe57c13657824354cdd90d4a30b99dd2249980b885ec73eaba9d2ed0c1fdc9254f926f3de26f1c2832e36e9344
+DIST nextcloud-17.0.7.tar.bz2 66884867 BLAKE2B 4800a13b0573f61dc380c518b81de216cfbbfccb45ec57e81ef7cbe308cf24e2c59dc30eac30f378123e0c814625d9412f2adbcb85763196a8a2f86e8b913e62 SHA512 52c4c499214e37edf8cc7fffce8ed71b8bc0efaf927507e0f6222503de40c146b62da61671e608f33f809ea0ad9c67dd7275a349aaa61a08ce2de5fb7a2f1e2d
 DIST nextcloud-18.0.3.tar.bz2 86636651 BLAKE2B ad73d397dfd8ceaa5b1edc42031a350560fd80c0c55500cff5e394f3a0ffedc0c02a5a0bbdb4579fba2765fe542cae6e8c835c2f6e07755ec368556d207cdecd SHA512 b1f433dee2e7eea800de8cd8131332530050b6194460a397081a134f63b236f65e33758c60cd8e97a43570d0b6a1baac9e0503535d85a9a34cd63abd50041292
 DIST nextcloud-18.0.4.tar.bz2 86677670 BLAKE2B 57675e71a50bffc3953cb41095e41fd5a3ac30c680097fcaded34db40dc8de4b972c1c751da39b2eb500d6a3ea4dba081058b9cda52a1ad3d2dd600d9a55592f SHA512 c9754562153fdb07e0c65d5cc9749871c875a455051cd632403c31b8cb52540b95f3fdf5ba3146d65a175508580b6f3c72d3ac86a90b060baafbca1225dbba95
-EBUILD nextcloud-16.0.10.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
-EBUILD nextcloud-16.0.9.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
+DIST nextcloud-18.0.6.tar.bz2 87767296 BLAKE2B 36d775861cf849e32ef9d1cfbf970ae7f3c24d19e99c7c4feb13fb29623e6a24077d384e08c38a0fbea98e1502dec37ee024ee1e6674326230d31021dd3c0c37 SHA512 812af75c893597c2683382362943df1973a78c67463c7f7e93fe721be6d60a98f9a70286c1b06f4d9757373b84a8f0ee8a5aaf21f005c9bdcb1dced2fdd7f270
+DIST nextcloud-19.0.0.tar.bz2 90077143 BLAKE2B cbffdda9dcf08209f09ca05071d3f27f97fb0b333298ed72f4c71939e2b43657c957f21cf27c0acdcc9aa325e04977262297bc9620bc515eb0343bb105546d22 SHA512 ac98083887ed59a3cf1003773c46270ba03ad631c4b1ed3608a3de349ecaaf32b9e084307d19bf67956d258fbf7acbe8739f32d34ce07db3c518a9bf5f50aa0d
 EBUILD nextcloud-17.0.5.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
 EBUILD nextcloud-17.0.6.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
+EBUILD nextcloud-17.0.7.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
 EBUILD nextcloud-18.0.3.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
 EBUILD nextcloud-18.0.4.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
+EBUILD nextcloud-18.0.6.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
+EBUILD nextcloud-19.0.0.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
 MISC metadata.xml 363 BLAKE2B 4da5b0e27af01e94e1e68b98274da6c9cacbe59ed1d85413038bccfa530af8fd479a7edd89f4d7633dfb07afbad4736cb6c075e021db7dc9761c273ec1256500 SHA512 60195d5859a8b175346a1cd533dbb6496d2787c1ff501d9233b2b1794670ae344c6f9f4cac4fbf86b24686a83692cff27513d05243947e2921e554e065696721
diff --git a/www-apps/nextcloud/nextcloud-16.0.10.ebuild b/www-apps/nextcloud/nextcloud-17.0.7.ebuild
index de1b7898efdf..de1b7898efdf 100644
--- a/www-apps/nextcloud/nextcloud-16.0.10.ebuild
+++ b/www-apps/nextcloud/nextcloud-17.0.7.ebuild
diff --git a/www-apps/nextcloud/nextcloud-16.0.9.ebuild b/www-apps/nextcloud/nextcloud-18.0.6.ebuild
index de1b7898efdf..de1b7898efdf 100644
--- a/www-apps/nextcloud/nextcloud-16.0.9.ebuild
+++ b/www-apps/nextcloud/nextcloud-18.0.6.ebuild
diff --git a/www-apps/nextcloud/nextcloud-19.0.0.ebuild b/www-apps/nextcloud/nextcloud-19.0.0.ebuild
new file mode 100644
index 000000000000..de1b7898efdf
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-19.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="https://nextcloud.com/"
+SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+curl +imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
+	imagemagick? ( dev-php/pecl-imagick )
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_src_install
+}
diff --git a/www-apps/rocketwiki-lqfb/Manifest b/www-apps/rocketwiki-lqfb/Manifest
index 5c8151e69002..0282dcf09b91 100644
--- a/www-apps/rocketwiki-lqfb/Manifest
+++ b/www-apps/rocketwiki-lqfb/Manifest
@@ -1,4 +1,5 @@
-AUX rocketwiki-lqfb-0.4-utf8.patch 1164 BLAKE2B ecbc3756cf6ca39d1f93578515e55591865b802a29847912d3590e44f477a2b3ccd2a39ba2c63c216fd8f5cb98490e3a0f0fa00ab98fb1c6b9b4d91b7391cefc SHA512 146a39a78e944f41d569f47ec39a53b192d4a5c127189cd3cb4e784e33a94761c0cc309f7edc08f73fab6eb6ceaf6545757e232c5a912f874c5bf4af80c9903b
+AUX rocketwiki-lqfb-0.4-parsec1.patch 508 BLAKE2B 50310abebefc331c0d430c17bd54001d31d1b15e45fa4352c870ed90c1f6dfa537ed6c4c1ab53950ade38ea69635f806af604c8b5f2ab52c6c99b27a854fbc46 SHA512 f8a71191b153551b4bcdaddc66ebec4be191b9ce125d79d2b02de2758ed96da96cf486e7f7f37bf7b1a7a51c9a95494ffa6d36fd1ff343525d913e1138a96531
+AUX rocketwiki-lqfb-0.4-utf8.patch 1164 BLAKE2B e333d743d213fc84e20565c8ee3041c3293b4cdde85a13455fdb3f9c796a0499356386235cf2a170e485ceaa91a013ea81be8fc9a8eefb90ab767f1c4fb0eef2 SHA512 91a92b8c024ff593092f4e66d9b474c2e24d52ab0277945bc5a95a415f2e2cb23cfb05881cf665e091e9201beef9ac9d14da71138ca09e0db3c6551bd5b77c1b
 DIST rocketwiki-lqfb-v0.4.tar.gz 5274 BLAKE2B f26390e0c238a0c8453ca15417396d87e9a6c3da2bad9bd0d02061ccf083114e83713eed268541bb6f1d04587083cf8cc24454f4719700b34b1e046f8c42e006 SHA512 fa90b317007c42e2e6d36c79773948ab7ab68ee914bd20825e0d5acbb8bf0add2c0a48119440d8a5b4c991f2d1f59bc83a1835b02d9070ae67fca1d4ffb73caf
-EBUILD rocketwiki-lqfb-0.4.ebuild 648 BLAKE2B cf21d4efd2febe8c57c4292b81f9dfc9089dc6de6e3a4b1f83e14085072b3fde06a75ef12d0ff62108df0300f6c31b7d47a1de83f2d47aecd6a64d7b8b3f6607 SHA512 2f54c4fda9de1a7c3d635631b8ed5a80a54a7b776c3f679ba2c5113ad2e98ddc3bc2a1466e5ebfdd7f2f62cb19c2f7d0d3358d0edb7da16995651235ae40c6a6
+EBUILD rocketwiki-lqfb-0.4.ebuild 666 BLAKE2B d9da7a0cb3a5a16901524b605b53c832d692d3450fc4170606d36e3f8e171eaa1b0a36cbd5d7631eccc6cb21915aee52b49198525fbfcc16b39c5bc3ce689126 SHA512 95b8e0709b135ae44f7eda3dd8f995bc50d5ce33391be93c26d7f9d41ca878da09ff2f3c32119131fe6452240f385f147a6c4f503f00c384d0a1b93161681c2e
 MISC metadata.xml 502 BLAKE2B ad09da6f3f0555ed6c2ed1f578dbac8f85a6f7a7feba9864ee8d9a591ead254c00c141346085d4f3c71d49944c06a62e822daca11d384ff9a4b0799f1d1820b5 SHA512 f9c4da2ace81b5cf8ce45de2e923ae3ef67bb486c606f6ef2737bc733c27308bf11a653a2fe12f9036d4053eb10e514489aa7fdcc5db363ad043c607c45800d7
diff --git a/www-apps/rocketwiki-lqfb/files/rocketwiki-lqfb-0.4-parsec1.patch b/www-apps/rocketwiki-lqfb/files/rocketwiki-lqfb-0.4-parsec1.patch
new file mode 100644
index 000000000000..d615aa86fcfb
--- /dev/null
+++ b/www-apps/rocketwiki-lqfb/files/rocketwiki-lqfb-0.4-parsec1.patch
@@ -0,0 +1,15 @@
+--- a/Makefile	2020-06-10 10:37:53.992504952 +0200
++++ b/Makefile	2020-06-10 10:38:37.419801522 +0200
+@@ -1,10 +1,10 @@
+ all:: rocketwiki-lqfb rocketwiki-lqfb-compat
+ 
+ rocketwiki-lqfb: rocketwiki-lqfb.hs
+-	ghc --make rocketwiki-lqfb
++	ghc -ignore-package=parsec1 --make rocketwiki-lqfb
+ 
+ rocketwiki-lqfb-compat: rocketwiki-lqfb-compat.hs
+-	ghc --make rocketwiki-lqfb-compat
++	ghc -ignore-package=parsec1 --make rocketwiki-lqfb-compat
+ 
+ clean::
+ 	rm -f rocketwiki-lqfb rocketwiki-lqfb.hi rocketwiki-lqfb.o
diff --git a/www-apps/rocketwiki-lqfb/files/rocketwiki-lqfb-0.4-utf8.patch b/www-apps/rocketwiki-lqfb/files/rocketwiki-lqfb-0.4-utf8.patch
index 0156686ee29c..52c08ee49bf3 100644
--- a/www-apps/rocketwiki-lqfb/files/rocketwiki-lqfb-0.4-utf8.patch
+++ b/www-apps/rocketwiki-lqfb/files/rocketwiki-lqfb-0.4-utf8.patch
@@ -1,5 +1,5 @@
---- rocketwiki-lqfb.hs.old	2013-04-25 21:41:34.044588280 +0200
-+++ rocketwiki-lqfb.hs	2013-04-25 21:42:33.108020316 +0200
+--- a/rocketwiki-lqfb.hs	2013-04-25 21:41:34.044588280 +0200
++++ b/rocketwiki-lqfb.hs	2013-04-25 21:42:33.108020316 +0200
 @@ -2,6 +2,7 @@
  import Text.ParserCombinators.Parsec
  import Control.Applicative ((<$>), (<*>))
@@ -20,8 +20,8 @@
  
  wikiParse str
    | success parseResult = html
---- rocketwiki-lqfb-compat.hs.old	2013-04-25 21:41:41.340518231 +0200
-+++ rocketwiki-lqfb-compat.hs	2013-04-25 21:43:21.299557312 +0200
+--- a/rocketwiki-lqfb-compat.hs	2013-04-25 21:41:41.340518231 +0200
++++ b/rocketwiki-lqfb-compat.hs	2013-04-25 21:43:21.299557312 +0200
 @@ -2,6 +2,7 @@
  import Text.ParserCombinators.Parsec
  import Control.Applicative ((<$>), (<*>))
diff --git a/www-apps/rocketwiki-lqfb/rocketwiki-lqfb-0.4.ebuild b/www-apps/rocketwiki-lqfb/rocketwiki-lqfb-0.4.ebuild
index 662933a4fb42..a36ffa354471 100644
--- a/www-apps/rocketwiki-lqfb/rocketwiki-lqfb-0.4.ebuild
+++ b/www-apps/rocketwiki-lqfb/rocketwiki-lqfb-0.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit eutils
 MY_P=${PN}-v${PV}
@@ -22,9 +22,10 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-utf8.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-utf8.patch
+	"${FILESDIR}"/${P}-parsec1.patch
+)
 
 src_install() {
 	dobin ${PN}{,-compat}
diff --git a/www-apps/webmcp/Manifest b/www-apps/webmcp/Manifest
index 080443033931..097bdcf6a78a 100644
--- a/www-apps/webmcp/Manifest
+++ b/www-apps/webmcp/Manifest
@@ -1,4 +1,4 @@
-AUX webmcp-1.2.6-gentoo.patch 5143 BLAKE2B f4b8ca3ec283f3b4e7149cb746adc889099ac90ffaf5265670ae9446d55135fcd73907e84525f44d0d20a312a6e4033fd503c48caf884c6b106a6c1a054f5c85 SHA512 da2b68d8a7adf787dfb42f2b3f9a73dcbdf256ba1eb665bdf41e19a1e4bfadeb138067abea53d07fa851ec4daa70ab198c9c3ca829ed406ce0dda2796518ae10
+AUX webmcp-1.2.6-gentoo.patch 5156 BLAKE2B 4d0680753a83422483c33909b692bc6a0fdd146216889aa83e6a9b99a15bf92920913330de12f2e2125b976214753ec4853b7dd48dabf8c2a0c88fb9b7d1ada5 SHA512 7e57b4f5f32f280198e8c6e01c21ed1414af3bf87a77022af37e3d144576a7d23c9f912e7f41282ef6d984f4323af1dbdda472cfe076fc62a6ee1a47d0529a7c
 DIST webmcp-v1.2.6.tar.gz 132283 BLAKE2B ed5539b91eeb809a1e19b98f2dc8888c055ec547c95c53c0ea9232531bf9b8432ba6a0ad566a1d2fecbdcc056a52e42e99b973741fc44f923ea88369393c5ade SHA512 a233c312f85851c690f9b020e5df1fffb548c708199279021f384a36cf6e2b73a9b7bc2343c886ccc0e18aecf6d205e2a699fa2398b9bf0da587bc4f8a8f8556
-EBUILD webmcp-1.2.6.ebuild 1414 BLAKE2B 23deebc5359c15f31d9a76b8b2cca925451f8e753385eab93ab7e7e27a6d17a521e2495c56c0742f8eb8dafb22f86dbe7f779ddc4f7e13669a9e02e499d191c2 SHA512 04de52cf954b54031cf41f56dbd10ee655b778688543e5c490c1aa6beb2f357409a71702dcb49ba5a94316f7c10218cdfb7320b335247c65b04f0d892147574a
+EBUILD webmcp-1.2.6.ebuild 1430 BLAKE2B e25f69e511d1b0bc9349761573fb4617e7daa96435584ba313d2d57e71fce09f3792551b3e95bbe8515a39df9e4531e6e5a60e7494029a3bdd780c61d9cf9684 SHA512 635a9ac44d15293681bb3beda2964bbe6d5e37dd4d0429d03242474b56c45f05f73e7d9b3e305c47c4866abb7d7784e96d5744fe9b08c76fc48156775602fa22
 MISC metadata.xml 821 BLAKE2B a116a4db4b1be4a6a860805b866e735633b1ee8031cc0750e9843c201fe5b1d36657f845d0e9fc1e3871ab091601b85996b4ebd5b224ea1fa6139ffc0e6fd8a2 SHA512 68b0741c84f5a93b26b89e56093b9554727ef375ed77e189cdeb62e12dc0a1b8506b56885be46c637e03b388830467eeac3f11511f49668d74dd36ff15f380e8
diff --git a/www-apps/webmcp/files/webmcp-1.2.6-gentoo.patch b/www-apps/webmcp/files/webmcp-1.2.6-gentoo.patch
index 2fa1eb4aff53..3b399fe96ad9 100644
--- a/www-apps/webmcp/files/webmcp-1.2.6-gentoo.patch
+++ b/www-apps/webmcp/files/webmcp-1.2.6-gentoo.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2013-03-12 21:49:03.976676966 +0100
-+++ Makefile	2013-03-12 21:50:02.888103540 +0100
+--- a/Makefile	2013-03-12 21:49:03.976676966 +0100
++++ b/Makefile	2013-03-12 21:50:02.888103540 +0100
 @@ -1,11 +1,11 @@
  include Makefile.options
  
@@ -34,8 +34,8 @@
  
  symlinks::
  	ln -s -f ../../libraries/atom/atom.lua framework/lib/
---- Makefile.options.old	2015-05-26 21:43:41.354197822 +0200
-+++ Makefile.options	2015-05-26 22:01:34.594735786 +0200
+--- a/Makefile.options	2015-05-26 21:43:41.354197822 +0200
++++ b/Makefile.options	2015-05-26 22:01:34.594735786 +0200
 @@ -14,13 +14,13 @@
  # C compiler flags
  # TODO: check alternatives to -D_GNU_SOURCE -fPIC
@@ -49,13 +49,13 @@
  
  # linker flags
 -LDFLAGS = -shared -L /usr/lib -L /usr/local/lib
-+LDFLAGS = -shared
++LDFLAGS = -shared $(MYLDFLAGS)
  
  # additional linker flags for parts which depend on PostgreSQL
 -LDFLAGS_PGSQL = -L /usr/local/lib/postgresql -rpath /usr/local/lib/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
+--- a/libraries/extos/Makefile	2013-03-13 21:49:19.710360750 +0100
++++ b/libraries/extos/Makefile	2013-03-13 21:49:47.778096460 +0100
 @@ -1,7 +1,7 @@
  include ../../Makefile.options
  
@@ -65,8 +65,8 @@
  
  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
+--- a/libraries/mondelefant/Makefile	2013-03-13 21:52:54.884250479 +0100
++++ b/libraries/mondelefant/Makefile	2013-03-13 21:53:27.511932686 +0100
 @@ -1,7 +1,7 @@
  include ../../Makefile.options
  
@@ -76,8 +76,8 @@
  
  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
+--- a/libraries/multirand/Makefile	2013-03-13 21:54:29.399328173 +0100
++++ b/libraries/multirand/Makefile	2013-03-13 21:54:58.019048434 +0100
 @@ -1,7 +1,7 @@
  include ../../Makefile.options
  
@@ -87,8 +87,8 @@
  
  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
+--- a/libraries/extos/extos.c	2013-04-05 23:19:52.028115226 +0200
++++ b/libraries/extos/extos.c	2013-04-05 23:20:14.819896253 +0200
 @@ -12,6 +12,7 @@
  #include <fcntl.h>
  #include <poll.h>
@@ -97,8 +97,8 @@
  
  #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
+--- a/framework/accelerator/Makefile	2014-06-21 20:15:21.019918183 +0200
++++ b/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
  
@@ -108,8 +108,8 @@
  
  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
+--- a/libraries/extos/Makefile	2014-06-21 20:18:25.594611956 +0200
++++ b/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
  
@@ -119,8 +119,8 @@
  
  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
+--- a/libraries/mondelefant/Makefile	2014-06-21 20:19:58.218962359 +0200
++++ b/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
  
@@ -130,8 +130,8 @@
  
  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
+--- a/libraries/multirand/Makefile	2014-06-21 20:21:36.950197127 +0200
++++ b/libraries/multirand/Makefile	2014-06-21 20:22:04.967703944 +0200
 @@ -4,7 +4,7 @@
  	$(LD) $(LDFLAGS) -o multirand.$(SLIB_EXT) multirand.o -llua
  
diff --git a/www-apps/webmcp/webmcp-1.2.6.ebuild b/www-apps/webmcp/webmcp-1.2.6.ebuild
index 8442fcfc0a2f..a156ac3bbf96 100644
--- a/www-apps/webmcp/webmcp-1.2.6.ebuild
+++ b/www-apps/webmcp/webmcp-1.2.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_P=${PN}-v${PV}
 DESCRIPTION="Web application framework written in Lua and C"
@@ -15,18 +15,16 @@ KEYWORDS="~amd64"
 SLOT=0
 IUSE=""
 
-RDEPEND="dev-lang/lua
-	dev-db/postgresql"
+RDEPEND="dev-lang/lua:=
+	dev-db/postgresql:="
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/${MY_P}
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_compile() {
-	emake CC=$(tc-getCC) LD=$(tc-getCC)
+	emake CC=$(tc-getCC) LD=$(tc-getCC) MYLDFLAGS="${LDFLAGS}"
 	# Dereference symlinks
 	cd framework
 	mkdir lib.link
@@ -61,5 +59,6 @@ src_install() {
 		doins -r demo-app${subdir}
 	done
 	dodoc doc/*sample.conf libraries/mondelefant/example.lua
-	dohtml doc/autodoc.html
+	docinto html
+	dodoc doc/autodoc.html
 }
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index e1f9f77cee3b..f7cd2412d15b 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,5 +1,5 @@
 AUX postinstall-en.txt 1285 BLAKE2B 09a372660022bda4064f2b298e6409be4d8f8943fd06d672e15c6126029acf2551b2eb0447f378a7c9287f757a820787ab6e592556e5cf199b0d8c0dd8f98f18 SHA512 8fa41aa39a1dfead723c87e6b16f979839dd5c585b9f9bb14a8a1ef556b69f9dcab113622b56c24890d1414df045b055b6997be02364ab4d5c7c06db2e4c12b2
 AUX postupgrade-en.txt 963 BLAKE2B c08e2ecca3d462d544549c80fb11abde670251002257d75fa8dd41d890f1327b08f1796c54125663fd35aca999f63b89035b610bdeedc32396c35d9d9b92ce4d SHA512 dbc86a1cf3b5280137322794a344818be8cfc137153f0e634e7bbd856ccb7ac589199353f2ccd5c28a8aa7d35cc2e041137bfc5d812fc6267efc758a1113c2d4
-DIST wordpress-5.4.1.tar.gz 12234700 BLAKE2B 0df1f1b1da22c5ad429ef59861dbcb80b5bd6c8720bc96b450d2b6599b903dda813e16f28fc2ee2afe1654b4047556a06bb409f6d0a3be3671b37e54fac52cf3 SHA512 5ed4f3bd593febdf2aec4c582c2ed850d3bf52122273b4306c1fba87939a675228df84092a709052f13e0096b2545cd6f078ab89b232ee4b4dce467d834de0cd
-EBUILD wordpress-5.4.1.ebuild 1368 BLAKE2B 45194566d2baf141dc52ed370456ae5bc84e94e0b8424f38093617652224603ec715bb490f992a32d4b3372320e8faa7905e821eeba792168b22e9e59ec59bc7 SHA512 224639d9d5827afab6aaf1f9e9808bb4a064da1cc7f686c5ef3818717f900280b8ded7161c9ae718ce14793f21e4591695a0deae718a54e751881e0bcd3a44cb
+DIST wordpress-5.4.2.tar.gz 12238031 BLAKE2B 47e80985392540d5cf46c40b3a4e7ef75ca8ee95996b13442e288ee68510d001ec92cb11c7621dfb1148a7a1409fed2418b2c6758555d63e457b19ae6cf43368 SHA512 d1f4366f6e8ec591ce91ed76ea6949feeaf112881c3d742860c79955283b31c1712a04394eda8308d6d5756ff6d20ef4cf2e18559a59469ef195cf2cb437c219
+EBUILD wordpress-5.4.2.ebuild 1368 BLAKE2B 45194566d2baf141dc52ed370456ae5bc84e94e0b8424f38093617652224603ec715bb490f992a32d4b3372320e8faa7905e821eeba792168b22e9e59ec59bc7 SHA512 224639d9d5827afab6aaf1f9e9808bb4a064da1cc7f686c5ef3818717f900280b8ded7161c9ae718ce14793f21e4591695a0deae718a54e751881e0bcd3a44cb
 MISC metadata.xml 392 BLAKE2B 736fb06bba21342a9cdd29ce815b1325098bc11798675534a4d299bcbaeb29f46d1eab8bebd90e2539187e82294510d06827ac068611797ad441e7c024bee6b8 SHA512 f63f0ac7c836f4f8c21d69b021d6e4d6f4257f80fd1995f180509379c7ab82028a89d1be22a381e36aad34b21d94e29c2471b48d6b31dd1a634150991e7b6c33
diff --git a/www-apps/wordpress/wordpress-5.4.1.ebuild b/www-apps/wordpress/wordpress-5.4.2.ebuild
index 6fc0786bf3b1..6fc0786bf3b1 100644
--- a/www-apps/wordpress/wordpress-5.4.1.ebuild
+++ b/www-apps/wordpress/wordpress-5.4.2.ebuild