gentoo resync : 02.06.2019

25 files changed, 440 insertions, 251 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index ba516bcba5ad..a5499608721a 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 d85d1f38d5c5..9c06724867fe 100644
--- a/www-apps/airdcpp-webui/Manifest
+++ b/www-apps/airdcpp-webui/Manifest
@@ -1,7 +1,5 @@
-DIST airdcpp-webui-2.5.1.tgz 6571762 BLAKE2B dd2d02913125c8166c1ca0f14d9276eed073fa58a46ddbf2ee5e70a97e081852e96a875c9f501781b81de0d2163c4c391c5aa3d078f6946fe35109fe901d8bb5 SHA512 771595f529361330fb54796b32fed61aa8fb37ef1ddbb551c10a8b6352eead6afe7e8a52df223c7e53c27942dd301f50b7234eb915ee378e90eb6ac847b16871
-DIST airdcpp-webui-2.5.2.tgz 6715659 BLAKE2B cfbd185fea4e4b9c07508f9cb29ecd312b004e63a8ce26c2fb0695895fc85e4e657b6813c69e05905ac950eea9288ba01df7814fd5106cce2933ebadc17fb82f SHA512 08dbbb5bcafb1b991f283c6975626843e96818cb02eaf3b0a5a7c700f64780dd18cc897343c57d2f46235c77d44b1da17f8d66fb0f021d75be164a6709978650
 DIST airdcpp-webui-2.6.0.tgz 7829663 BLAKE2B 2c0859598414f456cdca0ef8f0777580d64be6ecc0678e126b61acfe1c2b0cf3361d37b5ff49c89d897953bf998305d2062eb4b55336ddd6d37c52e3c46363c4 SHA512 e4556c0d5697ffcb4d0b4a7f297f9652c339bd1f66242765a74eaffdca077ccbdb323dd70485df34f39e95abfcdc9252280eb28f67cd50a1c28291385dcb2286
-EBUILD airdcpp-webui-2.5.1.ebuild 466 BLAKE2B a6c709a4fc399dff64f01178f72888e354bb5f564f93be837c85a0aea9cfe2c4272d0b63087164a44e2201255bbe5a77d0c370ca26bfebf7245f58059fc7ef0a SHA512 c7587abdf727b97ba914f6c3a89ed03b2e07eaed4cf03e2ce50846b7bb087222fa52f0b59ee81446a9aec3df5a061892a4d40ec257d5b185d340d031ab0ccec0
-EBUILD airdcpp-webui-2.5.2.ebuild 466 BLAKE2B 871c7665811ba71d6cdbe42220bdb9f88174e033c7b0c430788fa08ee24a01290a17612797ba6db9a89dace0c2c4a9a0b95400d8254a7ba06124545d5863dff7 SHA512 ce4e7b13149a79ace635f2f0f1d97fa3cdfb909cfb29323ba48d8d75ae3e3e87848c0f0c397180ea41d3722e471b6401c749557cb9ef2f982d5758886412bc62
+DIST airdcpp-webui-2.6.1.tgz 8418223 BLAKE2B d5f271909d20e8719d707e9eefd464379ec41c8cec378440f7a4483fef1f8c40e119cf827cef88e15c6925d02e71cd4d16dc9471fd5830c9e5bd8ae67a4b02f6 SHA512 be03b595a1f2ffc1bb35835d4bab0eb035dcbee0351aacad529dd4b93fa67af866ab9778a579410ecb8075ede5be8b10eb7cc89eab97f0d2a3f502889cd84fa8
 EBUILD airdcpp-webui-2.6.0.ebuild 466 BLAKE2B 871c7665811ba71d6cdbe42220bdb9f88174e033c7b0c430788fa08ee24a01290a17612797ba6db9a89dace0c2c4a9a0b95400d8254a7ba06124545d5863dff7 SHA512 ce4e7b13149a79ace635f2f0f1d97fa3cdfb909cfb29323ba48d8d75ae3e3e87848c0f0c397180ea41d3722e471b6401c749557cb9ef2f982d5758886412bc62
+EBUILD airdcpp-webui-2.6.1.ebuild 466 BLAKE2B 871c7665811ba71d6cdbe42220bdb9f88174e033c7b0c430788fa08ee24a01290a17612797ba6db9a89dace0c2c4a9a0b95400d8254a7ba06124545d5863dff7 SHA512 ce4e7b13149a79ace635f2f0f1d97fa3cdfb909cfb29323ba48d8d75ae3e3e87848c0f0c397180ea41d3722e471b6401c749557cb9ef2f982d5758886412bc62
 MISC metadata.xml 553 BLAKE2B aacc047cadd9f0d8078a997d9ac02aeda726575f1af69cd4e97afe9159987347247aee7ac74b11b8d23b18a669b447451e3e6123f578b501a872f395e418341c SHA512 0d1233d39b432f28fb9977b06a750e990524b250563e8fa5594bdf7dd6cc5b35468b70abe41e0cae87331c2052b592d4d314a897549f0a247c04af1a15782feb
diff --git a/www-apps/airdcpp-webui/airdcpp-webui-2.5.1.ebuild b/www-apps/airdcpp-webui/airdcpp-webui-2.5.1.ebuild
deleted file mode 100644
index 898d2fa96dc8..000000000000
--- a/www-apps/airdcpp-webui/airdcpp-webui-2.5.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Web interface for airdcpp-webclient"
-HOMEPAGE="https://airdcpp-web.github.io/"
-SRC_URI="https://registry.npmjs.org/${PN}/-/${P}.tgz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="=net-p2p/airdcpp-webclient-${PV%.*}*"
-
-S="${WORKDIR}/package"
-
-src_install() {
-	insinto "/usr/share/airdcpp/web-resources"
-	doins -r dist/.
-}
diff --git a/www-apps/airdcpp-webui/airdcpp-webui-2.5.2.ebuild b/www-apps/airdcpp-webui/airdcpp-webui-2.6.1.ebuild
index d656c051b69b..d656c051b69b 100644
--- a/www-apps/airdcpp-webui/airdcpp-webui-2.5.2.ebuild
+++ b/www-apps/airdcpp-webui/airdcpp-webui-2.6.1.ebuild
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 630dd5f73036..48a8362d58d6 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -5,8 +5,12 @@ DIST grafana-bin-5.4.3.tar.gz 55228439 BLAKE2B 63ee14b1ab074f453c8f1b870b8c0c513
 DIST grafana-bin-5.4.4.tar.gz 55227302 BLAKE2B f80fcf4447de6eb2f8a450650eb054da6a426e61142c2882cb5faef91b1d9779b77016b822d2f9082c81fe7b6ec14f23996132d880067bd956ac6260b171388e SHA512 c95a3e9b40fdd8fff88c01a66efdda1fc64c258a768bdf65f738562b0c039020de1aa2500cbaa93dff4220715c57ce803ca0ff01344d63a9b8548e4d27dc1af1
 DIST grafana-bin-6.1.4.tar.gz 56564647 BLAKE2B 277a51f056faee911adb46f80673bde05dd872cc2d1387e67066806c8b749e434cb0bf2cd0e55338081814c19edf025927dd2379064aca2acb1e718dc89140af SHA512 7d27dfcc689c4e96f4ea9276c75581ac0762556759c8a70a5f87199a9cdd49493b40b7e44bbcf069b0cb2b4ca60d4b8157c7d977673253db9a80c9c785b4b344
 DIST grafana-bin-6.1.6.tar.gz 56569580 BLAKE2B b8122e5ec6104ba211d7d331fd99e3caaea6b4bc2cdeae3315ea84abc6634723d106fb19b27f68ad5f5f0ff84648f8ea84254a3b0c96519702349acfeb6bd753 SHA512 b8851df5a00b752777c168446326603c5e00ed66e7217551c75a976961c9de1f5a5bf0d262068866ecd0dae685a09ac8829db2bb5201c32e1ecaed6bafc149e4
+DIST grafana-bin-6.2.0.tar.gz 58485103 BLAKE2B 8613821d8dc03518585def91119d3f3b53f1c65a3d31930d4bc3261dfad09d3f30a4de8826fff6057827de5099f9d6945573ffa2aa4908c243b5b82efb531266 SHA512 2f722823577adc7dcf85e1340cef111a09686c9e2a3064b81f53d28fc5a3339f542506bf1fa87b6c242678242683e670f949ab3aaa06d9e542fb6c22e107479c
+DIST grafana-bin-6.2.1.tar.gz 58508207 BLAKE2B 5f543b105768f5151fe868b43927984a9dac4a0987192c2d7d6b2b1b0a1d636fbc4beb898d55a707f5d220785a7c56b0163f834e27293f67b55acaf7c54811a0 SHA512 9a35e953686f8ad0d75d3e2fdfb713fe6cac95ffc56ec4ee78bbbc6d753611675b5bf48e45652cc8a76af38e2358754a415a5b09f660e3a5508a2434b882ec91
 EBUILD grafana-bin-5.4.3-r1.ebuild 1969 BLAKE2B f90d9c8c479edfd60eff8a4c6823fad5ba9683411a6e9b4e137a77990f528d6184ecf0f917520209dd4497e1cfef9198fe305bb76a9c6c4911cd09204481a69a SHA512 d674745ae0614747c945e96990c17c89c1c7e027e909c92a8e08a898d9567d531900e56ea5f2714128549b2094fdc568da3949b6578fd9bb84f3d78c4b339a10
 EBUILD grafana-bin-5.4.4.ebuild 1944 BLAKE2B be7426448610d8b2875bd13a8f37d7c771193e236f572699224dced158835b1fb050573fc425e1d1c8ff4b216aab730ceccd666052c3467d86cca0b88a57fae2 SHA512 ae168b08b5f7c14b0f54d94be5e10fb9ef2c2c4875c8db7b2299cf087734687dc448d08b5f4fdd06ad2c219c29dd5a82802e7e2f68dd0be0daf698fdded24ccd
 EBUILD grafana-bin-6.1.4.ebuild 2000 BLAKE2B a2aded1295055013836375d7dcc73efa0c198030ec7653e07d3288792e284bba24db7e01b575c89421bd21155529c8f6e99add702929bbb45a5ff7ba16254161 SHA512 1790f63faba64a441f2527f1cbdab6ed3685b23f0b5032f3d3208851d491e077dc01edff00dc60ce81e25ce7b0b59b3e70ab480b065295fc6c05c4d0710216e4
 EBUILD grafana-bin-6.1.6.ebuild 1971 BLAKE2B f8d887e76e958c29296e441bb7165590d910ec9e43c717244e264bd266abdf4874c5ac63c789a61afdf81c5602ac2411cf992507d03b3a941a28a870a3f00051 SHA512 cad905e8e9aa9a8f02431b6fe3c0f780cba7c2ddf3db9477a48bbc0fae8f3b800407e95a926b203b34414be2386bcc21c6b590d9657266f709be95a5e6ed1305
+EBUILD grafana-bin-6.2.0.ebuild 1971 BLAKE2B f8d887e76e958c29296e441bb7165590d910ec9e43c717244e264bd266abdf4874c5ac63c789a61afdf81c5602ac2411cf992507d03b3a941a28a870a3f00051 SHA512 cad905e8e9aa9a8f02431b6fe3c0f780cba7c2ddf3db9477a48bbc0fae8f3b800407e95a926b203b34414be2386bcc21c6b590d9657266f709be95a5e6ed1305
+EBUILD grafana-bin-6.2.1.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
 MISC metadata.xml 416 BLAKE2B ff5bdf7e202aa96bbf615df2f86c6542bb7d291e6d564dfac683a2e54002380dd80ef3f1ca0b6c1f398de0115e26398903256b9d64e353127f25c3e97e5b21c8 SHA512 db2cbd25cf9b21664db93dc8f9719bf7f9a2fd632c5231d0f296bb32f3f6af3e08307c8a662081cc68f33638d70f6512094fad76073a5de4ceba02eeb3d1188b
diff --git a/www-apps/grafana-bin/grafana-bin-6.2.0.ebuild b/www-apps/grafana-bin/grafana-bin-6.2.0.ebuild
new file mode 100644
index 000000000000..7760f27c61fd
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-6.2.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit user systemd
+
+MY_PN=${PN/-bin/}
+MY_PV=${PV/_beta/-beta}
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="https://grafana.org"
+SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	media-libs/fontconfig"
+
+QA_EXECSTACK="usr/share/grafana/tools/phantomjs/phantomjs"
+QA_PREBUILT="usr/bin/grafana-* ${QA_EXECSTACK}"
+QA_PRESTRIPPED=${QA_PREBUILT}
+
+pkg_setup() {
+	enewgroup grafana
+	enewuser grafana -1 -1 /usr/share/grafana grafana
+}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini || die
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf
+
+	dobin bin/grafana-cli
+	dobin bin/grafana-server
+
+	exeinto /usr/share/grafana/tools/phantomjs
+	doexe tools/phantomjs/phantomjs
+
+	insinto /usr/share/grafana/tools/phantomjs
+	doins tools/phantomjs/render.js
+
+	newconfd "${FILESDIR}"/grafana.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd.3 grafana
+	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+	keepdir /var/{lib,log}/grafana
+	keepdir /var/lib/grafana/{dashboards,plugins}
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+	fperms 0750 /var/{lib,log}/grafana
+	fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+postinst() {
+	elog "${PN} has built-in log rotation. Please see [log.file] section of"
+	elog "/etc/grafana/grafana.ini for related settings."
+	elog
+	elog "You may add your own custom configuration for app-admin/logrotate if you"
+	elog "wish to use external rotation of logs. In this case, you also need to make"
+	elog "sure the built-in rotation is turned off."
+}
diff --git a/www-apps/grafana-bin/grafana-bin-6.2.1.ebuild b/www-apps/grafana-bin/grafana-bin-6.2.1.ebuild
new file mode 100644
index 000000000000..ed520bacd97a
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-6.2.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd
+
+MY_PN=${PN/-bin/}
+MY_PV=${PV/_beta/-beta}
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="https://grafana.org"
+SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	media-libs/fontconfig"
+
+QA_EXECSTACK="usr/share/grafana/tools/phantomjs/phantomjs"
+QA_PREBUILT="usr/bin/grafana-* ${QA_EXECSTACK}"
+QA_PRESTRIPPED=${QA_PREBUILT}
+
+pkg_setup() {
+	enewgroup grafana
+	enewuser grafana -1 -1 /usr/share/grafana grafana
+}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini || die
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf
+
+	dobin bin/grafana-cli
+	dobin bin/grafana-server
+
+	exeinto /usr/share/grafana/tools/phantomjs
+	doexe tools/phantomjs/phantomjs
+
+	insinto /usr/share/grafana/tools/phantomjs
+	doins tools/phantomjs/render.js
+
+	newconfd "${FILESDIR}"/grafana.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd.3 grafana
+	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+	keepdir /var/{lib,log}/grafana
+	keepdir /var/lib/grafana/{dashboards,plugins}
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+	fperms 0750 /var/{lib,log}/grafana
+	fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+postinst() {
+	elog "${PN} has built-in log rotation. Please see [log.file] section of"
+	elog "/etc/grafana/grafana.ini for related settings."
+	elog
+	elog "You may add your own custom configuration for app-admin/logrotate if you"
+	elog "wish to use external rotation of logs. In this case, you also need to make"
+	elog "sure the built-in rotation is turned off."
+}
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 6fe912bbf341..cff6d2b16cd5 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,9 +1,6 @@
-DIST icingaweb2-2.6.1.tar.gz 8165384 BLAKE2B ea9b499f7da9fbdbe8340443f02b5a9fc348549bbffc7777ad63ac1e04c12ff45e5337418f1714b1d76af3818e9733bb0eb51a6bfbc39a7d1eb4820af8747392 SHA512 f2ac728abde9795e578b7d512f5b87e3307faed35a5413aaa2d3a958b57389c5297a124b530667aa248ee368aafaf3875097fa8e27b4c3090bb64badc7c329b7
 DIST icingaweb2-2.6.2.tar.gz 8171965 BLAKE2B 2a7ebe4ee84ea311a1e0cac14021db66c0950be74d5984bb055983cd24e0277b43945f0b78ee98edb123412dfd116f875803c988612cd2a8b247f36b7c55f04a SHA512 f5fffbec237b892dbcfeee75a23ba26005cad9b4a1505a4d500bcbd16a8fa29125ed255ee320d3efcd8e43dcfb835244234a5607c562dd8bebe871d1a356b520
 DIST icingaweb2-2.6.3.tar.gz 8174959 BLAKE2B 6301a0a509031828b8db886e4ab060596f2239de4e65fe714d98a8f8f73305a1116b534f5c2747ab78446ff39b34fa96fe4eae758942aab2de4946c7cf1cdbcb SHA512 f1d14c7ed87cd677a1c4ac03fd6a54514e7e4693000215e0e1628b0480c738848858546e54866eda3a55b4e7c35b5837ad01dc08b5b76502e24d5a727e271710
-EBUILD icingaweb2-2.6.1.ebuild 2753 BLAKE2B ca25d486a10b97ac6efb871049239c49301e1b242c5cf7021144f67c99f38ad525d5b06bd78b652d44ed7977cf86b43ef3e711af965fad4c583ba6246aac49a0 SHA512 4493fb4bca00b034ba9714c3b16edd202d8a3ccfeb6dd0ccdd4f14c86499fc0be27e59b10a44e14488d89e74926841cf6090156cbacb13fa8acf44035309c3a4
-EBUILD icingaweb2-2.6.2-r1.ebuild 2331 BLAKE2B 1363042c58ee67b76b6f82d89919c7a92edf289ca99ef6e1c157592c9a449ac1afc6459a42b4a1ed89168ee9ef1dc6c6f6012e1090a0b0f98115ec56b04823bf SHA512 73bc873c58b89adc43eed160788406ea9299e66d9388b681e31cd91ef300547c20ec27c8ed09309db12c813ce507e73e88b3850d9e6d87194f9a11758a90683c
 EBUILD icingaweb2-2.6.2.ebuild 2750 BLAKE2B f3a93c50db31b0d18d442a76ad42777bc26136a1aa10baed09c31ebf8b31529e76c21f9c26375e17bf9bce3ff10325e8e6f9cf7dde0cb7a7ddcb34a6788450b0 SHA512 1eff0bc5243c531f4d869ad8d0cf91551649dcae50489dfaad45d342777a6714dc58e752a315a00bae9967664b5b5c74386ebc2fef9193f3553c1027ea0fde70
-EBUILD icingaweb2-2.6.3.ebuild 2529 BLAKE2B 49280ea2832b73adbbb3a246cbea7bb10871be65e2741a1324712727508f0f4d344217568e1f77a8f520cd1a490f614d44bb22c762c57103d98625c82f940e69 SHA512 7d4c16ee5dcf92a26096c8ec7ca084d5b36afa25652246d0c34207d1a53a83fef34d625377b0c44e2648df3573a7241c7d4f16a6356fbc17c1f0bd969d59f0ea
+EBUILD icingaweb2-2.6.3.ebuild 2527 BLAKE2B 804935e74b5969090cd6caca25e16e0537ce9c467007fa72a56011b0b852b01920bb3592bba24da63a57767d3385229851749eb1a829e62523b6995ebbc6d9ce SHA512 7030468c78d304c7d745d95b3acbe1f8782b323126664449785ce9145fab750dccff5daf2c97e72179fb483790e9a978585ffc9d9e81c6723db337ba9fe96d1c
 EBUILD icingaweb2-9999.ebuild 2529 BLAKE2B 49280ea2832b73adbbb3a246cbea7bb10871be65e2741a1324712727508f0f4d344217568e1f77a8f520cd1a490f614d44bb22c762c57103d98625c82f940e69 SHA512 7d4c16ee5dcf92a26096c8ec7ca084d5b36afa25652246d0c34207d1a53a83fef34d625377b0c44e2648df3573a7241c7d4f16a6356fbc17c1f0bd969d59f0ea
 MISC metadata.xml 530 BLAKE2B 855edf88f825a4c2f286068f7195264f1ca75f15aecf56d322a2e96b79ccdbea0b45c0a9a6cc4025dd2632cb0c97b60ffda3dd859adb7a2cfb35c0373c72bc0f SHA512 4ec6c57d7342dc1fa154f16e262f762374e37f6e4db09290c1b1188cc27ee605697d28b8349c51dee71fbfd5a90fd091e17b1dff4c9c9745bd6e69df8191897a
diff --git a/www-apps/icingaweb2/icingaweb2-2.6.1.ebuild b/www-apps/icingaweb2/icingaweb2-2.6.1.ebuild
deleted file mode 100644
index 0bf5ea9d946a..000000000000
--- a/www-apps/icingaweb2/icingaweb2-2.6.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit depend.apache eutils multilib user
-
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
-HOMEPAGE="http://www.icinga.org/"
-SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apache2 ldap mysql nginx pdf postgres"
-REQUIRED_USE="^^ ( apache2 nginx )"
-KEYWORDS="amd64 x86"
-
-DEPEND=">=net-analyzer/icinga2-2.1.1
-		dev-php/pecl-imagick
-		pdf? ( media-gfx/imagemagick[png] )
-		apache2? (
-			>=www-servers/apache-2.4.0
-			|| (
-				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? (
-			>=www-servers/nginx-1.7.0:*
-			|| (
-				dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.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}"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-
-	enewgroup icingaweb2
-	enewgroup icingacmd
-	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
-	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
-}
-
-pkg_config() {
-	if [[ -d /etc/icingaweb2 ]] ; then
-		einfo "Updating existing installation ..."
-	else
-		einfo "Running first time setup ..."
-		einfo "Creating configuration directory ..."
-		/usr/share/${PN}/bin/icingacli setup config directory
-		einfo "Creating authentication token for web setup ..."
-		/usr/share/${PN}/bin/icingacli setup token create
-		if use apache2 ; then
-			einfo "The following might be useful for your Apache2 configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
-		fi
-		if use nginx ; then
-			einfo "The following might be useful for your NGinx configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
-		fi
-	fi
-	einfo "All done."
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins -r "${S}"/*
-	fperms -R a+rX "/usr/share/${PN}/public/"
-	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
-}
-
-pkg_postinst() {
-	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
-}
diff --git a/www-apps/icingaweb2/icingaweb2-2.6.2-r1.ebuild b/www-apps/icingaweb2/icingaweb2-2.6.2-r1.ebuild
deleted file mode 100644
index 86c829679241..000000000000
--- a/www-apps/icingaweb2/icingaweb2-2.6.2-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit depend.apache eutils multilib user
-
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
-HOMEPAGE="http://www.icinga.org/"
-SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apache2 fpm ldap mysql nginx pdf postgres"
-REQUIRED_USE="^^ ( apache2 nginx )"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=net-analyzer/icinga2-2.1.1
-		dev-php/pecl-imagick
-		pdf? ( media-gfx/imagemagick[png] )
-		apache2? ( >=www-servers/apache-2.4.0 )
-		nginx? ( >=www-servers/nginx-1.7.0:* )
-		|| (
-			dev-lang/php:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			dev-lang/php:7.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}"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-
-	enewgroup icingaweb2
-	enewgroup icingacmd
-	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
-	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
-}
-
-pkg_config() {
-	if [[ -d /etc/icingaweb2 ]] ; then
-		einfo "Updating existing installation ..."
-	else
-		einfo "Running first time setup ..."
-		einfo "Creating configuration directory ..."
-		/usr/share/${PN}/bin/icingacli setup config directory
-		einfo "Creating authentication token for web setup ..."
-		/usr/share/${PN}/bin/icingacli setup token create
-		if use apache2 ; then
-			einfo "The following might be useful for your Apache2 configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
-		fi
-		if use nginx ; then
-			einfo "The following might be useful for your NGinx configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
-		fi
-	fi
-	einfo "All done."
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins -r "${S}"/*
-	fperms -R a+rX "/usr/share/${PN}/public/"
-	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
-}
-
-pkg_postinst() {
-	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
-}
diff --git a/www-apps/icingaweb2/icingaweb2-2.6.3.ebuild b/www-apps/icingaweb2/icingaweb2-2.6.3.ebuild
index 45655f2ebdb1..4d66e260c407 100644
--- a/www-apps/icingaweb2/icingaweb2-2.6.3.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.6.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/www-apps/ikiwiki/Manifest b/www-apps/ikiwiki/Manifest
index e3423ca234b8..0c9770bf622e 100644
--- a/www-apps/ikiwiki/Manifest
+++ b/www-apps/ikiwiki/Manifest
@@ -3,5 +3,5 @@ DIST ikiwiki_3.20171001.tar.xz 2638780 BLAKE2B 537008233f4c9612b3d1236eb15fe85a7
 DIST ikiwiki_3.20190228.orig.tar.xz 2672244 BLAKE2B 43012fc14f08c491ebe382e20953b8b01e10c390c28da0184b4e45a1435ada00b1ad6ac61f28c56ba1edb2e22dca1ab1f32eb77fc8d6133b899a26023593d3bd SHA512 125147d83dae6166b45541ed9176398ba4bd22ef3389d3efb3f442e558e326e0b004583d29aa32ed4bfca489c9d55b4232f074aab5fa649e51d9edd103685172
 EBUILD ikiwiki-3.20170111.ebuild 2086 BLAKE2B fad60188d2fa890350c9b2308409c9259dcc60c629f003ce2ee281c4c059d20d1c0369bbaf6290fd24f541e2b02227fa3ca87091ee49815bbbaacba5937ddc0e SHA512 7efdda5c7beb52be7f3de65a0090be7295f97350e69091d1069908d36f3165293e1ae399dbaa25bea68f5b433d2aa7c48918d7f7f4c1559a303c7f8d71336b52
 EBUILD ikiwiki-3.20171001.ebuild 2087 BLAKE2B 97788b721fcb8c552b9cddf1edbaf86d7815263efd072e0deafdce10ec1a4ef9f8a6879eeee43554f74b2873e15bf22d567e0023627e8834a9308736e065ce6c SHA512 66e0690357126199f0350be0f1fb04b87159480a14ee8e6d7d6b9db37b3b89cc5b2cd3bf3bb09dd828d17350e512f8af4b85033038a7b46f6891d57283bbc304
-EBUILD ikiwiki-3.20190228.ebuild 2091 BLAKE2B bdeec0b4bb1c064c2f00cd58b19c83db4f0e8dfc7820299b3feb69e84f09d15ce78edf0cd39b7541c3eabad667e85b33c7959a8d30adfe2d1a82588629d76a34 SHA512 d45422d03ced2e8bc89ae4b06fe19036dacfba70af9183645288de1114e9013a3e532ebfd53d26ec85e6aea749d088da726388eea896c84fb4d3a422faef17bd
+EBUILD ikiwiki-3.20190228.ebuild 2090 BLAKE2B d21af6459cb5c11855f3c520578510c5bd3206a20e815b52916ef4bce8a8a9a695b8990371c77aae617af13975e8d45e4ecff3dd65c539cbc2dc4025cf187101 SHA512 d4aae81f8cfd839652979eee1a6b749e9af7c672dd01f420880ca14435e204fe3ce10cce6f3dfdd3813c654d022076eb678a4c0ab89a15fa82e09ad6518b907b
 MISC metadata.xml 336 BLAKE2B 659eb5913c4c6c05924f811fac31deea3cea40dd30b32b498ea5b55341f20cf9405065dfdf5d19e82f8ba93ff3ec4d5c5adbedfa51271d6762cff10c4a5088f4 SHA512 7d31f6078d1d49aef54bd46c5e8005d4247eb1cadfd4fdec36592deef15c4450a213d29c353dd43255a10918c2146c335efdbf7b626da2cd4ea98f815e0c5141
diff --git a/www-apps/ikiwiki/ikiwiki-3.20190228.ebuild b/www-apps/ikiwiki/ikiwiki-3.20190228.ebuild
index d89cc5295019..5791382b3092 100644
--- a/www-apps/ikiwiki/ikiwiki-3.20190228.ebuild
+++ b/www-apps/ikiwiki/ikiwiki-3.20190228.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/i/ikiwiki/${PN}_${PV}.orig.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="extras minimal test"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 S=${WORKDIR}/IkiWiki-${PV}
 
diff --git a/www-apps/klaus/Manifest b/www-apps/klaus/Manifest
index 0ee31ff8c26e..6d4774a45154 100644
--- a/www-apps/klaus/Manifest
+++ b/www-apps/klaus/Manifest
@@ -1,5 +1,5 @@
-DIST klaus-1.2.2.tar.gz 35308 BLAKE2B 4ac2cd77f5c95fd207a83e1688b65e286009a5830c96fce442e3e4a2989a320c0980ab96a03817be27d45d01ccb5e2db277ed535d62a781006b4747c797838d2 SHA512 2f054ca3d285dcf334188d72bbbc4ea99fe8778126d0d215cfd3508cb294d52e2944b3e251f903a863df018ec61d9dcd779f5c6cd284fb2f6cd90abb98783176
 DIST klaus-1.3.0.tar.gz 35363 BLAKE2B 881f9bd1a80d4a580a0dc84a7b8528a5703777817495639bb3ea8f608c2495287a37fe43839d0c64002e1d36453d37f116c73c9a7ef93651bc8a2d010d4d2e2c SHA512 c159d8195b1bde43f46d013f0337e998d905b1f3a9a23caf5f71180d19192c3c391cc5143545bd3d05a2aef45451a43e873ca3828c8f9f69ae3eaaa0d00560cb
-EBUILD klaus-1.2.2.ebuild 846 BLAKE2B ce62579f0ff24ff598da86669077907a4d29c7aad39a677a357c69f18430f020e0796da8bceca6b62bfa7aebbd202af74f92ebc4221b7eef1104ff6691c1321f SHA512 2dc006642ac991309ade7511508b752841db573f8520aa7b98391955501b5e3c8ade1cf0bc2e5fd4ff3bf2ae7574643499495aa8ae402e8e87478457e5822b45
+DIST klaus-1.4.0.tar.gz 36879 BLAKE2B 8a621338514e3be143c5b64a0a486d47edc7e7a14c839bc135e7c1693fd09ddea1529b5b2e1d8e0bb70f152629d7bff288f9221ae4243dac01995da4d00e5848 SHA512 8e596590fe29c62eeb823047780f747a0f4908f926dad8ff54000469dca013fcfcbaf7b53c0555db095fef71e4d9056e9b6e959005550bdfccc338f1ee3a5d2c
 EBUILD klaus-1.3.0.ebuild 845 BLAKE2B 4ccaead04d938250fc8a845eef3f46ab203933b00d0dde34ac73b3479c3cc0bad61372d81c0082b45c87db1da3ad1b52142b1e9cd9aeb37eb20193f8cfc2884e SHA512 82295552e538bb0837b35b1468e1c2fb27f1cabf65cc1fd6bad202f81bc2bf2da1b881b25fcce57f9db621fac99d8079a560335b8740e092a95cf650ac821308
+EBUILD klaus-1.4.0.ebuild 919 BLAKE2B 1a598db00725e56a879816336f06392335aaf2317316a5f3015b99bde856b8f0bff4929f5d2aaa6a4f9c8981a72cbc06170730b36fae630dd69d5334d1c0ffbb SHA512 7e3c5ed3f5fe46ffd85bdcbde573f985d0b68aa53b5d4e65973e69fa65299dc6eb41c8c383ba1fa1e769591a6fc244e17aff35efa1b4dcc6da2eb4939a8f7277
 MISC metadata.xml 684 BLAKE2B 3fd97f5f66e03afef819feddd1995814e607f188ca87ce5a294f3a10f794fdbcba2fdea691bca7e100d0b853925fd1248fea7eafc37cc947d31454a01c070af2 SHA512 37f5386826bc762dda625012e6016f65d0dd3d1ed4b88f62341cb4ed7b2876cc2a819550faed8fbcb939796d6d76f6d4dcca8f0559be329cc9f8f583c188d5e1
diff --git a/www-apps/klaus/klaus-1.2.2.ebuild b/www-apps/klaus/klaus-1.4.0.ebuild
index c7fba3e90a36..1966b9410b74 100644
--- a/www-apps/klaus/klaus-1.2.2.ebuild
+++ b/www-apps/klaus/klaus-1.4.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit distutils-r1
 
@@ -17,17 +17,20 @@ KEYWORDS="~amd64 ~x86"
 IUSE="ctags"
 
 RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.19.3[${PYTHON_USEDEP}]
 	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/dulwich-0.13.0[${PYTHON_USEDEP}]
 	dev-python/httpauth[${PYTHON_USEDEP}]
 	dev-python/humanize[${PYTHON_USEDEP}]
-	ctags? (
-		dev-python/python-ctags[${PYTHON_USEDEP}]
-	)
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	ctags? ( dev-python/python-ctags[${PYTHON_USEDEP}] )
 "
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 # The tests can only be run from a git repository
 # so they are not included in the source distributions
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman ${PN}.1
+}
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 50bfc8e9505d..f5d6b095b7c7 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -4,6 +4,8 @@ AUX postinstall-en.txt 6524 BLAKE2B 68262eaf6318780a468d9e6f98c3b2cce43164964de6
 AUX postinstall-nodb-en.txt 171 BLAKE2B ee2aa857cf365815b705b5e60c5b2fef0cdb0bcd8acef0375e0173f13c004e336df9b2dbc6cac376bea939e8fe73a72f06d52961500d05ee2137a8fea82286b1 SHA512 b0cf4787351f904caf06573c5bc50275b6a11361170b4006acc24224f44efde69cfe3a9b6340d6787c5805c605dc89f07072bf992b0ee255c97fba90e5d5617e
 DIST moodle-3.5.6.tgz 46703461 BLAKE2B edd438ffd4f1def04f9619150d8ef486323a5e9f458124d317d36e01eb79e2d0ed0039d8dba43a3956aafc8e92c8d2276b6be730607031ba0e561b62a24488ef SHA512 0a08359576665f78d2370d3f2796dd53cba692c5fe68de7cdf8478bb1f24136c4e78149fa6a3c37118015fdf7a401c50913d151b4b38d9928989255688df73f3
 DIST moodle-3.6.4.tgz 47736743 BLAKE2B b3a41b0025651e161a1ee76ec1c121666e8dd0d830a05165b6c4419dff3caccb5fd006434f5e8284b81bd892a1c184d8a008e2b948d3b63c472f31cca55dc77e SHA512 b3b3b138f8a2779dc41f25656a5f2640afa2f3b933d9e2f99065e176d1f5b6c9c4f8bdf8af53af04957eb520043e1c7c53ff6309896e399f4a012f624481ae44
+DIST moodle-3.7.tgz 45708647 BLAKE2B b4ce21bd98d91ad81f095c00aaee6c30fac238cf54de079e1021ec94109a24aee97f2d9aff0e99a6594c35cfd8ff7e06b83415109992df90e858d88ae8b66033 SHA512 ca3efbb146253e856ff6988abad4bd071e26599ba45e60186e89bda45b06b610de1e88aa165e5ac992e00f23772e932ffe770402c699898d128a3357f02ac895
 EBUILD moodle-3.5.6.ebuild 2949 BLAKE2B 948d8ccf72fa401f3243b6ed4751de0ecf498502c5d1fa1f592c0dcc649670e99c2576d0d1ba40be463ebb4ae2bd3803000c6132e3d00eae5758bf70bccd256e SHA512 0c300c8f3b7e7758a1d29ae12be386f4b459cdc65fcd39ed45da307e503e03bcd99e68aa6798260e813aa92d03e4f1d0a4161e6e093d0b4fca6cb0b6db86a86f
 EBUILD moodle-3.6.4.ebuild 2949 BLAKE2B 948d8ccf72fa401f3243b6ed4751de0ecf498502c5d1fa1f592c0dcc649670e99c2576d0d1ba40be463ebb4ae2bd3803000c6132e3d00eae5758bf70bccd256e SHA512 0c300c8f3b7e7758a1d29ae12be386f4b459cdc65fcd39ed45da307e503e03bcd99e68aa6798260e813aa92d03e4f1d0a4161e6e093d0b4fca6cb0b6db86a86f
+EBUILD moodle-3.7.ebuild 2949 BLAKE2B cb6e624bb0c83c5e8a3e7d9a541cb61dcf93dd6b06bdbf417ac96631444665a08bfdb5d1366636c0452421faf6350d4b886d08d6a9a07b8676f45cdcb040ffa8 SHA512 593727dc584922aa6a0074c01ab6d31bf738c7e198d4901ce2766c2dbda9eae26b0f2ccb4360d117da3d8fb76f34b656b6f777d2e1aa992401bc8bd627774c67
 MISC metadata.xml 355 BLAKE2B 68d10d39dd24da3d570f13edec9c4adae89b7620bb455c1c30377c3cebe56c4961d1548360adedc96fce780067b308193fdb7560478a60ab56c364b774b1984a SHA512 f02e5404a714cb20207e494f635fb0e98870576c4b5f6affc4dc27fccfcabdd1af1c7411a83cfd4e01b51ecc24d11944d1e612757ff45ab4405f6099ed9b1278
diff --git a/www-apps/moodle/moodle-3.7.ebuild b/www-apps/moodle/moodle-3.7.ebuild
new file mode 100644
index 000000000000..02e7fab65927
--- /dev/null
+++ b/www-apps/moodle/moodle-3.7.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2019 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.1[${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/owncloud/Manifest b/www-apps/owncloud/Manifest
index 036e30b4c9bd..8e576f3f5f2d 100644
--- a/www-apps/owncloud/Manifest
+++ b/www-apps/owncloud/Manifest
@@ -1,9 +1,7 @@
 DIST owncloud-10.0.10.tar.bz2 44943557 BLAKE2B a2cdfbef7affc306b7653f1841b0bb2e781d849bbd62d9b8a0f3a019cca5be8a02ca27b5fa5cbb39ddb9a440aa917b279c937ebdae034504d5c1b9ed3eeee603 SHA512 77f9567395ee5319afc397ed7b9bd93687ddfb90022445be06adfb58ae49557223227a656b638b1cdac19b730509292e7ba260846c9f67540418267ac7b518f7
-DIST owncloud-10.0.9.tar.bz2 40769945 BLAKE2B c2187838488e87a85a964a9f1cd181e203fef6475c8797f8fc7204ae91d00522193cf730340dcf3e08b85cb03992d8d922a1d72db0acfc3d77374f0f10f4cbea SHA512 756903ba98ca7612987e51d4f0d38452b8c38a3970ae6ac7ec0d30e469cd7cb7cf1a4a95dbe1a782c3ebddfdf3c2194193853b9f55cb75a9f0ef4c5a437c420b
-DIST owncloud-10.1.0.tar.bz2 20345340 BLAKE2B 0d5d6b1ea5ce6071ccd447737ab897e3ade60178497af538866ea60fdfad9b15a8971fcf921e1297d4b9b14a596c1397d7ae517cf8f0b9e9eb186511fe4e3210 SHA512 2e93510cc6a3668c4d1b9ad072aab05b44e531cadbc7e740a2d4c5822a221878fa2f3804cb2436461e3c2df46b59374bd641464c786a89582b01fcf816bb203d
 DIST owncloud-10.1.1.tar.bz2 20272676 BLAKE2B 36f4a1fb513dc1a49ba571935de309f78c12fad11b4b5297c48fa02541a7c7858ce8c525847c44b89e43a5142f52e37c9c23cfff71aef9380b4192729e5b110c SHA512 4252ac71b87bd7a6372507a501dea4022420b7c2cb6556ec258091238cf3b347a33cd56c2a8afefcf971c0bbd68422fc86db8be2e6bf8fb3b6c76ff3aac228e8
+DIST owncloud-10.2.0.tar.bz2 20370460 BLAKE2B df52e0bfd7090dcddffc2bd87059e17d575ac250bc737a6b38c45ec73cd793e2b2d3deb0bd17e7f91f858e9c4ffe92a551de8204cc0c0246ba833b93721ab3ed SHA512 cbeacfaee4b29d01bbea2a2a0800c34d4ec3d3a430e287b39df1414c359c1aeeaf61fe7d044674f44180bb37962c44f87392a663273e447cd6b0f4d2d62201a6
 EBUILD owncloud-10.0.10.ebuild 1267 BLAKE2B 3a1a4f21b2ca2a46975f2e60516eafdf6c96cde7205867aba7a54e995a1ea424d0d203e49405418c1c3be2ae8cc55bbcd2527c01e631dc66ddc5a1f21b227926 SHA512 1a94a56f9879e9fe2abc25d146539ce38a875d56a51f170d0305897b4e9dd9410bd7f010da89bcd10aa811610438568b6abee3da54a3755ac4dade2ebe8be36d
-EBUILD owncloud-10.0.9.ebuild 1267 BLAKE2B 3a1a4f21b2ca2a46975f2e60516eafdf6c96cde7205867aba7a54e995a1ea424d0d203e49405418c1c3be2ae8cc55bbcd2527c01e631dc66ddc5a1f21b227926 SHA512 1a94a56f9879e9fe2abc25d146539ce38a875d56a51f170d0305897b4e9dd9410bd7f010da89bcd10aa811610438568b6abee3da54a3755ac4dade2ebe8be36d
-EBUILD owncloud-10.1.0.ebuild 1267 BLAKE2B 3a1a4f21b2ca2a46975f2e60516eafdf6c96cde7205867aba7a54e995a1ea424d0d203e49405418c1c3be2ae8cc55bbcd2527c01e631dc66ddc5a1f21b227926 SHA512 1a94a56f9879e9fe2abc25d146539ce38a875d56a51f170d0305897b4e9dd9410bd7f010da89bcd10aa811610438568b6abee3da54a3755ac4dade2ebe8be36d
 EBUILD owncloud-10.1.1.ebuild 1267 BLAKE2B 3a1a4f21b2ca2a46975f2e60516eafdf6c96cde7205867aba7a54e995a1ea424d0d203e49405418c1c3be2ae8cc55bbcd2527c01e631dc66ddc5a1f21b227926 SHA512 1a94a56f9879e9fe2abc25d146539ce38a875d56a51f170d0305897b4e9dd9410bd7f010da89bcd10aa811610438568b6abee3da54a3755ac4dade2ebe8be36d
+EBUILD owncloud-10.2.0.ebuild 1267 BLAKE2B 3a1a4f21b2ca2a46975f2e60516eafdf6c96cde7205867aba7a54e995a1ea424d0d203e49405418c1c3be2ae8cc55bbcd2527c01e631dc66ddc5a1f21b227926 SHA512 1a94a56f9879e9fe2abc25d146539ce38a875d56a51f170d0305897b4e9dd9410bd7f010da89bcd10aa811610438568b6abee3da54a3755ac4dade2ebe8be36d
 MISC metadata.xml 362 BLAKE2B 966b48f98107fc73bd40f9c602962f2c876c1be1f074943452cfb5bbf60eb1c2ca08153294ce4166442da85beebd41395ca9bbe9c98d7832665fa16419db374d SHA512 64c690c6fa8bc6861f673b465e0519d5c5e945d76b66a2d9e7422cbfaa967624e7da287626bd12edbf347f0d0b5296fb9719ede93d15f073542367f5fecf5e99
diff --git a/www-apps/owncloud/owncloud-10.1.0.ebuild b/www-apps/owncloud/owncloud-10.1.0.ebuild
deleted file mode 100644
index f493a0c561af..000000000000
--- a/www-apps/owncloud/owncloud-10.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Web-based storage application where all your data is under your own control"
-HOMEPAGE="https://owncloud.org"
-SRC_URI="https://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+curl mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash,intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "Additional applications (calendar, ...) are no longer provided by default."
-	elog "You can install them after login via the applications management page"
-	elog "(check the recommended tab). No application data is lost."
-	webapp_pkg_postinst
-}
diff --git a/www-apps/owncloud/owncloud-10.0.9.ebuild b/www-apps/owncloud/owncloud-10.2.0.ebuild
index f493a0c561af..f493a0c561af 100644
--- a/www-apps/owncloud/owncloud-10.0.9.ebuild
+++ b/www-apps/owncloud/owncloud-10.2.0.ebuild
diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index 2d05e6262f6f..10c3ab3b19e2 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -5,6 +5,8 @@ AUX ttrssd.confd-r2 1581 BLAKE2B ce18840ddb58704abb9311d02e27cfc179bba43668b90cb
 AUX ttrssd.initd-r3 2338 BLAKE2B 6ddcb12c548ef6b34196da7539b5ec2f061db46f041912647ea2741208004d25cc7d51d88375aa06b5866a7ef44995088cc9002d625666bdaaf687733b699a8f SHA512 eb6a9824562f49d42e94522c074719720686cd2d3fb3d0ac13ce5d83fdeae6b17a5047e79e761aea084eb8ff6e6aa733d49131324f8a00406935f8e0b962764b
 AUX ttrssd.logrotated-r1 135 BLAKE2B dc653add518cd3ed5296097d51ca2346e102edcbad5ec82397713ded489e8ed8e49af928331e58b80152f13bddc37d673c67440df388651c875cfbd37ff62080 SHA512 c292020a55688c6edb4306d9d8144ad7d30be94fda08467b8bbe560c7bf02b0877d9591123a226dd030e9a9c01b79df4a3696e54fd1ece0dbdef1c285cdae97a
 DIST tt-rss-20180105.tar.gz 3070929 BLAKE2B 2370104c70f5381d690a29b216269c749bf1f7c6b925eb9499b741e5df3e686d95fce430a144946fd915414481280b67e6d0c881edcdd13aee0fa344dc0bec3f SHA512 86ceec3646629ad7fd3fde2f3c3237e48ad96bd08b46e73c34c76507d9b17613ea309e1bd5e6e85a0d9eb96029e54b54e5ee367c56aab31be3dcec9169c5ada5
+DIST tt-rss-20190523.tar.gz 3336985 BLAKE2B 9f37c676b6ca263b09685ae66c4183b4b1fed2e37c2fb361aeeb15f877916967ebdb272fb60ce554c8a7596f74de7713ca2ff6c70bf1ae8a669da2bd702607e9 SHA512 22fbed0199503ecf3728ed4c2e199bbd9fc617b83ec3a09d80352512460ab9cf46abfe840143e62c747743975d2e5b9c9ce0bfb8498b8c6187ae567552a49213
 EBUILD tt-rss-20180105.ebuild 2116 BLAKE2B 420d5b05643b29abe653a53db201ac1d5bd287faf48a5ed4eb8694e183ce38fec6c36dbe77cbdbe55cdb03508e720bd3371df939dd10d0185398a2fcc3fb5838 SHA512 362544447ff951a400056ebd8a083a0d7f37dd0a6772b5b25bc46aada86d69ed6df37b6f612c8313e2b6cd4667d0e16c5cc18990730e333dbb11588d528242c9
-EBUILD tt-rss-99999999.ebuild 2163 BLAKE2B 2147dd308815ea48e4b91bb62606647d18736772068ea82e5ea52dd155e15a523c271ea1691f65459101d0df5151a2b4dd0f06af4db828ee31261c1be6094186 SHA512 15ff6fc2390ad194a7f7b26e7b448c8e9062b0ab79b9c60edd2e5edc9bf5ca6bcb275469ec7a1a0a0fba0971bf1f1a843908f373862a34644071e484be68d3b4
+EBUILD tt-rss-20190523.ebuild 2123 BLAKE2B 5e741b1b68a15327824b3fb98090ee993dd2517cc0851bd1cbfce3f67f1fc5163e458aeec22767a915f2705c0c4970c8dd2bd3b4586a0ca091d50f2ab2ec0f17 SHA512 7baa07afbcb6112bfbab8409a31a63afab7f566cd764a7e110c61e62555ad330d07e8cba4d541ba1775b789b2c86f3cbb8ea15aec0748874133432f0d3441ce7
+EBUILD tt-rss-99999999.ebuild 2170 BLAKE2B 360b2ada6756ae564c7dc1497f488baebb4d1db78e93ff21c0681a40767b70bbfb5c4c161f08411cbe89cb9f3d3cdf451ba64208b4f3c2f2f7f6534ea25b0f48 SHA512 c453912dc640ba2a235601a8442061e775e0259a468df39bad3dedcd6f69999f906196076c57bcf44b79a8754558f4b3eedb0af400a31efc7077f089d6642c94
 MISC metadata.xml 349 BLAKE2B d14bc6946ab95fa116a982d4d9ea1c76b94c1094876c32451adeb783925410e5f80323943aa8922aef9c4c7bd630038bbab07186f62cbc3aa36b2d7eec5fc306 SHA512 2b18408b092177dc05b0720635e28c8dac334d9013d1e9f30ee7288fd2158a1c47fd313f916dea4e5f1bf37ea04b15e8845f4a7331dcce43579163fb7a36bb6a
diff --git a/www-apps/tt-rss/tt-rss-20190523.ebuild b/www-apps/tt-rss/tt-rss-20190523.ebuild
new file mode 100644
index 000000000000..fbfb5e9a9330
--- /dev/null
+++ b/www-apps/tt-rss/tt-rss-20190523.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit prefix user webapp
+
+COMMIT="4a2836ea90c4c471029d189a8c9fe5ec10a9521b"
+DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX"
+HOMEPAGE="https://tt-rss.org/"
+SRC_URI="https://git.tt-rss.org/git/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~mips ~x86"
+IUSE="+acl daemon +mysqli postgres"
+REQUIRED_USE="|| ( mysqli postgres )"
+
+DEPEND="daemon? ( acl? ( sys-apps/acl ) )"
+
+RDEPEND="${DEPEND}
+	daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,cli,intl,pcntl,pdo] )
+	!daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,intl,pdo] )
+	virtual/httpd-php:*"
+
+DEPEND="!vhosts? ( ${DEPEND} )"
+
+need_httpd_cgi # From webapp.eclass
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	if use daemon; then
+		enewgroup ttrssd
+		enewuser ttrssd -1 /bin/sh /dev/null ttrssd
+	fi
+}
+
+src_configure() {
+	hprefixify config.php-dist
+
+	sed -i -r \
+		-e "/'DB_TYPE'/s:,.*:, '$(usex mysqli mysql pgsql)'); // mysql or pgsql:" \
+		-e "/'CHECK_FOR_UPDATES'/s/true/false/" \
+		config.php-dist || die
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r *
+
+	# When updating, grep the plugins directory for additional CACHE_DIR
+	# instances as they cannot be created later due to permissions.
+	dodir "${MY_HTDOCSDIR}"/cache/starred-images
+
+	local dir
+	for dir in "${ED}${MY_HTDOCSDIR}"/{cache/*,feed-icons,lock}/; do
+		webapp_serverowned "${dir#${ED}}"
+	done
+
+	if use daemon; then
+		webapp_hook_script "${FILESDIR}"/permissions
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-en-with-daemon-r1.txt
+
+		newinitd "${FILESDIR}"/ttrssd.initd-r3 ttrssd
+		newconfd "${FILESDIR}"/ttrssd.confd-r2 ttrssd
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/ttrssd.logrotated-r1 ttrssd
+
+		elog "After upgrading, please restart ttrssd."
+	else
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	fi
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "You need to merge config.php-dist into config.php manually when upgrading."
+	webapp_pkg_postinst
+}
diff --git a/www-apps/tt-rss/tt-rss-99999999.ebuild b/www-apps/tt-rss/tt-rss-99999999.ebuild
index b611aa54bd70..1f6d41d337bf 100644
--- a/www-apps/tt-rss/tt-rss-99999999.ebuild
+++ b/www-apps/tt-rss/tt-rss-99999999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit git-r3 prefix user webapp
 
@@ -16,8 +16,8 @@ REQUIRED_USE="|| ( mysqli postgres )"
 DEPEND="daemon? ( acl? ( sys-apps/acl ) )"
 
 RDEPEND="${DEPEND}
-	daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,cli,pcntl,pdo] )
-	!daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,pdo] )
+	daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,cli,intl,pcntl,pdo] )
+	!daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,intl,pdo] )
 	virtual/httpd-php:*"
 
 DEPEND="!vhosts? ( ${DEPEND} )"
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 19a4ecd0d4dd..e21518333698 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -2,8 +2,10 @@ AUX postinstall-en.txt 1554 BLAKE2B 0a6e291b6d590e03fe4702a9e01f88a59fc4d820f95b
 AUX postupgrade-en.txt 1653 BLAKE2B cf2e403046ff8646b7dfffaec7c267633fa735f1be7448f76c9bfeefb2372c169453123db169d70bf871dc4c1ee1a239aeb17a25a1de582b23b38a7d589fd1c2 SHA512 3fa8b143a4cd8e23798423427ec31174947eeccfdbc5611dca3b32e02484f68602713dd75c3153db344de4151de1924fbaa6807e360fddeda79fa0dc70005913
 DIST wordpress-5.1.1.tar.gz 10654780 BLAKE2B c5105315ed07941811016244737d2a697864521a4cf0fedc9ba260629cedbe77cef642f71ea485813eb89cbef1a1bb60fdca3229611f7d2de435f0c28462a3f1 SHA512 0b06630c894c535b24787cda0ee9c8bc8eab54fe6f6523fd78da55cb00ea9b9404454d51a3b9b77c72fb5ebc94d36719be50785fd82ff3311ca1df9b8fd980c9
 DIST wordpress-5.1.tar.gz 10653910 BLAKE2B 26a4f42dd88d4c2616fb240b8b9a1f64a5380496600e3d132dbc162505907cda49e11b9f132d0f436e9426e77d42d6d78ed6b1e16f04d857429515d192761113 SHA512 e8504be918add0533a99f62e967e2c86afce0c28ae474cace5e4c44f66e8a71394eed7bc6f1e3108734e4410849b28d1da6c545c05a24025067a1321a8fa9a99
+DIST wordpress-5.2.1.tar.gz 11199196 BLAKE2B 284358e40e380f5467f92ced37cee57dd1c6b9400a80f01a5a7a5ae973f9c5af88345ebf46505ae392512a88d0c64dfd4f321edd825fd2d38e1160c3ca352d21 SHA512 b49368ba7a3f0cf101b2ad2c78d609050f371a4c7f6dca7d5966cc167ae20ca78df9a3144e1b91c4044d0a9a12163911d66c8faedc9c4a1e2978d2b54ef54855
 DIST wordpress-5.2.tar.gz 11195223 BLAKE2B 35bc5190751749f12d88a13314f021a9cefb6dd78aee9ec32e439031cd19af0929c1a84741b7965cc30638fc3f568289e75e25e9b63a1696e4c427ef29aa1f85 SHA512 741699a26b956b9d80505954f38e95b9f6328f892efb957d584ba6b669ae28d9a9e63249b72cc7a677cb4ae1008e0545f846492636e7e10442593be2054be824
 EBUILD wordpress-5.1.1.ebuild 1260 BLAKE2B 497617a28239b9636b455fd458e811ae00428a4938891e30d2cdc0144143f29c8bd9988b6dc695ce89b96b044e7cf3ccc14148b7aa13e653c67141625e987d28 SHA512 f6114430beffa148d151909fe1d01ab892b23a25ac83c9e2136ba3c49446164fb4a80407866db25d70e9acf9e0e4b01afbce35735a885d29d002a14332326b9c
 EBUILD wordpress-5.1.ebuild 1260 BLAKE2B 497617a28239b9636b455fd458e811ae00428a4938891e30d2cdc0144143f29c8bd9988b6dc695ce89b96b044e7cf3ccc14148b7aa13e653c67141625e987d28 SHA512 f6114430beffa148d151909fe1d01ab892b23a25ac83c9e2136ba3c49446164fb4a80407866db25d70e9acf9e0e4b01afbce35735a885d29d002a14332326b9c
+EBUILD wordpress-5.2.1.ebuild 1260 BLAKE2B b3478b9f1821baaee2517a15ee9ea6e67e2bc2dfa760e2a7b87bcd3933a2db89903e3d92f85b52db6afaa3906649dc7372cb80cfd6c3c962c87d215dbf6497f9 SHA512 077876f0d5c75686f33cfe5b6422a0bb8eefb56519f8b4cc098dde7c39dc09a38f4a43db4b8412890666e8adcab1f4f39f5601a34c7647b9c428987168dd8209
 EBUILD wordpress-5.2.ebuild 1260 BLAKE2B b3478b9f1821baaee2517a15ee9ea6e67e2bc2dfa760e2a7b87bcd3933a2db89903e3d92f85b52db6afaa3906649dc7372cb80cfd6c3c962c87d215dbf6497f9 SHA512 077876f0d5c75686f33cfe5b6422a0bb8eefb56519f8b4cc098dde7c39dc09a38f4a43db4b8412890666e8adcab1f4f39f5601a34c7647b9c428987168dd8209
 MISC metadata.xml 392 BLAKE2B 736fb06bba21342a9cdd29ce815b1325098bc11798675534a4d299bcbaeb29f46d1eab8bebd90e2539187e82294510d06827ac068611797ad441e7c024bee6b8 SHA512 f63f0ac7c836f4f8c21d69b021d6e4d6f4257f80fd1995f180509379c7ab82028a89d1be22a381e36aad34b21d94e29c2471b48d6b31dd1a634150991e7b6c33
diff --git a/www-apps/wordpress/wordpress-5.2.1.ebuild b/www-apps/wordpress/wordpress-5.2.1.ebuild
new file mode 100644
index 000000000000..9d6f0eaa173c
--- /dev/null
+++ b/www-apps/wordpress/wordpress-5.2.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+DESCRIPTION="Wordpress PHP and MySQL based content management system (CMS)"
+HOMEPAGE="https://wordpress.org/"
+SRC_URI="https://wordpress.org/${P/_rc/-RC}.tar.gz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="virtual/httpd-php
+	|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )"
+
+S=${WORKDIR}/${PN}
+
+need_httpd_cgi
+
+IUSE="+akismet examples +themes vhosts"
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc readme.html
+	rm readme.html license.txt || die
+
+	if ! use akismet ; then
+		rm -R wp-content/plugins/akismet/ || die
+	fi
+	if ! use examples ; then
+		rm wp-content/plugins/hello.php || die
+	fi
+	if ! use themes ; then
+		rm -R wp-content/themes/*/ || die
+	fi
+
+	[[ -f wp-config.php ]] || cp wp-config-sample.php wp-config.php
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/index.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php
+	webapp_serverowned "${MY_HTDOCSDIR}"
+
+	webapp_configfile  "${MY_HTDOCSDIR}"/wp-config.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
+
+	webapp_src_install
+}