gentoo resync : 10.02.2019

26 files changed, 382 insertions, 75 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index d66fb1376f10..c1791212a371 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 36ecee5890f4..1669696f5118 100644
--- a/www-apps/airdcpp-webui/Manifest
+++ b/www-apps/airdcpp-webui/Manifest
@@ -1,5 +1,5 @@
-DIST airdcpp-webui-2.4.0.tgz 9252281 BLAKE2B 9682b5c197a17a2a0a1de9e29999ca54bfd2ac85120702ec37671ddcc445e595fcf262f82729497b1b38b638c9d1e4cbeb5daabf21b5436d240c0b1097dba1fd SHA512 4251dadc0161324a21c4278e480c39f798988e15a3cf1fe812966be4afde5666276b30dc86b40ab900aba008eb09c90bc54a24e23747f889884a276da99dde44
 DIST airdcpp-webui-2.5.1.tgz 6571762 BLAKE2B dd2d02913125c8166c1ca0f14d9276eed073fa58a46ddbf2ee5e70a97e081852e96a875c9f501781b81de0d2163c4c391c5aa3d078f6946fe35109fe901d8bb5 SHA512 771595f529361330fb54796b32fed61aa8fb37ef1ddbb551c10a8b6352eead6afe7e8a52df223c7e53c27942dd301f50b7234eb915ee378e90eb6ac847b16871
-EBUILD airdcpp-webui-2.4.0.ebuild 466 BLAKE2B a6c709a4fc399dff64f01178f72888e354bb5f564f93be837c85a0aea9cfe2c4272d0b63087164a44e2201255bbe5a77d0c370ca26bfebf7245f58059fc7ef0a SHA512 c7587abdf727b97ba914f6c3a89ed03b2e07eaed4cf03e2ce50846b7bb087222fa52f0b59ee81446a9aec3df5a061892a4d40ec257d5b185d340d031ab0ccec0
+DIST airdcpp-webui-2.5.2.tgz 6715659 BLAKE2B cfbd185fea4e4b9c07508f9cb29ecd312b004e63a8ce26c2fb0695895fc85e4e657b6813c69e05905ac950eea9288ba01df7814fd5106cce2933ebadc17fb82f SHA512 08dbbb5bcafb1b991f283c6975626843e96818cb02eaf3b0a5a7c700f64780dd18cc897343c57d2f46235c77d44b1da17f8d66fb0f021d75be164a6709978650
 EBUILD airdcpp-webui-2.5.1.ebuild 466 BLAKE2B a6c709a4fc399dff64f01178f72888e354bb5f564f93be837c85a0aea9cfe2c4272d0b63087164a44e2201255bbe5a77d0c370ca26bfebf7245f58059fc7ef0a SHA512 c7587abdf727b97ba914f6c3a89ed03b2e07eaed4cf03e2ce50846b7bb087222fa52f0b59ee81446a9aec3df5a061892a4d40ec257d5b185d340d031ab0ccec0
+EBUILD airdcpp-webui-2.5.2.ebuild 466 BLAKE2B 871c7665811ba71d6cdbe42220bdb9f88174e033c7b0c430788fa08ee24a01290a17612797ba6db9a89dace0c2c4a9a0b95400d8254a7ba06124545d5863dff7 SHA512 ce4e7b13149a79ace635f2f0f1d97fa3cdfb909cfb29323ba48d8d75ae3e3e87848c0f0c397180ea41d3722e471b6401c749557cb9ef2f982d5758886412bc62
 MISC metadata.xml 553 BLAKE2B aacc047cadd9f0d8078a997d9ac02aeda726575f1af69cd4e97afe9159987347247aee7ac74b11b8d23b18a669b447451e3e6123f578b501a872f395e418341c SHA512 0d1233d39b432f28fb9977b06a750e990524b250563e8fa5594bdf7dd6cc5b35468b70abe41e0cae87331c2052b592d4d314a897549f0a247c04af1a15782feb
diff --git a/www-apps/airdcpp-webui/airdcpp-webui-2.4.0.ebuild b/www-apps/airdcpp-webui/airdcpp-webui-2.5.2.ebuild
index 898d2fa96dc8..d656c051b69b 100644
--- a/www-apps/airdcpp-webui/airdcpp-webui-2.4.0.ebuild
+++ b/www-apps/airdcpp-webui/airdcpp-webui-2.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index 4939e099dc66..bf7c02176a71 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -4,7 +4,9 @@ AUX postinstall-en.txt 1791 BLAKE2B 96a1f47933d402d7d33aa6cd54724d1f1e9fb717c3a0
 DIST dokuwiki-2016-06-26e.tgz 3464178 BLAKE2B cdeebee2f36cc899fcffe1d6df6f5beee8f7dd303db00a41fa4d187c27528971a8ea0fccffacb6331fe61f5854a9b2687ff55c2578d628164a39f817e4538a58 SHA512 b47c3a31b0bc731392703ed8d705717e7d1b75db0c44d822d8791c1e409d5285fe863a3dbd13bc60b73c01ca268f7a73a6a24c90edd211fd5c124d3a8be70039
 DIST dokuwiki-2017-02-19e.tgz 3505643 BLAKE2B 99fedb175fa8e1330a4ad14ed8d593edfc1edb9aeb7d8b9100e940fb4c5bfac9dada2fe395e030cff18b8c809e36211fc9d0bdc22d5be3fae7f243343704218a SHA512 6fadb64f9d8394731f346708849d8828b33f4f775e23bca97896b2e06bbfc3b70a6fc17d63dcef8199fdb0aaf0b8291eb0eebcdff7b81524b2d454229eb20be4
 DIST dokuwiki-2018-04-22a.tgz 3749191 BLAKE2B bb03b771e857a2db16ebd44d3f888af8e3c9dcd6fb5da2a549dc7c942ad87cb1e0aee6d3ed78edaa9df864804bf51cd18a17cf8a4123d12fac39405fe661bc04 SHA512 bf1dd7411abadedb395c9e12c7a9f5586fe078e59556b1ce66a5351c06f338406eca944d7589f40d8a9eb098da6ed0edc256f83ec8b19f6335415e2fe6c31284
+DIST dokuwiki-2018-04-22b.tgz 3745314 BLAKE2B 56c349c72038db83b5ae199ac1d6d00ef8566a00fdf2bc5a782e808e5205ae3ba5cfa47bdfc4f7fb0b2e493a22eed006517cfb46f7c0c57de748cfb800942f58 SHA512 6fc1fba8d93296d7cc795a4067e409339b3ce965ad38aefa42f1974d267ac05f199185e895a60d355ebe8371c68345fa51f2aea5871f955dbba1cdbdf8bedebf
 EBUILD dokuwiki-20160626e.ebuild 1658 BLAKE2B f8feede582cc726c174c76e7720de8d3b352d77be650533645f48abc8092f5b077695cdbe3e4e2e74916dc4da7db5c7399b99e181a9775d5db25ea072661e3e9 SHA512 cd6a68cfd2eac03ec5e77e44aaad86abad20ad1065ca2838a3ab5cf80bc3f84b4e4245684c7f892072cca196340a5f6b25539120953ee50eecc1aa069b4ecf9b
 EBUILD dokuwiki-20170219e.ebuild 1658 BLAKE2B f8feede582cc726c174c76e7720de8d3b352d77be650533645f48abc8092f5b077695cdbe3e4e2e74916dc4da7db5c7399b99e181a9775d5db25ea072661e3e9 SHA512 cd6a68cfd2eac03ec5e77e44aaad86abad20ad1065ca2838a3ab5cf80bc3f84b4e4245684c7f892072cca196340a5f6b25539120953ee50eecc1aa069b4ecf9b
 EBUILD dokuwiki-20180422a.ebuild 1654 BLAKE2B 6b468972d44f26972dee1b761afceb73b761adec0e29e3c33c8b255db5294e33a8081b9fe0b495b334841192d7e349a01686ea9f038e2ede3acfad33ba53e5b2 SHA512 b9c3fdf7a2f7e68374957cd47f837b3dbf7b34776864e38cca57c2db5990d8059dc92e03192f579db41beecbdaabd8b70fcb1af7d9ee5e1bd5469c913eeca41c
+EBUILD dokuwiki-20180422b.ebuild 1651 BLAKE2B 8bf185b5b0a8e72c0cfc74579582e33f0e701371a7d025956cd521d48c394566be6a11d923e4b9fcaba1e0fed6147d8526cd8f39ba73b34558bbb0895c227170 SHA512 74d04e42a4d0c02c6b5f8bd4340779ce5077733737e7d9fd6191f28bf8c94107a0ccabe186de6e89674269bfa63810eddcf08a6c9cbdd889c19ad89366ed8356
 MISC metadata.xml 820 BLAKE2B d67c70213557139c38731aae770bc35541a5e10a3c757012dc6a9bae78310bb9b57a9e62d3cf46b99bfb414047bfdbaf7edb66ded453bdee696bcf9a849ab498 SHA512 9fc806f40f766674a758578017d2dd6a81ff81d65b9dc202c811d4970eea0b2e5135e49c9b655bfd25969ba038ce449885424020ac52c2b2e493665b9d2e313f
diff --git a/www-apps/dokuwiki/dokuwiki-20180422b.ebuild b/www-apps/dokuwiki/dokuwiki-20180422b.ebuild
new file mode 100644
index 000000000000..1d99e100aff1
--- /dev/null
+++ b/www-apps/dokuwiki/dokuwiki-20180422b.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+# upstream uses dashes in the datestamp
+MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
+MY_PV="${MY_BASE_PV}${PV:8:1}"
+
+DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small company's documentation needs."
+HOMEPAGE="https://wiki.dokuwiki.org"
+SRC_URI="https://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="gd"
+
+DEPEND=""
+RDEPEND="
+	>=dev-lang/php-5.3[xml]
+	virtual/httpd-php:*
+	gd? ( ||
+		(
+			dev-lang/php[gd]
+			media-gfx/imagemagick
+		)
+	)
+"
+
+need_httpd_cgi
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	# create initial changes file
+	touch data/changes.log
+
+	default
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc README
+	rm -f README COPYING
+
+	docinto scripts
+	dodoc bin/*
+	rm -rf bin
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# Copy custom .htaccess that works with both apache 2.2 and 2.4
+	for dir in "conf" "data" "inc" "inc/lang"; do
+		insinto "${MY_HTDOCSDIR}/${dir}"
+		newins "${FILESDIR}/htaccess" ".htaccess"
+	done
+
+	# Use custom .htaccess.dist that works with both apache 2.2 and 2.4
+	insinto "${MY_HTDOCSDIR}/"
+	newins "${FILESDIR}/htaccess-dist" ".htaccess.dist"
+
+	for x in $(find data/ -not -name '.htaccess'); do
+		webapp_serverowned "${MY_HTDOCSDIR}"/${x}
+	done
+
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess.dist
+	webapp_configfile "${MY_HTDOCSDIR}"/conf
+
+	for x in $(find conf/ -not -name 'msg'); do
+		webapp_configfile "${MY_HTDOCSDIR}"/${x}
+	done
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+}
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 4284cd7455aa..16e85cfea07c 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,7 +1,6 @@
 AUX app.ini 67 BLAKE2B 4ec7b8217486047b419202b3a8a7172ac21ae0e5ad9224cd4f010be730ac5cda9d05bf06dcba2d06f8809900094b3b007ef98dd4ea20a125fb7d3db279f53e4a SHA512 93f6f7cf49dd1ece56f7da711adbb58cc38a503527aeea140837d74456ee6f550a089e897d9cb94382e1eb3f5a5cbe4a61362534463eada08a91f314da0f2108
 AUX gitea.confd 74 BLAKE2B 656800d35c8f0075005e7e9e5c804292f9884663f89f653426064a20cfbcb518f736bd94947a03bce5adad670fb6150d93026999d6d5395f37a85666b6663a2f SHA512 3e05bad19cd924c4375d9ca6fc57142ba4b5ec897a1c789c3fc9710dfcfee209a199c95040eece089ad93e0357486ab98fad0c448a61e318646b7a71845e9a25
 AUX gitea.initd-r1 688 BLAKE2B eb2341dee53f3fd92c49137855615d9ae7ca77efc396e2d2ed8b624ed2776c7522455a469c00172ecbbe2151ccab476baa0c779baf8a39f63348bdc7ebbd29c2 SHA512 4a6bba463c9abafcb6fc9f3854efd1a69fb3b213c2b34ff6a233f90db535c2ab0f375a0809e4c4be6651ed60d7696a54148a5ee9192567d70ca6a5203a8d3266
-AUX gitea.logrotated 87 BLAKE2B 373830ddd6eed0ce2f0f7b1dab14e4a253e5a56a73f477cfadbc6deec373846d4df2d697735391581771699d5a6513acb0e14a446873de01eba10d19e3a6bd88 SHA512 798f3fc33026f19dd31ffa78b9b1ed313d7b82b19c047f509e896c1798b2925a1bb7c4998d98a6b47e728979bf7132fb1c2a80eb7fda096a763d6791631cb6d4
 AUX gitea.service 472 BLAKE2B 4c728e2987d0c0a86e65d4b9c1a59f6193ff8a3f9b066991a06f495ad1c5586b3497c71fca1cce5b65f167af09343e7bf3215ee5e8fdefa539e384198d2d88d6 SHA512 6666fe3b4cdbb78a58db4a6bf47a15e6be9ab30b666c6eb77a9e8a002d8c0abd510fc75ef463a11ee6892ab12c98943774616072cb64fd9f2fa42ff8f676aa95
 DIST gitea-1.5.2.tar.gz 18866286 BLAKE2B a9a31fa6a310dcb6debd9399f234262214021d72adda52af959e6d9d692d5902ff6955a9802bf60212cecb2a0146c4905952d44643aa83e49c645d32541907c2 SHA512 ef91c881b3cb81d79d182b78c95624f24d63e21daa2d6e561fca79edba0ad588fae7c55503f900a8f05c566ed3bff92a9c4385fc7e5c701a80749d2a8c58b599
 EBUILD gitea-1.5.2.ebuild 1923 BLAKE2B 5267d3a75c41ba874b4db011de06ec14aa1356358104bb2d715b10d47ecd1e862ce1852ee04289842b00c99c4f22b307ee18db5d4b830d20231e358f8952f248 SHA512 d5601d742af950ae69e00f2800caea64196f34626eefeba9910cc049ce82265ce6a9572c52ae74b7a48fbf863fbdc6a05edeb10235f468c39d66039e6e8e89f3
diff --git a/www-apps/gitea/files/gitea.logrotated b/www-apps/gitea/files/gitea.logrotated
deleted file mode 100644
index ec6ddfe606b9..000000000000
--- a/www-apps/gitea/files/gitea.logrotated
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/gitea/* {
-	su git git
-	missingok
-	size 5M
-	rotate 3
-	compress
-	copytruncate
-}
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index e0c6812a0bf8..f35fa2242186 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -6,9 +6,11 @@ DIST grafana-bin-5.4.0.tar.gz 55200142 BLAKE2B f529b0fbb82aabf290f89ceb94d757725
 DIST grafana-bin-5.4.1.tar.gz 55202271 BLAKE2B 8b4ae8551e9fb9d5cb2d3bebf571fe0234bd6100f6dabf1aa2fdc32ab169f729ca38f4d28212456d13158a7dd51967d42ae387ca423a9c3548ee22ddaefac492 SHA512 0b6f8b1f71f39f6fd38ee8a6daa925818acd2be22c7ba98021a185dabbff5cf520cb8cc955498562344528649c4546f9b3fb331da2d88d5794a4a2cf4c5e7368
 DIST grafana-bin-5.4.2.tar.gz 55202302 BLAKE2B 6e6e5300128a17db4f2323a5c94528eaed67c6446f44180355d7bcbeb91ccf05c9f1ed0aa89c4f8a0cfc72e9d7342c8bb5617884ad3ba3046f44491cf625f88f SHA512 9944f47b489579eac692fe46f9b161f59416d50a38984d5dc07478988bda163c2b66e6715629ee92067fa4ce9e8b9205107f9e7b4a6697d1194227f80d09df2e
 DIST grafana-bin-5.4.3.tar.gz 55228439 BLAKE2B 63ee14b1ab074f453c8f1b870b8c0c51365106cb2af59fa20f56805f7add7fec29bc5ecd7e2ffc1f3f6811049e839893433e14b1871cb2aea359f58537b9e0dc SHA512 781466c7477ecb4fbca59006600adc3569d0ee2158da3b75831b1934fd39456030471d4508fbf2d3296d3660dcc8b92782295d7afe458229bad1d64de88ad33b
+DIST grafana-bin-6.0.0_beta1.tar.gz 56647687 BLAKE2B 911557c15cc1f0b50e69e5c80e57b91a2882ab1e0c2d62547cc626a90a8cf0f0b0a9b715f972bc4a925326012ecbb076d942356d8dd2c58bdc3f923e193b153d SHA512 e6c70bcbe27bdd2b83794eb0aad3813b77893623cea9d61f0bf7ee536860c62db34f87243160b4983f49062c8984b8cc0cbda6a639efa465e4ebd00a4acf80ec
 EBUILD grafana-bin-5.3.4.ebuild 1777 BLAKE2B 9450adb124f556ad37ce3526d30e416b1c38c16b406bc4e6de0c2f16b0b8c0d3ffa10bc94d73c5abdb608367715a806bfe9a7bfbdc2c80a1a3f3131f1ee5b9b3 SHA512 6fdc6feb53f5a578e8c3cbc766499daabcb00d56910a1beb9214b15a06c31898bc5f18a128e3310ca90e8fa66932762af432661c079a9d543316368616709c34
 EBUILD grafana-bin-5.4.0.ebuild 1777 BLAKE2B 9450adb124f556ad37ce3526d30e416b1c38c16b406bc4e6de0c2f16b0b8c0d3ffa10bc94d73c5abdb608367715a806bfe9a7bfbdc2c80a1a3f3131f1ee5b9b3 SHA512 6fdc6feb53f5a578e8c3cbc766499daabcb00d56910a1beb9214b15a06c31898bc5f18a128e3310ca90e8fa66932762af432661c079a9d543316368616709c34
 EBUILD grafana-bin-5.4.1.ebuild 1777 BLAKE2B 9450adb124f556ad37ce3526d30e416b1c38c16b406bc4e6de0c2f16b0b8c0d3ffa10bc94d73c5abdb608367715a806bfe9a7bfbdc2c80a1a3f3131f1ee5b9b3 SHA512 6fdc6feb53f5a578e8c3cbc766499daabcb00d56910a1beb9214b15a06c31898bc5f18a128e3310ca90e8fa66932762af432661c079a9d543316368616709c34
 EBUILD grafana-bin-5.4.2.ebuild 1777 BLAKE2B 9450adb124f556ad37ce3526d30e416b1c38c16b406bc4e6de0c2f16b0b8c0d3ffa10bc94d73c5abdb608367715a806bfe9a7bfbdc2c80a1a3f3131f1ee5b9b3 SHA512 6fdc6feb53f5a578e8c3cbc766499daabcb00d56910a1beb9214b15a06c31898bc5f18a128e3310ca90e8fa66932762af432661c079a9d543316368616709c34
-EBUILD grafana-bin-5.4.3.ebuild 1777 BLAKE2B 6616ce91890ea10c4b4a6e24918393cf951a214e55f2779ee878021ffddaf169c85b029a23d2275c8978acfc340c10023aed415151e848fc093287b3c637254e SHA512 5bccf95c893e19c38817a6a682c217531790a0f35205c06aa98b395a70a72d42445d6df49570c99268632897607b0b186dabf62c0143ae1b01b7dd32b9cada7d
+EBUILD grafana-bin-5.4.3.ebuild 1776 BLAKE2B 23228bd5d950c6b1fbb3189e4a5cdbddb11790bfc7c1c396a6a7e86c1cfe5f454390c73cf1dbc9615455a776d36772c00193abd559a00f991b6a8ec07bd7fa8c SHA512 1b9b5f87d1ba801004ebd0aee3ae393224c98b7b1faf36657d32be88342a7f13164fa12c2e26e8d13fde947fe22557b65adcdf5064d7b60f6fb2a457bb39f582
+EBUILD grafana-bin-6.0.0_beta1.ebuild 1807 BLAKE2B da1a9b558d15d36b344b9670fa49993a8a6ad502abfba6964ae2404068b91b76983073a9c59a277da111edc26ef3810129a705289f4354c8e4831af60364e68a SHA512 6a1b7fb34f2d06a7c49e5621137a4b2582e28e9a55f6f8cc464a3a18c0eca411080884fb9ded7dc1642ce601c14f992a659d27031382671e74af186b3b1726c2
 MISC metadata.xml 416 BLAKE2B ff5bdf7e202aa96bbf615df2f86c6542bb7d291e6d564dfac683a2e54002380dd80ef3f1ca0b6c1f398de0115e26398903256b9d64e353127f25c3e97e5b21c8 SHA512 db2cbd25cf9b21664db93dc8f9719bf7f9a2fd632c5231d0f296bb32f3f6af3e08307c8a662081cc68f33638d70f6512094fad76073a5de4ceba02eeb3d1188b
diff --git a/www-apps/grafana-bin/grafana-bin-5.4.3.ebuild b/www-apps/grafana-bin/grafana-bin-5.4.3.ebuild
index 415b1fe8bfa6..7a42364c3e03 100644
--- a/www-apps/grafana-bin/grafana-bin-5.4.3.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-5.4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/www-apps/grafana-bin/grafana-bin-6.0.0_beta1.ebuild b/www-apps/grafana-bin/grafana-bin-6.0.0_beta1.ebuild
new file mode 100644
index 000000000000..b252435ffde3
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-6.0.0_beta1.ebuild
@@ -0,0 +1,64 @@
+# 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://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${MY_PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs"
+QA_PREBUILT="usr/bin/grafana-*"
+QA_PRESTRIPPED=${QA_EXECSTACK}
+
+pkg_setup() {
+	enewgroup grafana
+	enewuser grafana -1 -1 /usr/share/grafana grafana
+}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini || die
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf
+
+	dobin bin/grafana-cli
+	dobin bin/grafana-server
+
+	newconfd "${FILESDIR}"/grafana.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd.3 grafana
+	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+	keepdir /var/{lib,log}/grafana
+	keepdir /var/lib/grafana/{dashboards,plugins}
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+	fperms 0750 /var/{lib,log}/grafana
+	fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+postinst() {
+	elog "${PN} has built-in log rotation. Please see [log.file] section of"
+	elog "/etc/grafana/grafana.ini for related settings."
+	elog
+	elog "You may add your own custom configuration for app-admin/logrotate if you"
+	elog "wish to use external rotation of logs. In this case, you also need to make"
+	elog "sure the built-in rotation is turned off."
+}
diff --git a/www-apps/karma-bin/Manifest b/www-apps/karma-bin/Manifest
new file mode 100644
index 000000000000..082646958ef6
--- /dev/null
+++ b/www-apps/karma-bin/Manifest
@@ -0,0 +1,5 @@
+AUX karma-0.24.yaml 946 BLAKE2B 9cee1af92d690892b6160d43e086ee20b24b525cb821848e500f0280304c10a0a2c0e7c7f64ee101f0b437529be7640eec8c37ecffdfae67b991117272605911 SHA512 82f3d5e3213bae5258364bdae8d4463d5010314ab2ba737335c395f00c690e740d5a672dc345169057d15b1ffbd4cb34ce6132e1a99fcdd5f19f906b5bf3a466
+AUX karma.initd 374 BLAKE2B 0b0e81fd0738b9b440a7fc6505a7575303016cf9297652223fd403f5256706b483719d4a7674ac29cdc0566a7edeab47d488ba52286019904edb0b4e6fe056ef SHA512 a0344542591276fe29ec489eb6cbf00f1b959438cdcbb936d6b2d751c54f8ee39190713a45a30f21215107f187e972cd8d46e7915503f44e0e6655b65e2b1a43
+DIST karma-bin-0.24-amd64.tar.gz 11511588 BLAKE2B 4de38f4925e039ae28e160d2f541cb8b92388b42c68b3f00ca1a4aced635078a5f8bfabe63fe20dcb05a5a75188b2a866b627a26fd68d43de5f0c21a97a28160 SHA512 2864eac54be7f156f4b8feb144825615576e7f18f61f58d3e3834e9968a59a0373d0b156a0f00c5c019b922b251f8a7f35a41f139fbf42c27c562a74af33f14d
+EBUILD karma-bin-0.24.ebuild 950 BLAKE2B d966dc1b996ed5e2d95b2b12007c45cf0522862a48782e05c4fe1b62407ceee9e7cf015259291e6c6999df9d59409e9bb5b880feba66e0ad70489726641de462 SHA512 d83f53417628d3274b338e3bfe36ac7d1472fef3f7cd51525dea1a5f0f64fdb825cf26f235128353c4e2ad7b63e5b8d8560e5cc78d3124eb83c4f8ec4787d3c1
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/www-apps/karma-bin/files/karma-0.24.yaml b/www-apps/karma-bin/files/karma-0.24.yaml
new file mode 100644
index 000000000000..38b2dd3e3bf0
--- /dev/null
+++ b/www-apps/karma-bin/files/karma-0.24.yaml
@@ -0,0 +1,55 @@
+alertmanager:
+  interval: 60s
+  servers:
+    - name: local
+      uri: http://localhost:9093
+      timeout: 10s
+      proxy: true
+      headers:
+        X-Auth-Test: some-token-or-other-string
+    - name: client-auth
+      uri: https://localhost:9093
+      timeout: 10s
+      tls:
+        ca: /etc/ssl/certs/ca-bundle.crt
+        cert: /etc/karma/client.pem
+        key: /etc/karma/client.key
+annotations:
+  default:
+    hidden: false
+  hidden:
+    - help
+  visible: []
+custom:
+  css: /custom.css
+  js: /custom.js
+debug: false
+filters:
+  default:
+    - "@receiver=by-cluster-service"
+labels:
+  color:
+    static:
+      - job
+    unique:
+      - cluster
+      - instance
+      - "@receiver"
+  keep: []
+  strip: []
+listen:
+  address: "0.0.0.0"
+  port: 8080
+  prefix: /
+log:
+  config: false
+  level: info
+jira:
+  - regex: DEVOPS-[0-9]+
+    uri: https://jira.example.com
+receivers:
+  keep: []
+  strip: []
+sentry:
+  private: secret
+  public: 123456789
diff --git a/www-apps/karma-bin/files/karma.initd b/www-apps/karma-bin/files/karma.initd
new file mode 100644
index 000000000000..08dbc3bd5c96
--- /dev/null
+++ b/www-apps/karma-bin/files/karma.initd
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command=/usr/bin/karma
+command_args="--config.file /etc/karma/karma.yaml ${command_args}"
+command_background=yes
+command_group=karma
+command_user=karma
+error_log=/var/log/karma/karma.log
+output_log=/var/log/karma/karma.log
+pidfile=/var/run/karma.pid
diff --git a/www-apps/karma-bin/karma-bin-0.24.ebuild b/www-apps/karma-bin/karma-bin-0.24.ebuild
new file mode 100644
index 000000000000..215180ca0dfa
--- /dev/null
+++ b/www-apps/karma-bin/karma-bin-0.24.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MY_PN=${PN%-bin}
+
+inherit user
+
+DESCRIPTION="Alerts dashboard for Prometheus Alertmanager"
+HOMEPAGE="https://github.com/prymitive/karma"
+SRC_URI="https://github.com/prymitive/${MY_PN}/releases/download/v${PV}/${MY_PN}-linux-amd64.tar.gz -> ${P}-amd64.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+QA_PREBUILT="usr/bin/*"
+S="${WORKDIR}"
+
+pkg_setup() {
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 -1 -1 ${MY_PN}
+}
+
+src_install() {
+	dobin karma-linux-amd64
+	dosym karma-linux-amd64 /usr/bin/karma
+	insinto /etc/${MY_PN}
+	newins "${FILESDIR}"/${MY_PN}-${PV}.yaml ${MY_PN}.yaml
+	newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
+keepdir /var/log/${MY_PN}
+fowners ${MY_PN}:${MY_PN} /var/log/${MY_PN}
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Please edit ${EROOT}/etc/karma/karma.yaml to match your system."
+	fi
+}
diff --git a/www-apps/karma-bin/metadata.xml b/www-apps/karma-bin/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/www-apps/karma-bin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index 62e988ef5ba5..9d923e3eff47 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -2,6 +2,8 @@ AUX postinstall-1.18-en.txt 2611 BLAKE2B c4d110d0d7c3fc270b0dc7f134cf7de8f2ca459
 AUX postupgrade-1.16-en.txt 1514 BLAKE2B f2a7284a49638a2e1ca694a84b490f4a3348cab1afe1b022f617fc7df74c958be29e36e3c777514765b7a01758f11cfb653092e2190a5e7dc572884f5942196c SHA512 58d11cdf8daaa2ee62ca64dfeddad3ef2d10feac5b93b51f96e5802dd2915c3d969b8e99d059e79a9b62386ae70a7690db3c4e4d248501e839769bc7f24d2dd5
 DIST mediawiki-1.27.3.tar.gz 31509270 BLAKE2B e48feef42bd1bc32019df338975851df737eb032a48703a07d074b5efa6fa9acade2f412017c55990288beaf0267cef3fb49248002e41a61a700911cc023d549 SHA512 bc6228342b589a3acb0f5623b9ef45982d7aab032ff322aaf7bda7ac3ee16a7732b8013698d8f509da4310bbb65c12a73b7bbe4612d5e0e3d93965199efdc8eb
 DIST mediawiki-1.31.1.tar.gz 35260876 BLAKE2B 4a1b5f2c47535a1099b105f35158c2e15cef028e752b1a195de4f924ba2a1d02bce64f713d2bde608882228e82cbea91ee2f5fb2f1f64f267334550b7cd33cdb SHA512 ee49649cc37d0a7d45a7c6d90c822c2a595df290be2b5bf085affbec3318768700a458a6e5b5b7e437651400b9641424429d6d304f870c22ec63fae86ffc5152
+DIST mediawiki-1.32.0.tar.gz 36168475 BLAKE2B 33613bf6274abe3d58f66319afaea8ea091d5b07c1d1b1148721856c8d38b84cb96e9a9c041a93ef27a6700e36a10bba9dffc7cbc245dba2a10a6ce0d46a49fe SHA512 5e198844bba12f5a3a73a05dd7d855d3e883914c6e7c23676921a169dc1c7089ed31adfb7369c24cbaf10b43171dd2a12929284b65edde44d7b9721385ff1cc3
 EBUILD mediawiki-1.27.3.ebuild 2364 BLAKE2B 5026e3364ae048e973a6f11d898ae52831e541f3b682420bc41c4936504ec778826a1f5be34546bc2c9aa97a84c4a39a32fa571a5b73db1a2618679fdfe6bbdc SHA512 0adfcc39cfcb96f80e33d3d428e3d2cd243a36caf51a4505aed59456fde85c677b38252a383eff32d0d5946b19cd7a57516e0691961aaeab2fdcce701f204056
 EBUILD mediawiki-1.31.1.ebuild 2437 BLAKE2B 8334f4316ac8bbb91f33d2fc6c702ca55186d5f6cfdef85e50c573b11e4a04b991f03bc498c5ec8781b73c34c92120ba8631db538aec5420ed079cb0e8a3a104 SHA512 49f663aa4941524ea38fd092814200d3e880bfdb3b68cf5af327a4a47b8904d3042a13eb4d86010814cfb74991222b8d7f42b513c4151a9203ab8ab2d4aba635
+EBUILD mediawiki-1.32.0.ebuild 2415 BLAKE2B 18a0256b98a3e476060b1e17100c112bee2bb1a065e1dc8119c7b0035b83ef5b2e69b81f329f9790c79343402a9909b1f3bde479d5cbbd5d392b951c839b4a3c SHA512 fd10189db8efc069f0592fc6f414c39ca51ab171408063b689dfac346b9a451d43bcacf77a21052fd63392c4a17462b7db60be3ebef8272b543def5288bf2633
 MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
diff --git a/www-apps/mediawiki/mediawiki-1.32.0.ebuild b/www-apps/mediawiki/mediawiki-1.32.0.ebuild
new file mode 100644
index 000000000000..e027bd58c353
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.32.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit webapp eapi7-ver
+
+MY_BRANCH=$(ver_cut 1-2)
+
+DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
+HOMEPAGE="http://www.mediawiki.org"
+SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="imagemagick mysql postgres sqlite"
+
+RDEPEND=">=dev-lang/php-7.0.0[json,mysql?,postgres?,session,xml,xmlreader]
+	imagemagick? ( virtual/imagemagick-tools )
+	!imagemagick? ( dev-lang/php[gd] )
+	mysql? (
+		|| ( >=dev-db/mariadb-5.5.8 >=dev-db/mysql-5.5.8 )
+		)
+	sqlite? (
+		>=dev-db/sqlite-3.3.7[fts3(+)]
+		>=dev-lang/php-7.0.0[pdo]
+		|| ( dev-lang/php[sqlite] dev-lang/php[sqlite3] )
+	)
+	virtual/httpd-php"
+
+need_httpd_cgi
+
+RESTRICT="test"
+
+src_install() {
+	webapp_src_preinst
+
+	# First we install docs and then copy everything left into htdocs dir
+	# to avoid bugs like #236411.
+
+	# We ensure the directories are prepared for writing.  The post-
+	# install instructions guide the user to enable the feature.
+	local DOCS="FAQ HISTORY INSTALL README RELEASE-NOTES-${PV:0:4} UPGRADE"
+	dodoc ${DOCS} docs/*.txt
+	docinto php-memcached
+	dodoc docs/php-memcached/*
+
+	# Clean everything not used at the site...
+	rm -rf ${DOCS} COPYING tests docs || die
+	find . -name Makefile -delete || die
+	# and install
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# If imagemagick is enabled then setup for image upload.
+	# We ensure the directory is prepared for writing.
+	if use imagemagick ; then
+		webapp_serverowned "${MY_HTDOCSDIR}"/images
+	fi
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-1.18-en.txt"
+	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.16-en.txt"
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "=== Consult the release notes ==="
+		elog "Before doing anything, stop and consult the release notes"
+		elog "/usr/share/doc/${PF}/RELEASE-NOTES-${PV:0:4}.bz2"
+		echo
+		elog "These detail bug fixes, new features and functionality, and any"
+		elog "particular points that may need to be noted during the upgrade procedure."
+		echo
+		ewarn "Back up existing files and the database before upgrade."
+		ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki"
+		ewarn "provides an overview of the backup process."
+		echo
+	fi
+}
diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
index 627a9be9a5b7..43b2b85f297d 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -5,7 +5,7 @@ DIST nanoc-4.9.6.tar.gz 282811 BLAKE2B 109b73e4908b45c055912f6e3b2d18675ee00dd84
 DIST nanoc-4.9.9.tar.gz 286136 BLAKE2B c8cc2d334b3e8b74032be108495f2501fffa78650e35c30865c78e888f471fadc1e26ec6ba23481f76caa63b4167ea394f78903f41428bdd899efa60f3e6a4a2 SHA512 fd180254dd79cf238ca9e9f87e7b3f84d43ff24a0d81da8ccf9f0d5b22bb1e0373c7e2f10a5b69a392d95897958af63ab9f415f0060dfe9c4d68fd2cbd6d7e7a
 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.11.0.ebuild 2626 BLAKE2B b4cdd5df85c200cca904dd6564d22e0b08ff6d76aee5110a0d2ae9cf7195884c6bf6c6e5e0b1af3c28bd5dee95931e6be2727047351dc42c0b53e736bd3fe0d7 SHA512 071fd944e68c277b9aa13bbcf22ce3bd7b4642974f43950dc75975e8255de90be402a60df2642b54f9ec6e6f731f771839e4701ccbb44e51ca2054647fe0e7a6
 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.11.0.ebuild b/www-apps/nanoc/nanoc-4.11.0.ebuild
index aeeea18a61de..9de9c8a62776 100644
--- a/www-apps/nanoc/nanoc-4.11.0.ebuild
+++ b/www-apps/nanoc/nanoc-4.11.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby24"
+USE_RUBY="ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
 
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index 914b410c3142..c2920f134cd1 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,18 +1,14 @@
 AUX nextcloud-12.0.4-destroy_modal_when_closed.patch 786 BLAKE2B 24222dde0d9ed5f3c5fa31b7cd1b837f765837543475db235056dccff9fa17cce83a37b0ed64a1999a6b61dedd5857866debb1950686acf062e42d80bccb3813 SHA512 93297f991312c5fd2504267bb16a8c38797970fdf8d109d4c4b4416a5e72c8677141ebc9a13a2dadc40845348e07f264937dd852384f88d65be4f3cc4f0cb462
 DIST nextcloud-13.0.10.tar.bz2 30033121 BLAKE2B 1549340f7b2b3f3bacbbc4be7c0894cf6b9caa1de1fef27aad3753e022ab3eef36787f075356ebd1ac0b2757e212e769eef79ff761c23cdf0cfaf841dd124894 SHA512 169f3f974944322d3a606f9b9e35c438b40b73e4c75c6dd9cc8b153713bbf411430f0d68603f24287a81eb9108589e6129d00e2ee3c0c57397ce03305bdbc9b6
-DIST nextcloud-13.0.7.tar.bz2 45085663 BLAKE2B 1d4f07310fd0b85981c8f45197b0c760e484db5eb47b347ce6d51b6e7729072a1ff13ed30739ee5b96a7456fab20d4f4ec5b3651e709aa466f305ca3ea374ca3 SHA512 511a4f35f03e9696806342781f4b8b7e2265a8209d9c8b01aa1b9f58a9ab55876e9feb90357816ff991d19a27862fe3009f0f081b5c2e971e919412eb4e71024
-DIST nextcloud-13.0.8.tar.bz2 45133964 BLAKE2B 1eba0ef0b7cf0bcd65b7b71407b39a9a885995e746d9e61a44cee290a5de1ac3aa3dbb26a097ddfc2195f315f3d14d1f69db9c8a9feadd58938b98a558ad48e2 SHA512 eda9075c9cc888a5838397c6299c1e27905a095fb734b6d7cd760baff5268aef1db912ded0c03b044ba9ded91c3664d8d565ef1134f416ed7f17726307877294
-DIST nextcloud-14.0.3.tar.bz2 49713609 BLAKE2B 0b87b899a273fc5a31b3e3e0451f2214e4377bec8671e9ca7022054d294820de4964053be950cf951b8c0d7a10f4958648164b3a76681ee2fc7aad7a902a1be7 SHA512 09f224d5e55496dcad4d743a0b62af407b4e1fece009fea19d87ac32672cec83bde135e25607236971af0ba32804cc5ebff9295472c276eb2898e21400c6e2c5
+DIST nextcloud-13.0.11.tar.bz2 40812176 BLAKE2B 541875dd136fddf34abc61a89850c736891e01377d57a9d3b23d6f18a45578c31845667ecddd79f03261c7cb2f5c9c00a5d1c6f5958515e3330010c5a1e335b4 SHA512 18f785dfc10b4ca7afbdb7134a7ee3c23f302b9ad4c43f245c3d80d37d4ac7f651e23a032d27cb678b21a2d895069ed44ba846b6ea07445134bb26acbae20495
 DIST nextcloud-14.0.4.tar.bz2 49827498 BLAKE2B 5bcf873f9e0f5b35450a4d381ea1e2fec0e1ef63e9424c83d18add4a6b19631d44191ae207ed60b25209e2b7b45ddec951d3441d8876ce0a057883d21a5e5864 SHA512 a53eb90645619d6558c93304c43ca86cf00cacf8a0f783e699f5041c7b5eb1c9ee8719d4bde5cc16bd1c7b90529d9b100c79e1ce14cc8f8192158c705c8db09e
-DIST nextcloud-14.0.6.tar.bz2 34908643 BLAKE2B e44cda6996bcddb2fd1c3ac150fc3b6e1ad2903aa7d961891baa0ba70a15b47c2f67fd898d9d317b42951cb15e8fdba2a504dce44ff2d7f161d014a4cc76bdb5 SHA512 d3a8a9d4c988740bbfcd0213bda6078808face912858959bc186d259afa694b23b82f284805d136872434e5e7d461a3b137a5cd6c39dd646057f6b5cb6fb9e7e
-DIST nextcloud-15.0.0.tar.bz2 36181234 BLAKE2B 6e9e1cfb1dc9d017f7443adccd2ac420213b2849f9bcf009c94aea741b45582fe1690e0876f378c5964cf10e28ae4ab74765dd56cad0f5ab8c39ce2ae94fe631 SHA512 3ebc21ca80f31bfa486de73d707e7c448eca3f517d73c8762fb543ce82b3f89cfcfcf0edda15caf324a4987be72df8531dccebd2a6af9ac668913f6f750f20c0
+DIST nextcloud-14.0.7.tar.bz2 45913292 BLAKE2B 69494b7e618f564e063e217d357903992e2ea5f9200c67c079476eb7e110c0a623f7dd3eb19336967a8f3cff061e90d24215619c294d130b020802d5a813f982 SHA512 9fbd9e669eb77285336ab7dfbe0b92ecee6d99a92eecac0c8eaac8a3c42e1154c0e5d77ec808b56b90080859584027b295d3014fdf89ff92730b39571caee3b9
 DIST nextcloud-15.0.2.tar.bz2 36224830 BLAKE2B 59393b5da69a80a92d71e3c9276087fef8758d07d599de2b1f185b97fdd09fc9893325b62b676dcb86f7fd864ef81304e10021bee73e025a9104f747699d0355 SHA512 ab9bf8db9fb231dd965188d2226d34e86128edfad5b5db259fe445cecd4f74e573e4cba3e151bd705dce6ced31d421e3986f5733ebe9f06804807c4bb7e21349
+DIST nextcloud-15.0.4.tar.bz2 47648166 BLAKE2B 2c645857b0d75b38bf76ca78e91899d780ed272919cf71b68a8908167d7ede3c26cd8d258dc61f041cbe2f03adf206b2c71d1879a01aee25c2265ad4bced962d SHA512 0942e1e5f0fb2038b27a697452b037b835d5a3614ec9660bde379a290b672b506b9dab3510e89b64916d995bb20c7165cf2bca628800d73f95067ff25dabcbc6
 EBUILD nextcloud-13.0.10.ebuild 960 BLAKE2B 3547350ff45ce7149df5459a0c511d6e45c5e05ebdebf3935f6353cafa1f7700b890d03ab8cd4fb63a391234859f83a30cff10378787463f9d8a4d5de15e4351 SHA512 008d81f8dd97a2c0509aae80cb7a77ab1f6656b6e6d1b3c54db1ddc1fc5c8d7d3c1b71ffffe5eb2bd3a9a061bc25a1aa023c0e531d707138cdd29d762ac68ac9
-EBUILD nextcloud-13.0.7.ebuild 960 BLAKE2B 2cb97022fdd35b923c7da44caeb91589690e2af957d7d0dd0b39bda3a3449500bf2de19d9bace295895443acda66968e05a629afe4c8e72faba094f242736112 SHA512 2d02b65261d1dacd1736182f0731e83aabd16031189b8e372d27634361deccea91651a4e2bbd6edaf66c4a3ea80a34b32ed0909b252d115171380e63371b14d4
-EBUILD nextcloud-13.0.8.ebuild 960 BLAKE2B 2cb97022fdd35b923c7da44caeb91589690e2af957d7d0dd0b39bda3a3449500bf2de19d9bace295895443acda66968e05a629afe4c8e72faba094f242736112 SHA512 2d02b65261d1dacd1736182f0731e83aabd16031189b8e372d27634361deccea91651a4e2bbd6edaf66c4a3ea80a34b32ed0909b252d115171380e63371b14d4
-EBUILD nextcloud-14.0.3-r1.ebuild 965 BLAKE2B d7fe81d87b280314655c36f6ee0987b875effe88f6845e16b3567862478a41d2833b552ce6a08638ab080797a26bf64c9ec3dc3559efa95e311151577ee05b51 SHA512 50026d383b7b9961d64ab808a787ce023be59a925514ff0e541394f3be00c89fed527700dae75219ab2e2ece0cb5c327cd8f2cd9e245674d6ac0f0253333c071
+EBUILD nextcloud-13.0.11.ebuild 960 BLAKE2B 3547350ff45ce7149df5459a0c511d6e45c5e05ebdebf3935f6353cafa1f7700b890d03ab8cd4fb63a391234859f83a30cff10378787463f9d8a4d5de15e4351 SHA512 008d81f8dd97a2c0509aae80cb7a77ab1f6656b6e6d1b3c54db1ddc1fc5c8d7d3c1b71ffffe5eb2bd3a9a061bc25a1aa023c0e531d707138cdd29d762ac68ac9
 EBUILD nextcloud-14.0.4.ebuild 965 BLAKE2B d7fe81d87b280314655c36f6ee0987b875effe88f6845e16b3567862478a41d2833b552ce6a08638ab080797a26bf64c9ec3dc3559efa95e311151577ee05b51 SHA512 50026d383b7b9961d64ab808a787ce023be59a925514ff0e541394f3be00c89fed527700dae75219ab2e2ece0cb5c327cd8f2cd9e245674d6ac0f0253333c071
-EBUILD nextcloud-14.0.6.ebuild 965 BLAKE2B 85a1255cea04da166a96736b9f421c606b3cbfc19ff16ea5996ab624dd0da853ad09456a91916d9055020975818410962691bacea6560d0ce73c752460eb9400 SHA512 41c20d697555a6dc5dd45588805d158f0f106437a3b3517f4a146388659bfbadec916a2ec6e2a75edd23d1c8dcb33b380f94945d70d3e0157dbbce0b538de085
-EBUILD nextcloud-15.0.0.ebuild 965 BLAKE2B d7fe81d87b280314655c36f6ee0987b875effe88f6845e16b3567862478a41d2833b552ce6a08638ab080797a26bf64c9ec3dc3559efa95e311151577ee05b51 SHA512 50026d383b7b9961d64ab808a787ce023be59a925514ff0e541394f3be00c89fed527700dae75219ab2e2ece0cb5c327cd8f2cd9e245674d6ac0f0253333c071
+EBUILD nextcloud-14.0.7.ebuild 965 BLAKE2B 85a1255cea04da166a96736b9f421c606b3cbfc19ff16ea5996ab624dd0da853ad09456a91916d9055020975818410962691bacea6560d0ce73c752460eb9400 SHA512 41c20d697555a6dc5dd45588805d158f0f106437a3b3517f4a146388659bfbadec916a2ec6e2a75edd23d1c8dcb33b380f94945d70d3e0157dbbce0b538de085
 EBUILD nextcloud-15.0.2.ebuild 1017 BLAKE2B c4484d59b07f818dfff314fa4b83746685595b763bfb8f2bba98aa5ae58ac483e5951730243f78611a5dcef59cd1d5c28904720eea3ae323fb16d0d0a1618ce1 SHA512 5c21ac8e1a23fdaec145f20a9d73e334b50125bcaac7a9dc2953c4211c6a241903e921f74483bd103d847a718ddbdbcb3562428f9e43c757e8072ca9617d6ac2
+EBUILD nextcloud-15.0.4.ebuild 1017 BLAKE2B c4484d59b07f818dfff314fa4b83746685595b763bfb8f2bba98aa5ae58ac483e5951730243f78611a5dcef59cd1d5c28904720eea3ae323fb16d0d0a1618ce1 SHA512 5c21ac8e1a23fdaec145f20a9d73e334b50125bcaac7a9dc2953c4211c6a241903e921f74483bd103d847a718ddbdbcb3562428f9e43c757e8072ca9617d6ac2
 MISC metadata.xml 363 BLAKE2B 4da5b0e27af01e94e1e68b98274da6c9cacbe59ed1d85413038bccfa530af8fd479a7edd89f4d7633dfb07afbad4736cb6c075e021db7dc9761c273ec1256500 SHA512 60195d5859a8b175346a1cd533dbb6496d2787c1ff501d9233b2b1794670ae344c6f9f4cac4fbf86b24686a83692cff27513d05243947e2921e554e065696721
diff --git a/www-apps/nextcloud/nextcloud-13.0.7.ebuild b/www-apps/nextcloud/nextcloud-13.0.11.ebuild
index b6bf2a09eba7..a9c1d18899d9 100644
--- a/www-apps/nextcloud/nextcloud-13.0.7.ebuild
+++ b/www-apps/nextcloud/nextcloud-13.0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/www-apps/nextcloud/nextcloud-13.0.8.ebuild b/www-apps/nextcloud/nextcloud-13.0.8.ebuild
deleted file mode 100644
index b6bf2a09eba7..000000000000
--- a/www-apps/nextcloud/nextcloud-13.0.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="http://nextcloud.com"
-SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+curl mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-14.0.6.ebuild b/www-apps/nextcloud/nextcloud-14.0.7.ebuild
index e4392ac62888..e4392ac62888 100644
--- a/www-apps/nextcloud/nextcloud-14.0.6.ebuild
+++ b/www-apps/nextcloud/nextcloud-14.0.7.ebuild
diff --git a/www-apps/nextcloud/nextcloud-14.0.3-r1.ebuild b/www-apps/nextcloud/nextcloud-15.0.4.ebuild
index 040f3eed112d..d0d144714efc 100644
--- a/www-apps/nextcloud/nextcloud-14.0.3-r1.ebuild
+++ b/www-apps/nextcloud/nextcloud-15.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,11 +11,12 @@ SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
 LICENSE="AGPL-3"
 
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+curl mysql postgres +sqlite"
+IUSE="+curl +imagemagick mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 DEPEND=""
 RDEPEND="dev-lang/php[curl?,filter,gd,hash,intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
+	imagemagick? ( dev-php/pecl-imagick )
 	virtual/httpd-php"
 
 S=${WORKDIR}/${PN}
diff --git a/www-apps/owncloud/Manifest b/www-apps/owncloud/Manifest
index 7d89f961e2f6..0182ed755efd 100644
--- a/www-apps/owncloud/Manifest
+++ b/www-apps/owncloud/Manifest
@@ -1,5 +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
 EBUILD owncloud-10.0.10.ebuild 1265 BLAKE2B 1d93200492663e339f5c1bb0e2d12ab9297383cc141be30bca20066b9406116846bb41744b01a99ce2d1c776c38c78d0d10aad5f74a30f02899a64f9b9334628 SHA512 556d8b2b53540509932218d1a94f90eb6065fe73f04656c12f61ea6a47c84f44b1f7d34e0e6fe40365cb3a96186b3c2c20f08274edb528f38a6286e9b7f01f70
 EBUILD owncloud-10.0.9.ebuild 1268 BLAKE2B b4f40061310548894fd841d488669ee1ee46dccc49a43cf0bd2a9e3389bdfb2fb60d60a5af194d440b6803b46db3b214503fe7e9612172b6343050626aeaa93f SHA512 fe26f3984d504eb3695fbcd6b91e4592e1d6b2e5eb69de1798885a3f2da308f232a02c58890efce827207ec022d4262f5945271fb2826c1ec8134efc40e221cd
+EBUILD owncloud-10.1.0.ebuild 1265 BLAKE2B 8211eee8eef98e33779e0666481803c24c220da0786223ad9d788b94236831ac2f8d73712f2e0aadf797800f006e5332e086ab846f7eb3fc4327f1673cd685a6 SHA512 986ad383753ebad9bf588637e71a67ffcd3f2663e6a4162aee5896965447acc6817cd6062127266a66d555f6828fd0d3ffb9516a22a2808c410ed35c4aec4ac1
 MISC metadata.xml 362 BLAKE2B 966b48f98107fc73bd40f9c602962f2c876c1be1f074943452cfb5bbf60eb1c2ca08153294ce4166442da85beebd41395ca9bbe9c98d7832665fa16419db374d SHA512 64c690c6fa8bc6861f673b465e0519d5c5e945d76b66a2d9e7422cbfaa967624e7da287626bd12edbf347f0d0b5296fb9719ede93d15f073542367f5fecf5e99
diff --git a/www-apps/nextcloud/nextcloud-15.0.0.ebuild b/www-apps/owncloud/owncloud-10.1.0.ebuild
index 040f3eed112d..d38aecf9bd7d 100644
--- a/www-apps/nextcloud/nextcloud-15.0.0.ebuild
+++ b/www-apps/owncloud/owncloud-10.1.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit eutils webapp
 
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="http://nextcloud.com"
-SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
+DESCRIPTION="Web-based storage application where all your data is under your own control"
+HOMEPAGE="http://owncloud.org"
+SRC_URI="http://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
 LICENSE="AGPL-3"
 
 KEYWORDS="~amd64 ~arm ~x86"
@@ -15,7 +15,7 @@ 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]
+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}
@@ -38,3 +38,10 @@ src_install() {
 
 	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
+}