gentoo resync : 24.12.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
commit: de49812990871e1705b64051c35161d5e6400269 (patch)
tree: 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /www-apps
parent: 536c3711867ec947c1738f2c4b96f22e4863322d (diff)
51 files changed, 772 insertions, 431 deletions
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 707c837e5b56..9abf26db22b5 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 e7ca01b63228..36ecee5890f4 100644
--- a/www-apps/airdcpp-webui/Manifest
+++ b/www-apps/airdcpp-webui/Manifest
@@ -1,5 +1,5 @@
-DIST airdcpp-webui-2.3.0.tgz 8428607 BLAKE2B ad2649c892234b32b6b29624c961a0c89f18255a3b991a2d823f42c3a38d386aec74c71b476cfe55bfec518583b4ed674843e4e6e7fd0fed2f2dcdcc09ae285b SHA512 1fe8896c471916cdfa9ee2c2a774ca62e295b2d6292d76817effa9a1be07e0c44d73449a239da23a90594a749177d5b54be56099482c1021b9ff0c576aa7ac00
 DIST airdcpp-webui-2.4.0.tgz 9252281 BLAKE2B 9682b5c197a17a2a0a1de9e29999ca54bfd2ac85120702ec37671ddcc445e595fcf262f82729497b1b38b638c9d1e4cbeb5daabf21b5436d240c0b1097dba1fd SHA512 4251dadc0161324a21c4278e480c39f798988e15a3cf1fe812966be4afde5666276b30dc86b40ab900aba008eb09c90bc54a24e23747f889884a276da99dde44
-EBUILD airdcpp-webui-2.3.0.ebuild 469 BLAKE2B 69fe90707f603ad98fccc3accb9b708e8a621688546829a99db57246170f75ccfe827c9c21ab69b21675b9aabc940bf0fd2c059b1fd5bdc97e3724eb7668872c SHA512 d2f88c397096281ac0797917753cdad8cf944d62ead08511f08ec0667495a5d9891b56861e0057b1094df91406767653fdd2f4997240ea92ce9d6bd22ce135d8
+DIST airdcpp-webui-2.5.1.tgz 6571762 BLAKE2B dd2d02913125c8166c1ca0f14d9276eed073fa58a46ddbf2ee5e70a97e081852e96a875c9f501781b81de0d2163c4c391c5aa3d078f6946fe35109fe901d8bb5 SHA512 771595f529361330fb54796b32fed61aa8fb37ef1ddbb551c10a8b6352eead6afe7e8a52df223c7e53c27942dd301f50b7234eb915ee378e90eb6ac847b16871
 EBUILD airdcpp-webui-2.4.0.ebuild 466 BLAKE2B a6c709a4fc399dff64f01178f72888e354bb5f564f93be837c85a0aea9cfe2c4272d0b63087164a44e2201255bbe5a77d0c370ca26bfebf7245f58059fc7ef0a SHA512 c7587abdf727b97ba914f6c3a89ed03b2e07eaed4cf03e2ce50846b7bb087222fa52f0b59ee81446a9aec3df5a061892a4d40ec257d5b185d340d031ab0ccec0
+EBUILD airdcpp-webui-2.5.1.ebuild 466 BLAKE2B a6c709a4fc399dff64f01178f72888e354bb5f564f93be837c85a0aea9cfe2c4272d0b63087164a44e2201255bbe5a77d0c370ca26bfebf7245f58059fc7ef0a SHA512 c7587abdf727b97ba914f6c3a89ed03b2e07eaed4cf03e2ce50846b7bb087222fa52f0b59ee81446a9aec3df5a061892a4d40ec257d5b185d340d031ab0ccec0
 MISC metadata.xml 553 BLAKE2B aacc047cadd9f0d8078a997d9ac02aeda726575f1af69cd4e97afe9159987347247aee7ac74b11b8d23b18a669b447451e3e6123f578b501a872f395e418341c SHA512 0d1233d39b432f28fb9977b06a750e990524b250563e8fa5594bdf7dd6cc5b35468b70abe41e0cae87331c2052b592d4d314a897549f0a247c04af1a15782feb
diff --git a/www-apps/airdcpp-webui/airdcpp-webui-2.3.0.ebuild b/www-apps/airdcpp-webui/airdcpp-webui-2.5.1.ebuild
index e31b00ac8f24..898d2fa96dc8 100644
--- a/www-apps/airdcpp-webui/airdcpp-webui-2.3.0.ebuild
+++ b/www-apps/airdcpp-webui/airdcpp-webui-2.5.1.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
 
 DESCRIPTION="Web interface for airdcpp-webclient"
 HOMEPAGE="https://airdcpp-web.github.io/"
diff --git a/www-apps/blazeblogger/Manifest b/www-apps/blazeblogger/Manifest
index 80259836ef0a..d1263e123769 100644
--- a/www-apps/blazeblogger/Manifest
+++ b/www-apps/blazeblogger/Manifest
@@ -3,4 +3,4 @@ DIST blazeblogger-1.2.0.tar.gz 81340 BLAKE2B 08415245ea7114ecfad7f5817eae4c2a921
 DIST blazeblogger-doc-1.2.0.tar.gz 191467 BLAKE2B 501981679a16b3cd592b6f2fd55c2d8192944106b507ce3119828a3266fe27d49e18887cabb072cece273475b1ccb2321e043195276e53bcb651317839655cd7 SHA512 135d77ae30fa090207cf1147188ceb3552582fcba28d548ed8b104d86d0cff1beb6a3209e4e7cc8984f698e927ab96437254277d96b9dff371d90866c5657989
 EBUILD blazeblogger-1.2.0-r1.ebuild 822 BLAKE2B 02d0fa7f918d0d1e534d629bfc4c2d67eee2bd23c2b953a00c9c8b53e82a1dad5960813b486ac0d37cc7fba34c2d171081d57a296229edff3fd136b9c4177f87 SHA512 21c6bd49895658dc2bb1e7c2c6d05c744ba01a955c0e3dd61a4a5f2ec723d33b66c06f856a754b541aea78a5d8de9f907ee45105a1cb62530bf36e9e175ad809
 EBUILD blazeblogger-1.2.0.ebuild 699 BLAKE2B 642fab200ebb1a56542c0669979a284feed911ea97a78cc70987065390dfccf75256f3c2061ceff399f6873925f8be5ed4da76df3dc6d1ab3929c5782d2e509a SHA512 03a9d25fb8594613b44857a2a0d0d66f715e974476f60dd56c512ddfe66b577553d5508da994eec8792e6a21dba9e6c75662275e2aea690e3807442756698b7b
-MISC metadata.xml 325 BLAKE2B 7c6ad84d21680eb68d21ae2a9e9c929f6d5b482bef2f7c2059fec558c76871d4e614800059cc144bc3239c72b0da39172214c1fc7feb05665842359aa1e5265d SHA512 d30a3e0a39a7fb4f542acfd36a545934962449c33dfb659360212a68df41f0e148cf835b3da19123f93ae66f47a11422ede84bb25b2421b2edf57cf0464f1a03
+MISC metadata.xml 249 BLAKE2B 91cbef2ed101800f4cf8640ce7e6eccabbea893a436b81fbcf7a4d79914b80390e9ad90811eaac53a05f8a45eceeb939f32fff9b41bf9f086a0f51ccfe1f6e16 SHA512 276f06c4a1bea09c70d260c03dc673a0e0826484806b084761ed6f98506f37b551a84ff6a6b293988df9d29ad30f207bdf4206b666dcdd5286415fea1257480d
diff --git a/www-apps/blazeblogger/metadata.xml b/www-apps/blazeblogger/metadata.xml
index c2f03805ce86..8d99d982540d 100644
--- a/www-apps/blazeblogger/metadata.xml
+++ b/www-apps/blazeblogger/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">blazeblogger</remote-id>
 	</upstream>
diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest
index cee00f1ee66a..b61f5c7b4477 100644
--- a/www-apps/davical/Manifest
+++ b/www-apps/davical/Manifest
@@ -1,5 +1,7 @@
+AUX davical-1.1.7-fix_php4_style_constructors.patch 1364 BLAKE2B 4e4217fcb0a096f6020f0fb35eb800f52e349b8b4a4540ce19d7395d924926d8bda4f3c835311b95f2f2f3719289c71873b69d60d950254f37c82cb7e04e29c3 SHA512 3d971649f4fabf40b6683917d111f4cd374d6f01b98ffb8502030ff63e3b36e667a969c67e457f415a053b546e0362b128f1632e668f7eb2421832b86bf3cb75
 AUX postinstall-en.txt 730 BLAKE2B 43e38a6c099ffd1abf70a066fd0c4a7e88829ddc03bd8804eef1843158210a20a3030b4193ce89d969a88d8be4373e0d22ccb5a9984ec8cacfd9bedccf29d958 SHA512 e77199c7978bf44f96b82dee6d7cf22e4a964f2bd48c17890add7ec0742a5f4c3a296bcb813f6ac79059e8b98b5c155a0846b00c3622ea708f6baf3895270de4
 AUX vhost-example 366 BLAKE2B 2aef55fee2759d1063936a583cdf6b96fcab77a0d6b056d59390931327ebcfdc338a515a8f7d9cfc5a6f071e0266fa82f0b6b3b4bab97979ff4dd8231fa2d729 SHA512 a2fde5ad64445aee0936a4fe2c608f48ec8163c46949cccd98c1b36b548e769477d387fb82e065b6dade5277580ad43426264ce13dca614182db16a4951247b9
 DIST davical-1.1.7.tar.xz 1347368 BLAKE2B 74418e99190db94dbb95fe9bdbed8f468cf98070a6ef86cb5af1f6460a97eb8c2faede7858a38b9728c5b3e400c6340f1abf3f00ae757847d8996b22e709f70e SHA512 d66388479259a8369f3a648a9d81f1e2f5488f6a3c4415360c133b21b6c6d4b4d433d5f94a635cffdaa0385a56c24176fa660ee8653d75246604655ccdd1a455
-EBUILD davical-1.1.7.ebuild 1274 BLAKE2B f7719fbe99311187884aeaf65a760d86135e8f9176ec2cdf84d34db5c7f4681f39c6344cb161306ab8ebbaeb711ae72a135c15d43def684e56c8c6f0a2a3fdc2 SHA512 c69d4fe244d216c7a028862b0eaaafa275e27cc0f17370ab3efcce0599b176e9ee5460fc10f76e39fdfe5076545c76e6b05314fcdb0bd122a782a78babf2ba50
+EBUILD davical-1.1.7-r1.ebuild 1307 BLAKE2B a9cbc71f0586e2f0614077dfe711d8e73412f6a10abe643cfc9f3cf4883fbddc0a36f65021eff65b5723472ea59ea5f91be89cf08249908bc8f6f8743194383f SHA512 0eba7bcf05036cc95d55c5691a35ef22d626a82b7f2c4306ab745fde925596702b405922122e2bee553f51f6641f202c010f93fae451c9425ae2ad24b03b4556
+EBUILD davical-1.1.7.ebuild 1272 BLAKE2B 79c7b8181f50611ceb51ddbc0da6fa55a827ea2de44eb78ffcd7abb73132979b4699b659c987307e42b6baee07dbe148b5cb8d490d5fc31235d06a5eb9fd9e2e SHA512 301de270a523525ad93399b68ce892cb382e69d8d6c4b84d15915d1840760756ad6c8d0266dd67627d983d6016566cece93d375b82459d611547b4719f82bbc5
 MISC metadata.xml 464 BLAKE2B f84e3f2c3b622eea5925ed066e9885aa1adb55d2f62245da5a63118bd99b30e36c10f21cd001da54a35926489860ee92cbde495552a52faf2f70dfd87807035d SHA512 74382454cf5fad3dc417c8c5be290919a3e86fae9f7508eadc995a0253e18350f1ef8ba9b0085f174e7fb15b14b5cd5630180dcbc2178132409d858182c31b84
diff --git a/www-apps/davical/davical-1.1.7-r1.ebuild b/www-apps/davical/davical-1.1.7-r1.ebuild
new file mode 100644
index 000000000000..b3bad2197f85
--- /dev/null
+++ b/www-apps/davical/davical-1.1.7-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+DESCRIPTION="A CalDAV and CardDAV Server"
+HOMEPAGE="https://davical.org/"
+SRC_URI="https://www.davical.org/downloads/${PN}_${PV}.orig.tar.xz -> ${P}.tar.xz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=dev-php/awl-0.59
+	sys-devel/gettext"
+RDEPEND="app-admin/pwgen
+	dev-lang/php:*[calendar,curl,pdo,postgres,xml]
+	dev-perl/DBD-Pg
+	dev-perl/DBI
+	dev-perl/YAML
+	>=dev-php/awl-0.59
+	virtual/httpd-php"
+
+need_httpd
+
+PATCHES=( "${FILESDIR}/${P}-fix_php4_style_constructors.patch" )
+
+S="${WORKDIR}"
+
+src_compile() {
+	emake built-locale
+}
+
+src_install() {
+	webapp_src_preinst
+
+	einstalldocs
+
+	einfo "Installing web files"
+	insinto "${MY_HTDOCSDIR}"
+	doins -r htdocs/. htdocs/.htaccess
+
+	einfo "Installing main files and i18n"
+	insinto "${MY_HOSTROOTDIR}/${PN}"
+	doins -r inc locale
+	rm "${ED}/${MY_HOSTROOTDIR}/${PN}/inc/always.php.in" || die
+
+	einfo "Installing sql files"
+	insinto "${MY_SQLSCRIPTSDIR}"
+	doins -r dba/.
+
+	insinto /etc/${PN}
+	doins -r config/. "${FILESDIR}/vhost-example"
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
+	webapp_src_install
+
+	fperms +x "${MY_SQLSCRIPTSDIR}/create-database.sh"
+	fperms +x "${MY_SQLSCRIPTSDIR}/update-davical-database"
+}
diff --git a/www-apps/davical/davical-1.1.7.ebuild b/www-apps/davical/davical-1.1.7.ebuild
index f247e7e3b458..1f459316daa3 100644
--- a/www-apps/davical/davical-1.1.7.ebuild
+++ b/www-apps/davical/davical-1.1.7.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
@@ -9,7 +9,7 @@ DESCRIPTION="A CalDAV and CardDAV Server"
 HOMEPAGE="https://davical.org/"
 SRC_URI="https://www.davical.org/downloads/${PN}_${PV}.orig.tar.xz -> ${P}.tar.xz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND=">=dev-php/awl-0.59
diff --git a/www-apps/davical/files/davical-1.1.7-fix_php4_style_constructors.patch b/www-apps/davical/files/davical-1.1.7-fix_php4_style_constructors.patch
new file mode 100644
index 000000000000..a236e2823373
--- /dev/null
+++ b/www-apps/davical/files/davical-1.1.7-fix_php4_style_constructors.patch
@@ -0,0 +1,39 @@
+diff --git a/inc/HTTPAuthSession.php b/inc/HTTPAuthSession.php
+index e3b208c6..08663286 100644
+--- a/inc/HTTPAuthSession.php
++++ b/inc/HTTPAuthSession.php
+@@ -60,7 +60,7 @@ class HTTPAuthSession {
+   /**
+   * The constructor, which just calls the type supplied or configured
+   */
+-  function HTTPAuthSession() {
++  function __construct() {
+     global $c;
+ 
+     if ( ! empty($_SERVER['PHP_AUTH_DIGEST'])) {
+diff --git a/inc/PublicSession.php b/inc/PublicSession.php
+index 28e06173..e779a9df 100644
+--- a/inc/PublicSession.php
++++ b/inc/PublicSession.php
+@@ -59,7 +59,7 @@ class PublicSession {
+   /**
+   * The constructor, which just calls the actual type configured
+   */
+-  function PublicSession() {
++  function __construct() {
+     global $c;
+ 
+     $principal = new Principal('username','unauthenticated');
+diff --git a/inc/caldav-client.php b/inc/caldav-client.php
+index 4c1bf67f..b32c5c91 100644
+--- a/inc/caldav-client.php
++++ b/inc/caldav-client.php
+@@ -48,7 +48,7 @@ class CalDAVClient {
+   * @param string $pass      The password for that user
+   * @param string $calendar  The name of the calendar (not currently used)
+   */
+-  function CalDAVClient( $base_url, $user, $pass, $calendar = '' ) {
++  function __construct( $base_url, $user, $pass, $calendar = '' ) {
+     $this->user = $user;
+     $this->pass = $pass;
+     $this->calendar = $calendar;
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 34ef19a6b40d..8062f85bc471 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -3,8 +3,10 @@ DIST drupal-7.60.tar.gz 3283058 BLAKE2B 2c29c089e0e13ce52c5d7a0bbf72c79596fbdc1a
 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
 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
 MISC metadata.xml 419 BLAKE2B 3652ed012764eeebfd813e1979965e76caf500aea8a29bf8652c56f145e62e5ac8c5ae233919a0be123878cccdbab5fa52a4c02ed7367099862407487ca0b8b9 SHA512 3610c6151b6bbbb452a9c599d04d28a18c3e535c0976e425778e8b138bb03637bb28900acef2ef405ec10176390db33e997ba5d789f8a0fc49564538194fc8a1
diff --git a/www-apps/drupal/drupal-8.6.4.ebuild b/www-apps/drupal/drupal-8.6.4.ebuild
new file mode 100644
index 000000000000..b6b875c85dfc
--- /dev/null
+++ b/www-apps/drupal/drupal-8.6.4.ebuild
@@ -0,0 +1,84 @@
+# 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/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 1b1ba72c19a5..4fa537fc31d1 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,12 +1,12 @@
 AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e871a86738f21b8b3ee68caf1e2b437343f739564dac5ef91db5dcb6b2f31b49a936f9d4e6a62cca4 SHA512 13b9868a4c0a5a7209e6f4aa1206a93a0fb33b0234c4c0a6942bdab9d1cf139049181c066e01c49f639165ea422259fa7cab9e0bdf21537b3722bd86691d9b2c
 AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743e94fc59f76ef77220610d2fd02950ad0157b9ebbfd8380a489cd0da33b5b25102fbaa936c1212e2f SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
-DIST grafana-bin-5.2.4.tar.gz 54300847 BLAKE2B defb1b32fafe95c17ab4201665df053d8cb1cf7154a366d2b0bbf3936ffa4baf6f5a3ae3e5fe9fa96334fc0bfcc557106c38d4dcab5d5b5ca64b588726274034 SHA512 75c0ca8735ab0e8c2b340322cc5b0d5adec90a7159761cd9fa2c346a5a4e9fcceb904d160e55be2e4c9b5fa582356aa20430f9d4577e2df3195825d83de897d2
-DIST grafana-bin-5.2.5.tar.gz 54300812 BLAKE2B c6b0928f15938e6240551a80b00e996e450a1fef5aeb703728e4654d4e0c081ad23f3250775d5de5858b4bff7ed0753a90b41caf502e2e93b28bb4fa4f1c86c7 SHA512 eff8331c99ed4483a6d715b58170cc0b9c7f57aaff66cc03daa68e767cfb67635ece0583ea476a74e0df176d40fe4d92778533d0545476a5528d8ec8f9e400a7
-DIST grafana-bin-5.3.1.tar.gz 54595281 BLAKE2B a6feb32e885bb6ce89c168e51e2b2ef6fd33557b44e6ed5f23a3b724b67f7e3055234bb25a714cc515a89d0de6dd69ccfec92c5aeeed72865ce4f646b3a9bba5 SHA512 b439be6d031d24f046985cddce0ce2866efb808f9d107f305998ed042b6bc86f5fdb4482d31bb3da53e4f57d52ac61bd7448394410cd063e46f396f7506cd179
-DIST grafana-bin-5.3.2.tar.gz 54609996 BLAKE2B c5c4493e31a766332cda727ede440d4cce59278e1d1693409d112d8093f3074f95e2cc10b0c21379f306eed497d1fc236d5744f111afb512473ff5e097afb3d2 SHA512 d2f4786c304af42c2680210f712cb11010825b76cb1155235841a1f80d30715f2f2b3510ac93594d807b132e4f5c43d89cab026db2b7ea20672f592e3b117b09
-EBUILD grafana-bin-5.2.4.ebuild 1780 BLAKE2B 603d8212864953f010df6846f9ab863a3a0256d912a0d53d4d5b0b1239c3d60252ae9a2781d210daddbaff0970095740f6cd900b6863aaa1cb38da9debf1b75c SHA512 0674a4fee1ae83ff36ca4506c534b7c02f2bc47e930f67ab76dd2ac9eae979022cb9d23a85c45c4ccc395ce3245125930878cf6513d61c65afed90dd233f034d
-EBUILD grafana-bin-5.2.5.ebuild 1777 BLAKE2B 9450adb124f556ad37ce3526d30e416b1c38c16b406bc4e6de0c2f16b0b8c0d3ffa10bc94d73c5abdb608367715a806bfe9a7bfbdc2c80a1a3f3131f1ee5b9b3 SHA512 6fdc6feb53f5a578e8c3cbc766499daabcb00d56910a1beb9214b15a06c31898bc5f18a128e3310ca90e8fa66932762af432661c079a9d543316368616709c34
-EBUILD grafana-bin-5.3.1.ebuild 1743 BLAKE2B f9636d2f85fd3c96a88a915b0bb173bec3f2cb46db4c9434eb44840a6a93e0657f3b00542ccdffe82bf3f737338511249c76884c9dfd599f34182ead06889586 SHA512 d5612249b0f78b21ccfdea99b034ffc9697367c64cb6fbff5578ccca279d3c23e08c360965f71e038caf1b41dc2a8142ba4c0edc4db74cadb52dc28f24f3ab96
-EBUILD grafana-bin-5.3.2.ebuild 1743 BLAKE2B f9636d2f85fd3c96a88a915b0bb173bec3f2cb46db4c9434eb44840a6a93e0657f3b00542ccdffe82bf3f737338511249c76884c9dfd599f34182ead06889586 SHA512 d5612249b0f78b21ccfdea99b034ffc9697367c64cb6fbff5578ccca279d3c23e08c360965f71e038caf1b41dc2a8142ba4c0edc4db74cadb52dc28f24f3ab96
+DIST grafana-bin-5.3.4.tar.gz 54609273 BLAKE2B 4a9197baaa6d6689d1e23630f49513a9b6b90ebb081ab8f82fff8e2f3f1c156b0fec5a30c6f6222a3225646b37305a535747e4a60157528a56f222cba56a8ada SHA512 97aa9325f9886a13844828d29395fb6a0752ccc0311119850c78425a0d0c8e82844b20b4c0dbacec0de479aaa26dddb5510485d0fd6a8a7e760f4b540bb3b270
+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
+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
 MISC metadata.xml 416 BLAKE2B ff5bdf7e202aa96bbf615df2f86c6542bb7d291e6d564dfac683a2e54002380dd80ef3f1ca0b6c1f398de0115e26398903256b9d64e353127f25c3e97e5b21c8 SHA512 db2cbd25cf9b21664db93dc8f9719bf7f9a2fd632c5231d0f296bb32f3f6af3e08307c8a662081cc68f33638d70f6512094fad76073a5de4ceba02eeb3d1188b
diff --git a/www-apps/grafana-bin/grafana-bin-5.2.5.ebuild b/www-apps/grafana-bin/grafana-bin-5.3.4.ebuild
index 211fc9468af4..211fc9468af4 100644
--- a/www-apps/grafana-bin/grafana-bin-5.2.5.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-5.3.4.ebuild
diff --git a/www-apps/grafana-bin/grafana-bin-5.2.4.ebuild b/www-apps/grafana-bin/grafana-bin-5.4.0.ebuild
index 8db7c5ac1d9f..211fc9468af4 100644
--- a/www-apps/grafana-bin/grafana-bin-5.2.4.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-5.4.0.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/grafana-bin/grafana-bin-5.3.2.ebuild b/www-apps/grafana-bin/grafana-bin-5.4.1.ebuild
index e918394e986d..211fc9468af4 100644
--- a/www-apps/grafana-bin/grafana-bin-5.3.2.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-5.4.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="7"
 
 inherit user systemd
 
@@ -20,6 +20,7 @@ DEPEND=""
 RDEPEND="${DEPEND}"
 
 QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs"
+QA_PREBUILT="usr/bin/grafana-*"
 QA_PRESTRIPPED=${QA_EXECSTACK}
 
 pkg_setup() {
diff --git a/www-apps/grafana-bin/grafana-bin-5.3.1.ebuild b/www-apps/grafana-bin/grafana-bin-5.4.2.ebuild
index e918394e986d..211fc9468af4 100644
--- a/www-apps/grafana-bin/grafana-bin-5.3.1.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-5.4.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="7"
 
 inherit user systemd
 
@@ -20,6 +20,7 @@ DEPEND=""
 RDEPEND="${DEPEND}"
 
 QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs"
+QA_PREBUILT="usr/bin/grafana-*"
 QA_PRESTRIPPED=${QA_EXECSTACK}
 
 pkg_setup() {
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 9ff9410f9a12..4bd5a71f4ec7 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,6 +1,6 @@
-DIST icingaweb2-2.5.3.tar.gz 8124667 BLAKE2B 43f9e47d670aaeffb15a8dbca6794d72436b195d4a19491d31f548a57ef9d2d0c411f16276be5355700e8dc863b8ef84821c68759d65ef2e97688a88d92605ca SHA512 d11d4f90f0cb54ab6fc5412151d412fc7827c895e81f6c91806090c364b3df4f2999bbc5f65cd4007406a3e7a7c9e0d48fb8f8362f3d7780681ac8702cfcb572
 DIST icingaweb2-2.6.1.tar.gz 8165384 BLAKE2B ea9b499f7da9fbdbe8340443f02b5a9fc348549bbffc7777ad63ac1e04c12ff45e5337418f1714b1d76af3818e9733bb0eb51a6bfbc39a7d1eb4820af8747392 SHA512 f2ac728abde9795e578b7d512f5b87e3307faed35a5413aaa2d3a958b57389c5297a124b530667aa248ee368aafaf3875097fa8e27b4c3090bb64badc7c329b7
-EBUILD icingaweb2-2.5.3.ebuild 2549 BLAKE2B 3578e930824e6dee430d33190fb62f7074c6e8ed8d839f88abe840502d767441f8d156e869ff0a1c14ae3bd4af7fad423f43150ae18e439886df46e1e75510b4 SHA512 46ffbd0eccd4e880bc74398dc63c9f5d5c4a7423602cc81be889beac106e5090166aa838a3d0ea62a883cac4bdfef89bbfd888eb64a0f62b6dc84c317d204948
+DIST icingaweb2-2.6.2.tar.gz 8171965 BLAKE2B 2a7ebe4ee84ea311a1e0cac14021db66c0950be74d5984bb055983cd24e0277b43945f0b78ee98edb123412dfd116f875803c988612cd2a8b247f36b7c55f04a SHA512 f5fffbec237b892dbcfeee75a23ba26005cad9b4a1505a4d500bcbd16a8fa29125ed255ee320d3efcd8e43dcfb835244234a5607c562dd8bebe871d1a356b520
 EBUILD icingaweb2-2.6.1.ebuild 2753 BLAKE2B ca25d486a10b97ac6efb871049239c49301e1b242c5cf7021144f67c99f38ad525d5b06bd78b652d44ed7977cf86b43ef3e711af965fad4c583ba6246aac49a0 SHA512 4493fb4bca00b034ba9714c3b16edd202d8a3ccfeb6dd0ccdd4f14c86499fc0be27e59b10a44e14488d89e74926841cf6090156cbacb13fa8acf44035309c3a4
+EBUILD icingaweb2-2.6.2.ebuild 2750 BLAKE2B f3a93c50db31b0d18d442a76ad42777bc26136a1aa10baed09c31ebf8b31529e76c21f9c26375e17bf9bce3ff10325e8e6f9cf7dde0cb7a7ddcb34a6788450b0 SHA512 1eff0bc5243c531f4d869ad8d0cf91551649dcae50489dfaad45d342777a6714dc58e752a315a00bae9967664b5b5c74386ebc2fef9193f3553c1027ea0fde70
 EBUILD icingaweb2-9999.ebuild 2750 BLAKE2B 4f45b14184dc5091e5c139a66404b8f57df53f66502a2dc716de7c41849895b5720020f3d8fe0994766a14ba004707f71c28b07058074edab47aa8b864013fa1 SHA512 a3e5cb7daf5d8926c91805c355aaf83c7ed15f802b3ac4e313624f05afe04c5c80167d55fd65d9c2e9d35a4139995caad4de31aab87d40ba150260c63802a47a
 MISC metadata.xml 407 BLAKE2B 42e1ae67b6d8307c3af6ee7257eb811d893705aedd5852c4b33b103d77bbb4858d01bf8369511d7ce1cc187158482755894583d3b77be0ca7580043279f96461 SHA512 40eb3b6ff856fb8a4bcced4b177c73e4a7987b468dbcfe645d4a9f816f100ce899c8f8f803ad343c2b33b60cbcfbd4cef37257548311d22b4272a15602b1c961
diff --git a/www-apps/icingaweb2/icingaweb2-2.5.3.ebuild b/www-apps/icingaweb2/icingaweb2-2.6.2.ebuild
index f0f9dd8f5d6a..da0929cc43f7 100644
--- a/www-apps/icingaweb2/icingaweb2-2.5.3.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.6.2.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"
@@ -23,6 +23,7 @@ DEPEND=">=net-analyzer/icinga2-2.1.1
 				dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 				dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 				dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.2[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 			)
 		)
 		nginx? (
@@ -31,6 +32,7 @@ DEPEND=">=net-analyzer/icinga2-2.1.1
 				dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 				dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 				dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.2[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 			)
 		)"
 RDEPEND="${DEPEND}"
diff --git a/www-apps/jekyll-watch/Manifest b/www-apps/jekyll-watch/Manifest
index f8ffd6203502..6d9166e42c3f 100644
--- a/www-apps/jekyll-watch/Manifest
+++ b/www-apps/jekyll-watch/Manifest
@@ -1,3 +1,5 @@
 DIST jekyll-watch-1.5.1.tar.gz 14764 BLAKE2B fcb0e80060e65e85e0047d54f6277cf5e31ec8347c2c960e15c00d74b7dc255bb8cd1fea3671e2ecc7d380227bdae7cf62d835a5dc1b249aa68ca8f0ed9a1f34 SHA512 05e7f89f213adf6695a8bd1f8ff25d7aa6338cc378a934981f1112df556380cc40d2352ea4ce0a362c4d8e51ed8a6e36ca96c86385a6f179347031396db94a54
+DIST jekyll-watch-2.1.2.tar.gz 15966 BLAKE2B 877935b518f887aa58987942cf03b337f41f142947416386410c3924880738e64b4aa05a06eba2089635d417e329a72b0602112ff19070ea203cf07bb9988ce7 SHA512 a411f354e1971727d1fabe6fe1fc6e9f889a0cbc9cf253e8dbee87c66f7a8f3ca1e75cdad242c9235e93ce45983939ded2a439d2a8339bfc70bc55b5b2eaff4a
 EBUILD jekyll-watch-1.5.1.ebuild 671 BLAKE2B 6e842e73c743ec350bcfc3ba3e2ebb6213d73ed6a8ecc99129916caf2a83b0281672c0edea34d7f1130c9213a757869e1aa1f77696a6cb090730f73944ae6031 SHA512 3b541b861dc860ec0ed6807479a2591313a0114399a9eeb4f7ae0746227e76ea619b13110a8d0e54568e6c6d12f64444d4d1878162ac6f5d96834d9a06e0b54c
-MISC metadata.xml 331 BLAKE2B c43bc1213adee987e9bd55089f8f5fa00f5de2461fe584b8715332d7ace822a5b0ffc47a2af7001e5c134ff20d9a3580d2225dacee73e4fbdadc1735cbe806a6 SHA512 53a2e135c948ee84fdf2f7ad1583d658636ea1077b80b6e2ab52c10615ceb5a30ac4a400c213e5fff5f4effdee0acd4afc8653adbca80178815f1fdfd3620004
+EBUILD jekyll-watch-2.1.2.ebuild 671 BLAKE2B 6e842e73c743ec350bcfc3ba3e2ebb6213d73ed6a8ecc99129916caf2a83b0281672c0edea34d7f1130c9213a757869e1aa1f77696a6cb090730f73944ae6031 SHA512 3b541b861dc860ec0ed6807479a2591313a0114399a9eeb4f7ae0746227e76ea619b13110a8d0e54568e6c6d12f64444d4d1878162ac6f5d96834d9a06e0b54c
+MISC metadata.xml 436 BLAKE2B 72dd2e30ff3976205bc604cf6a5be914ad2a1e79b72a96b6bee54dba91d5a8f19b857d70510483ad10a093ef0786da8a2c71a4d4c8ed800d3756e4a6136d4d03 SHA512 965327c1e3256487e17066618b4f27ae8e60d4d705988da4409fc62b52fe4e3a7d31d9bc13ef794b7544e2a4fb3b76e8d8cee075075c56817128b749fc22f419
diff --git a/www-apps/jekyll-watch/jekyll-watch-2.1.2.ebuild b/www-apps/jekyll-watch/jekyll-watch-2.1.2.ebuild
new file mode 100644
index 000000000000..3468c5c4a5e8
--- /dev/null
+++ b/www-apps/jekyll-watch/jekyll-watch-2.1.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rebuild your Jekyll site when a file changes with the --watch switch"
+HOMEPAGE="https://github.com/jekyll/jekyll-watch"
+SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/listen-3.0"
+ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
+
+all_ruby_prepare() {
+	rm Rakefile || die
+}
diff --git a/www-apps/jekyll-watch/metadata.xml b/www-apps/jekyll-watch/metadata.xml
index dcf06adc1086..6f7f00be6e72 100644
--- a/www-apps/jekyll-watch/metadata.xml
+++ b/www-apps/jekyll-watch/metadata.xml
@@ -5,6 +5,10 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>bman@gentoo.org></email>
+		<name>Aaron Bauman</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">jekyll/jekyll-watch</remote-id>
 	</upstream>
diff --git a/www-apps/jekyll/Manifest b/www-apps/jekyll/Manifest
index 691787ced907..ca82846398bc 100644
--- a/www-apps/jekyll/Manifest
+++ b/www-apps/jekyll/Manifest
@@ -1,4 +1,6 @@
 AUX jekyll-3.6.0-test-helper.patch 657 BLAKE2B 8e9d9bb57efa2370976d459dac772f7f41c0bf02c2fc0c71f19d4b78714e06f96d8a800a45f7c3eca80f766639036a624df24e681a9258e4bdc76bfb563498ad SHA512 7b53cd03a988cc5c949d15be8de91ffd37d4f228822cc3bec64c961c163ba60946df1d314bdf746a33a42df091f06f481f945a712515cca04539e111393246d0
 DIST jekyll-3.6.2.tar.gz 740389 BLAKE2B c51e8b1545bfd1bab64c890fdf8d53087e27b3ba2fac07d286d009f1c4b6efb81d3528d239f73a73afa68d1f2d320e816c7015bf385dc9e27cad13d1b4279a50 SHA512 3af17f32098bf1012393d0ad47269ef305138553735ede9c65e461c8f1e1033008a01805c8c96f9aa0f4682f7e68a9cff3eda83a70660a334161ec3d04ce9c72
+DIST jekyll-3.8.5.tar.gz 852490 BLAKE2B 3831c68c8c17b5ca14521988572849b89c8cd37f3fa4d7048adb7e25319f59a31e6174a6d25fb5ba4d33c919389f3a30cb28274cddd29ea644ec5d5aa11875e7 SHA512 2cd6bb8786fa2efc249457f72e9e1a3dc76c61a23d2ed8388fef56f1bd576897260b199edb393eb358cfe3a0b26487e40cc2fd3502c52cc9c828839b9eef624d
 EBUILD jekyll-3.6.2.ebuild 2061 BLAKE2B fdc85cfc7fa1beffe671f5d54bed57ace5ac9f2023e438b02e889ebf9b49e7c66a432e8adbc8b0575fdf296bc181886d05987c8eb39b169c6062b6b3dff3c81a SHA512 9fe2223b9cf6e1c95657b1312232794eb416b7902551a9a4573c134ce0fef348667b3ee5de688bc525aa44d6b4c474b2d5b2da3a0739f99f60f908c589d8f2bb
-MISC metadata.xml 325 BLAKE2B c29145c8eacfee5164b55192ebd77d0b4134179380ac4c5f0ac29b1f708dc0cb1d91748ad68aca73380466451efcfe03c1115ebc706c16a70b527b2e3360a7d2 SHA512 02b93ff17a615bde6a2074bed7dc0d64c0cea0d11002e48fe5a132b3d8044c0329a5a69f62f917eadf8fb090ef1ea7ce99bd78496fd738a1d327599dde7582e2
+EBUILD jekyll-3.8.5.ebuild 2116 BLAKE2B 08cce5c39040f258b6c4594fa6923faf2ed1da1f1c9969115adeb2705cd8dc84d0055c0e538c10728f137781858f9bf53cd2025629053ef8b9bc4b48a4c95ed8 SHA512 6341fd4808d3b7b39e82636379c96bf9a3d2fe0a7dc920c58505e4e7e7de9d2cdb3436790aea17f652daf3280560912c7a3b3e043aa0f16a3ff2fd56ddf33c62
+MISC metadata.xml 429 BLAKE2B 9a3bc0c4945b7be24fae6e0b8bfe18b33ea06d32232200b42050c18f9bd9786c3737cedec0e850312df0599d78cd9db66a4d302395017cb9d27a1cba184c4df3 SHA512 0755fd020670ebb1fbb922a1765cb2d6a4fdb4c39886ef010aee9ff4035d7e6157721060da917567d6ccac0910d1e3872896490b35eedf7c293a16bab44e3645
diff --git a/www-apps/jekyll/jekyll-3.8.5.ebuild b/www-apps/jekyll/jekyll-3.8.5.ebuild
new file mode 100644
index 000000000000..fdab590b1702
--- /dev/null
+++ b/www-apps/jekyll/jekyll-3.8.5.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24"
+
+inherit ruby-fakegem
+
+RUBY_FAKEGEM_EXTRADOC="README.markdown History.markdown"
+RUBY_FAKEGEM_EXTRAINSTALL="features"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+DESCRIPTION="A simple, blog aware, static site generator"
+HOMEPAGE="https://jekyllrb.com https://github.com/jekyll/jekyll"
+SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/addressable-2.4
+	>=dev-ruby/colorator-1.0i
+	>=dev-ruby/em-websocket-0.5
+	>=dev-ruby/i18n-0.7:0.7
+	>=dev-ruby/kramdown-1.14
+	>=dev-ruby/liquid-4.0:4
+	>=dev-ruby/mercenary-0.3.3
+	>=dev-ruby/pathutil-0.9
+	>=dev-ruby/safe_yaml-1.0
+	>=dev-ruby/rouge-1.7:0
+	>=www-apps/jekyll-sass-converter-1.0
+	>=www-apps/jekyll-watch-2.0
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/classifier-reborn-2.1.0
+		dev-ruby/launchy
+		>=dev-ruby/pygments_rb-0.6.0
+		>=dev-ruby/rdiscount-2.0
+		>=dev-ruby/redcarpet-3.2.3
+		dev-ruby/rspec-mocks
+		>=dev-ruby/shoulda-3
+		dev-ruby/test-unit:2
+		www-apps/jekyll-coffeescript
+	)
+"
+
+all_ruby_prepare() {
+	eapply "${FILESDIR}"/jekyll-3.6.0-test-helper.patch
+
+	# Drop tests requiring bundler
+	sed -i -e '/bundle_message/d' test/test_new_command.rb || die
+	rm test/test_plugin_manager.rb || die
+
+	# Replace git command in gemspec
+	sed -i 's/git ls-files -z/find -not -type d -print0/' $RUBY_FAKEGEM_GEMSPEC || die
+
+	# FIXMEs:
+	# fails to find fixtures
+	rm test/test_theme.rb || die
+	rm test/test_theme_assets_reader.rb || die
+	sed -i -e '/^    should.*theme/,/^    end$/d' \
+		-e '/^      should.*theme/,/^      end$/d' test/test_site.rb || die
+	# partially requires 'toml'
+	rm test/test_configuration.rb || die
+	# pygments tests fail because of line numbering
+	sed -i -e '/^  context.*pygments/,/^  end$/d' test/test_tags.rb || die
+	sed -i -e '/^    context.*pygments/,/^    end$/d' test/test_redcarpet.rb || die
+}
+
+src_test() {
+	local -x JEKYLL_NO_BUNDLER_REQUIRE=true
+
+	ruby-ng_src_test
+}
diff --git a/www-apps/jekyll/metadata.xml b/www-apps/jekyll/metadata.xml
index 482fe238b680..28188a0391e2 100644
--- a/www-apps/jekyll/metadata.xml
+++ b/www-apps/jekyll/metadata.xml
@@ -5,6 +5,10 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>bman@gentoo.org</email>
+		<name>Aaron Bauman</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">jekyll/jekyll</remote-id>
 	</upstream>
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index a43cd20a14bb..cbe4e768a1d5 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -5,9 +5,12 @@ AUX kibana.service 511 BLAKE2B 2b0786bfaf37c26e061973f38adea0a55ac1b8bf771395242
 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.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-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
 MISC metadata.xml 538 BLAKE2B 649a05badea8d1116854565d09820a8ce623c733d9d0d1cbded145fdc0dfcac2478273d99f686119adab16126149ad4da8f6feb0c7be9499f5721f31a259ec34 SHA512 f0e65883a644eeb57f2d11d0871631142665e74bf8820431ac8333a1cf3e40a0b517b5cca747adba173c7eab20b70311b7bd8de6c4fb5cee4982e044189e5256
diff --git a/www-apps/kibana-bin/kibana-bin-6.5.4.ebuild b/www-apps/kibana-bin/kibana-bin-6.5.4.ebuild
new file mode 100644
index 000000000000..ed01f9fe2aa0
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-6.5.4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd user
+
+MY_PN="${PN%-bin}"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Analytics and search dashboard for Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/kibana"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RDEPEND=">=net-libs/nodejs-8.14.0"
+
+S="${WORKDIR}/${MY_P}-linux-x86_64"
+
+pkg_setup() {
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 -1 /opt/${MY_PN} ${MY_PN}
+}
+
+src_prepare() {
+	default
+
+	# remove bundled nodejs
+	rm -r node || die
+
+	# remove empty unused directory
+	rmdir data || die
+
+	# handle node.js version with RDEPEND
+	sed -i /node_version_validator/d src/setup_node_env/index.js || die
+}
+
+src_install() {
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	rm -r config || die
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
+
+	newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
+	newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
+
+	insinto /opt/${MY_PN}
+	doins -r .
+
+	fperms -R +x /opt/${MY_PN}/bin
+
+	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
+	keepdir /var/log/${MY_PN}
+}
+
+pkg_postinst() {
+	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
+	elog "Node.js 8. Some plugins may fail with other versions of Node.js (Bug #656008)."
+	elog
+	elog "To set a customized Elasticsearch instance:"
+	elog "  OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}"
+	elog "  systemd: set elasticsearch.url in /etc/${MY_PN}/kibana.yml"
+	elog
+	elog "Elasticsearch can run local or remote."
+}
diff --git a/www-apps/lxr/Manifest b/www-apps/lxr/Manifest
deleted file mode 100644
index 58a9c77ff9bb..000000000000
--- a/www-apps/lxr/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX lxr-0.9.8-initdb-mysql.patch 484 BLAKE2B 4f503eec1951f8a0010ab1b62cfe577d2672fcf7e434654c7d0701dd143615e94000d995f75f8b58c60652444ad117bfad4af3fc20395ef5347c6240ad18bf29 SHA512 616a819fdd899bbac114dcebe42864f16e7b17e81f07be915ae36c9dfac4d621e960d5901a253d6e13d4e16440eb84702784b66ba1922a0cba72afea1f896da4
-AUX postinstall-en.txt 1351 BLAKE2B 781df94841c533848e74a6f4b2b317bcbfd68f428206be10c527a4d03c1c4c6ea69bae2642a87e0a94051c0f1ba033a19dd5d28a605138604067fb06bd9db5dd SHA512 4730fcc56b8a775d5922883906f9db8ead7a0f3beb8a46ceeb451f8ba273e823fbe328b227da72f39a9dfa926cd93b77c5d27c0d1ba2730afec0c570b1da0006
-AUX reconfig 357 BLAKE2B 4ebe2e2539021b7411fa814bef122b69d9540848a90290cf89182a3557a26db83332b5036e1be74c6e018604b44b027897b22bf08c18f95400fe6c76e82c9d97 SHA512 b218ddf830fc1412ab95bd53377f07b76209b2dd7640654618e937355efd716f2374a0a18f97e8f92c06619f8aed6bbc311eb93541ebf088437e40250288f8cd
-DIST lxr-0.9.8.tgz 104246 BLAKE2B 9088f00a47c2cd9e4822b7f79554f820dd3fb97973f25dbb6eacdccc6e436aa6eb9a50806b726b53a6347d8266ceaf1c35c54c221030fe7edcd65294567fa3ec SHA512 2ee9965448edc63a35a3c9d51b2e22c142e5e0aed8e487a590ad3e8a9f840f94fbe38736fe139fb02941ab4e5c891821460b0f32b56a52bf295988c6ef432318
-EBUILD lxr-0.9.8-r1.ebuild 2074 BLAKE2B 6b612ac4817923e6aa22d43447c2fe4667157daa5422a2cfa36d79077e4b338186d470b06ecff502623fac0ad5019066ae2b02787155282984074aaea02d58f0 SHA512 3046e42362be0bf8912f403f3c8b305ad81bb533bdab8f814f748237c350424f1b8022d493dd81ee6340f838f6b5d3a0bbb180fa7250b1cd2c9a03abc030d433
-MISC metadata.xml 323 BLAKE2B 9df52ba795520f0636d98fd35cf63b4f532c7488d0c9737c09c93a88ce29db06f34ceaf0aa0470d3c34be5a56f99228580d9538a35e7696dfe5d3a52810f7e02 SHA512 2010845b78056b6e51326ad0a3c8bd88152f20a2799ba14c4cbffb52374e5d81135a6972b6a16446f3c8ee456169dea9dc717d5aee452636d7012152991666c0
diff --git a/www-apps/lxr/files/lxr-0.9.8-initdb-mysql.patch b/www-apps/lxr/files/lxr-0.9.8-initdb-mysql.patch
deleted file mode 100644
index f28604683781..000000000000
--- a/www-apps/lxr/files/lxr-0.9.8-initdb-mysql.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- initdb-mysql	2004-07-20 11:31:24.000000000 -0400
-+++ initdb-mysql.patched	2006-01-26 15:41:43.000000000 -0500
-@@ -34,8 +34,8 @@ create table lxr_indexes (
-
- create table lxr_releases
-         (fileid         int not null references lxr_files,
--        releaseid             char(255) binary not null,
--        primary key     (fileid,releaseid)
-+        `releaseid`             char(255) binary not null,
-+        primary key     (fileid,`releaseid`)
- );
-
- create table lxr_usage
diff --git a/www-apps/lxr/files/postinstall-en.txt b/www-apps/lxr/files/postinstall-en.txt
deleted file mode 100644
index 07412c4da554..000000000000
--- a/www-apps/lxr/files/postinstall-en.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-0. Create a db for lxr:
-
- MySQL: run mysql and read in the initdb file using:
-   \. ${MY_SQLSCRIPTSDIR}/mysql/${PVR}_create.sql
-
- PostgreSQL:
-   createuser lxr
-   createdb -U lxr lxr
-   psql -U lxr lxr
-   \i ${MY_SQLSCRIPTSDIR}/postgresql/${PVR}_create.sql
-
-1. Edit ${MY_INSTALLDIR}/lxr.conf and set:
- - db settings
- - 'v'
- - 'sourceroot'
- - 'graphicfile'
- - 'filetype'
- - 'incprefix'
-
-2. If you want to use CVS, also set:
-  'range' => sub { return
-	($files->allreleases($LXR::Common::pathname),
-	$files->allrevisions($LXR::Common::pathname))
-	}, # deferred function call.
-
-	You should also set the default version retrieved to a version that really
-	does exist otherwise you will receive errors when generating your index.
-
-	A good value for the default version is head.
-	  'default' => 'head'
-	Set 'sourceroot' and 'sourcerootname'.
-
-3. If you want to use swish-e:
-	Create a directory for the swish index files to go in, and put the
-	path of this directory in the 'swishdir' variable.
-
-4. An .htaccess file has been installed into ${MY_INSTALLDIR}. Please note that
-you must take special care not to make lxr.conf visible to the world. If you
-are not using mod_perl, use .htaccess_cgi instead.
-
-5. Create the index:
- ${MY_INSTALLDIR}/genxref --url http://${VHOST_HOSTNAME}${VHOST_APPDIR}
-
-6. Browse to http://${VHOST_HOSTNAME}${VHOST_APPDIR}/source
diff --git a/www-apps/lxr/files/reconfig b/www-apps/lxr/files/reconfig
deleted file mode 100644
index e9e2f47b3f69..000000000000
--- a/www-apps/lxr/files/reconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-die() {
-	echo "#####"
-	echo "$@"
-	echo "#####"
-	exit 1
-}
-
-if [[ $1 == "install" ]] ; then
-	cd "${MY_INSTALLDIR}" || die
-	files="lxr.conf $(ls ._cfg*lxr.conf 2>/dev/null)"
-	sed -i \
-		-e "s|/lxr|${VHOST_APPDIR}|" \
-		-e "s|192.168.1.3/lxr|${VHOST_HOSTNAME}${VHOST_APPDIR}|" \
-		${files} || die
-elif [[ $1 = "clean" ]] ; then
-	echo $1
-fi
-
-exit 0
diff --git a/www-apps/lxr/lxr-0.9.8-r1.ebuild b/www-apps/lxr/lxr-0.9.8-r1.ebuild
deleted file mode 100644
index b7ffd3e3f5a5..000000000000
--- a/www-apps/lxr/lxr-0.9.8-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module webapp multilib eutils depend.apache
-
-DESCRIPTION="general purpose source code indexer and cross-referener with web-based frontend"
-HOMEPAGE="https://sourceforge.net/projects/lxr"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc ~x86"
-IUSE="cvs mysql postgres"
-WEBAPP_MANUAL_SLOT="yes"
-SLOT="0"
-
-RDEPEND="dev-util/ctags
-	dev-lang/perl
-	dev-perl/DBI
-	dev-perl/File-MMagic
-	cvs? ( dev-vcs/rcs )
-	postgres? ( dev-perl/DBD-Pg )
-	mysql? ( dev-perl/DBD-mysql )"
-
-need_apache2
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_prepare() {
-
-	epatch "${FILESDIR}/${PN}-0.9.8-initdb-mysql.patch"
-
-	sed -i \
-		-e 's|/usr/local/bin/swish-e|/usr/bin/swish-e|' \
-		-e 's|/usr/bin/ctags|/usr/bin/exuberant-ctags|' \
-		-e "s|'glimpse|#'glimpse|g" \
-		-e "s:/path/to/lib:${VENDOR_LIB}:" \
-		templates/lxr.conf || die "sed failed"
-	sed -i \
-		-e 's|Apache::Registry|ModPerl::PerlRun|' \
-		.htaccess-apache1 || die "sed failed"
-	sed -i \
-		-e 's|require Local;|require LXR::Local;|' \
-		-e 's|use Local;|use LXR::Local;|' \
-		-e 's|package Local;|package LXR::Local;|' \
-		Local.pm lib/LXR/Common.pm diff find ident search source || die "sed failed"
-}
-
-# prevent eclasses from overriding this
-src_compile() { :; }
-
-src_install() {
-	perl_set_version
-	webapp_src_preinst
-
-	insinto "${VENDOR_LIB}"
-	doins -r lib/LXR
-	insinto "${VENDOR_LIB}"/LXR
-	doins Local.pm
-
-	dodoc BUGS CREDITS.txt ChangeLog HACKING INSTALL notes .htaccess* swish-e.conf
-
-	exeinto "${MY_HTDOCSDIR}"
-	doexe diff find genxref ident search source
-	insinto "${MY_HTDOCSDIR}"
-	doins .htaccess* templates/*
-
-	webapp_configfile "${MY_HTDOCSDIR}"/lxr.conf "${MY_HTDOCSDIR}"/.htaccess-apache1
-	webapp_sqlscript mysql initdb-mysql
-	webapp_sqlscript postgresql initdb-postgres
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_hook_script "${FILESDIR}"/reconfig
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-}
-
-pkg_prerm() {
-	webapp_pkg_prerm
-}
diff --git a/www-apps/lxr/metadata.xml b/www-apps/lxr/metadata.xml
deleted file mode 100644
index b1a40455a1f2..000000000000
--- a/www-apps/lxr/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>web-apps@gentoo.org</email>
-		<name>Gentoo Webapps</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">lxr</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/www-apps/moinmoin/Manifest b/www-apps/moinmoin/Manifest
deleted file mode 100644
index ab27faad9cb0..000000000000
--- a/www-apps/moinmoin/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX postinstall-en-1.9.4.txt 548 BLAKE2B 090546047ce73cf1ba1cd45e6c3ff65578b9657c688f1f9e2e694dec5eed7255c22c47bbfdd8029c43aff1e06aaf76eb306a6ede4ae28b1692d085e62ef1e782 SHA512 a007244d5807ca89ad515f738cdcf739d3f4ba0a6c2ee35f05435856c4ccc9c993d44ed08a06b5d8555450b6b34013d3254628480900e515bb19ba80719a05ba
-AUX reconfig-1.9.4 457 BLAKE2B 1c3033513891088f5ab1db5f070c55cf0279d5d3f14b31ada555f4f32ee7f485910d95775bd2c2b6ad4e957f92dd531fd4ff4467ae6f726bdc076f30f7e835fd SHA512 c5b493354e44e0a81e540eb80469b6787e2b898dbb2737ea8b6a52c95e92ba79af78bb0fc67b406a23ef2ca5d3df9a88c7e89c688e2d139abd2a3f480b30299c
-DIST moin-1.9.7.tar.gz 36911772 BLAKE2B 26e0896a68692054c7a40da3e4ccb85a947e5335fde1387f47d6cc39f4c43e1e7421a4143ded9a1659596a2137cd68091967acd8a95630fe8263904e98d0d275 SHA512 5cb6c205fb0c18b83fe7cee83bf88098bfbbc357c89004f8b7cf484bd7efd35af4ace78d0e80df71b01f70861e8bbb63aeefdd831768989d5b7f511ca24fb60c
-EBUILD moinmoin-1.9.7-r1.ebuild 2610 BLAKE2B 6ab247dfce0afaadd2ae29ca186367cefac962dfebbbfc5c8845bd55dfcf17352bbaa44b608818d414bc7f0ab8c4ef7ae4c05297fda1db31ce398e55cbd50cb5 SHA512 db65218b12b4a645b3bbceeb78d630c7c096c0dbba317f1b2c38fc76d0c8006ff28cae42b6b36fe26fcdd96d1643c7c4b9acc35802d8377913c096bc981d23ef
-MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
diff --git a/www-apps/moinmoin/files/postinstall-en-1.9.4.txt b/www-apps/moinmoin/files/postinstall-en-1.9.4.txt
deleted file mode 100644
index 6a6baf764ead..000000000000
--- a/www-apps/moinmoin/files/postinstall-en-1.9.4.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Now please read the installation manual at
-/usr/share/doc/${PF}/html
-
-MoinMoin can work with a variety of webservers. Simple Apache instructions
-are given below:
-
-1. ExecCGI needs to be enabled in your Moinmoin directory by doing:
-# echo "Options ExecCGI" > ${MY_INSTALLDIR}/.htaccess
-# echo "AddHandler cgi-script .cgi" >> ${MY_INSTALLDIR}/.htaccess
-
-2. Add the following lines to your Apache configs:
-ScriptAlias /mywiki "${MY_INSTALLDIR}/moin.cgi"
-
-3. Restart Apache
-
-4. Go to http://${VHOST_HOSTNAME}/mywiki/ and follow the instructions there.
diff --git a/www-apps/moinmoin/files/reconfig-1.9.4 b/www-apps/moinmoin/files/reconfig-1.9.4
deleted file mode 100644
index 698da419fdb5..000000000000
--- a/www-apps/moinmoin/files/reconfig-1.9.4
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-die() {
-	echo "#####"
-	echo $1
-	echo "#####"
-	exit 1
-}
-
-if [ $1 = "install" ]; then
-	sed -e "s|^#\(.*\)/path/to/wikiconfigdir|\1${VHOST_ROOT}/${PN}-${PVR}|g" -i ${MY_INSTALLDIR}/moin.cgi || die "sed failed"
-	sed -e "s|#url_prefix_static|url_prefix_static|" -i ${VHOST_ROOT}/${PN}-${PVR}/wikiconfig.py || die "sed failed"
-	sed -e "s|//|/|" -i ${VHOST_ROOT}/${PN}-${PVR}/wikiconfig.py || die "sed failed"
-
-elif [ $1 = "clean" ]; then
-	echo $1
-fi
diff --git a/www-apps/moinmoin/metadata.xml b/www-apps/moinmoin/metadata.xml
deleted file mode 100644
index f2f2ba9e2823..000000000000
--- a/www-apps/moinmoin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>web-apps@gentoo.org</email>
-	<name>Gentoo Webapps</name>
-</maintainer>
-</pkgmetadata>
diff --git a/www-apps/moinmoin/moinmoin-1.9.7-r1.ebuild b/www-apps/moinmoin/moinmoin-1.9.7-r1.ebuild
deleted file mode 100644
index 27ad731eec99..000000000000
--- a/www-apps/moinmoin/moinmoin-1.9.7-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit eutils distutils-r1 webapp
-
-MY_PN="moin"
-
-DESCRIPTION="Python WikiClone"
-HOMEPAGE="http://moinmo.in/"
-SRC_URI="http://static.moinmo.in/files/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-
-RDEPEND=">=dev-python/docutils-0.4[${PYTHON_USEDEP}]
-	>=dev-python/flup-1.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.7.0[${PYTHON_USEDEP}]"
-
-need_httpd_cgi
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-WEBAPP_MANUAL_SLOT="yes"
-
-pkg_setup() {
-	if has_version "<www-apps/moinmoin-1.9" ; then
-		ewarn
-		ewarn "You already have a version of moinmoin prior to 1.9 installed."
-		ewarn "moinmoin-1.9 has a very different configuration than 1.8 (among"
-		ewarn "other changes, static content is no longer installed under the"
-		ewarn "htdocs directory)."
-		ewarn
-		ewarn "Please read http://moinmo.in/MoinMoinRelease1.9 and"
-		ewarn "README.migration in /usr/share/doc/${PF}"
-		ewarn
-	fi
-
-	webapp_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# remove bundled -- parsedatetime and xappy not packaged yet
-	rm -r MoinMoin/support/{pygments,werkzeug,flup} || die
-	sed -i "/\(flup\|pygments\|werkzeug\)/d" setup.py || die
-
-	# needed for python_fix_shebang
-	edos2unix MoinMoin/web/static/htdocs/applets/FCKeditor/editor/filemanager/connectors/py/*.py
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	webapp_src_preinst
-	distutils-r1_src_install
-
-	dodoc README docs/CHANGES* docs/README.migration
-	dohtml docs/INSTALL.html
-	rm -rf README docs/
-
-	cd "${D}"/usr/share/moin
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r server/moin.cgi
-	fperms +x "${MY_HTDOCSDIR}/moin.cgi"
-
-	insinto "${MY_HOSTROOTDIR}"/${PF}
-	doins -r data underlay config/wikiconfig.py
-
-	insinto "${MY_HOSTROOTDIR}"/${PF}/altconfigs
-	doins -r config
-
-	insinto "${MY_HOSTROOTDIR}"/${PF}/altserver
-	doins -r server
-
-	# data needs to be server owned per moin devs
-	cd "${D}/${MY_HOSTROOTDIR}"/${PF}
-	for file in $(find data underlay); do
-		webapp_serverowned "${MY_HOSTROOTDIR}/${PF}/${file}"
-	done
-
-	webapp_configfile "${MY_HOSTROOTDIR}"/${PF}/wikiconfig.py
-	webapp_hook_script "${FILESDIR}"/reconfig-1.9.4
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-1.9.4.txt
-
-	webapp_src_install
-
-	# bug 466390
-	python_fix_shebang "${D}"
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If you are upgrading from an older version, please read"
-	ewarn "README.migration in /usr/share/doc/${PF}"
-	ewarn
-	webapp_pkg_postinst
-}
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index cb2ffae99fe6..a2c7fd57e872 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -6,8 +6,10 @@ DIST moodle-3.1.15.tgz 38055035 BLAKE2B d55f523fce2f7193330665132b4d7faf6a7a698c
 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
 MISC metadata.xml 355 BLAKE2B 68d10d39dd24da3d570f13edec9c4adae89b7620bb455c1c30377c3cebe56c4961d1548360adedc96fce780067b308193fdb7560478a60ab56c364b774b1984a SHA512 f02e5404a714cb20207e494f635fb0e98870576c4b5f6affc4dc27fccfcabdd1af1c7411a83cfd4e01b51ecc24d11944d1e612757ff45ab4405f6099ed9b1278
diff --git a/www-apps/moodle/moodle-3.6.1.ebuild b/www-apps/moodle/moodle-3.6.1.ebuild
new file mode 100644
index 000000000000..dea9710e1e62
--- /dev/null
+++ b/www-apps/moodle/moodle-3.6.1.ebuild
@@ -0,0 +1,123 @@
+# 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-7.0[${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/nanoc/Manifest b/www-apps/nanoc/Manifest
index 3c2c783533f3..627a9be9a5b7 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -1,9 +1,11 @@
-DIST nanoc-4.8.10.gem 260608 BLAKE2B 102548bc4616287d7084f81f505f2c1f7fa294a6bfc87c9be80919a4fff6c547ecbc77cc5cb96d7b1fd9414f189cdf62bad9cd4cdf44fe536c60a2eb3c39ac63 SHA512 36080407696d19739af666d9ba4e04d051d679b29b3e8e5d24d893a2d05b05201b74777007781a0da80125a98fd8cc465fb0b78ca0c28c5fc80bdd5229d5fa24
-DIST nanoc-4.9.5.tar.gz 282523 BLAKE2B 5faad9c9d666637cb5540d26bb1db0ee42615333aac4daec94a8c13c1d68da0b0ccf714a1643fd231dd39cfb4f169ef9ad6bbc1ccc6bf141c26f7236e234d627 SHA512 455a55ce5cd983d0c292380d0e60e8016e7c7dbde7ea1d17ef7cf112707a481da4623ad30762b64167e2e277a7a11c0b06f21b2685467455ee31fc3b9d6cc4c1
+DIST nanoc-4.10.3.tar.gz 290368 BLAKE2B 5fed3e8d137a24df9a1e94e112425198422a284274a1a052fe89d02f9fd04960e54e867c0d96141a7e143b20d7731f60af5748100dc19df07e62a7921d21d009 SHA512 aace4b84de90177d25099194158ef6308b98242935f65ac6bf07f7e508297a866e86a64e0304bdf5df6c88603479abfb9245ba125074dd8c4185d1a492bb0a46
+DIST nanoc-4.10.4.tar.gz 290367 BLAKE2B 0b5cf03938af1f971fccddb6bed4fa6b67da3aaf93cb7666c52e3ff8fc524f17ff10bf1a60ccf7f7b59f840d4c445ef57677349f5b83bc55e754e7078ac4b8d9 SHA512 5446e351906b5b6bbe5c9059dab86490d5deef5e1197adf5827fe201f2932d5cf79c65bfd9d9370ce57c35d965e013098d39d53fa96db8b4d1c6017977683ea2
+DIST nanoc-4.11.0.tar.gz 291654 BLAKE2B ab88bf36b472106f356ae67782dac61f691e0d64646f410ae0cceca7a9df11689dd7a011bf58a773d6b35956f0092deac4db43bb8663d66463b72e10da27c658 SHA512 357345c9247465bd470bf6c71ea2b16e3415680fad6a4d4ee755eeb3a1443664590753003a5de0a740ffcfbaf93049c2c12c1f22de052f4d6efc2382430a4e08
 DIST nanoc-4.9.6.tar.gz 282811 BLAKE2B 109b73e4908b45c055912f6e3b2d18675ee00dd848cf7b84197d1a53c30d5862183dcdbd917f1f6f235f97dc5d33b36ba423f34b72bb83ca6f9f2fda4f0081b3 SHA512 67b2df683c4becfbb9a64462b053544c68117c2459fce8e5941f8415c79f1ec73e9c386622dfdb201cf5473f6b83ff1b1444b6492d247036e696d3761e4589ce
 DIST nanoc-4.9.9.tar.gz 286136 BLAKE2B c8cc2d334b3e8b74032be108495f2501fffa78650e35c30865c78e888f471fadc1e26ec6ba23481f76caa63b4167ea394f78903f41428bdd899efa60f3e6a4a2 SHA512 fd180254dd79cf238ca9e9f87e7b3f84d43ff24a0d81da8ccf9f0d5b22bb1e0373c7e2f10a5b69a392d95897958af63ab9f415f0060dfe9c4d68fd2cbd6d7e7a
-EBUILD nanoc-4.8.10.ebuild 1579 BLAKE2B 98932d52b2f1db9f17e0d0af6117a380712a3bf6aad6506417368b797fb5a76a0a8a8908cf7c1c376c10eba31e1db216bae063e2e691c769b8934c7c925bf3e8 SHA512 c33f02538ec443598aeb7b103c7d452470898a74f1b9f28f53258b196287fc035f244fb5535cc84c64a898615b46a8b7ab2509e1b553e2da2039f068aa22f153
-EBUILD nanoc-4.9.5.ebuild 2456 BLAKE2B 5cb22d012719734408ffba44834bff4e592fb7003770e9e8acca8e1b2c584b235d043e37f152a998e29ea18fca3259c3e52b0dc6501d9ede8c94974d13be2030 SHA512 8862a7c15cb81ceb803e2e55729681de2a096d031d9bca657ee3d4d1e89d81f567f7e44f71f7d48179b4a264b2b423870e3f6ca94595877ae9590654f3cfde36
+EBUILD nanoc-4.10.3.ebuild 2599 BLAKE2B 46a90fb82d90aab556488823fe787f63b1de4fa1a0a4ef93f5621f5ef9f91d5b4c27fa599a396035e34daed1db73975b82304ef690f17b2185da4c7c52c20e02 SHA512 09e5afd771b1ae2e368c6c747da06677e1f1d0f2d892ed72e08882d376af2174d82fc09daf4a8a905b2733c5ab87dbc4f8a2ebf97d8682671949f827b4330add
+EBUILD nanoc-4.10.4.ebuild 2619 BLAKE2B 7e5ff080ec66019c9c0706b66fee93fc4029daa1a174eb907798f98673abd0b468ca49f85fa91c4bb214316613e1f0cbc2c42536a9a9ebc19e2d3126ad957a58 SHA512 588d87ec7f8545e89685e80c838280147792b10010ed8ae81dd8a1d10d2c68aa7681eea4cb12d1840242847c1ec164e4252d40a76812323ae10b57aab363a92b
+EBUILD nanoc-4.11.0.ebuild 2619 BLAKE2B 7e5ff080ec66019c9c0706b66fee93fc4029daa1a174eb907798f98673abd0b468ca49f85fa91c4bb214316613e1f0cbc2c42536a9a9ebc19e2d3126ad957a58 SHA512 588d87ec7f8545e89685e80c838280147792b10010ed8ae81dd8a1d10d2c68aa7681eea4cb12d1840242847c1ec164e4252d40a76812323ae10b57aab363a92b
 EBUILD nanoc-4.9.6.ebuild 2456 BLAKE2B 5cb22d012719734408ffba44834bff4e592fb7003770e9e8acca8e1b2c584b235d043e37f152a998e29ea18fca3259c3e52b0dc6501d9ede8c94974d13be2030 SHA512 8862a7c15cb81ceb803e2e55729681de2a096d031d9bca657ee3d4d1e89d81f567f7e44f71f7d48179b4a264b2b423870e3f6ca94595877ae9590654f3cfde36
 EBUILD nanoc-4.9.9.ebuild 2477 BLAKE2B 3d555df3161c39e057cabee67d0f9115c63f00024da419eb0f8f86a3a92604c8d431ac1d2bf43c6baeda4322d840181816280bce54cb62e484b60fb1198e1c0b SHA512 28d82a455baf1c2ffcf241925def5deb463c49dfe1d2c87d42ee665e1f864b19e03958be56e6374b0ca8cbb5fe3a65620299a5165c723dbf98ebb67da6ceed6f
 MISC metadata.xml 317 BLAKE2B c6af48dcdb56be1e50ef78910bc5150112d2914bbd13b576883eeeecdcc2a47f6360ffcf7a83432266bc737891527f4f1cacaf90b62e7b38d75a0c74c87bb0d8 SHA512 5394c6280515d4728d6b30f6eff872dd1d3dc283fe125aa8b5bc7f1206d967b74864bd144c6b2623ea63db19f78b5a94d13261464b35b4056cf92cccf374db1e
diff --git a/www-apps/nanoc/nanoc-4.9.5.ebuild b/www-apps/nanoc/nanoc-4.10.3.ebuild
index 9e6642788b8f..5bc4acaf8b84 100644
--- a/www-apps/nanoc/nanoc-4.9.5.ebuild
+++ b/www-apps/nanoc/nanoc-4.10.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby24"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
 
@@ -29,11 +29,12 @@ ruby_add_rdepend "!minimal? (
 	www-servers/adsf
 )
 	>=dev-ruby/addressable-2.5
-	>=dev-ruby/cri-2.13:0
+	>=dev-ruby/cri-2.15:0
 	dev-ruby/ddmemoize:1
 	dev-ruby/ddmetrics:1
 	dev-ruby/ddplugin:1
 	=dev-ruby/hamster-3*
+	>=dev-ruby/json_schema-0.19:0
 	>=dev-ruby/parallel-1.12:1
 	dev-ruby/ref:2
 	>=dev-ruby/slow_enumerator_tools-1.1.0:1
@@ -86,6 +87,7 @@ all_ruby_prepare() {
 	sed -i -e '145askip "gentoo"' spec/nanoc/cli/error_handler_spec.rb || die
 	sed -i -e '/does not crash when output dir does not exist and/askip "gentoo"' spec/nanoc/cli/commands/view_spec.rb || die
 	sed -i -e '/watches with --watch/askip "gentoo"' spec/nanoc/cli/commands/compile_spec.rb || die
+	sed -i -e '124askip "ordering issues"' -e '168askip "ordering issues"' spec/nanoc/data_sources/filesystem_spec.rb || die
 }
 
 each_ruby_test() {
diff --git a/www-apps/nanoc/nanoc-4.8.10.ebuild b/www-apps/nanoc/nanoc-4.10.4.ebuild
index a98bfc00657b..aeeea18a61de 100644
--- a/www-apps/nanoc/nanoc-4.8.10.ebuild
+++ b/www-apps/nanoc/nanoc-4.10.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby24"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
 
@@ -12,6 +12,7 @@ inherit ruby-fakegem
 
 DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
 HOMEPAGE="https://nanoc.ws/"
+SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
 KEYWORDS="~amd64"
@@ -20,24 +21,38 @@ IUSE="${IUSE} minimal"
 
 DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
 
+RUBY_S="${P}/nanoc"
+
 ruby_add_rdepend "!minimal? (
 	dev-ruby/mime-types:*
 	dev-ruby/rack:*
 	www-servers/adsf
 )
 	>=dev-ruby/addressable-2.5
-	>=dev-ruby/cri-2.8:0
+	>=dev-ruby/cri-2.15:0
+	dev-ruby/ddmemoize:1
+	dev-ruby/ddmetrics:1
 	dev-ruby/ddplugin:1
 	=dev-ruby/hamster-3*
-	dev-ruby/ref:2"
+	>=dev-ruby/json_schema-0.19:0
+	>=dev-ruby/parallel-1.12:1
+	dev-ruby/ref:2
+	>=dev-ruby/slow_enumerator_tools-1.1.0:1
+	>=dev-ruby/tomlrb-1.2:1"
 
 ruby_add_bdepend "test? (
 	dev-ruby/rspec:3
+	dev-ruby/asciidoctor
 	dev-ruby/fuubar
+	dev-ruby/maruku
 	>=dev-ruby/mocha-0.13
 	dev-ruby/minitest
+	dev-ruby/pry
 	dev-ruby/rdoc
+	dev-ruby/rouge:2
+	dev-ruby/rubypants
 	dev-ruby/systemu
+	dev-ruby/timecop
 	dev-ruby/vcr
 	dev-ruby/webmock
 	dev-ruby/yard
@@ -51,7 +66,8 @@ doc? (
 all_ruby_prepare() {
 	# Avoid unneeded development dependencies
 	sed -i -e '/simplecov/,/SimpleCov.formatter/ s:^:#:' test/helper.rb || die
-	sed -i -e '/simplecov/I s:^:#:' -e '/codecov/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/codecov/I s:^:#:' ../common/spec/spec_helper_head.rb || die
 	sed -i -e '/coverall/I s:^:#:' \
 		-e '/rubocop/ s:^:#:' Rakefile || die
 
@@ -61,7 +77,18 @@ all_ruby_prepare() {
 	rm -f test/checking/checks/test_{css,html}.rb || die
 
 	# Avoid tests for unpackaged dependencies
-	rm spec/nanoc/deploying/fog_spec.rb spec/nanoc/filters/less_spec.rb || die
+	rm spec/nanoc/deploying/fog_spec.rb \
+	   spec/nanoc/filters/less_spec.rb \
+	   test/filters/test_{markaby,rainpress}.rb || die
+
+	# Use useable tmp dir
+	sed -i -e 's:/tmp/whatever:'${T}'/whatever:' spec/nanoc/base/checksummer_spec.rb || die
+
+	# Avoid non-fatal failing tests due to specifics in the environment
+	sed -i -e '145askip "gentoo"' spec/nanoc/cli/error_handler_spec.rb || die
+	sed -i -e '/does not crash when output dir does not exist and/askip "gentoo"' spec/nanoc/cli/commands/view_spec.rb || die
+	sed -i -e '/watches with --watch/askip "gentoo"' spec/nanoc/cli/commands/compile_spec.rb || die
+	sed -i -e '124askip "ordering issues"' -e '168askip "ordering issues"' spec/nanoc/data_sources/filesystem_spec.rb || die
 }
 
 each_ruby_test() {
diff --git a/www-apps/nanoc/nanoc-4.11.0.ebuild b/www-apps/nanoc/nanoc-4.11.0.ebuild
new file mode 100644
index 000000000000..aeeea18a61de
--- /dev/null
+++ b/www-apps/nanoc/nanoc-4.11.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+RUBY_S="${P}/nanoc"
+
+ruby_add_rdepend "!minimal? (
+	dev-ruby/mime-types:*
+	dev-ruby/rack:*
+	www-servers/adsf
+)
+	>=dev-ruby/addressable-2.5
+	>=dev-ruby/cri-2.15:0
+	dev-ruby/ddmemoize:1
+	dev-ruby/ddmetrics:1
+	dev-ruby/ddplugin:1
+	=dev-ruby/hamster-3*
+	>=dev-ruby/json_schema-0.19:0
+	>=dev-ruby/parallel-1.12:1
+	dev-ruby/ref:2
+	>=dev-ruby/slow_enumerator_tools-1.1.0:1
+	>=dev-ruby/tomlrb-1.2:1"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	dev-ruby/asciidoctor
+	dev-ruby/fuubar
+	dev-ruby/maruku
+	>=dev-ruby/mocha-0.13
+	dev-ruby/minitest
+	dev-ruby/pry
+	dev-ruby/rdoc
+	dev-ruby/rouge:2
+	dev-ruby/rubypants
+	dev-ruby/systemu
+	dev-ruby/timecop
+	dev-ruby/vcr
+	dev-ruby/webmock
+	dev-ruby/yard
+)
+doc? (
+	dev-ruby/kramdown
+	dev-ruby/rdiscount
+	dev-ruby/yard
+)"
+
+all_ruby_prepare() {
+	# Avoid unneeded development dependencies
+	sed -i -e '/simplecov/,/SimpleCov.formatter/ s:^:#:' test/helper.rb || die
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/codecov/I s:^:#:' ../common/spec/spec_helper_head.rb || die
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '/rubocop/ s:^:#:' Rakefile || die
+
+	echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+	# Avoid tests requiring a network connection
+	rm -f test/checking/checks/test_{css,html}.rb || die
+
+	# Avoid tests for unpackaged dependencies
+	rm spec/nanoc/deploying/fog_spec.rb \
+	   spec/nanoc/filters/less_spec.rb \
+	   test/filters/test_{markaby,rainpress}.rb || die
+
+	# Use useable tmp dir
+	sed -i -e 's:/tmp/whatever:'${T}'/whatever:' spec/nanoc/base/checksummer_spec.rb || die
+
+	# Avoid non-fatal failing tests due to specifics in the environment
+	sed -i -e '145askip "gentoo"' spec/nanoc/cli/error_handler_spec.rb || die
+	sed -i -e '/does not crash when output dir does not exist and/askip "gentoo"' spec/nanoc/cli/commands/view_spec.rb || die
+	sed -i -e '/watches with --watch/askip "gentoo"' spec/nanoc/cli/commands/compile_spec.rb || die
+	sed -i -e '124askip "ordering issues"' -e '168askip "ordering issues"' spec/nanoc/data_sources/filesystem_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake spec test_all || die
+}
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index 81b592a16493..3963fd90b230 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,8 +1,12 @@
 AUX nextcloud-12.0.4-destroy_modal_when_closed.patch 786 BLAKE2B 24222dde0d9ed5f3c5fa31b7cd1b837f765837543475db235056dccff9fa17cce83a37b0ed64a1999a6b61dedd5857866debb1950686acf062e42d80bccb3813 SHA512 93297f991312c5fd2504267bb16a8c38797970fdf8d109d4c4b4416a5e72c8677141ebc9a13a2dadc40845348e07f264937dd852384f88d65be4f3cc4f0cb462
-DIST nextcloud-12.0.12.tar.bz2 45164894 BLAKE2B b316a5e831148787569ac80b55c411a8ed59eae312c48badd0aeeadec9dd0c048194b8feeea720b1ad4f19eae906fd1e114299756351b4831af744a918bb7210 SHA512 fd47157dc8437718e2765ed3b0644fa1ecd76707ed8aab06648524fe42cbe8e1c66244d85cd6e48bc5babf4a4a4f684b2da7a29ad60fde7755988a474fdf55f4
 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
-EBUILD nextcloud-12.0.12.ebuild 1033 BLAKE2B e0d1fd02c8e6be0937378d98d72dd0e2ad42111a5fd7234b0767d29e1273c8442adb7bfb71125ea0992e9418ca0f898680e290ce023dbcab9d0aea5dc9676657 SHA512 d7d046780d5a02555f5c804eca9d3de0c96ae21d66f52022ecd0460516f9614f72626e6a3b1ad1535ebbfc234d57844669b55bec0144b14d2477551149888a7f
+DIST nextcloud-14.0.4.tar.bz2 49827498 BLAKE2B 5bcf873f9e0f5b35450a4d381ea1e2fec0e1ef63e9424c83d18add4a6b19631d44191ae207ed60b25209e2b7b45ddec951d3441d8876ce0a057883d21a5e5864 SHA512 a53eb90645619d6558c93304c43ca86cf00cacf8a0f783e699f5041c7b5eb1c9ee8719d4bde5cc16bd1c7b90529d9b100c79e1ce14cc8f8192158c705c8db09e
+DIST nextcloud-15.0.0.tar.bz2 36181234 BLAKE2B 6e9e1cfb1dc9d017f7443adccd2ac420213b2849f9bcf009c94aea741b45582fe1690e0876f378c5964cf10e28ae4ab74765dd56cad0f5ab8c39ce2ae94fe631 SHA512 3ebc21ca80f31bfa486de73d707e7c448eca3f517d73c8762fb543ce82b3f89cfcfcf0edda15caf324a4987be72df8531dccebd2a6af9ac668913f6f750f20c0
 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-15.0.0.ebuild 965 BLAKE2B d7fe81d87b280314655c36f6ee0987b875effe88f6845e16b3567862478a41d2833b552ce6a08638ab080797a26bf64c9ec3dc3559efa95e311151577ee05b51 SHA512 50026d383b7b9961d64ab808a787ce023be59a925514ff0e541394f3be00c89fed527700dae75219ab2e2ece0cb5c327cd8f2cd9e245674d6ac0f0253333c071
 MISC metadata.xml 363 BLAKE2B 4da5b0e27af01e94e1e68b98274da6c9cacbe59ed1d85413038bccfa530af8fd479a7edd89f4d7633dfb07afbad4736cb6c075e021db7dc9761c273ec1256500 SHA512 60195d5859a8b175346a1cd533dbb6496d2787c1ff501d9233b2b1794670ae344c6f9f4cac4fbf86b24686a83692cff27513d05243947e2921e554e065696721
diff --git a/www-apps/nextcloud/nextcloud-12.0.12.ebuild b/www-apps/nextcloud/nextcloud-13.0.8.ebuild
index 5509a59a7522..b6bf2a09eba7 100644
--- a/www-apps/nextcloud/nextcloud-12.0.12.ebuild
+++ b/www-apps/nextcloud/nextcloud-13.0.8.ebuild
@@ -15,10 +15,8 @@ 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 )
+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}
 
diff --git a/www-apps/nextcloud/nextcloud-14.0.4.ebuild b/www-apps/nextcloud/nextcloud-14.0.4.ebuild
new file mode 100644
index 000000000000..040f3eed112d
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-14.0.4.ebuild
@@ -0,0 +1,40 @@
+# 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,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.0.ebuild b/www-apps/nextcloud/nextcloud-15.0.0.ebuild
new file mode 100644
index 000000000000..040f3eed112d
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-15.0.0.ebuild
@@ -0,0 +1,40 @@
+# 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,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/phpsysinfo/Manifest b/www-apps/phpsysinfo/Manifest
index 43550a7641c2..11cc2c27f1a1 100644
--- a/www-apps/phpsysinfo/Manifest
+++ b/www-apps/phpsysinfo/Manifest
@@ -1,7 +1,6 @@
 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
diff --git a/www-apps/phpsysinfo/phpsysinfo-3.2.10-r1.ebuild b/www-apps/phpsysinfo/phpsysinfo-3.2.10-r1.ebuild
deleted file mode 100644
index b662ec40f4f0..000000000000
--- a/www-apps/phpsysinfo/phpsysinfo-3.2.10-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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
-}
diff --git a/www-apps/websvn/Manifest b/www-apps/websvn/Manifest
index d92c0a20cd46..8d4f20f6513b 100644
--- a/www-apps/websvn/Manifest
+++ b/www-apps/websvn/Manifest
@@ -3,4 +3,4 @@ AUX 30_CVE-2016-2511.patch 605 BLAKE2B 02c792bee252dd2dd94ffa86c4e08da05c938c98c
 AUX 31_CVE-2016-1236.patch 2523 BLAKE2B 98f9eddb5ff7e1f3eace26a8ac2ac97812beb6b4dd13794a8167d7627c732a6c1f62689cf876df996f0cdc6affe863b280bae0d87dc51f129bfaf03e9f628d22 SHA512 d41a2afe42ac520d8c2d8085f90b1dc4364d82d7fc8905e54b40cbdaa80abf902c0b37b075a78c3af30feb2a1869efb11519e7b6a42d691ecd8e51c41f8b4382
 DIST websvn-2.3.3.tar.gz 882779 BLAKE2B e851bdd8cf42c34202c8416b5f63d0b4b6731f082d1103eaf21689bd65ddb11d8ed2d9d1a8e476d2c342db9b59bc7dea37ae0c9eb929a8c8298dfa3965da34ce SHA512 8c77a9770dfc3c9487793cd71c460d4048aa4aa7b8520a53eea8ae872f30e06d885f849d63fa0e9f61ed5923f9dd9c5ef1f3c4f020afaa83d7815a99d64818a0
 EBUILD websvn-2.3.3-r1.ebuild 1143 BLAKE2B dc1d38fb3c87819cb26defafcc76f6c887291fd3b7143b2d5f4311b16c6c826bc88dd68fc545cacf79be8e1e12b4da3e3720c35942967e0f2521b4c5f4d80692 SHA512 b3bd4c4e5a7d694fbadd3ea1b01f1e1359f832b703b5aa438abd80d00c6cec314e5b851812a0238e5edaa444c4a2828366281ea41ae2dd26b6e57c0002a80ede
-MISC metadata.xml 346 BLAKE2B 102deed366edcf59362f3757b2692f2db3a795ed94493d0c402fb08edbb4a8ab1ee799869ac2c7460ee7bb659f2d8c3d7736e9b5daa128e68d586a215c325640 SHA512 016d009e180a6bca5a0dd17a4899f36c87edba7b9463fb3058c00c2d1ba0b49e27959d1b7c0804da2ac79f24f34a774ee1bbc525336aebf6b27c07ff45879092
+MISC metadata.xml 458 BLAKE2B 81503279d5c223b19508f0661e46530fa6cc0fbf77f49df8cbe4b07d806500970972abf2e6e86921764d3a9debdc0c027de7554f1e546c978001e7d6a61a5f88 SHA512 815c74ac416042eeb7ffdb4c2617cc51dcff8ab826f15425002fd845aacbbd92498f3357e5ba5f59659fbc4b0d44364ceb70ad21db8b17008520dce92b08eb95
diff --git a/www-apps/websvn/metadata.xml b/www-apps/websvn/metadata.xml
index 23492929dea5..bcf1012b79da 100644
--- a/www-apps/websvn/metadata.xml
+++ b/www-apps/websvn/metadata.xml
@@ -5,6 +5,10 @@
 		<email>web-apps@gentoo.org</email>
 		<name>Gentoo Webapps</name>
 	</maintainer>
+	<use>
+		<flag name='enscript'>Add enscript support to colorize code
+			stored in the repository</flag>
+	</use>
 	<longdescription>
 		Web based Subversion repository browser written in PHP
 	</longdescription>
author	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
commit	de49812990871e1705b64051c35161d5e6400269 (patch)
tree	5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /www-apps
parent	536c3711867ec947c1738f2c4b96f22e4863322d (diff)