gentoo resync : 22.01.2019

24 files changed, 216 insertions, 487 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 2ec9d3ee5c8b..d9c60a2a6e08 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/agendav/Manifest b/www-apps/agendav/Manifest
index 76f6e4489f46..0c108781f042 100644
--- a/www-apps/agendav/Manifest
+++ b/www-apps/agendav/Manifest
@@ -3,5 +3,5 @@ AUX postinstall-en.txt 486 BLAKE2B 6f811568d41da8992498df1e576aeb0647cd10f4b0e6f
 DIST agendav-1.2.6.2.tar.gz 2586820 BLAKE2B 440bb7d8fafb482e99d1a9745c71914668d8aa262a1e5ea72c65a0feaa527cdebb8191551971e46661221b558f1fe78ed3aa937b1a5ed723407649c45e1cad19 SHA512 bfae7c00ab7f8baf239310e2c04229ee76a56befc57d9ab449654bb0c28dd30aab628a2292670dc8c1ce479593bd1b6a57ba1e4f3bcffb4de27214c855ccabab
 DIST agendav-2.2.0.tar.gz 5313351 BLAKE2B 3d7f47900f0030c87fe00c187faee5c508cd740afee2a5021a38e2e2f3986207d324891fc71b53c6b8938684981933f29c7c3022179e90f3b9e5b19e2437df99 SHA512 4bf3c6152d69d8c58cea4e4377acdc30ef90d7d40946ad495715a34348051db8d2c20c60d495fb629dd9ad143836025082109c2102149ab143e98ad2ba4b191b
 EBUILD agendav-1.2.6.2.ebuild 2144 BLAKE2B 0877ccf0f6db2b5c973ee1e8887debb2c271eac8df7dfdb9acd23d9dc3375c6b84193e8aca88f4b538dfed09cd2d16a5cb6619d51cb2e158dcd6c7ef00a6d0e2 SHA512 d55c96ecf0a04d0552b7802ee46952c5317f6a362676ef7e4079aa103456e7ed4d76eb9850cf6157c5218628209fa4edb28e0b6ce6da66348371abd14f141aa4
-EBUILD agendav-2.2.0.ebuild 1404 BLAKE2B 34f717975e9b80420164524c8f98eb916f630389b6ed226879ddc051e736bc3091b98b4a52cc06df5cfbff12577b6d506d2720e93331cbd3424b8cbf4f5aacab SHA512 48b63fd9276a5b20cccde54ee50f1a6b0d4c4c6fbfa1db45b87ae353434f9faeb109f4658f4363dfa91d4862cad1ff37a11f727980ca613800d2912b5f05365f
+EBUILD agendav-2.2.0.ebuild 1393 BLAKE2B 4fab8e14ed36162cc57c83a69149bbabfbe4eaa544cfc3c5625a12a86918711fb06f3651739e4a142ce4ff9efba1e5d6d938c6777a03273407b709713f2fb849 SHA512 d096259e0fc90c252494731b5b8806f1bec5f61a78cee9b56290ac606b183a1ba1c07495bc76f2c4f7bbff0d6c39c86172a79fda6f3bb00ba5a289d913403c76
 MISC metadata.xml 326 BLAKE2B 0755116594edad3309ee654710ae5e3df2172e730355ee4bb8e1c7ed1f9292565fb2c71a14307d8632a14011fe200a2e5582bb219a818ce2bcd99b73c008b1c7 SHA512 353e3ba7bcb34dbcc4a7f3ee7c282914b5744f796da8ae8e19ccdd7bf1d65110b3e41938380fb460485f47468b9ebef8c3bb24b6f82911dac5a454784ba1fbcd
diff --git a/www-apps/agendav/agendav-2.2.0.ebuild b/www-apps/agendav/agendav-2.2.0.ebuild
index 47b914cb2e67..ead4966a1fa6 100644
--- a/www-apps/agendav/agendav-2.2.0.ebuild
+++ b/www-apps/agendav/agendav-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 LICENSE="GPL-3+"
 KEYWORDS="~amd64 ~ppc64"
 
-RDEPEND=">=dev-lang/php-5.5.9[ctype,curl,crypt,unicode,tokenizer,xml,xmlreader,xmlwriter]
+RDEPEND=">=dev-lang/php-5.6[ctype,curl,unicode,tokenizer,xml,xmlreader,xmlwriter]
 	virtual/httpd-php
 	|| ( >=virtual/mysql-5.1 >=dev-db/postgresql-8.1 )"
 
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 75498f87b4cc..f3f3e5b44369 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,14 +1,6 @@
 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
-DIST drupal-8.6.4.tar.gz 16401179 BLAKE2B 15b44df0ddbc420aad07c95eda6c238a9862c186cd762c6f332452919340939f7b604b424a046adbe2111bd7ae4e50b7dad2a8d67b5122035fc0f30a7b2cb47a SHA512 ff81fe8aa10f635b5906d7a21efc5e8d44e96594d26a2637987ea2ef36b6ea323638bf4fca2374553d381645e4d187ef72d0284d4d0bad8663efe1e0b7bfcf8b
-DIST drupal-8.6.5.tar.gz 16465640 BLAKE2B 39d2ae65884a54bb4830b41d58f7b84ed76d1476a3a1c08a291a0bc75b8351108648f872525f03236fa078438d9863b635084484d8003b20c9331c8ac02f874d SHA512 7298b315c14931c24a1f433625c91a96bb2c7d09ab6ceac31fba62d316604a8b72c13941ef99ffc878ff697f00fb70924f6ffdd23081ec1c9258d0dba1b52e76
-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
-EBUILD drupal-8.6.4.ebuild 2308 BLAKE2B 0b05ff48f64b17a262c5220852bcb1f9d185b7404d2934f7252cdc184207cbb49d3defa31fcd9ea7ceeb8618a2934a60d742ff55a9b28bfb6438649b1ef38c6b SHA512 8046d3eaaa248ac73513708a5f4e465bb5761e6101eef7c11d622584b1bcfc2c8be752a03e607a40c5d83df74e93452a353d7a1478f33138b539b464117623ac
-EBUILD drupal-8.6.5.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
+DIST drupal-7.63.tar.gz 3298415 BLAKE2B 28b136911b7faf4cf9ac790dbb5260de1004e34c77dcc08fabee7ae464a5f30645a4377f3c9f1ca4df45a357864bd1b5f6deb09a20db41bfbe9ef7621bf404a7 SHA512 e601732590a0b6d63d15d4d73e9531576592092dda986d965ff4d466069f21fc0adcd004798547b14dc528546ddcb5bb089a7cb1919b89f94339888858f12dd1
+DIST drupal-8.6.7.tar.gz 16478439 BLAKE2B d1649f792e79ece2c17842478f23fbed8ef331ad6fcf7509f5cdd4fd5875fc6a00e1820fe39a66dd5404945658260436b9438c8d25a725517bc13f44d1407290 SHA512 0150f42066fe1a2e5c96eea1fd3d59221d2d3102cde8e629de79f4f248496c506cd2f76165a1baee3c36ca2d3d266658949a7927743c9e1859a525aa34ae80a6
+EBUILD drupal-7.63.ebuild 1770 BLAKE2B b429cd79794eb2975636cd89c42f56926c6eb4edf86ff329bc8680ae8ee4e64f85acc2e6a668e5302b75093e59be611d459e1d23b95ded075ccb41866d912107 SHA512 1db7207e4af8c0fb2594ace139c63a14f0f01f40f26b4a785265691f57ac939c462c2b73b32ac63d735cf7b3e984a43a06e385f1c6009c1d6141bc2bbfe1b282
+EBUILD drupal-8.6.7.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
 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
deleted file mode 100644
index 6f40a8c2e6ea..000000000000
--- a/www-apps/drupal/drupal-7.61.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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-7.60.ebuild b/www-apps/drupal/drupal-7.63.ebuild
index 6f40a8c2e6ea..2d1f90ebbd06 100644
--- a/www-apps/drupal/drupal-7.60.ebuild
+++ b/www-apps/drupal/drupal-7.63.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/www-apps/drupal/drupal-8.6.2.ebuild b/www-apps/drupal/drupal-8.6.2.ebuild
deleted file mode 100644
index 236af8564a81..000000000000
--- a/www-apps/drupal/drupal-8.6.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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/drupal/drupal-8.6.3.ebuild b/www-apps/drupal/drupal-8.6.3.ebuild
deleted file mode 100644
index 236af8564a81..000000000000
--- a/www-apps/drupal/drupal-8.6.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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/drupal/drupal-8.6.4.ebuild b/www-apps/drupal/drupal-8.6.4.ebuild
deleted file mode 100644
index b6b875c85dfc..000000000000
--- a/www-apps/drupal/drupal-8.6.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	echo
-	ewarn "SECURITY NOTICE"
-	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
-	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
-	echo
-	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
-	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
-	echo
-	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
-	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
-	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
-	ewarn "reported by the setup."
-	echo
-}
diff --git a/www-apps/drupal/drupal-8.6.5.ebuild b/www-apps/drupal/drupal-8.6.7.ebuild
index a8514d07dfe0..a8514d07dfe0 100644
--- a/www-apps/drupal/drupal-8.6.5.ebuild
+++ b/www-apps/drupal/drupal-8.6.7.ebuild
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 4fa537fc31d1..e0c6812a0bf8 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -5,8 +5,10 @@ DIST grafana-bin-5.3.4.tar.gz 54609273 BLAKE2B 4a9197baaa6d6689d1e23630f49513a9b
 DIST grafana-bin-5.4.0.tar.gz 55200142 BLAKE2B f529b0fbb82aabf290f89ceb94d757725c5fef48a94a2ec54f26f20b332b0138fa54b122380d71205e03638c33d152bfac0e814c18b0f99bcdb8ef112ef9bba7 SHA512 e05793d23fead999868c7edf925fd90da099f50ecb03166471eebfc42aed1c30fcbd8edc3156b14e48309a34cbd9f87566d1901cc946ec45a4834b4ac7808e9d
 DIST grafana-bin-5.4.1.tar.gz 55202271 BLAKE2B 8b4ae8551e9fb9d5cb2d3bebf571fe0234bd6100f6dabf1aa2fdc32ab169f729ca38f4d28212456d13158a7dd51967d42ae387ca423a9c3548ee22ddaefac492 SHA512 0b6f8b1f71f39f6fd38ee8a6daa925818acd2be22c7ba98021a185dabbff5cf520cb8cc955498562344528649c4546f9b3fb331da2d88d5794a4a2cf4c5e7368
 DIST grafana-bin-5.4.2.tar.gz 55202302 BLAKE2B 6e6e5300128a17db4f2323a5c94528eaed67c6446f44180355d7bcbeb91ccf05c9f1ed0aa89c4f8a0cfc72e9d7342c8bb5617884ad3ba3046f44491cf625f88f SHA512 9944f47b489579eac692fe46f9b161f59416d50a38984d5dc07478988bda163c2b66e6715629ee92067fa4ce9e8b9205107f9e7b4a6697d1194227f80d09df2e
+DIST grafana-bin-5.4.3.tar.gz 55228439 BLAKE2B 63ee14b1ab074f453c8f1b870b8c0c51365106cb2af59fa20f56805f7add7fec29bc5ecd7e2ffc1f3f6811049e839893433e14b1871cb2aea359f58537b9e0dc SHA512 781466c7477ecb4fbca59006600adc3569d0ee2158da3b75831b1934fd39456030471d4508fbf2d3296d3660dcc8b92782295d7afe458229bad1d64de88ad33b
 EBUILD grafana-bin-5.3.4.ebuild 1777 BLAKE2B 9450adb124f556ad37ce3526d30e416b1c38c16b406bc4e6de0c2f16b0b8c0d3ffa10bc94d73c5abdb608367715a806bfe9a7bfbdc2c80a1a3f3131f1ee5b9b3 SHA512 6fdc6feb53f5a578e8c3cbc766499daabcb00d56910a1beb9214b15a06c31898bc5f18a128e3310ca90e8fa66932762af432661c079a9d543316368616709c34
 EBUILD grafana-bin-5.4.0.ebuild 1777 BLAKE2B 9450adb124f556ad37ce3526d30e416b1c38c16b406bc4e6de0c2f16b0b8c0d3ffa10bc94d73c5abdb608367715a806bfe9a7bfbdc2c80a1a3f3131f1ee5b9b3 SHA512 6fdc6feb53f5a578e8c3cbc766499daabcb00d56910a1beb9214b15a06c31898bc5f18a128e3310ca90e8fa66932762af432661c079a9d543316368616709c34
 EBUILD grafana-bin-5.4.1.ebuild 1777 BLAKE2B 9450adb124f556ad37ce3526d30e416b1c38c16b406bc4e6de0c2f16b0b8c0d3ffa10bc94d73c5abdb608367715a806bfe9a7bfbdc2c80a1a3f3131f1ee5b9b3 SHA512 6fdc6feb53f5a578e8c3cbc766499daabcb00d56910a1beb9214b15a06c31898bc5f18a128e3310ca90e8fa66932762af432661c079a9d543316368616709c34
 EBUILD grafana-bin-5.4.2.ebuild 1777 BLAKE2B 9450adb124f556ad37ce3526d30e416b1c38c16b406bc4e6de0c2f16b0b8c0d3ffa10bc94d73c5abdb608367715a806bfe9a7bfbdc2c80a1a3f3131f1ee5b9b3 SHA512 6fdc6feb53f5a578e8c3cbc766499daabcb00d56910a1beb9214b15a06c31898bc5f18a128e3310ca90e8fa66932762af432661c079a9d543316368616709c34
+EBUILD grafana-bin-5.4.3.ebuild 1777 BLAKE2B 6616ce91890ea10c4b4a6e24918393cf951a214e55f2779ee878021ffddaf169c85b029a23d2275c8978acfc340c10023aed415151e848fc093287b3c637254e SHA512 5bccf95c893e19c38817a6a682c217531790a0f35205c06aa98b395a70a72d42445d6df49570c99268632897607b0b186dabf62c0143ae1b01b7dd32b9cada7d
 MISC metadata.xml 416 BLAKE2B ff5bdf7e202aa96bbf615df2f86c6542bb7d291e6d564dfac683a2e54002380dd80ef3f1ca0b6c1f398de0115e26398903256b9d64e353127f25c3e97e5b21c8 SHA512 db2cbd25cf9b21664db93dc8f9719bf7f9a2fd632c5231d0f296bb32f3f6af3e08307c8a662081cc68f33638d70f6512094fad76073a5de4ceba02eeb3d1188b
diff --git a/www-apps/grafana-bin/grafana-bin-5.4.3.ebuild b/www-apps/grafana-bin/grafana-bin-5.4.3.ebuild
new file mode 100644
index 000000000000..415b1fe8bfa6
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-5.4.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit user systemd
+
+MY_PN=${PN/-bin/}
+S=${WORKDIR}/${MY_PN}-${PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="https://grafana.org"
+SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs"
+QA_PREBUILT="usr/bin/grafana-*"
+QA_PRESTRIPPED=${QA_EXECSTACK}
+
+pkg_setup() {
+	enewgroup grafana
+	enewuser grafana -1 -1 /usr/share/grafana grafana
+}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini || die
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf
+
+	dobin bin/grafana-cli
+	dobin bin/grafana-server
+
+	newconfd "${FILESDIR}"/grafana.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd.3 grafana
+	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+	keepdir /var/{lib,log}/grafana
+	keepdir /var/lib/grafana/{dashboards,plugins}
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+	fperms 0750 /var/{lib,log}/grafana
+	fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+postinst() {
+	elog "${PN} has built-in log rotation. Please see [log.file] section of"
+	elog "/etc/grafana/grafana.ini for related settings."
+	elog
+	elog "You may add your own custom configuration for app-admin/logrotate if you"
+	elog "wish to use external rotation of logs. In this case, you also need to make"
+	elog "sure the built-in rotation is turned off."
+}
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index cbe4e768a1d5..e8928ba6121e 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -2,14 +2,14 @@ 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.13-linux-x86_64.tar.gz 53161803 BLAKE2B 708827b2d9d3b216cc20ae8f63376fbbb53b6a7baaf3dbc73d4649ff02b54e417cbc0c4609a6c8b8388029ec0f34092e34a683d97f57963e3203d503eb5651fe SHA512 e32631f58e4428840f7f9482fed30f685bba0ac99dbeb39aa9b4b5e490cdae52105df332917dd9d149880bf8bbe200816304d03a93d919b7ca0b9c54ebe51353
+DIST kibana-5.6.14-linux-x86_64.tar.gz 53261984 BLAKE2B ec81b6579f00a894ad19c048c54f690611f4f8e015ffdd2e600d207974ac1df31d89b4c242c638ce6b2295ab6cab83ddf78b7e77d802b9dd5037e0c8371db7f5 SHA512 64b12517a6177dde273aefb4d31602c074925e57c842b8c69367098f348a062f5c03c3eddf53ad4260bdebc6e56edfd78ced5e39d557fa03af181ec99c88bda8
 DIST kibana-6.3.2-linux-x86_64.tar.gz 205331616 BLAKE2B 17273e641a9f146943cc4aebbce1114706dcf5d4c5f4d865a79d5b576a845c40268ea4389c358d555ca278c0bed4a68baef661472f80f7957dd013f0ce2e9835 SHA512 35eb97ca2f8d0bd80dc7dcdc5bc03f8ab21d1280d11d892f12eda5a173a951dfe88718d45c94ff0a748bb324e44f243cda0ba314c6dcd249cd960928f7c7b7ea
 DIST kibana-6.4.3-linux-x86_64.tar.gz 235299366 BLAKE2B 58d788180b2afbf5c010b712e04fe39f469d63effb256454e8d56e36a0e0eb372255ac8c19af3b3e878992858472353c79eaaf447f2fdd8a8d70235dd79d36bf SHA512 f247078bfa7435239f9b9258a1563e73e17662735a83b154a02809f9c383f56cec68a3c189c84f43ecd2d9e4abc25d55f6593dd79b725fd79820f92d8543d244
 DIST kibana-6.5.4-linux-x86_64.tar.gz 206631363 BLAKE2B 83be5a2c0f47257338ad5b547fecb20748c10f1607d88543ec36d6a9ea6b519c6545af13df90eac5fbb774ff1431bcede8c29d7cb4c0bca98ce26557d907bb03 SHA512 260e577ba5f9464228a03689e8fd823cfba4a91670dea2f210da508d97ade6091febb2bae29893427eccdcfd2db75a8d62e265edade7ca9b9f2513fb66f8917d
 DIST kibana-oss-6.3.2-linux-x86_64.tar.gz 89561513 BLAKE2B 37031653e171d683a18f25c957545b6b143c2f0d8c07da6c02ea61c8296657d190540f4ffee2c6a62a9146800971041d7e4e30767892ba2bbff0486aef31cda5 SHA512 87236fa1a45a5c5e0ecdc033f864e9a1f74cb148e350b83c6c024b37eb71e3c16236fe52525898532f286f816cb6d03de23cba3d97e0cc0c4d622cdd18c7defb
 DIST kibana-oss-6.4.3-linux-x86_64.tar.gz 76671516 BLAKE2B c3800f2c53af55139ce101ff13391fff2908fb0b9e45b46588f18a27653bf6492259a81e93b5c0f8e654696434efa510646cba5d5f6dba9ba2377451aaf9f259 SHA512 db55d5201675d1d71cbc511ffd4fb94332316eef8f06c2419d498b930e068030c625c18a0c2fec761cb0c066abc16ddf2c2d8a2fa59aaa3bc35ea1e289b8ae99
 DIST kibana-oss-6.5.4-linux-x86_64.tar.gz 77637829 BLAKE2B f9b6881c35ebcaf112634989337f40820b450cf2a070c32f02f4a7d4c122f0c4ff44f8feb56b0d8683e96a13f2ef6ee96e237dd27fd9c32efdb9c7dfde020fb8 SHA512 65c4ab427ae2a2486b71520893eeb78d8628bf3e6fd47c0d576ca4b6bfa8f9058ecf957ef488fd47260c8295ea49952e1b411d6a6c199f26d74e6a84cfcf7309
-EBUILD kibana-bin-5.6.13.ebuild 1684 BLAKE2B e52d578da62e770834e1c6fddd776820aa5efd995a267a8e3b89d9c66a63210c57d3484a75e0f1876ccc0318a4390c5c4ace56dba63cbe3b3ecffac56331bfdf SHA512 50b831002dd04b7c8a727b59e4e540a21de0ee802a16f8dddea533e3efe2d33fc5a9290858c14207d5509c379e88a2bc76663a007ff5259046749cfbda902a57
+EBUILD kibana-bin-5.6.14.ebuild 1684 BLAKE2B e9b035e06c665f8402b90ff5ef21ed3ecf4a72c32c3936061d44d5ab9922f0c7753ab6fbe443dfa79059b17d2f7598e70ce975b96031920b16c9aeb8dc8e22f6 SHA512 cbf2712e7ecea5e9405fd0b1436f7bf1d509de7a80568989d98058f7eadfdf3101f7856fbe7623fd0895fccaff37f6f5d0d819a7953bfc5efd45536f4dd63bfd
 EBUILD kibana-bin-6.3.2.ebuild 1892 BLAKE2B 29ed1dfb8f3b986e6b0d1cc2d2e5c1d87e903108963acd4ebac21f44252f8daa1c76165fe6bb49dfb1e079d47c8378d7285b9650170db4c2a03da01d371a79cd SHA512 8b269eab38464251f02d9e25882543d520efb2eadde3b0164977f808dfb5d70b943f995c573f00210e3367462cda985b034a0a6bf5d54bd0c48a5b5d8d126071
 EBUILD kibana-bin-6.4.3.ebuild 1983 BLAKE2B 01404f0836d31c82d69442835d7c48c4d49900cd18033367cad75a2f4a758592915d8f8f09e19ab3a3011ce1f7f8d0f5358a6af8e67fcfa4cdc6c1aa589ce902 SHA512 414fb03020ac77216786330ffba92cd2672fe54852eb08f768cf5be1ec430a26a4499a04d7961211cd90815bc2deb31f7979691d79e89a1f71866c28a2b56005
 EBUILD kibana-bin-6.5.4.ebuild 1983 BLAKE2B c28969c939861b0e8d8b83f1e725bb20cde1f0f3b096cd0c5b4cf0b54d10335d66aefe1c99675106e69f1c25c171b1b200d728b8980d5fea0704eccade06a89d SHA512 fbf2bef71f36e2bc3893942c0fe03426ccac025ea3c9b69ee43e701689236e7ad99ff882659cc7b9e76acf8e5f6ad2bd1a31068ad0ac4ce78129456e59f30222
diff --git a/www-apps/kibana-bin/kibana-bin-5.6.13.ebuild b/www-apps/kibana-bin/kibana-bin-5.6.14.ebuild
index d1625dea1d9a..2535f757f063 100644
--- a/www-apps/kibana-bin/kibana-bin-5.6.13.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-5.6.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ 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-6.14.4"
+RDEPEND=">=net-libs/nodejs-6.15.1"
 
 # Do not complain about CFLAGS etc since kibana does not use them.
 QA_FLAGS_IGNORED='.*'
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index a2c7fd57e872..d65409ec1329 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -2,14 +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.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
-DIST moodle-3.6.1.tgz 47660920 BLAKE2B 3dba1adb2a2c9926a0efb1942df4239a020c2c2d661a6a2a6825acc70b6e7aab69afb4f0f297cd316fd5f693ab711cccea8bc5c68fa1b72288297b8d00791088 SHA512 79cf5127748e6511101b9f802165eefbe6dafbe89806e8616902765d14481af0b6ba06757be5fecd343bda7dde261c58018f940254549decc66452415a99ab9d
-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
-EBUILD moodle-3.6.1.ebuild 2949 BLAKE2B 3931582d8ca9407ae580bb91b7c8d6f9b109fc1f10d5182f8b75d3525272f10bc10e53349f397f981b78c938e8508d2ac633e03e1b695aa5736183657ed4b78b SHA512 e76b4d0a5cf53e116c47b1eedd1aabedb52331904f92a7e824cca4db5273c7d83c8e7de0341ef261833c868c803180c3b53a446dc6924a50e27d31d109a5638c
+DIST moodle-3.1.16.tgz 38057145 BLAKE2B 09995a5ff87069e47b891e0e19a038d10af820d37b756803ceb2dcebad9a04a827a5b2548a3dd205d07eb4d9e116a15a12fa3d6832e524dde76450b5170e979a SHA512 46ed0cd702e86529dda32b128604acc7c6bc13530bb3acab402d5c36f59a55dd35e0ffaa827aef85f7e75b0b9939514f868c0dc8ddc1b5f8aa49637acdf89c5c
+DIST moodle-3.4.7.tgz 46051440 BLAKE2B 2b6a2eb7c071da56236a0a8d08b944fa9f5028bf9f22de259302885804cbb7e3e5bc5f1e18524a183fea362c8809ee38590dfcd836bef9de976fd7ab89b2fbdd SHA512 6819a20cd477b37744786793b74dcf258098640e453345cc940fae02789cca31b43730dc421715be411ce77ef23fa876189a2c481efb5e643282355b4fdf043b
+DIST moodle-3.5.4.tgz 46648296 BLAKE2B 2ed589f46061beb81e558b96461729aafe0624237c99b2e306c57da04ca6bff709d8377012bcfbb73a9a03dabf12dfa5d2a21e47139702b067f3fde0b99794f8 SHA512 03d0821f0863ed360129f00dda834618ae6b5dbb5794ee1a993eaaecbbac4dae8e6085f83cd86674bd93104a17229cb662db57a5500c3eff09f1480fbef9772d
+DIST moodle-3.6.2.tgz 47673889 BLAKE2B f81844f933ec3bc2ebd92957d16a9e59c43678b9ee548767bfacc443a68f574792c641787722cad8fe3007fd0c8d279ac097c361843089441bbe21b4af5b7492 SHA512 30e48e6fff788294db83d7889e32caf12fa07459dbd61a5cb0495f3c5b6bc005e41faee447a0cd6441e5120dbd04ee02056425c67a118755d45bc29e32867d74
+EBUILD moodle-3.1.16.ebuild 2937 BLAKE2B e6dc81392ce7de27765e68363f7b4f772f3ce9f8fafa2fa1139a78a34d8a5ec60441d40d52f4698ba48914dc3ef22bb340b590db24552224e680c11790f9f738 SHA512 ac9fa234a15f04f9ff25fd33f3f8004c80cedc1d54620f483cc9b3b30ac46aa71d80827f4520efad73084d07e7741311413b4b596730b5bef37428e2e066ac9e
+EBUILD moodle-3.4.7.ebuild 2949 BLAKE2B 948d8ccf72fa401f3243b6ed4751de0ecf498502c5d1fa1f592c0dcc649670e99c2576d0d1ba40be463ebb4ae2bd3803000c6132e3d00eae5758bf70bccd256e SHA512 0c300c8f3b7e7758a1d29ae12be386f4b459cdc65fcd39ed45da307e503e03bcd99e68aa6798260e813aa92d03e4f1d0a4161e6e093d0b4fca6cb0b6db86a86f
+EBUILD moodle-3.5.4.ebuild 2949 BLAKE2B 948d8ccf72fa401f3243b6ed4751de0ecf498502c5d1fa1f592c0dcc649670e99c2576d0d1ba40be463ebb4ae2bd3803000c6132e3d00eae5758bf70bccd256e SHA512 0c300c8f3b7e7758a1d29ae12be386f4b459cdc65fcd39ed45da307e503e03bcd99e68aa6798260e813aa92d03e4f1d0a4161e6e093d0b4fca6cb0b6db86a86f
+EBUILD moodle-3.6.2.ebuild 2949 BLAKE2B 948d8ccf72fa401f3243b6ed4751de0ecf498502c5d1fa1f592c0dcc649670e99c2576d0d1ba40be463ebb4ae2bd3803000c6132e3d00eae5758bf70bccd256e SHA512 0c300c8f3b7e7758a1d29ae12be386f4b459cdc65fcd39ed45da307e503e03bcd99e68aa6798260e813aa92d03e4f1d0a4161e6e093d0b4fca6cb0b6db86a86f
 MISC metadata.xml 355 BLAKE2B 68d10d39dd24da3d570f13edec9c4adae89b7620bb455c1c30377c3cebe56c4961d1548360adedc96fce780067b308193fdb7560478a60ab56c364b774b1984a SHA512 f02e5404a714cb20207e494f635fb0e98870576c4b5f6affc4dc27fccfcabdd1af1c7411a83cfd4e01b51ecc24d11944d1e612757ff45ab4405f6099ed9b1278
diff --git a/www-apps/moodle/moodle-3.1.15.ebuild b/www-apps/moodle/moodle-3.1.16.ebuild
index 13576b6f03f7..b96de5d5680f 100644
--- a/www-apps/moodle/moodle-3.1.15.ebuild
+++ b/www-apps/moodle/moodle-3.1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
diff --git a/www-apps/moodle/moodle-3.3.9.ebuild b/www-apps/moodle/moodle-3.3.9.ebuild
deleted file mode 100644
index e7b7c22a19e2..000000000000
--- a/www-apps/moodle/moodle-3.3.9.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit versionator webapp
-
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
-
-DESCRIPTION="The Moodle Course Management System"
-HOMEPAGE="https://moodle.org"
-SRC_URI="https://download.moodle.org/${MY_BRANCH}/${P}.tgz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-#SLOT empty due to webapp
-
-DB_FLAGS="mysqli?,mssql?,postgres?"
-DB_TYPES=${DB_FLAGS//\?/}
-DB_TYPES=${DB_TYPES//,/ }
-
-AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
-AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
-AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
-
-PHP_REQUIRED_FLAGS="ctype,curl,iconv,json,session,simplexml,xml,zip"
-PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
-
-IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
-REQUIRED_USE="|| ( ${DB_TYPES} )"
-
-# No forced dependency on
-#  mssql? - lives on a windows server
-#  mysql? ( virtual/mysql )
-#  postgres? ( dev-db/postgresql-server-9* )
-# which may live on another server.  These USE flags affect the configuration
-# file and the dependency on php.  However other dbs are possible.  See config.php
-# and the moodle documentation for other possibilities.
-DEPEND=""
-RDEPEND="
-	>=dev-lang/php-5.6.5[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
-	virtual/httpd-php
-	virtual/cron"
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	# How many dbs were selected? If one and only one, which one is it?
-	MYDB=""
-	DB_COUNT=0
-	for db in ${DB_TYPES}; do
-		if use ${db}; then
-			MYDB=${db}
-			DB_COUNT=$(($DB_COUNT+1))
-		fi
-	done
-
-	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
-	#if [[ ${DB_COUNT} -eq 0 ]]; then
-	#	eerror
-	#	eerror "No database selected in your USE flags,"
-	#	eerror "You must select at least one."
-	#	eerror
-	#	die
-	#fi
-
-	if [[ ${DB_COUNT} -gt 1 ]]; then
-		MYDB=""
-		ewarn
-		ewarn "Multiple databases selected in your USE flags,"
-		ewarn "You will have to choose your database manually."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	rm COPYING.txt
-	cp "${FILESDIR}"/config-r1.php config.php
-
-	# Moodle expect pgsql, not postgres
-	MYDB=${MYDB/postgres/pgsql}
-
-	if [[ ${DB_COUNT} -eq 1 ]] ; then
-		sed -i -e "s|mydb|${MYDB}|" config.php
-	fi
-
-	eapply_user
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
-	dodir ${MOODLEDATA}
-	webapp_serverowned -R "${MOODLEDATA}"
-
-	local MOODLEROOT="${MY_HTDOCSDIR}"
-	insinto ${MOODLEROOT}
-	doins -r *
-
-	webapp_configfile "${MOODLEROOT}"/config.php
-
-	if [[ ${DB_COUNT} -eq 1 ]]; then
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	else
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
-	fi
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	einfo
-	einfo
-	einfo "To see the post install instructions, do"
-	einfo
-	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
-	einfo
-	einfo
-}
diff --git a/www-apps/moodle/moodle-3.5.3.ebuild b/www-apps/moodle/moodle-3.4.7.ebuild
index dea9710e1e62..1c5e865ec67c 100644
--- a/www-apps/moodle/moodle-3.5.3.ebuild
+++ b/www-apps/moodle/moodle-3.4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/www-apps/moodle/moodle-3.6.1.ebuild b/www-apps/moodle/moodle-3.5.4.ebuild
index dea9710e1e62..1c5e865ec67c 100644
--- a/www-apps/moodle/moodle-3.6.1.ebuild
+++ b/www-apps/moodle/moodle-3.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/www-apps/moodle/moodle-3.4.6.ebuild b/www-apps/moodle/moodle-3.6.2.ebuild
index dea9710e1e62..1c5e865ec67c 100644
--- a/www-apps/moodle/moodle-3.4.6.ebuild
+++ b/www-apps/moodle/moodle-3.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 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 3963fd90b230..914b410c3142 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,12 +1,18 @@
 AUX nextcloud-12.0.4-destroy_modal_when_closed.patch 786 BLAKE2B 24222dde0d9ed5f3c5fa31b7cd1b837f765837543475db235056dccff9fa17cce83a37b0ed64a1999a6b61dedd5857866debb1950686acf062e42d80bccb3813 SHA512 93297f991312c5fd2504267bb16a8c38797970fdf8d109d4c4b4416a5e72c8677141ebc9a13a2dadc40845348e07f264937dd852384f88d65be4f3cc4f0cb462
+DIST nextcloud-13.0.10.tar.bz2 30033121 BLAKE2B 1549340f7b2b3f3bacbbc4be7c0894cf6b9caa1de1fef27aad3753e022ab3eef36787f075356ebd1ac0b2757e212e769eef79ff761c23cdf0cfaf841dd124894 SHA512 169f3f974944322d3a606f9b9e35c438b40b73e4c75c6dd9cc8b153713bbf411430f0d68603f24287a81eb9108589e6129d00e2ee3c0c57397ce03305bdbc9b6
 DIST nextcloud-13.0.7.tar.bz2 45085663 BLAKE2B 1d4f07310fd0b85981c8f45197b0c760e484db5eb47b347ce6d51b6e7729072a1ff13ed30739ee5b96a7456fab20d4f4ec5b3651e709aa466f305ca3ea374ca3 SHA512 511a4f35f03e9696806342781f4b8b7e2265a8209d9c8b01aa1b9f58a9ab55876e9feb90357816ff991d19a27862fe3009f0f081b5c2e971e919412eb4e71024
 DIST nextcloud-13.0.8.tar.bz2 45133964 BLAKE2B 1eba0ef0b7cf0bcd65b7b71407b39a9a885995e746d9e61a44cee290a5de1ac3aa3dbb26a097ddfc2195f315f3d14d1f69db9c8a9feadd58938b98a558ad48e2 SHA512 eda9075c9cc888a5838397c6299c1e27905a095fb734b6d7cd760baff5268aef1db912ded0c03b044ba9ded91c3664d8d565ef1134f416ed7f17726307877294
 DIST nextcloud-14.0.3.tar.bz2 49713609 BLAKE2B 0b87b899a273fc5a31b3e3e0451f2214e4377bec8671e9ca7022054d294820de4964053be950cf951b8c0d7a10f4958648164b3a76681ee2fc7aad7a902a1be7 SHA512 09f224d5e55496dcad4d743a0b62af407b4e1fece009fea19d87ac32672cec83bde135e25607236971af0ba32804cc5ebff9295472c276eb2898e21400c6e2c5
 DIST nextcloud-14.0.4.tar.bz2 49827498 BLAKE2B 5bcf873f9e0f5b35450a4d381ea1e2fec0e1ef63e9424c83d18add4a6b19631d44191ae207ed60b25209e2b7b45ddec951d3441d8876ce0a057883d21a5e5864 SHA512 a53eb90645619d6558c93304c43ca86cf00cacf8a0f783e699f5041c7b5eb1c9ee8719d4bde5cc16bd1c7b90529d9b100c79e1ce14cc8f8192158c705c8db09e
+DIST nextcloud-14.0.6.tar.bz2 34908643 BLAKE2B e44cda6996bcddb2fd1c3ac150fc3b6e1ad2903aa7d961891baa0ba70a15b47c2f67fd898d9d317b42951cb15e8fdba2a504dce44ff2d7f161d014a4cc76bdb5 SHA512 d3a8a9d4c988740bbfcd0213bda6078808face912858959bc186d259afa694b23b82f284805d136872434e5e7d461a3b137a5cd6c39dd646057f6b5cb6fb9e7e
 DIST nextcloud-15.0.0.tar.bz2 36181234 BLAKE2B 6e9e1cfb1dc9d017f7443adccd2ac420213b2849f9bcf009c94aea741b45582fe1690e0876f378c5964cf10e28ae4ab74765dd56cad0f5ab8c39ce2ae94fe631 SHA512 3ebc21ca80f31bfa486de73d707e7c448eca3f517d73c8762fb543ce82b3f89cfcfcf0edda15caf324a4987be72df8531dccebd2a6af9ac668913f6f750f20c0
+DIST nextcloud-15.0.2.tar.bz2 36224830 BLAKE2B 59393b5da69a80a92d71e3c9276087fef8758d07d599de2b1f185b97fdd09fc9893325b62b676dcb86f7fd864ef81304e10021bee73e025a9104f747699d0355 SHA512 ab9bf8db9fb231dd965188d2226d34e86128edfad5b5db259fe445cecd4f74e573e4cba3e151bd705dce6ced31d421e3986f5733ebe9f06804807c4bb7e21349
+EBUILD nextcloud-13.0.10.ebuild 960 BLAKE2B 3547350ff45ce7149df5459a0c511d6e45c5e05ebdebf3935f6353cafa1f7700b890d03ab8cd4fb63a391234859f83a30cff10378787463f9d8a4d5de15e4351 SHA512 008d81f8dd97a2c0509aae80cb7a77ab1f6656b6e6d1b3c54db1ddc1fc5c8d7d3c1b71ffffe5eb2bd3a9a061bc25a1aa023c0e531d707138cdd29d762ac68ac9
 EBUILD nextcloud-13.0.7.ebuild 960 BLAKE2B 2cb97022fdd35b923c7da44caeb91589690e2af957d7d0dd0b39bda3a3449500bf2de19d9bace295895443acda66968e05a629afe4c8e72faba094f242736112 SHA512 2d02b65261d1dacd1736182f0731e83aabd16031189b8e372d27634361deccea91651a4e2bbd6edaf66c4a3ea80a34b32ed0909b252d115171380e63371b14d4
 EBUILD nextcloud-13.0.8.ebuild 960 BLAKE2B 2cb97022fdd35b923c7da44caeb91589690e2af957d7d0dd0b39bda3a3449500bf2de19d9bace295895443acda66968e05a629afe4c8e72faba094f242736112 SHA512 2d02b65261d1dacd1736182f0731e83aabd16031189b8e372d27634361deccea91651a4e2bbd6edaf66c4a3ea80a34b32ed0909b252d115171380e63371b14d4
 EBUILD nextcloud-14.0.3-r1.ebuild 965 BLAKE2B d7fe81d87b280314655c36f6ee0987b875effe88f6845e16b3567862478a41d2833b552ce6a08638ab080797a26bf64c9ec3dc3559efa95e311151577ee05b51 SHA512 50026d383b7b9961d64ab808a787ce023be59a925514ff0e541394f3be00c89fed527700dae75219ab2e2ece0cb5c327cd8f2cd9e245674d6ac0f0253333c071
 EBUILD nextcloud-14.0.4.ebuild 965 BLAKE2B d7fe81d87b280314655c36f6ee0987b875effe88f6845e16b3567862478a41d2833b552ce6a08638ab080797a26bf64c9ec3dc3559efa95e311151577ee05b51 SHA512 50026d383b7b9961d64ab808a787ce023be59a925514ff0e541394f3be00c89fed527700dae75219ab2e2ece0cb5c327cd8f2cd9e245674d6ac0f0253333c071
+EBUILD nextcloud-14.0.6.ebuild 965 BLAKE2B 85a1255cea04da166a96736b9f421c606b3cbfc19ff16ea5996ab624dd0da853ad09456a91916d9055020975818410962691bacea6560d0ce73c752460eb9400 SHA512 41c20d697555a6dc5dd45588805d158f0f106437a3b3517f4a146388659bfbadec916a2ec6e2a75edd23d1c8dcb33b380f94945d70d3e0157dbbce0b538de085
 EBUILD nextcloud-15.0.0.ebuild 965 BLAKE2B d7fe81d87b280314655c36f6ee0987b875effe88f6845e16b3567862478a41d2833b552ce6a08638ab080797a26bf64c9ec3dc3559efa95e311151577ee05b51 SHA512 50026d383b7b9961d64ab808a787ce023be59a925514ff0e541394f3be00c89fed527700dae75219ab2e2ece0cb5c327cd8f2cd9e245674d6ac0f0253333c071
+EBUILD nextcloud-15.0.2.ebuild 1017 BLAKE2B c4484d59b07f818dfff314fa4b83746685595b763bfb8f2bba98aa5ae58ac483e5951730243f78611a5dcef59cd1d5c28904720eea3ae323fb16d0d0a1618ce1 SHA512 5c21ac8e1a23fdaec145f20a9d73e334b50125bcaac7a9dc2953c4211c6a241903e921f74483bd103d847a718ddbdbcb3562428f9e43c757e8072ca9617d6ac2
 MISC metadata.xml 363 BLAKE2B 4da5b0e27af01e94e1e68b98274da6c9cacbe59ed1d85413038bccfa530af8fd479a7edd89f4d7633dfb07afbad4736cb6c075e021db7dc9761c273ec1256500 SHA512 60195d5859a8b175346a1cd533dbb6496d2787c1ff501d9233b2b1794670ae344c6f9f4cac4fbf86b24686a83692cff27513d05243947e2921e554e065696721
diff --git a/www-apps/nextcloud/nextcloud-13.0.10.ebuild b/www-apps/nextcloud/nextcloud-13.0.10.ebuild
new file mode 100644
index 000000000000..a9c1d18899d9
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-13.0.10.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 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.6.ebuild b/www-apps/nextcloud/nextcloud-14.0.6.ebuild
new file mode 100644
index 000000000000..e4392ac62888
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-14.0.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 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,intl,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-15.0.2.ebuild b/www-apps/nextcloud/nextcloud-15.0.2.ebuild
new file mode 100644
index 000000000000..d0d144714efc
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-15.0.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 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 +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
+}