gentoo resync : 18.11.2018

34 files changed, 261 insertions, 546 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 02333b426205..707c837e5b56 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/airdcpp-webui/Manifest b/www-apps/airdcpp-webui/Manifest
index ba472225ed6e..e7ca01b63228 100644
--- a/www-apps/airdcpp-webui/Manifest
+++ b/www-apps/airdcpp-webui/Manifest
@@ -1,5 +1,5 @@
-DIST airdcpp-webui-2.2.1.tgz 7767520 BLAKE2B 0acb29ed1aa2bba8bce0186a12723ebd42e07d9d4d66b9f09070fb1679d51930d082fbc16f49cd5ca10c5f4abe8c341de67ab1ca8d7b8be5bbece269b9a2a86c SHA512 21011adae14d86e19305a991d9a37f379796690394645877da459166222274d26ee54c583266890f970f650b6db03a91205965e06277218c69a3697e542e771d
 DIST airdcpp-webui-2.3.0.tgz 8428607 BLAKE2B ad2649c892234b32b6b29624c961a0c89f18255a3b991a2d823f42c3a38d386aec74c71b476cfe55bfec518583b4ed674843e4e6e7fd0fed2f2dcdcc09ae285b SHA512 1fe8896c471916cdfa9ee2c2a774ca62e295b2d6292d76817effa9a1be07e0c44d73449a239da23a90594a749177d5b54be56099482c1021b9ff0c576aa7ac00
-EBUILD airdcpp-webui-2.2.1.ebuild 469 BLAKE2B 4536300ff4ae703dac01e29dbd52681be6c3205ea57365caee9bb0f2a782cc5a9fc70a678df108886fa157483fd4169d5b712c7d9b6ea84b96d818f00ab968d5 SHA512 a8b87f4cc1ef05808502af531d8649812dfbb6a550cd1237dedf287f229004bc93d936175b0bca270eb6da4859aeebfe79dd85f12706cbf301693d561a7839e9
+DIST airdcpp-webui-2.4.0.tgz 9252281 BLAKE2B 9682b5c197a17a2a0a1de9e29999ca54bfd2ac85120702ec37671ddcc445e595fcf262f82729497b1b38b638c9d1e4cbeb5daabf21b5436d240c0b1097dba1fd SHA512 4251dadc0161324a21c4278e480c39f798988e15a3cf1fe812966be4afde5666276b30dc86b40ab900aba008eb09c90bc54a24e23747f889884a276da99dde44
 EBUILD airdcpp-webui-2.3.0.ebuild 469 BLAKE2B 69fe90707f603ad98fccc3accb9b708e8a621688546829a99db57246170f75ccfe827c9c21ab69b21675b9aabc940bf0fd2c059b1fd5bdc97e3724eb7668872c SHA512 d2f88c397096281ac0797917753cdad8cf944d62ead08511f08ec0667495a5d9891b56861e0057b1094df91406767653fdd2f4997240ea92ce9d6bd22ce135d8
+EBUILD airdcpp-webui-2.4.0.ebuild 466 BLAKE2B a6c709a4fc399dff64f01178f72888e354bb5f564f93be837c85a0aea9cfe2c4272d0b63087164a44e2201255bbe5a77d0c370ca26bfebf7245f58059fc7ef0a SHA512 c7587abdf727b97ba914f6c3a89ed03b2e07eaed4cf03e2ce50846b7bb087222fa52f0b59ee81446a9aec3df5a061892a4d40ec257d5b185d340d031ab0ccec0
 MISC metadata.xml 553 BLAKE2B aacc047cadd9f0d8078a997d9ac02aeda726575f1af69cd4e97afe9159987347247aee7ac74b11b8d23b18a669b447451e3e6123f578b501a872f395e418341c SHA512 0d1233d39b432f28fb9977b06a750e990524b250563e8fa5594bdf7dd6cc5b35468b70abe41e0cae87331c2052b592d4d314a897549f0a247c04af1a15782feb
diff --git a/www-apps/airdcpp-webui/airdcpp-webui-2.2.1.ebuild b/www-apps/airdcpp-webui/airdcpp-webui-2.4.0.ebuild
index 213a54088678..898d2fa96dc8 100644
--- a/www-apps/airdcpp-webui/airdcpp-webui-2.2.1.ebuild
+++ b/www-apps/airdcpp-webui/airdcpp-webui-2.4.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Web interface for airdcpp-webclient"
 HOMEPAGE="https://airdcpp-web.github.io/"
diff --git a/www-apps/cgp/Manifest b/www-apps/cgp/Manifest
index f3e02e3ea7f8..c6b545290212 100644
--- a/www-apps/cgp/Manifest
+++ b/www-apps/cgp/Manifest
@@ -1,5 +1,3 @@
-DIST cgp-1.tar.gz 139265 BLAKE2B bf0f18def8ac3c2117b951172d4150f0626e8dcbe22accbcc6ad156e5f9f5c21792e38fa1bf5a964d8b50cbc7ee9003e4dcdcd75730ba2b0445f4dcfeffdda6c SHA512 fc5bc6d39dac896b56579cb6ca013c81493b994a7a190e0c0eec8a64f7b87c6eb2e0ad5cc969b8ea03ca4b00eee212ccee5c8785c23f5656bff3fe5490ff8f75
 DIST cgp-1_p20180620.tar.gz 139549 BLAKE2B 2cc1a416ae1158b5788615b05bf43039049af52eb5296e7fd8136c9895e8ee0a9887e84ad37c6598a4c4387982a2860fbdb7cf9cdff39cfe5bbee598b9ace88f SHA512 acd09bb699af678347dacfc08fee60a86843874543851805f245952e538777d7ccd528c156f7a21b803503c7aac134013a4eb8200d5266cf35541b0dce5839e4
-EBUILD cgp-1.ebuild 1262 BLAKE2B a1a68c636ea31e13e1a62cca4522934276783d872c3032ce50581ff080cd0605c9a6ac4f5d467017480cc8a829309aa8b4c7d5de18a401cd87bb2a35391f8c14 SHA512 a23e7721c97d8c1d97f313e0474cbdffe69f2172de50be4406e0549d7299407bf77024e65261e4d09d9592c68451e5ee10be67f5f2fe0c80653dc66cbcfd36d8
-EBUILD cgp-1_p20180620.ebuild 1316 BLAKE2B a0a69092f89fad5b8b06b421a005f944a5f723a9da8259d7c3ee99f78a7d147093ee528d75edb580cc4c9db0eaf0ca6dbab870c30b36cd573390aaf6384fb1f4 SHA512 c76b4cafd07a56c68b50744cf5f15e0f0de8f734a8f6f30a18333996c8afa3672daba101564660deeb1dd8f024d433a554b01eafc30c07a54f257162342f4504
+EBUILD cgp-1_p20180620-r1.ebuild 1278 BLAKE2B 7b40e0cc919201e00a42a420db0c531da1db82846a4985e99931bb76e5ef281d078febb48f9338155416bec2a42f8153b24c433ce97ba489e4ac82e52d240b80 SHA512 006443901477d5547435592cd872ad00b35434305563d9a40bca90fcdb166e319b1f60a2b120ffde10d1ff18b536613ceb79bf9e8eab4e92169fb91d0e51ffd3
 MISC metadata.xml 677 BLAKE2B 2085e266da1c26131975e252ac7f4e9d778b8d32c708e78cecab760775af5273d1b8cfed21141159178b4a5d4d516118934b40e6ceaa67fc4b98decc643dfaf4 SHA512 a31566e2a70a4819d03b18bb7fe5a951d53db2a354430e767a26bea62666fd7c7968c423e335dd4e5d7070537e5e062bad4f5567dabcf4d900d560cc6a30bbc1
diff --git a/www-apps/cgp/cgp-1.ebuild b/www-apps/cgp/cgp-1.ebuild
deleted file mode 100644
index 0d1bc985b145..000000000000
--- a/www-apps/cgp/cgp-1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp
-
-MY_PN="${PN^^}"
-
-DESCRIPTION="A graphical web-based front-end for visualizing RRD collected by collectd"
-HOMEPAGE="https://github.com/pommi/CGP
-	https://pommi.nethuis.nl/category/cgp/"
-SRC_URI="https://github.com/pommi/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-2.0 GPL-2+ GPL-3 MIT"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-lang/php[json]
-	net-analyzer/rrdtool[graph]
-	virtual/httpd-php"
-
-need_httpd_cgi
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-DOCS=( "README.md" "doc/CHANGELOG" "doc/nginx.conf" )
-
-src_install() {
-	webapp_src_preinst
-
-	einstalldocs
-
-	# Since the docs are already installed, remove them from htdocs
-	# The file doc/CHANGELOG is needed, as CGP reads from there it's version
-	rm -r .gitignore doc/LICENSE doc/nginx.conf || die
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	einfo "The command shell_exec must not be disabled"
-	einfo "through the disable_functions php.ini directive."
-	einfo "It must allow execution of the rrdtool program."
-	einfo ""
-	einfo "An configuration file for www-servers/nginx"
-	einfo "has been installed as an example."
-}
diff --git a/www-apps/cgp/cgp-1_p20180620.ebuild b/www-apps/cgp/cgp-1_p20180620-r1.ebuild
index 6051624a6a90..6fe5fc73bda7 100644
--- a/www-apps/cgp/cgp-1_p20180620.ebuild
+++ b/www-apps/cgp/cgp-1_p20180620-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="7"
 
 inherit webapp
 
@@ -9,16 +9,17 @@ MY_PN="${PN^^}"
 MY_PV="1920ca24a067ac157a6bd8f3c017f4c6244ae245"
 
 DESCRIPTION="A graphical web-based front-end for visualizing RRD collected by collectd"
-HOMEPAGE="https://github.com/pommi/CGP
-	https://pommi.nethuis.nl/category/cgp/"
+HOMEPAGE="https://github.com/pommi/CGP"
 SRC_URI="https://github.com/pommi/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC-BY-2.0 GPL-2+ GPL-3 MIT"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="dev-lang/php[json]
+RDEPEND="
+	dev-lang/php[json]
 	net-analyzer/rrdtool[graph]
-	virtual/httpd-php"
+	virtual/httpd-php
+"
 
 need_httpd_cgi
 
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index b8c5216fba86..34ef19a6b40d 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,6 +1,10 @@
 AUX postinstall-en.txt 1595 BLAKE2B 9b5c237befcf415d0f769052c9634da830326ff57da1a1db538059138780c8ebf8d0666908fb6bb3eba99fee5d5869cd12042f0d276b560b51db60803e46c146 SHA512 6a0a5388d40b3c49f3c685a6a7986c2a9efe3e6d7c5115fbb3110ebe4c19c605a4ff785447a20c0296f3cb16811a8a6e77f2439d58253a011603709c9dd9b760
 DIST drupal-7.60.tar.gz 3283058 BLAKE2B 2c29c089e0e13ce52c5d7a0bbf72c79596fbdc1a370a60b33d617ab29f2aaec86e36545ced7620832f333de66bb775178f7eeeca80976d6e2616553b766c07b3 SHA512 fee59cf303a6c44e3fa3cbeda4912f7d61ffe8294282f9ad0416a6536cc6ea65cf114a6a801dd1f68572185c2b1e300f58f907f9bd61f96beaba3706c527d512
+DIST drupal-7.61.tar.gz 3287629 BLAKE2B 635fca54063bf3030cd3699f2395c64a4949719b38ad51e1ae67de928a0177bb8c049f383245ecd1ebf1d8dfe4dc1be012c0d83bd50eada8b05a959fd160d4ac SHA512 8f0bdd5b7ef33e62d09698b3889726fab1edb14df6263635bca65c9bbe0400df618dbf02ef298eeee169d48ab554d3b58d867bd4ce0d429b4b9167979917db51
 DIST drupal-8.6.2.tar.gz 16240694 BLAKE2B 122ff2464af6376256d96db8b470cf5f83beeba80a5c63e549e7eb0cfc875629d0b2d4ed46b130294e2145ea5a428b15cfa0edfcd31596660188df769b68bcd2 SHA512 8cdcd31f3a112a577e622cca0fb7957580b5691102421344c6f6bfc3096f33aae3a68d7d8eb9062ad14761bac14b68c2967973b1b1ef367dcbd79b972493b7c5
+DIST drupal-8.6.3.tar.gz 16372220 BLAKE2B b9bbf18e25292bfa87f23e2aa2329f86dfe714a265188c35998059b0075f31ceb6d0d6a23ed576615b1a6a6aef6b935a495e70b22aed0e649b41b79994bc9123 SHA512 93284235c9620ed235bfe0100317846694095ca96b1da7ac402c415e9f5f0819887c4da516655dabb49b4bbdba58935d7f78712c525c803125ec27d6a5692cea
 EBUILD drupal-7.60.ebuild 1770 BLAKE2B c95fb45714d745fe90f8522f44f4c6c4e8447fc0ca70bef0ba14e4d9112f6d17cb8241a15f6eec9cd3ff7dc4821f2f3744f797c9a756224efbc4dda6e1104251 SHA512 cc332985461f2fd70e73231af6841c8f9c64d5f9ec961b46ca2814d24bc6a2d4a29e35c53ea1fe231de4f8c6183461402fcdce46a37db64e28af6f36658e095c
+EBUILD drupal-7.61.ebuild 1770 BLAKE2B c95fb45714d745fe90f8522f44f4c6c4e8447fc0ca70bef0ba14e4d9112f6d17cb8241a15f6eec9cd3ff7dc4821f2f3744f797c9a756224efbc4dda6e1104251 SHA512 cc332985461f2fd70e73231af6841c8f9c64d5f9ec961b46ca2814d24bc6a2d4a29e35c53ea1fe231de4f8c6183461402fcdce46a37db64e28af6f36658e095c
 EBUILD drupal-8.6.2.ebuild 2425 BLAKE2B 6c7c13e66671b68a6f3d1305bdbd07e06fc1d07e4f9d44fd093196f266f690cff3d1e02444c3b9fbf9ca4733f32d396be55888e4fb87c464706fdf36692f9481 SHA512 5e436f0647278c0f2775ce4aa3096fa32e7f9b9d682e16b1cbda27d622fc5b9f11842b002d39efd47f6430e5799199c6bd28b4f980bfaa75ad2be20776fc74ff
+EBUILD drupal-8.6.3.ebuild 2425 BLAKE2B 6c7c13e66671b68a6f3d1305bdbd07e06fc1d07e4f9d44fd093196f266f690cff3d1e02444c3b9fbf9ca4733f32d396be55888e4fb87c464706fdf36692f9481 SHA512 5e436f0647278c0f2775ce4aa3096fa32e7f9b9d682e16b1cbda27d622fc5b9f11842b002d39efd47f6430e5799199c6bd28b4f980bfaa75ad2be20776fc74ff
 MISC metadata.xml 419 BLAKE2B 3652ed012764eeebfd813e1979965e76caf500aea8a29bf8652c56f145e62e5ac8c5ae233919a0be123878cccdbab5fa52a4c02ed7367099862407487ca0b8b9 SHA512 3610c6151b6bbbb452a9c599d04d28a18c3e535c0976e425778e8b138bb03637bb28900acef2ef405ec10176390db33e997ba5d789f8a0fc49564538194fc8a1
diff --git a/www-apps/drupal/drupal-7.61.ebuild b/www-apps/drupal/drupal-7.61.ebuild
new file mode 100644
index 000000000000..6f40a8c2e6ea
--- /dev/null
+++ b/www-apps/drupal/drupal-7.61.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 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="~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="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt INSTALL.mysql.txt INSTALL.pgsql.txt INSTALL.sqlite.txt UPGRADE.txt "
+	dodoc ${docs}
+	rm -f ${docs} INSTALL COPYRIGHT.txt || die
+
+	cp sites/default/{default.settings.php,settings.php} || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
+
+	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	echo
+	ewarn "SECURITY NOTICE"
+	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
+	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
+	echo
+}
diff --git a/www-apps/drupal/drupal-8.6.3.ebuild b/www-apps/drupal/drupal-8.6.3.ebuild
new file mode 100644
index 000000000000..236af8564a81
--- /dev/null
+++ b/www-apps/drupal/drupal-8.6.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 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_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
+	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
+	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
+	echo
+	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
+	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
+	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
+	ewarn "reported by the setup."
+	echo
+}
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 008378952ded..a43cd20a14bb 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -2,12 +2,12 @@ AUX kibana.confd 72 BLAKE2B 786203cfc47132fedb989fbcaebc799ed566e15f2b0ced965798
 AUX kibana.initd 1015 BLAKE2B 4e8e3e22fdbc2cee3fe9b992f2118a57f82d8f099236842b787b8e66fa59a353fcc49364db31016bdec50e0c465b48c18f07236e828268e9a0b76ad3741bb3ec SHA512 cd89c1fc7846d4c553bf2abc7e3df851561a574ef70ba3c6709ee8e3016d0348093563c70e5800bf6ff2e977976835dc7bed30e5b191d60e5f3c5f17fb3adc7e
 AUX kibana.logrotate 186 BLAKE2B e0446247e29b474dcab5756ac26f10fd8f46300e144386ff54a4e25fc1c2678ce0d21196b7365b01417cd0304a3f1edd6841800256e931bdc10f7d4e0f4ccd49 SHA512 1e0a51a83798e30b3807f496245b5733bc60a7bd1a529d2548a187ff8d3fa56d60bc23abf516d239ef76a8e9b66358ed84c687040a7b04c7818ea63417d33a1e
 AUX kibana.service 511 BLAKE2B 2b0786bfaf37c26e061973f38adea0a55ac1b8bf771395242c0ed3b53c6586099c121c286b23f0a3be67dc481a3e95c6f87486cd1601df997126d3cfd14435c1 SHA512 0b7754ebfa7e3538e64843436d8abe32a6ce38a9ab5e252e52657a99d97fa1801777db4502c1af5ec6082d83f0b3a0613e074f6ebe28624832bd0c258a478899
-DIST kibana-5.6.10-linux-x86_64.tar.gz 52586941 BLAKE2B cb4e1716c640c80be980541e5496a96fc6baa04152e11f754b46dc71a9995809038b8a82c3404d9d86d1bd0381e9fc55fca44c66f046cb41e005c760aa077092 SHA512 c56c600c79bf2f5d2991d6c1442db300c78dd4135bf8dec5b9f500d609e2f041d09649195cfdae2f6d30cf8de2c2c865ac607283f865c4aa8ec1d400af84c270
+DIST kibana-5.6.13-linux-x86_64.tar.gz 53161803 BLAKE2B 708827b2d9d3b216cc20ae8f63376fbbb53b6a7baaf3dbc73d4649ff02b54e417cbc0c4609a6c8b8388029ec0f34092e34a683d97f57963e3203d503eb5651fe SHA512 e32631f58e4428840f7f9482fed30f685bba0ac99dbeb39aa9b4b5e490cdae52105df332917dd9d149880bf8bbe200816304d03a93d919b7ca0b9c54ebe51353
 DIST kibana-6.3.2-linux-x86_64.tar.gz 205331616 BLAKE2B 17273e641a9f146943cc4aebbce1114706dcf5d4c5f4d865a79d5b576a845c40268ea4389c358d555ca278c0bed4a68baef661472f80f7957dd013f0ce2e9835 SHA512 35eb97ca2f8d0bd80dc7dcdc5bc03f8ab21d1280d11d892f12eda5a173a951dfe88718d45c94ff0a748bb324e44f243cda0ba314c6dcd249cd960928f7c7b7ea
-DIST kibana-6.4.0-linux-x86_64.tar.gz 187936225 BLAKE2B 826962a18522b81311f26bb70f0a4591493676cd3bc750045476780f5c8ea7f5c8e78fe06b55cc8c330654278363c9f8fa98a6905eda59cc76a1b04b3b435d9b SHA512 ae0f6ede637bf373e44eb5711b5a07ce726bb72009d792c8e9a16d7eb32b2361cdda556a19c3f5fd50207320e86950217cf5e9a1a06607004d4b7f30d3dbb344
+DIST kibana-6.4.3-linux-x86_64.tar.gz 235299366 BLAKE2B 58d788180b2afbf5c010b712e04fe39f469d63effb256454e8d56e36a0e0eb372255ac8c19af3b3e878992858472353c79eaaf447f2fdd8a8d70235dd79d36bf SHA512 f247078bfa7435239f9b9258a1563e73e17662735a83b154a02809f9c383f56cec68a3c189c84f43ecd2d9e4abc25d55f6593dd79b725fd79820f92d8543d244
 DIST kibana-oss-6.3.2-linux-x86_64.tar.gz 89561513 BLAKE2B 37031653e171d683a18f25c957545b6b143c2f0d8c07da6c02ea61c8296657d190540f4ffee2c6a62a9146800971041d7e4e30767892ba2bbff0486aef31cda5 SHA512 87236fa1a45a5c5e0ecdc033f864e9a1f74cb148e350b83c6c024b37eb71e3c16236fe52525898532f286f816cb6d03de23cba3d97e0cc0c4d622cdd18c7defb
-DIST kibana-oss-6.4.0-linux-x86_64.tar.gz 75103937 BLAKE2B 6fa7b731a15f2fb2088740a59706bf4085b049cd880f63b10cdcc0cd9e3e7d197384731360c285adab2a6838454761f6fa95bddbc470b4895728f87b14b946ff SHA512 eec78bb1935fdc126f7c69ea08c0997abc74f435f5ca24aa6fa370ad201dd1ebe9ab1d177f64ec66652a3c9c0dd3f13a8fa7866697d3f201f8bc124c051ebeba
-EBUILD kibana-bin-5.6.10.ebuild 1612 BLAKE2B fba7f593b8a2bbed90cf316f4c7f118fb65204efb9be4ebd81480f0ddc0333648a6478bb4fe0d2c1bda61e7ed355f084647d55c62685852daab3c0182b1f7476 SHA512 eb15aae68dec70c34af29140039ec0e16ccc8721817df07ff191eb18ea81bd1d4872b37ade34b74ca5470847b158d90d81c4e0b123073c5bee89854ad41f3c76
+DIST kibana-oss-6.4.3-linux-x86_64.tar.gz 76671516 BLAKE2B c3800f2c53af55139ce101ff13391fff2908fb0b9e45b46588f18a27653bf6492259a81e93b5c0f8e654696434efa510646cba5d5f6dba9ba2377451aaf9f259 SHA512 db55d5201675d1d71cbc511ffd4fb94332316eef8f06c2419d498b930e068030c625c18a0c2fec761cb0c066abc16ddf2c2d8a2fa59aaa3bc35ea1e289b8ae99
+EBUILD kibana-bin-5.6.13.ebuild 1684 BLAKE2B e52d578da62e770834e1c6fddd776820aa5efd995a267a8e3b89d9c66a63210c57d3484a75e0f1876ccc0318a4390c5c4ace56dba63cbe3b3ecffac56331bfdf SHA512 50b831002dd04b7c8a727b59e4e540a21de0ee802a16f8dddea533e3efe2d33fc5a9290858c14207d5509c379e88a2bc76663a007ff5259046749cfbda902a57
 EBUILD kibana-bin-6.3.2.ebuild 1892 BLAKE2B 29ed1dfb8f3b986e6b0d1cc2d2e5c1d87e903108963acd4ebac21f44252f8daa1c76165fe6bb49dfb1e079d47c8378d7285b9650170db4c2a03da01d371a79cd SHA512 8b269eab38464251f02d9e25882543d520efb2eadde3b0164977f808dfb5d70b943f995c573f00210e3367462cda985b034a0a6bf5d54bd0c48a5b5d8d126071
-EBUILD kibana-bin-6.4.0-r1.ebuild 1986 BLAKE2B cafeb52102f2b0178d64ad4a00f2a8e5493639849f65b9849b1446a416aaa026458358d0a6ab3a9ffd25925a171d7fd83d6c598cc26cc738e5ae0958cb96bbfc SHA512 298c1a920a31d534562db1f1a2bc4ca5f3407c0e52a0979b204f203292cfe68e908506aa6bf4eeb8997b3743d7410963c074f9646fff161d1c1c61a107f2b944
+EBUILD kibana-bin-6.4.3.ebuild 1983 BLAKE2B 01404f0836d31c82d69442835d7c48c4d49900cd18033367cad75a2f4a758592915d8f8f09e19ab3a3011ce1f7f8d0f5358a6af8e67fcfa4cdc6c1aa589ce902 SHA512 414fb03020ac77216786330ffba92cd2672fe54852eb08f768cf5be1ec430a26a4499a04d7961211cd90815bc2deb31f7979691d79e89a1f71866c28a2b56005
 MISC metadata.xml 538 BLAKE2B 649a05badea8d1116854565d09820a8ce623c733d9d0d1cbded145fdc0dfcac2478273d99f686119adab16126149ad4da8f6feb0c7be9499f5721f31a259ec34 SHA512 f0e65883a644eeb57f2d11d0871631142665e74bf8820431ac8333a1cf3e40a0b517b5cca747adba173c7eab20b70311b7bd8de6c4fb5cee4982e044189e5256
diff --git a/www-apps/kibana-bin/kibana-bin-5.6.10.ebuild b/www-apps/kibana-bin/kibana-bin-5.6.13.ebuild
index 3a61facff7bb..d1625dea1d9a 100644
--- a/www-apps/kibana-bin/kibana-bin-5.6.10.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-5.6.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eapi7-ver user
+inherit user
 
 MY_PN="${PN%-bin}"
 MY_P=${MY_PN}-${PV}
@@ -17,7 +17,10 @@ LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0
 SLOT="0"
 KEYWORDS="~amd64"
 
-RDEPEND="net-libs/nodejs"
+RDEPEND=">=net-libs/nodejs-6.14.4"
+
+# Do not complain about CFLAGS etc since kibana does not use them.
+QA_FLAGS_IGNORED='.*'
 
 S="${WORKDIR}/${MY_P}-linux-x86_64"
 
@@ -50,7 +53,7 @@ src_install() {
 	insinto /opt/${MY_PN}
 	doins -r .
 
-	chmod +x "${ED%/}"/opt/${MY_PN}/bin/* || die
+	fperms -R +x /opt/${MY_PN}/bin
 
 	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
 	keepdir /var/log/${MY_PN}
diff --git a/www-apps/kibana-bin/kibana-bin-6.4.0-r1.ebuild b/www-apps/kibana-bin/kibana-bin-6.4.3.ebuild
index fda8f3b78d71..54fce5a19974 100644
--- a/www-apps/kibana-bin/kibana-bin-6.4.0-r1.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-6.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 89a391657d57..cb2ffae99fe6 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.1.14.tgz 38045267 BLAKE2B f98c2dd5b1e85e533c531b18271d94eb0e01b630fb2097aa025ae45152e1f343d95b393214b5313b48630eff3fefb4b5436fd38a60dfe1ddbbefa0309653bd8d SHA512 f5b137fece92bc16ba03e31f4eef448e5ea2744b663d4da7aa9b6b045ff874fad73f73576690322dd6f8efbbfc3c3be09b7c74e2cfa659a12b04c3aa26828be3
-DIST moodle-3.3.8.tgz 45067185 BLAKE2B 4833164e7afe8ef3bb9c08db2db7045caa2f7b7c39c08a564d159113a8d3e1ec6e73774c5d56e2c203c4c010632022b0130cd1141f58c83d2916ce43d8e77c09 SHA512 250df5d5a29f70cd108c84f4d3d58eb0f6486c72a9c3e4274426d6c911876612082bfe718e16e40463dab83b47be3de606742c66073974ba5f151056b4c3ea5b
-DIST moodle-3.4.5.tgz 45763211 BLAKE2B a83823153e497e3c327aa6bcad041a9272d8a1cd1855f1f9692aa5690cac7ddab6a9028c09e38c0bcb8f98a0cb02de70b2265f2be57ddd74cc359cefceae9eea SHA512 ee852cd0ebb7c501adf8698423602165501440d9411baae516f322be8cad759b950d03df0e138aeb815c20d9834e57cb6c19e95a428595e21cef87d8de7a7f5b
-DIST moodle-3.5.2.tgz 46446558 BLAKE2B ad64f9c56da55902bf3de16a2a34445c3f3be30be1ef0de9f0a84e7aa5dd751d286a4e45fd8e0e3e32f1f37ff664473eb29cae275b4904b2ba2befe746459fda SHA512 a96dc88a8963bd1f117ca9b58e0959cc29fef0c4ea8375d6c8993aeabd8d606ddf639dc52b0c995f22dfb575df5ef602897cb1e457e9f786f10f805a55883088
-EBUILD moodle-3.1.14.ebuild 2940 BLAKE2B fd1e914e7f7e855cb50447fb213259116d4ad418253db19e4d05bb7dda22178df4c302eecc5b258c728a581088493c11bd70ea302049069ef38f90c6828900b9 SHA512 47d2571d4e7a8e6217edbb2a491427ec39067649d61aed699bb41ce4a7912ea2bdcc773d3e6ab75426f8c3c163339f1b49a54a6e18dfaa6715d230495d69fbac
-EBUILD moodle-3.3.8.ebuild 2954 BLAKE2B 537ddca9825bc9113b92ac1e32dd25bf045f0d9d7937a964260752d1d9114e68fe45cbde22a7d8c800ae2e89dd31db2e2b338fd3c363b765637178a735a8f3fe SHA512 190fea32bf4412a827f7e603bdc1c6a55433f19fa2181edba843527e95fec71d4133ee4e43e2fb4ea80688240905046920510851cc68bf61bebc4951af6b3ac2
-EBUILD moodle-3.4.5.ebuild 2952 BLAKE2B d41d38833dac8c16aa78d7ff71750cfa500a5398a505fdf3825b26a20609630eebf22209bdb054c1751ea3cc49b12f9b9663746467ce9224ade7d9c40236c8e2 SHA512 bf2475f92a8d07c49c89d0dcd0653a078f7569c25028271ed8691dd14cb375adb73c21300e773c54fb26979ce1f4e1bc0079716b27e8d172c200967c2a4eb47c
-EBUILD moodle-3.5.2.ebuild 2952 BLAKE2B d41d38833dac8c16aa78d7ff71750cfa500a5398a505fdf3825b26a20609630eebf22209bdb054c1751ea3cc49b12f9b9663746467ce9224ade7d9c40236c8e2 SHA512 bf2475f92a8d07c49c89d0dcd0653a078f7569c25028271ed8691dd14cb375adb73c21300e773c54fb26979ce1f4e1bc0079716b27e8d172c200967c2a4eb47c
+DIST moodle-3.1.15.tgz 38055035 BLAKE2B d55f523fce2f7193330665132b4d7faf6a7a698ca8f297d7e2dbc03e859ed43aef34292666e931e6c86aee2f414097accfd8ece7f5ecf53a8439697fdb28ba31 SHA512 17100ad6caa3a7ca5dc8f09b12215700061ead3a30701985e89d39e1e063d6142391c01c2dc0d1c7f4b86bd80b8d1ccc1d0477389691d6545b3be590b0508912
+DIST moodle-3.3.9.tgz 45123816 BLAKE2B 0e23668fb6ac536a1a87067fc9574424c33934402184ffc6f25f48f7e87c70fb0d9b25bb12b46320d54968ddb8b337471be7b5795369585ce4c488f93168f6d9 SHA512 6150a4c0f4a85ac508d2da9b35fd506eca614c3a44d582096fdecd113899a72481507ce85101505570e0e8237f7af744e3d7a8cf990cf8b250f5ac335ebae1de
+DIST moodle-3.4.6.tgz 45961570 BLAKE2B 49a20412b386cc3f463dd3be58dc56f50821298d36109889b3eb092d39f4dfe477dfbbf1ea3f1b6ce8076b4d4dca21efc00e7d772b0ced395139d76e56759482 SHA512 2afa7facb2068c63d0a1bd42da40a1cb688a1bcdedc5287e59633bb085f96c65598396f03b99b35c9aa3769463dea316584ce3793978101989fc53f53140ff04
+DIST moodle-3.5.3.tgz 46645219 BLAKE2B bd1aa2ae73f807c3b8a0e341893c7b004761e147fe42eac615153ae1ee7fa4bf9268e160a14ab1ac62dfe2c5e462d042cb30b725d6a28844e4749492b6a9b193 SHA512 130d1c30acb78452021f4fd5c0d29bfc4c938993e7d0cf3b2fdf13061fa993f9cebc7214f287e62ceb13bfd5999c12132a45fd4aec5efe8c25078dfe97bee861
+EBUILD moodle-3.1.15.ebuild 2937 BLAKE2B b978bb074ad0cfa0ce5b7708616feb918be5dfe1979d8f4783683bf348d3c7ad3ba7fcbf1b72f1b65404ec3ab5d8d8324292a81b5cd4d9c80a5309e3f1698540 SHA512 48dac3a85860059458fe7fc69f061c0d2897fe3504082484c1cdfe0edd2b090659c04df4eb2c73d9f5a3c9ea568032fa99aa0378c050cc6b2dcb8e6ca82d123e
+EBUILD moodle-3.3.9.ebuild 2951 BLAKE2B 4df5f122a1d05be0cebe8b5d8e135520e1c172704b658ee1b49422acd271f347d0d0c90004053a5f798a5f52cbbfb2c153007b0a0031ffbfffabaefa3b574571 SHA512 039354ff6df864e155b061f0ef5c4125ffb3c8b179ffd6dc7dd1039b7c61092f22db5de5414175581776e3482a9ef8c63f6d0739841cfaef4f62ac45ea4a2d92
+EBUILD moodle-3.4.6.ebuild 2949 BLAKE2B 3931582d8ca9407ae580bb91b7c8d6f9b109fc1f10d5182f8b75d3525272f10bc10e53349f397f981b78c938e8508d2ac633e03e1b695aa5736183657ed4b78b SHA512 e76b4d0a5cf53e116c47b1eedd1aabedb52331904f92a7e824cca4db5273c7d83c8e7de0341ef261833c868c803180c3b53a446dc6924a50e27d31d109a5638c
+EBUILD moodle-3.5.3.ebuild 2949 BLAKE2B 3931582d8ca9407ae580bb91b7c8d6f9b109fc1f10d5182f8b75d3525272f10bc10e53349f397f981b78c938e8508d2ac633e03e1b695aa5736183657ed4b78b SHA512 e76b4d0a5cf53e116c47b1eedd1aabedb52331904f92a7e824cca4db5273c7d83c8e7de0341ef261833c868c803180c3b53a446dc6924a50e27d31d109a5638c
 MISC metadata.xml 355 BLAKE2B 68d10d39dd24da3d570f13edec9c4adae89b7620bb455c1c30377c3cebe56c4961d1548360adedc96fce780067b308193fdb7560478a60ab56c364b774b1984a SHA512 f02e5404a714cb20207e494f635fb0e98870576c4b5f6affc4dc27fccfcabdd1af1c7411a83cfd4e01b51ecc24d11944d1e612757ff45ab4405f6099ed9b1278
diff --git a/www-apps/moodle/moodle-3.1.14.ebuild b/www-apps/moodle/moodle-3.1.15.ebuild
index 0c8f962ab4a7..13576b6f03f7 100644
--- a/www-apps/moodle/moodle-3.1.14.ebuild
+++ b/www-apps/moodle/moodle-3.1.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
diff --git a/www-apps/moodle/moodle-3.3.8.ebuild b/www-apps/moodle/moodle-3.3.9.ebuild
index 2a3db73f4d01..e7b7c22a19e2 100644
--- a/www-apps/moodle/moodle-3.3.8.ebuild
+++ b/www-apps/moodle/moodle-3.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/www-apps/moodle/moodle-3.5.2.ebuild b/www-apps/moodle/moodle-3.4.6.ebuild
index 201f542fb5c2..dea9710e1e62 100644
--- a/www-apps/moodle/moodle-3.5.2.ebuild
+++ b/www-apps/moodle/moodle-3.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/www-apps/moodle/moodle-3.4.5.ebuild b/www-apps/moodle/moodle-3.5.3.ebuild
index 201f542fb5c2..dea9710e1e62 100644
--- a/www-apps/moodle/moodle-3.4.5.ebuild
+++ b/www-apps/moodle/moodle-3.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index d97a87b80633..81b592a16493 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,20 +1,8 @@
 AUX nextcloud-12.0.4-destroy_modal_when_closed.patch 786 BLAKE2B 24222dde0d9ed5f3c5fa31b7cd1b837f765837543475db235056dccff9fa17cce83a37b0ed64a1999a6b61dedd5857866debb1950686acf062e42d80bccb3813 SHA512 93297f991312c5fd2504267bb16a8c38797970fdf8d109d4c4b4416a5e72c8677141ebc9a13a2dadc40845348e07f264937dd852384f88d65be4f3cc4f0cb462
-DIST nextcloud-12.0.10.tar.bz2 45114548 BLAKE2B e993c617d27fea12ba95e4fa365c02ae6a6930ef944fcd1604862d4aca331291d1e738a846316f89947f466095b300fa53f652e1ac501440fe88512f8bf0b096 SHA512 10ec239f55e88f247bb52816c8c959b9e504c5a0ae428d0ff372866f72d900e6e9cf8dee43f24f906bebf2db4b4a9d2d8386447b838d834b24da404ee1e5849a
-DIST nextcloud-12.0.11.tar.bz2 45123785 BLAKE2B 3d1f9131ff89d348dd18c0f7de284b13563177b388729e6049909fa1be3ae3ccdd03a85094869a872e4eb18e210a7ef406b0813e2ec5a1804aaecd9df4cf770d SHA512 885daa98ce602c6b59adaf66eb2e10ac6f5c5b2a607b5ebb80b82ee08256fd77d12aa1dee4db463d42abdd169e4acad14ee793cdfbcfa5b466f25ca3fb6ffa79
 DIST nextcloud-12.0.12.tar.bz2 45164894 BLAKE2B b316a5e831148787569ac80b55c411a8ed59eae312c48badd0aeeadec9dd0c048194b8feeea720b1ad4f19eae906fd1e114299756351b4831af744a918bb7210 SHA512 fd47157dc8437718e2765ed3b0644fa1ecd76707ed8aab06648524fe42cbe8e1c66244d85cd6e48bc5babf4a4a4f684b2da7a29ad60fde7755988a474fdf55f4
-DIST nextcloud-13.0.5.tar.bz2 44792418 BLAKE2B 0582b36a078ccea7a2b482e8be213f0102fff2d60f0b92736d7c488498cf8ae4b75ea6a9e5c14cd0d71f2b3ad9d0ff9b6a2fba7b809bcc89e2287c7801e26a49 SHA512 5456f95d3835e0c9fcf015453e1f6e75ba6f5c0266d8951596fad7d3bf06230199a22e5869bc616581410db0ed831a5cdec123a9d2955898a837614a2bfff32c
-DIST nextcloud-13.0.6.tar.bz2 44769940 BLAKE2B e9c227d64a23dbd677326f528cc268842403c6d51514e8b0d5d446ca5e91fd49910777b6cc7d7bbf0e7f6e1c422fed390cd38506edde019dc5a1955d94757102 SHA512 cbecd5dc98c96f28cbefe6b25e51f4be4583004841eb38d32a3261ed01f906590e16053dd7d8e31589a2288eafd368a47e280d511ee8c994886b4ea892f535ff
 DIST nextcloud-13.0.7.tar.bz2 45085663 BLAKE2B 1d4f07310fd0b85981c8f45197b0c760e484db5eb47b347ce6d51b6e7729072a1ff13ed30739ee5b96a7456fab20d4f4ec5b3651e709aa466f305ca3ea374ca3 SHA512 511a4f35f03e9696806342781f4b8b7e2265a8209d9c8b01aa1b9f58a9ab55876e9feb90357816ff991d19a27862fe3009f0f081b5c2e971e919412eb4e71024
-DIST nextcloud-14.0.0.tar.bz2 49762528 BLAKE2B 4c5bbddda0d93504b3530ac0a69511b66faba5d64014a372cd411b9807ca931de484f0db74823534fe97ad5beee25d8c3a0eb001e25a208983b7f13545bd1af4 SHA512 8028f46a6b45834f411ff0942dfc41b72d41d356d01136c74c82fabe1247cd5e62e3b57a298b706a02eb27fabc03790a6ec6a8618b70f2016ae756cf8b523014
-DIST nextcloud-14.0.1.tar.bz2 49761953 BLAKE2B bd7886defeee82d28cbe28548a015cd64bac7d15a3f4d1a6c458f25b87d07370537c26a432c3abf32c574f6b202f15a2cd6a5f1fbbb40bd50b4bd94132154619 SHA512 2d74ac3806372f86020f586f33bde6e4b7694f6dca38a49eaba8955c2108b034e62042e4fa166b3b8e2ecf979c4130674408c4500c461637037a9d4a55fc5465
 DIST nextcloud-14.0.3.tar.bz2 49713609 BLAKE2B 0b87b899a273fc5a31b3e3e0451f2214e4377bec8671e9ca7022054d294820de4964053be950cf951b8c0d7a10f4958648164b3a76681ee2fc7aad7a902a1be7 SHA512 09f224d5e55496dcad4d743a0b62af407b4e1fece009fea19d87ac32672cec83bde135e25607236971af0ba32804cc5ebff9295472c276eb2898e21400c6e2c5
-EBUILD nextcloud-12.0.10.ebuild 1036 BLAKE2B b2879a65866185315d051004f3d4126e7b309f6f0ffee59f08ec4a60b2474db4d1177827d6aad961b1fd1d07d02582124051b29b62763a5aeab0d2d3cfc49c3c SHA512 c978bb14c48115b5dc0e7aaea8e93d87b78426f31ac4a8d2225c6d22c8f00fb0d330f4fcbb2da232d18ede79dc27451a69787232d5d3ef0527a5b128d560a56a
-EBUILD nextcloud-12.0.11.ebuild 1036 BLAKE2B b2879a65866185315d051004f3d4126e7b309f6f0ffee59f08ec4a60b2474db4d1177827d6aad961b1fd1d07d02582124051b29b62763a5aeab0d2d3cfc49c3c SHA512 c978bb14c48115b5dc0e7aaea8e93d87b78426f31ac4a8d2225c6d22c8f00fb0d330f4fcbb2da232d18ede79dc27451a69787232d5d3ef0527a5b128d560a56a
 EBUILD nextcloud-12.0.12.ebuild 1033 BLAKE2B e0d1fd02c8e6be0937378d98d72dd0e2ad42111a5fd7234b0767d29e1273c8442adb7bfb71125ea0992e9418ca0f898680e290ce023dbcab9d0aea5dc9676657 SHA512 d7d046780d5a02555f5c804eca9d3de0c96ae21d66f52022ecd0460516f9614f72626e6a3b1ad1535ebbfc234d57844669b55bec0144b14d2477551149888a7f
-EBUILD nextcloud-13.0.5.ebuild 963 BLAKE2B dff4264ae3181dde8690bfef1340c4aeaa57a626439eebea606bb8c52e5d9348ac348e53a20c45c176fb0a9e4f6dfbe67d013fcc4645547f4adca3d691f8ea92 SHA512 f464b4beb1435cd48f670dc5c75fadb7aad567bf55f15a6b928af54a43c9452e1f60346ff930930195c90143fdbc56345ebfa3eb099871e08e7dd0c24702f697
-EBUILD nextcloud-13.0.6.ebuild 963 BLAKE2B dff4264ae3181dde8690bfef1340c4aeaa57a626439eebea606bb8c52e5d9348ac348e53a20c45c176fb0a9e4f6dfbe67d013fcc4645547f4adca3d691f8ea92 SHA512 f464b4beb1435cd48f670dc5c75fadb7aad567bf55f15a6b928af54a43c9452e1f60346ff930930195c90143fdbc56345ebfa3eb099871e08e7dd0c24702f697
 EBUILD nextcloud-13.0.7.ebuild 960 BLAKE2B 2cb97022fdd35b923c7da44caeb91589690e2af957d7d0dd0b39bda3a3449500bf2de19d9bace295895443acda66968e05a629afe4c8e72faba094f242736112 SHA512 2d02b65261d1dacd1736182f0731e83aabd16031189b8e372d27634361deccea91651a4e2bbd6edaf66c4a3ea80a34b32ed0909b252d115171380e63371b14d4
-EBUILD nextcloud-14.0.0.ebuild 963 BLAKE2B dff4264ae3181dde8690bfef1340c4aeaa57a626439eebea606bb8c52e5d9348ac348e53a20c45c176fb0a9e4f6dfbe67d013fcc4645547f4adca3d691f8ea92 SHA512 f464b4beb1435cd48f670dc5c75fadb7aad567bf55f15a6b928af54a43c9452e1f60346ff930930195c90143fdbc56345ebfa3eb099871e08e7dd0c24702f697
-EBUILD nextcloud-14.0.1.ebuild 960 BLAKE2B 2cb97022fdd35b923c7da44caeb91589690e2af957d7d0dd0b39bda3a3449500bf2de19d9bace295895443acda66968e05a629afe4c8e72faba094f242736112 SHA512 2d02b65261d1dacd1736182f0731e83aabd16031189b8e372d27634361deccea91651a4e2bbd6edaf66c4a3ea80a34b32ed0909b252d115171380e63371b14d4
-EBUILD nextcloud-14.0.3.ebuild 960 BLAKE2B 2cb97022fdd35b923c7da44caeb91589690e2af957d7d0dd0b39bda3a3449500bf2de19d9bace295895443acda66968e05a629afe4c8e72faba094f242736112 SHA512 2d02b65261d1dacd1736182f0731e83aabd16031189b8e372d27634361deccea91651a4e2bbd6edaf66c4a3ea80a34b32ed0909b252d115171380e63371b14d4
+EBUILD nextcloud-14.0.3-r1.ebuild 965 BLAKE2B d7fe81d87b280314655c36f6ee0987b875effe88f6845e16b3567862478a41d2833b552ce6a08638ab080797a26bf64c9ec3dc3559efa95e311151577ee05b51 SHA512 50026d383b7b9961d64ab808a787ce023be59a925514ff0e541394f3be00c89fed527700dae75219ab2e2ece0cb5c327cd8f2cd9e245674d6ac0f0253333c071
 MISC metadata.xml 363 BLAKE2B 4da5b0e27af01e94e1e68b98274da6c9cacbe59ed1d85413038bccfa530af8fd479a7edd89f4d7633dfb07afbad4736cb6c075e021db7dc9761c273ec1256500 SHA512 60195d5859a8b175346a1cd533dbb6496d2787c1ff501d9233b2b1794670ae344c6f9f4cac4fbf86b24686a83692cff27513d05243947e2921e554e065696721
diff --git a/www-apps/nextcloud/nextcloud-12.0.10.ebuild b/www-apps/nextcloud/nextcloud-12.0.10.ebuild
deleted file mode 100644
index b5b260e20578..000000000000
--- a/www-apps/nextcloud/nextcloud-12.0.10.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils 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 ~x86"
-IUSE="+curl mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="<dev-lang/php-7.2[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
-	<virtual/httpd-php-7.2"
-
-PATCHES=( "${FILESDIR}"/${PN}-12.0.4-destroy_modal_when_closed.patch )
-
-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-12.0.11.ebuild b/www-apps/nextcloud/nextcloud-12.0.11.ebuild
deleted file mode 100644
index b5b260e20578..000000000000
--- a/www-apps/nextcloud/nextcloud-12.0.11.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils 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 ~x86"
-IUSE="+curl mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="<dev-lang/php-7.2[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
-	<virtual/httpd-php-7.2"
-
-PATCHES=( "${FILESDIR}"/${PN}-12.0.4-destroy_modal_when_closed.patch )
-
-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-13.0.5.ebuild b/www-apps/nextcloud/nextcloud-13.0.5.ebuild
deleted file mode 100644
index 92163a886deb..000000000000
--- a/www-apps/nextcloud/nextcloud-13.0.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils 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 ~x86"
-IUSE="+curl mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-13.0.6.ebuild b/www-apps/nextcloud/nextcloud-13.0.6.ebuild
deleted file mode 100644
index 92163a886deb..000000000000
--- a/www-apps/nextcloud/nextcloud-13.0.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils 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 ~x86"
-IUSE="+curl mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-14.0.0.ebuild b/www-apps/nextcloud/nextcloud-14.0.0.ebuild
deleted file mode 100644
index 92163a886deb..000000000000
--- a/www-apps/nextcloud/nextcloud-14.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils 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 ~x86"
-IUSE="+curl mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-14.0.1.ebuild b/www-apps/nextcloud/nextcloud-14.0.1.ebuild
deleted file mode 100644
index b6bf2a09eba7..000000000000
--- a/www-apps/nextcloud/nextcloud-14.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils 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 ~x86"
-IUSE="+curl mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-14.0.3.ebuild b/www-apps/nextcloud/nextcloud-14.0.3-r1.ebuild
index b6bf2a09eba7..040f3eed112d 100644
--- a/www-apps/nextcloud/nextcloud-14.0.3.ebuild
+++ b/www-apps/nextcloud/nextcloud-14.0.3-r1.ebuild
@@ -15,7 +15,7 @@ IUSE="+curl mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
+RDEPEND="dev-lang/php[curl?,filter,gd,hash,intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
 	virtual/httpd-php"
 
 S=${WORKDIR}/${PN}
diff --git a/www-apps/owncloud/Manifest b/www-apps/owncloud/Manifest
index bcee249cee50..7d89f961e2f6 100644
--- a/www-apps/owncloud/Manifest
+++ b/www-apps/owncloud/Manifest
@@ -1,13 +1,5 @@
-DIST owncloud-10.0.6-r1.tar.bz2 39393658 BLAKE2B 34498d5c63a3417f9f42e55353884600c59a9b9e11167ef5b0dad3b496cfdcf091c95853dfcc851f767493483158a1a4b9e6bd291cddb95549b7fc07cce92618 SHA512 aaeb646255507cbe85de9f8e5f353479ee152f285e2c90ae48669a3fe78b718123105333d4b5c73478135fe2c940171dc8ffd732a9357c9709f391bcf01779d2
-DIST owncloud-10.0.7.tar.bz2 39395237 BLAKE2B c855913e60c214fddaa83e07278388501efd7510547cafb3ba7b87ca24086c2e603bec587dad52265ed824b6b67e4f6bef00ceddb9aaff3f9d9b468c306ea6af SHA512 5e644a92469ef0ea6e9996282a1013923301ed4252c7f337571134ab0d8bceb0c69765144d4ecbabf91e2edfad2e2842935a66cbcbbc64e9ea82ad4f83c6fa21
-DIST owncloud-10.0.8.tar.bz2 40671279 BLAKE2B 01f0f20640c8b98138835d7f164cefcdb457ee2e2e7188166e5ff8473ee984066cb6a869d3038541c26f622a0e3775710e7e75f5b49af94fd043e90d59bfaeae SHA512 aebefb0051a1478f6da307c92d983c131b2e15c496fcc628569282875e2b21554a94e5f4ad335a11c1eb18be1987b15eaa033fdfa62cfdc1467a905b7e96211a
+DIST owncloud-10.0.10.tar.bz2 44943557 BLAKE2B a2cdfbef7affc306b7653f1841b0bb2e781d849bbd62d9b8a0f3a019cca5be8a02ca27b5fa5cbb39ddb9a440aa917b279c937ebdae034504d5c1b9ed3eeee603 SHA512 77f9567395ee5319afc397ed7b9bd93687ddfb90022445be06adfb58ae49557223227a656b638b1cdac19b730509292e7ba260846c9f67540418267ac7b518f7
 DIST owncloud-10.0.9.tar.bz2 40769945 BLAKE2B c2187838488e87a85a964a9f1cd181e203fef6475c8797f8fc7204ae91d00522193cf730340dcf3e08b85cb03992d8d922a1d72db0acfc3d77374f0f10f4cbea SHA512 756903ba98ca7612987e51d4f0d38452b8c38a3970ae6ac7ec0d30e469cd7cb7cf1a4a95dbe1a782c3ebddfdf3c2194193853b9f55cb75a9f0ef4c5a437c420b
-DIST owncloud-9.1.7.tar.bz2 29243610 BLAKE2B 8a8a54c299df25c0f3fcca1accae3de7f27fe229d8175522fd2b72f3f865539219b733318b077455f80907b74fbd63d570dd73f40a61a5005415923b562ea819 SHA512 b31888c2c3e991869018a1cd46e75348b2b02d93effee8950d6e54568cd22eb634d750c790421e8bc0c1c991d146fb50c1826f4aa786e4a348f1d8fa5aa4870d
-DIST owncloud-9.1.8.tar.bz2 29210020 BLAKE2B 53dfa05e5a8ed3a040b26a0b6c6a5d6b50dfd7ea4727f9e0bc297a26be23b5aea8af16d766bda469b14bebdfbad9b46ea14e8e0ed973941c7d543551579f7ef5 SHA512 37475eb3dadda1911d7020b44e347629d59919b9298fd2dbe230388a061c03e8e9c0179381632afe0491a9b47f540ce62a748c9a4f59e7bffb0ce94aeb93d088
-EBUILD owncloud-10.0.6-r1.ebuild 1268 BLAKE2B b4f40061310548894fd841d488669ee1ee46dccc49a43cf0bd2a9e3389bdfb2fb60d60a5af194d440b6803b46db3b214503fe7e9612172b6343050626aeaa93f SHA512 fe26f3984d504eb3695fbcd6b91e4592e1d6b2e5eb69de1798885a3f2da308f232a02c58890efce827207ec022d4262f5945271fb2826c1ec8134efc40e221cd
-EBUILD owncloud-10.0.7.ebuild 1268 BLAKE2B b4f40061310548894fd841d488669ee1ee46dccc49a43cf0bd2a9e3389bdfb2fb60d60a5af194d440b6803b46db3b214503fe7e9612172b6343050626aeaa93f SHA512 fe26f3984d504eb3695fbcd6b91e4592e1d6b2e5eb69de1798885a3f2da308f232a02c58890efce827207ec022d4262f5945271fb2826c1ec8134efc40e221cd
-EBUILD owncloud-10.0.8.ebuild 1268 BLAKE2B b4f40061310548894fd841d488669ee1ee46dccc49a43cf0bd2a9e3389bdfb2fb60d60a5af194d440b6803b46db3b214503fe7e9612172b6343050626aeaa93f SHA512 fe26f3984d504eb3695fbcd6b91e4592e1d6b2e5eb69de1798885a3f2da308f232a02c58890efce827207ec022d4262f5945271fb2826c1ec8134efc40e221cd
+EBUILD owncloud-10.0.10.ebuild 1265 BLAKE2B 1d93200492663e339f5c1bb0e2d12ab9297383cc141be30bca20066b9406116846bb41744b01a99ce2d1c776c38c78d0d10aad5f74a30f02899a64f9b9334628 SHA512 556d8b2b53540509932218d1a94f90eb6065fe73f04656c12f61ea6a47c84f44b1f7d34e0e6fe40365cb3a96186b3c2c20f08274edb528f38a6286e9b7f01f70
 EBUILD owncloud-10.0.9.ebuild 1268 BLAKE2B b4f40061310548894fd841d488669ee1ee46dccc49a43cf0bd2a9e3389bdfb2fb60d60a5af194d440b6803b46db3b214503fe7e9612172b6343050626aeaa93f SHA512 fe26f3984d504eb3695fbcd6b91e4592e1d6b2e5eb69de1798885a3f2da308f232a02c58890efce827207ec022d4262f5945271fb2826c1ec8134efc40e221cd
-EBUILD owncloud-9.1.7.ebuild 1273 BLAKE2B 77b8e3c8c32516a15ffce26e1da47294efc36ebc4a8a3eb480f8934a73344a412211ec03cc51d2cc80f2325649e95379b6b67ac2e976a72489e4b67a970d041c SHA512 4220760318016c1202e7176bd19741ef502d24b6a0f156dfb3067bfa4e54d81dc088d3c9e255921731a9079fe1adc0ad317c1bad8d04e19fa5c8b169a84ce750
-EBUILD owncloud-9.1.8.ebuild 1273 BLAKE2B 1f2346edc5dad3ea0e8bda680be9ef71a44a7a9b103e3b9adecbf990da1bd61812ae36b2dbad251d1b530e33d17f97341917abe86c48091750cd99e7f028d373 SHA512 18c6569dcc6e098ee312f85022c484e43698309ed78d117f298efbb18dcd552ec0c7ea7604b737a704309412633cc70eca8c6cb96aaa1a6beffc3922d5ab38ad
 MISC metadata.xml 362 BLAKE2B 966b48f98107fc73bd40f9c602962f2c876c1be1f074943452cfb5bbf60eb1c2ca08153294ce4166442da85beebd41395ca9bbe9c98d7832665fa16419db374d SHA512 64c690c6fa8bc6861f673b465e0519d5c5e945d76b66a2d9e7422cbfaa967624e7da287626bd12edbf347f0d0b5296fb9719ede93d15f073542367f5fecf5e99
diff --git a/www-apps/owncloud/owncloud-10.0.8.ebuild b/www-apps/owncloud/owncloud-10.0.10.ebuild
index 5f42e8285829..39879f966061 100644
--- a/www-apps/owncloud/owncloud-10.0.8.ebuild
+++ b/www-apps/owncloud/owncloud-10.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/www-apps/owncloud/owncloud-10.0.6-r1.ebuild b/www-apps/owncloud/owncloud-10.0.6-r1.ebuild
deleted file mode 100644
index 5f42e8285829..000000000000
--- a/www-apps/owncloud/owncloud-10.0.6-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Web-based storage application where all your data is under your own control"
-HOMEPAGE="http://owncloud.org"
-SRC_URI="http://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+curl 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?,xmlreader,xmlwriter,zip]
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "Additional applications (calendar, ...) are no longer provided by default."
-	elog "You can install them after login via the applications management page"
-	elog "(check the recommended tab). No application data is lost."
-	webapp_pkg_postinst
-}
diff --git a/www-apps/owncloud/owncloud-10.0.7.ebuild b/www-apps/owncloud/owncloud-10.0.7.ebuild
deleted file mode 100644
index 5f42e8285829..000000000000
--- a/www-apps/owncloud/owncloud-10.0.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Web-based storage application where all your data is under your own control"
-HOMEPAGE="http://owncloud.org"
-SRC_URI="http://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+curl 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?,xmlreader,xmlwriter,zip]
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "Additional applications (calendar, ...) are no longer provided by default."
-	elog "You can install them after login via the applications management page"
-	elog "(check the recommended tab). No application data is lost."
-	webapp_pkg_postinst
-}
diff --git a/www-apps/owncloud/owncloud-9.1.7.ebuild b/www-apps/owncloud/owncloud-9.1.7.ebuild
deleted file mode 100644
index 85552c665ee3..000000000000
--- a/www-apps/owncloud/owncloud-9.1.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Web-based storage application where all your data is under your own control"
-HOMEPAGE="http://owncloud.org"
-SRC_URI="http://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+curl mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="<dev-lang/php-7.1[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
-	<virtual/httpd-php-7.1"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "Additional applications (calendar, ...) are no longer provided by default."
-	elog "You can install them after login via the applications management page"
-	elog "(check the recommended tab). No application data is lost."
-	webapp_pkg_postinst
-}
diff --git a/www-apps/owncloud/owncloud-9.1.8.ebuild b/www-apps/owncloud/owncloud-9.1.8.ebuild
deleted file mode 100644
index 5274245756aa..000000000000
--- a/www-apps/owncloud/owncloud-9.1.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Web-based storage application where all your data is under your own control"
-HOMEPAGE="http://owncloud.org"
-SRC_URI="http://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+curl mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="<dev-lang/php-7.1[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
-	<virtual/httpd-php-7.1"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "Additional applications (calendar, ...) are no longer provided by default."
-	elog "You can install them after login via the applications management page"
-	elog "(check the recommended tab). No application data is lost."
-	webapp_pkg_postinst
-}
diff --git a/www-apps/phpsysinfo/Manifest b/www-apps/phpsysinfo/Manifest
index 24ae6e7438a3..43550a7641c2 100644
--- a/www-apps/phpsysinfo/Manifest
+++ b/www-apps/phpsysinfo/Manifest
@@ -1,7 +1,8 @@
 DIST phpsysinfo-3.2.10.tar.gz 1021435 BLAKE2B b9db266021c0392902d6de58492165a889151716484d23f99648e8322c7e76edfda17e8a7b8f415fcc42d5970a98603ea84571989c1168e10e8d87ee3a2f6927 SHA512 56954e64e6c267c2a60baaf91a9a218d2c81d99dc4f159e35d752328bdd38135eb4e9d91d09798b3822cdbf0d04a6169a46385c2d02a812b136fe115b7310a88
 DIST phpsysinfo-3.2.2.tar.gz 899974 BLAKE2B 4da569d90a4ee383535a5a155c754a40f104453d504148729fcde03a4ee6839e914dc0375115d392c81225a451a35e3009218c20019abf0661ba629c98377952 SHA512 fe1fae67379abf0fb75d166aaab87cb91ead33c87cfbd0569b61d95b9b3172820565dff37f6d35744fbf9332adc5a5af1ec49477a56572f55f57e53edb9164b9
 DIST phpsysinfo-3.2.3.tar.gz 909045 BLAKE2B dc1f9d9f7cd83b60eb16f073607f5c7a5f5ad155b297d4defc9b1768c771cd12bd315af3e67f4c7a5f731ef66b8e9eb00da4083074f9cb3908ebbce9198a568c SHA512 33a77d96f3f9ac4e59a078e3106af656f68ec048aa7b89409915373cb4174fff7f709a3a3984cdba2990d397fd019930ae7f24b8fe5484061f3a89dc9f023eaa
+EBUILD phpsysinfo-3.2.10-r1.ebuild 1348 BLAKE2B f927257697ee9e95d2dda6086cd39375dce0b36dd145134958a1a9000246eb78c49ae6a237dc7369554521a6f72e1b910858378cf7480158defe4fc1e5912327 SHA512 1205176816d31dfec5bfe84332003fa322808aa3139dc7cac88ed4eaf52218f25f89b171634be8cd89e943fbb3063fe7e83079012cac93210a369e7a193eac3a
 EBUILD phpsysinfo-3.2.10.ebuild 1347 BLAKE2B 4ee01314100c6f87a1d869e47c3ddca3377700349b1ddf58c8c344112a4d455d76ad1183867a3a2ef8d8871fa64f6a24bbe2ea5f5642a6f45300225d3e1ef69f SHA512 34bce3d9f8e349ef8f01eabb41f3c63d8aa2b0353c8063fa8f3439bca1fa604643dc19bc3943206dc96f5a5e7d1e8b5833ece0aba5d140c96a8166323115e1e0
 EBUILD phpsysinfo-3.2.2.ebuild 768 BLAKE2B 93aa4397be216ffd4e0b68d713343188beac30ed635931c93978747ec8fb2ea7a66b3bf5de1f7669c9fb280143425968dd9629e11b6f9c4ac2023cf251f1c023 SHA512 0d323edd89bc17bb949aa386505a2c5ad5e81f355f9abfe4d0d59009f7f62f94b156bd8d94a8bd0da7a9e2c2677bea23a4650357f8f75941fb49127f7c9370e2
 EBUILD phpsysinfo-3.2.3.ebuild 773 BLAKE2B 3aef2f8cc844f30046b344153450f9910c0f08b8af5fb198db073eeff12df0000fd006322bdf0155682de301987891dd0b5cb98c2c98979afaa0b979a04b403e SHA512 a33a1ce86e6048ff9a768401c598999082554c8ffe37e64d128196f0cf8b988d83c2f82d2558023cc51cdcd046acc663d80041e6a544270041f003d4ae72b416
-MISC metadata.xml 1929 BLAKE2B 78edd070d0ab359a162a93d41f781eeb197a519d68f00115e4a3528370b292c765eff1780d45661b397415143a5bc48216c9b9d7733fa20d13726172f90d66ee SHA512 bc6621ead3fa65d5f8c6b7be58db5845d444490d4018eb888c30f7fd4756d752246b94d860a534d13d97cae23b7682f435bbc3da33dff38dc09d6d0e5422c465
+MISC metadata.xml 1998 BLAKE2B 44ef1459ba690c8a4f590ed98f3c199cb7b5ce34dff56ab1dc053ddf839649d02ddd196fe131decea06095372d4a82f6cca4172846097a176d73cd64d1a55213 SHA512 253afce98c226f160ab955961163517e36103c05dba11e08493adda9a0e237e7168c0dfe07caafc7f14f7e73c2680f8ff0cf79d8a1f2f436614226a2506f6aaf
diff --git a/www-apps/phpsysinfo/metadata.xml b/www-apps/phpsysinfo/metadata.xml
index f8482ac659c0..9f825ab8bb6d 100644
--- a/www-apps/phpsysinfo/metadata.xml
+++ b/www-apps/phpsysinfo/metadata.xml
@@ -31,6 +31,7 @@
 		<flag name="uptime">Install <pkg>app-misc/uptimed</pkg> to display those stats.</flag>
 	</use>
 	<upstream>
+		<bugs-to>https://github.com/phpsysinfo/phpsysinfo/issues</bugs-to>
 		<remote-id type="github">rk4an/phpsysinfo</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/www-apps/phpsysinfo/phpsysinfo-3.2.10-r1.ebuild b/www-apps/phpsysinfo/phpsysinfo-3.2.10-r1.ebuild
new file mode 100644
index 000000000000..b662ec40f4f0
--- /dev/null
+++ b/www-apps/phpsysinfo/phpsysinfo-3.2.10-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+DESCRIPTION="A customizable PHP script that displays information about your system nicely"
+HOMEPAGE="https://rk4an.github.com/phpsysinfo/"
+SRC_URI="https://github.com/rk4an/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="apcupsd dmraid freeipmi hddtemp ipmitool ipmiutil iptables lm_sensors mdadm megactl nut quota smart snmp uptime"
+
+RDEPEND="
+	dev-lang/php[simplexml,xml,xsl(+),xslt(+),unicode]
+	virtual/httpd-php
+	apcupsd? ( sys-power/apcupsd )
+	dmraid? ( sys-fs/dmraid )
+	freeipmi? ( sys-libs/freeipmi )
+	hddtemp? ( app-admin/hddtemp )
+	ipmitool? ( sys-apps/ipmitool )
+	ipmiutil? ( sys-apps/ipmiutil )
+	iptables? ( net-firewall/iptables )
+	lm_sensors? ( sys-apps/lm_sensors )
+	mdadm? ( sys-fs/mdadm )
+	megactl? ( sys-block/megactl )
+	nut? ( sys-power/nut )
+	quota? ( sys-fs/quota )
+	smart? ( sys-apps/smartmontools )
+	snmp? ( net-analyzer/net-snmp )
+	uptime? ( app-misc/uptimed )
+"
+
+need_httpd_cgi
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGELOG.md README*
+	rm CHANGELOG.md COPYING README* .gitignore .travis.yml || die
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	newins phpsysinfo.ini{.new,}
+
+	webapp_configfile "${MY_HTDOCSDIR}"/phpsysinfo.ini
+
+	webapp_src_install
+}