gentoo resync : 05.04.2019

27 files changed, 651 insertions, 13 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index c6c32970d123..1f701413a42b 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 1669696f5118..d85d1f38d5c5 100644
--- a/www-apps/airdcpp-webui/Manifest
+++ b/www-apps/airdcpp-webui/Manifest
@@ -1,5 +1,7 @@
 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
+EBUILD airdcpp-webui-2.6.0.ebuild 466 BLAKE2B 871c7665811ba71d6cdbe42220bdb9f88174e033c7b0c430788fa08ee24a01290a17612797ba6db9a89dace0c2c4a9a0b95400d8254a7ba06124545d5863dff7 SHA512 ce4e7b13149a79ace635f2f0f1d97fa3cdfb909cfb29323ba48d8d75ae3e3e87848c0f0c397180ea41d3722e471b6401c749557cb9ef2f982d5758886412bc62
 MISC metadata.xml 553 BLAKE2B aacc047cadd9f0d8078a997d9ac02aeda726575f1af69cd4e97afe9159987347247aee7ac74b11b8d23b18a669b447451e3e6123f578b501a872f395e418341c SHA512 0d1233d39b432f28fb9977b06a750e990524b250563e8fa5594bdf7dd6cc5b35468b70abe41e0cae87331c2052b592d4d314a897549f0a247c04af1a15782feb
diff --git a/www-apps/airdcpp-webui/airdcpp-webui-2.6.0.ebuild b/www-apps/airdcpp-webui/airdcpp-webui-2.6.0.ebuild
new file mode 100644
index 000000000000..d656c051b69b
--- /dev/null
+++ b/www-apps/airdcpp-webui/airdcpp-webui-2.6.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 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/drupal/Manifest b/www-apps/drupal/Manifest
index 91b3363ad094..b9b7dce09900 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,8 +1,8 @@
 AUX postinstall-en.txt 1595 BLAKE2B 9b5c237befcf415d0f769052c9634da830326ff57da1a1db538059138780c8ebf8d0666908fb6bb3eba99fee5d5869cd12042f0d276b560b51db60803e46c146 SHA512 6a0a5388d40b3c49f3c685a6a7986c2a9efe3e6d7c5115fbb3110ebe4c19c605a4ff785447a20c0296f3cb16811a8a6e77f2439d58253a011603709c9dd9b760
-DIST drupal-7.64.tar.gz 3297822 BLAKE2B 8f1e9fa72086ae41a4d5bc2b261d23b5302400263cea28eb4e7b70ffb56d16c70dde31f7759eec9493a485e4527ba6e1085321362e835110d9b672bb520331dd SHA512 90d4b863df5597ac7e88dc09317e3ab8b2beacd6051ef267de52d1fe599a8704f25ede708d2a106c18d76f19c2c9de1e5003086ab9116bae5624acd418e8a014
-DIST drupal-8.5.11.tar.gz 15817672 BLAKE2B da944b432cacf070f47c3c16966c0a0a8950258f067bf2da50ae00281cee6a72f53940ad227ca2864f342c25a7bd6a500140f8070c932aa1a07a96b98016f1ff SHA512 16695af590d048882fa2c3b4aae071d6cbbad6eb4d0dd02763b7c95c782ef4cec70e3825cebbaecf2d5a6f18e2744017accb7bf9e7caf17b1b497eabfef3a348
-DIST drupal-8.6.10.tar.gz 16858107 BLAKE2B 1a86d907fea4ec77d88bc7a8d937baa093972b4823e347ce151040a8f7a53330433cea73273097a8960c41b9655094451f38160bcf2f6197fa7e7fcf82c52060 SHA512 acd37fd87a15ca5056b1b1341cd24481073b21dca279536f4065c817230b83dd41a01fc82867781ee2d70cd7e5ccd333b6bdda0cfe4966ce79bf5b1435ad5192
-EBUILD drupal-7.64.ebuild 1770 BLAKE2B b429cd79794eb2975636cd89c42f56926c6eb4edf86ff329bc8680ae8ee4e64f85acc2e6a668e5302b75093e59be611d459e1d23b95ded075ccb41866d912107 SHA512 1db7207e4af8c0fb2594ace139c63a14f0f01f40f26b4a785265691f57ac939c462c2b73b32ac63d735cf7b3e984a43a06e385f1c6009c1d6141bc2bbfe1b282
-EBUILD drupal-8.5.11.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
-EBUILD drupal-8.6.10.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
+DIST drupal-7.65.tar.gz 3298607 BLAKE2B f3a728c3e464b8d94719ed7a79359c5fa2b8b0216ee90029d05e873377566a398d80f188f9dc36f2504057c0000a7bcd364d5c4f50652f25e73e1aa0e7d5d7b1 SHA512 a79ff93e13456b35160ee17f986dce9cffefa265d0034dab6223a3097eaf45c11ea3548904ff6c125be0817dc71a8ac7320aca91a11eefeaad03d45527725e79
+DIST drupal-8.5.14.tar.gz 15828327 BLAKE2B aa638ac4643541d9ec2b2168633c8ab4fe6b64f3c2b9fec46a6a45903ccaaa26ba671c62d57c51a5698ad2558c6ed3ee491dff739f1eed05ea2a0fefba5ace31 SHA512 2be4878cbb27389d11f3686fdc911468a8481d7cbade168c70e733615f2ed699bcc8eb1798079d0b354c81caec0cf74fb232b310e9ab7e059c00fba4b3ee2796
+DIST drupal-8.6.13.tar.gz 17137449 BLAKE2B f52b082bdccbeb3600da723483bbdef8645babc84a433c82e38b7029332764361a3ca6996b6ac9c20e96c27b4412c7d14a9b0b454c234594f13ba4fdeba39029 SHA512 ed9da8596ca5f4dee569b2beea561b75742aa801ef450258786c6d496e9205cd865af3a6cca56bc276df48841b95bcaaaae46ffcda6bbf8183866ec3c991fff2
+EBUILD drupal-7.65.ebuild 1770 BLAKE2B b429cd79794eb2975636cd89c42f56926c6eb4edf86ff329bc8680ae8ee4e64f85acc2e6a668e5302b75093e59be611d459e1d23b95ded075ccb41866d912107 SHA512 1db7207e4af8c0fb2594ace139c63a14f0f01f40f26b4a785265691f57ac939c462c2b73b32ac63d735cf7b3e984a43a06e385f1c6009c1d6141bc2bbfe1b282
+EBUILD drupal-8.5.14.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
+EBUILD drupal-8.6.13.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
 MISC metadata.xml 419 BLAKE2B 3652ed012764eeebfd813e1979965e76caf500aea8a29bf8652c56f145e62e5ac8c5ae233919a0be123878cccdbab5fa52a4c02ed7367099862407487ca0b8b9 SHA512 3610c6151b6bbbb452a9c599d04d28a18c3e535c0976e425778e8b138bb03637bb28900acef2ef405ec10176390db33e997ba5d789f8a0fc49564538194fc8a1
diff --git a/www-apps/drupal/drupal-7.64.ebuild b/www-apps/drupal/drupal-7.65.ebuild
index 2d1f90ebbd06..2d1f90ebbd06 100644
--- a/www-apps/drupal/drupal-7.64.ebuild
+++ b/www-apps/drupal/drupal-7.65.ebuild
diff --git a/www-apps/drupal/drupal-8.5.11.ebuild b/www-apps/drupal/drupal-8.5.14.ebuild
index a8514d07dfe0..a8514d07dfe0 100644
--- a/www-apps/drupal/drupal-8.5.11.ebuild
+++ b/www-apps/drupal/drupal-8.5.14.ebuild
diff --git a/www-apps/drupal/drupal-8.6.10.ebuild b/www-apps/drupal/drupal-8.6.13.ebuild
index a8514d07dfe0..a8514d07dfe0 100644
--- a/www-apps/drupal/drupal-8.6.10.ebuild
+++ b/www-apps/drupal/drupal-8.6.13.ebuild
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 6dc6fdb0205b..e7ec4fd4ecbd 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -4,7 +4,13 @@ AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34
 DIST grafana-bin-5.4.3.tar.gz 55228439 BLAKE2B 63ee14b1ab074f453c8f1b870b8c0c51365106cb2af59fa20f56805f7add7fec29bc5ecd7e2ffc1f3f6811049e839893433e14b1871cb2aea359f58537b9e0dc SHA512 781466c7477ecb4fbca59006600adc3569d0ee2158da3b75831b1934fd39456030471d4508fbf2d3296d3660dcc8b92782295d7afe458229bad1d64de88ad33b
 DIST grafana-bin-6.0.0.tar.gz 56196184 BLAKE2B c3b50e93816a747cfaf343a40589291ffd3ee8c11d90a29d220b8dc7fa0025efea5e4f915d26aff2b0725b377bf8f06ee9e6188916d174bfa6c9dc8c76a65837 SHA512 2b80f0cd5ea3386ce013c97e087ae44281bf9aac778ff5bb049a02e418dee42067098415ef902e964cefff8218b5d32e67df3b97f971f5b82bfb2b15e095a187
 DIST grafana-bin-6.0.1.tar.gz 56203033 BLAKE2B 190c838d08b95e0a38dafbaa64f77eae8e2cea178c7b079de0684119fc2cab412e19639624e5c99ae6cac5dd4ce6db1209555a5aafdc6a5d990297f06b6e1ca2 SHA512 d0e920406fe3b0c9540cf2ae7ea1efe9681d1de40f5971742cf7814374823d04dedaa5dda26f1cba42b615d542e6e00a16cf8ef3a55def4bdcea5b47ea92ea2a
+DIST grafana-bin-6.0.2.tar.gz 56207202 BLAKE2B 805dde25c102c9ca6b1698c06a61d6b153343897fcd43258b3cd2f97613b6e914d60a59c467124bb6c248a30e6624345161f2032f622eddac5366b1744443f38 SHA512 6fda6342aea0281627ad368f39943e54540e6d672d0e026d04f3061840802ab9a0c51f819f16a53d329f15fd50ab4ff54e0afe984fd4fb6f0be6629c7f2629ef
+DIST grafana-bin-6.1.0.tar.gz 56560533 BLAKE2B 4cd15ab713fecf46c554335ec520dce998a8a277e0cdb92d41bad08f8b8a58ac6ce48b6218bc56d39cdd43ef64113ed0725a12f7edec6ed35d6aff0c99477151 SHA512 a7528497cf09e3d00218a3205038377efb84d6d2d5a238067aed7a5ae34ef46051d29f0d35575e37d67f4681dd56136a91af28414f4f87aaba302301eabe0b04
+DIST grafana-bin-6.1.1.tar.gz 56562242 BLAKE2B 0917594ed5b219bf230bc043c5b0726d85de6764019cf2b2353293a13d5f1343071dff09f0741b32bd9973a6270ef57ba9dc14b08f74e745d1fa3330fe8d2040 SHA512 60b72f93242528808912083f75d9454d449f9371492492ced3c1ae87374fa5ae81d5c25a05abe793862b5b92f112f30a3e05c93fc73a14e6d93ba56129c9b991
 EBUILD grafana-bin-5.4.3-r1.ebuild 1969 BLAKE2B f90d9c8c479edfd60eff8a4c6823fad5ba9683411a6e9b4e137a77990f528d6184ecf0f917520209dd4497e1cfef9198fe305bb76a9c6c4911cd09204481a69a SHA512 d674745ae0614747c945e96990c17c89c1c7e027e909c92a8e08a898d9567d531900e56ea5f2714128549b2094fdc568da3949b6578fd9bb84f3d78c4b339a10
 EBUILD grafana-bin-6.0.0-r1.ebuild 2000 BLAKE2B a2aded1295055013836375d7dcc73efa0c198030ec7653e07d3288792e284bba24db7e01b575c89421bd21155529c8f6e99add702929bbb45a5ff7ba16254161 SHA512 1790f63faba64a441f2527f1cbdab6ed3685b23f0b5032f3d3208851d491e077dc01edff00dc60ce81e25ce7b0b59b3e70ab480b065295fc6c05c4d0710216e4
 EBUILD grafana-bin-6.0.1.ebuild 2000 BLAKE2B a2aded1295055013836375d7dcc73efa0c198030ec7653e07d3288792e284bba24db7e01b575c89421bd21155529c8f6e99add702929bbb45a5ff7ba16254161 SHA512 1790f63faba64a441f2527f1cbdab6ed3685b23f0b5032f3d3208851d491e077dc01edff00dc60ce81e25ce7b0b59b3e70ab480b065295fc6c05c4d0710216e4
+EBUILD grafana-bin-6.0.2.ebuild 2000 BLAKE2B a2aded1295055013836375d7dcc73efa0c198030ec7653e07d3288792e284bba24db7e01b575c89421bd21155529c8f6e99add702929bbb45a5ff7ba16254161 SHA512 1790f63faba64a441f2527f1cbdab6ed3685b23f0b5032f3d3208851d491e077dc01edff00dc60ce81e25ce7b0b59b3e70ab480b065295fc6c05c4d0710216e4
+EBUILD grafana-bin-6.1.0.ebuild 2000 BLAKE2B a2aded1295055013836375d7dcc73efa0c198030ec7653e07d3288792e284bba24db7e01b575c89421bd21155529c8f6e99add702929bbb45a5ff7ba16254161 SHA512 1790f63faba64a441f2527f1cbdab6ed3685b23f0b5032f3d3208851d491e077dc01edff00dc60ce81e25ce7b0b59b3e70ab480b065295fc6c05c4d0710216e4
+EBUILD grafana-bin-6.1.1.ebuild 2000 BLAKE2B a2aded1295055013836375d7dcc73efa0c198030ec7653e07d3288792e284bba24db7e01b575c89421bd21155529c8f6e99add702929bbb45a5ff7ba16254161 SHA512 1790f63faba64a441f2527f1cbdab6ed3685b23f0b5032f3d3208851d491e077dc01edff00dc60ce81e25ce7b0b59b3e70ab480b065295fc6c05c4d0710216e4
 MISC metadata.xml 416 BLAKE2B ff5bdf7e202aa96bbf615df2f86c6542bb7d291e6d564dfac683a2e54002380dd80ef3f1ca0b6c1f398de0115e26398903256b9d64e353127f25c3e97e5b21c8 SHA512 db2cbd25cf9b21664db93dc8f9719bf7f9a2fd632c5231d0f296bb32f3f6af3e08307c8a662081cc68f33638d70f6512094fad76073a5de4ceba02eeb3d1188b
diff --git a/www-apps/grafana-bin/grafana-bin-6.0.2.ebuild b/www-apps/grafana-bin/grafana-bin-6.0.2.ebuild
new file mode 100644
index 000000000000..f5baddc3529b
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-6.0.2.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://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}
+	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.1.0.ebuild b/www-apps/grafana-bin/grafana-bin-6.1.0.ebuild
new file mode 100644
index 000000000000..f5baddc3529b
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-6.1.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://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}
+	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.1.1.ebuild b/www-apps/grafana-bin/grafana-bin-6.1.1.ebuild
new file mode 100644
index 000000000000..f5baddc3529b
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-6.1.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://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}
+	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-module-director/Manifest b/www-apps/icingaweb2-module-director/Manifest
index 07228c522506..5824bacc694a 100644
--- a/www-apps/icingaweb2-module-director/Manifest
+++ b/www-apps/icingaweb2-module-director/Manifest
@@ -1,6 +1,8 @@
 DIST icingaweb2-module-director-1.1.0.tar.gz 1287302 BLAKE2B f056a59fc05b7024e2c1fd16830010a4d73d038d2995350449e36a0899729292ae5ca60f70aff6c8c403a7861f7afe9e0b5fdebcb5a8c81aeb30f28fe80eee46 SHA512 a1253c1c803f05b238e12d86e7a367c56e10998293f99beb645ba3ca4d7165407a34dd4f53ef84ee1338464013201adb4fcee09cf3ca78d8850513c366a7a038
 DIST icingaweb2-module-director-1.4.3.tar.gz 2561910 BLAKE2B 3f33aac474f557a24c162fb22987be85984f35eff2b01bed3bdff4b486d2aea633beeb7b4821e8ee430d98898213e1f3ee99b103121371cc10611a4130eb0dd9 SHA512 2802de2f1d8ebac04be39cb2c3478ad1b6dac2ebdbcb39165d0316f684321eb4f0f3b2d851201641540a2b6f2fd714c8d78aea98b43259e413c14e2aa7b8f57c
+DIST icingaweb2-module-director-1.6.2.tar.gz 2772722 BLAKE2B 3d51f68469cd4ddf45f6bc62f76ad1f4c8d7d7bec36cc33022f1e0761334707bb345c87bc9f0e1276010e4a643867f1e1a6ea7c53a6fa28dd33e810089b7840b SHA512 693a2aca10e25f99fcf9ada4babb031d682b577b82098185259991214ac7d7662c494b58cf52284569dbca90c8eafa522177b6c64dd817912dafd20b4d7109cb
 EBUILD icingaweb2-module-director-1.1.0.ebuild 805 BLAKE2B 0ab56cc32f27d72b9c92b95bc0692df2cbc8c5a097ef1a74ee8bce33d48a1f13f0a8f499bd619d7b29066ada689a776a214919ccba76324e76aed2b1613b831e SHA512 782d14bc88f2959d18031b4f13e74b35841e94c9727961b7afdafdbf457ca6dd9a91dd9fe569fe30f882c1134b958da3537c75800d569d9d1e326253a9124ad6
 EBUILD icingaweb2-module-director-1.4.3.ebuild 805 BLAKE2B 977c664fadd36f53b55e6d5e9fd1db4c58c74d396ac43644c6dac01ab7f1ccddfe322c8ddb7b3fc3197e18f1546610f5069f61512e56480db5bb886e5e16be0e SHA512 b78ace5f0bb590ba7faeee4856d19960e840593e3608d01a57bb1f163fa5ead40dc2080114e18ed832c9225c0e3a9c23bf4e42f10f9f91e19ab42ed4242b58d4
-EBUILD icingaweb2-module-director-9999.ebuild 805 BLAKE2B 0ab56cc32f27d72b9c92b95bc0692df2cbc8c5a097ef1a74ee8bce33d48a1f13f0a8f499bd619d7b29066ada689a776a214919ccba76324e76aed2b1613b831e SHA512 782d14bc88f2959d18031b4f13e74b35841e94c9727961b7afdafdbf457ca6dd9a91dd9fe569fe30f882c1134b958da3537c75800d569d9d1e326253a9124ad6
+EBUILD icingaweb2-module-director-1.6.2.ebuild 852 BLAKE2B 1ea6bb826157c55611c75431ad8479d165174a0f741bed61f9de0e21b4c719080182aa671d7c8751d9c350e796da9647ca44fc916de70266f5cab8d8542665aa SHA512 16f2166e547f92549aa815710e78da502b2e958a7568d2ec73591c0e025cd0ef48c82cc10672cc7e6b09cc7d96a6ec42df6666cd0d4d420056080336310545e8
+EBUILD icingaweb2-module-director-9999.ebuild 852 BLAKE2B 1ea6bb826157c55611c75431ad8479d165174a0f741bed61f9de0e21b4c719080182aa671d7c8751d9c350e796da9647ca44fc916de70266f5cab8d8542665aa SHA512 16f2166e547f92549aa815710e78da502b2e958a7568d2ec73591c0e025cd0ef48c82cc10672cc7e6b09cc7d96a6ec42df6666cd0d4d420056080336310545e8
 MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
diff --git a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.6.2.ebuild b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.6.2.ebuild
new file mode 100644
index 000000000000..eab3c4caccb8
--- /dev/null
+++ b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.6.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Icinga Web 2 plugin for configuration"
+HOMEPAGE="https://dev.icinga.org/projects/icingaweb2-module-director/"
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-director.git"
+else
+	KEYWORDS="~amd64 ~x86"
+	MY_PN="icingaweb2-module-director"
+	SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=net-analyzer/icinga2-2.4.3
+	>=www-apps/icingaweb2-2.2.0
+	|| (
+		dev-lang/php:5.6[curl]
+		dev-lang/php:7.1[curl]
+		dev-lang/php:7.2[curl]
+		dev-lang/php:7.3[curl]
+	)"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	insinto "/usr/share/icingaweb2/modules/director/"
+	doins -r "${S}"/*
+}
diff --git a/www-apps/icingaweb2-module-director/icingaweb2-module-director-9999.ebuild b/www-apps/icingaweb2-module-director/icingaweb2-module-director-9999.ebuild
index bb2346eec3e3..eab3c4caccb8 100644
--- a/www-apps/icingaweb2-module-director/icingaweb2-module-director-9999.ebuild
+++ b/www-apps/icingaweb2-module-director/icingaweb2-module-director-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,9 @@ DEPEND=">=net-analyzer/icinga2-2.4.3
 	>=www-apps/icingaweb2-2.2.0
 	|| (
 		dev-lang/php:5.6[curl]
-		dev-lang/php:7.0[curl]
+		dev-lang/php:7.1[curl]
+		dev-lang/php:7.2[curl]
+		dev-lang/php:7.3[curl]
 	)"
 RDEPEND="${DEPEND}"
 
diff --git a/www-apps/owncloud/Manifest b/www-apps/owncloud/Manifest
index a6256a1d8c9b..036e30b4c9bd 100644
--- a/www-apps/owncloud/Manifest
+++ b/www-apps/owncloud/Manifest
@@ -1,7 +1,9 @@
 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
 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
 MISC metadata.xml 362 BLAKE2B 966b48f98107fc73bd40f9c602962f2c876c1be1f074943452cfb5bbf60eb1c2ca08153294ce4166442da85beebd41395ca9bbe9c98d7832665fa16419db374d SHA512 64c690c6fa8bc6861f673b465e0519d5c5e945d76b66a2d9e7422cbfaa967624e7da287626bd12edbf347f0d0b5296fb9719ede93d15f073542367f5fecf5e99
diff --git a/www-apps/owncloud/owncloud-10.1.1.ebuild b/www-apps/owncloud/owncloud-10.1.1.ebuild
new file mode 100644
index 000000000000..f493a0c561af
--- /dev/null
+++ b/www-apps/owncloud/owncloud-10.1.1.ebuild
@@ -0,0 +1,47 @@
+# 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/phpsysinfo/Manifest b/www-apps/phpsysinfo/Manifest
index 11cc2c27f1a1..ff915680978c 100644
--- a/www-apps/phpsysinfo/Manifest
+++ b/www-apps/phpsysinfo/Manifest
@@ -1,7 +1,7 @@
 DIST phpsysinfo-3.2.10.tar.gz 1021435 BLAKE2B b9db266021c0392902d6de58492165a889151716484d23f99648e8322c7e76edfda17e8a7b8f415fcc42d5970a98603ea84571989c1168e10e8d87ee3a2f6927 SHA512 56954e64e6c267c2a60baaf91a9a218d2c81d99dc4f159e35d752328bdd38135eb4e9d91d09798b3822cdbf0d04a6169a46385c2d02a812b136fe115b7310a88
 DIST phpsysinfo-3.2.2.tar.gz 899974 BLAKE2B 4da569d90a4ee383535a5a155c754a40f104453d504148729fcde03a4ee6839e914dc0375115d392c81225a451a35e3009218c20019abf0661ba629c98377952 SHA512 fe1fae67379abf0fb75d166aaab87cb91ead33c87cfbd0569b61d95b9b3172820565dff37f6d35744fbf9332adc5a5af1ec49477a56572f55f57e53edb9164b9
 DIST phpsysinfo-3.2.3.tar.gz 909045 BLAKE2B dc1f9d9f7cd83b60eb16f073607f5c7a5f5ad155b297d4defc9b1768c771cd12bd315af3e67f4c7a5f731ef66b8e9eb00da4083074f9cb3908ebbce9198a568c SHA512 33a77d96f3f9ac4e59a078e3106af656f68ec048aa7b89409915373cb4174fff7f709a3a3984cdba2990d397fd019930ae7f24b8fe5484061f3a89dc9f023eaa
-EBUILD phpsysinfo-3.2.10.ebuild 1347 BLAKE2B 4ee01314100c6f87a1d869e47c3ddca3377700349b1ddf58c8c344112a4d455d76ad1183867a3a2ef8d8871fa64f6a24bbe2ea5f5642a6f45300225d3e1ef69f SHA512 34bce3d9f8e349ef8f01eabb41f3c63d8aa2b0353c8063fa8f3439bca1fa604643dc19bc3943206dc96f5a5e7d1e8b5833ece0aba5d140c96a8166323115e1e0
+EBUILD phpsysinfo-3.2.10.ebuild 1349 BLAKE2B 977967ab77016bdd78ae0c3a463316c142e31ec461b6053dc743032f88a2abd68ec4fc4057f5b90950828e948b0786199055064169d0f5753300e88d0188efc2 SHA512 ba60f658ad46f82d5c4db16e0ed5a973416bd3fd00a71bfab7bc834c793897414335b005cf617641a8bf81fdc2f6718a77574a9ff3c85db9ec2e3d3440c30c8f
 EBUILD phpsysinfo-3.2.2.ebuild 768 BLAKE2B 93aa4397be216ffd4e0b68d713343188beac30ed635931c93978747ec8fb2ea7a66b3bf5de1f7669c9fb280143425968dd9629e11b6f9c4ac2023cf251f1c023 SHA512 0d323edd89bc17bb949aa386505a2c5ad5e81f355f9abfe4d0d59009f7f62f94b156bd8d94a8bd0da7a9e2c2677bea23a4650357f8f75941fb49127f7c9370e2
 EBUILD phpsysinfo-3.2.3.ebuild 773 BLAKE2B 3aef2f8cc844f30046b344153450f9910c0f08b8af5fb198db073eeff12df0000fd006322bdf0155682de301987891dd0b5cb98c2c98979afaa0b979a04b403e SHA512 a33a1ce86e6048ff9a768401c598999082554c8ffe37e64d128196f0cf8b988d83c2f82d2558023cc51cdcd046acc663d80041e6a544270041f003d4ae72b416
 MISC metadata.xml 1998 BLAKE2B 44ef1459ba690c8a4f590ed98f3c199cb7b5ce34dff56ab1dc053ddf839649d02ddd196fe131decea06095372d4a82f6cca4172846097a176d73cd64d1a55213 SHA512 253afce98c226f160ab955961163517e36103c05dba11e08493adda9a0e237e7168c0dfe07caafc7f14f7e73c2680f8ff0cf79d8a1f2f436614226a2506f6aaf
diff --git a/www-apps/phpsysinfo/phpsysinfo-3.2.10.ebuild b/www-apps/phpsysinfo/phpsysinfo-3.2.10.ebuild
index 9cc1c23ec996..b3a02983ac6b 100644
--- a/www-apps/phpsysinfo/phpsysinfo-3.2.10.ebuild
+++ b/www-apps/phpsysinfo/phpsysinfo-3.2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://rk4an.github.com/phpsysinfo/"
 SRC_URI="https://github.com/rk4an/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="apcupsd dmraid freeipmi hddtemp ipmitool ipmiutil iptables lm_sensors mdadm megactl nut quota smart snmp uptime"
 RDEPEND="dev-lang/php[simplexml,xml,xsl(+),xslt(+),unicode]
 	virtual/httpd-php
diff --git a/www-apps/roundup/Manifest b/www-apps/roundup/Manifest
index 698b99917b22..5976cfbdcdbf 100644
--- a/www-apps/roundup/Manifest
+++ b/www-apps/roundup/Manifest
@@ -1,5 +1,8 @@
+AUX roundup-1.6.0-configparser.patch 1159 BLAKE2B 555aac3215c1e706a89de6d85e7ee7add2284daf608bbbbcd818132f58c84a26c01e4ea6b561d3733d8b32c6524f5c4191a2522737417e88a1bdaf51f2c11f41 SHA512 961bd05fc36c00780ec7ac94d14534ccca9b492dfa524bbc62a21b15fa507f9aebc5816e28f9707e93e7bedd060506742720b2c9b1dd157ec71be8caeb48b580
+AUX roundup-1.6.0-csrf-headers.patch 7402 BLAKE2B b5c78e31a0de357f5074907271a81f66090ee4fc8d1ea49c94c511f29a8d639149e3483fd5335710bf3deca0bffb1c8ceb8f8fcf3dabd5de9efefe61b06f906c SHA512 a6cdb78a8725c8f7fc2004dd12679ac5beff34ecc5d31025344fa914827bd3c8f989731d830a38dbc98a2c9651ad0483bbb29743b29d1ed4f4f9ba5326f05341
+AUX roundup-1.6.0-xss.patch 1421 BLAKE2B 94938ffda8e83bf13e81c5b8d07579dcb6a97caae549c1f172ef081f5848648804c3f64797550f3b93e1eb24bc48b05dd78574ef02031c014d0a21c961331907 SHA512 bd265f305850bb6931f4c25fb18fd1fc06508b3e6c834814f52b25fc47a87f681600d0484ba8014915d4374ba0f32c522e1bf5b01c84fb1bd1e3166b394c704b
 DIST roundup-1.5.1.tar.gz 2618886 BLAKE2B 5ccca10ce7f30b35b0875340c4cae87aa19e5384e6e5973576ea8e2de79eb83d32447580944f472d73e7cdb5f43a4ed7f805d51242e22cc2f756b3deae4004b2 SHA512 d7cdeaafb682ce7f202cacddeb1a42312f22778a2c83b52b4e838c27b1e7141a94b2ac2b670b0edee0efcfe27d74e31e6f267ae1380e90359def27385ca68d58
 DIST roundup-1.6.0.tar.gz 2893499 BLAKE2B 5fe75b0953d16cebe52a25379d5a13f7745eb87e4a6a46f17945c3655394c1d1d2aff9e74783ee3e4757fc407ca2b46a7c3ef6d20eedbfb695783302fb64bf1f SHA512 1a8e9c0c7a6e607953ee91ce750f72bf53b5c6dc4bbd6d001570dd77abf396d4de2c832ef45495b87890a3c11b158be9e7a8eed635f63b5586b7bb9399856dcc
 EBUILD roundup-1.5.1.ebuild 1223 BLAKE2B 7ed134153096b574ae8efd88613d28555055ba10ecde2bbcc47ffb78dc68de813b8fd6e2c8ade791b34fd69ca8ef88a4e7522cf24f26c282c463f87c3e4571af SHA512 226588bc17c7fa2726b1734d6a233c354f684d39b705f47ce3ce2b9792c6ecbe7979075861a677a6434e78caa0f5abede020a329c145ed59e112769591575a62
-EBUILD roundup-1.6.0.ebuild 736 BLAKE2B e3201ca312233101a3891b616d81b2ca1d064f10cb34937cefff3f686edc323be6d5f6f04c45f3192ebcc6a51dd03548bbe00b7547a9596dccb01a7ac67ee024 SHA512 67ed3036ab5260fe6c1399e89b7cf2cb66f48782aae872dedd44465add2130a5c006f5c40ff7cf17951ed287f57a828361d46132581d1d38ecb3d1637f979672
+EBUILD roundup-1.6.0-r1.ebuild 857 BLAKE2B 5381a9e6d13e526ec7591c9d0765c2d17bdb9eb2c387696c7f23d1f54a2ff4baad3a23bff9288f347ff34a982ea5d8fc05243af39ec34c7c406e1b2f0cafbd93 SHA512 cfe90f9195f634cef21a1465332d6368a2d30d7490f004376a2aeeb02ad804afccde6c907106b067fbce43c2fcd6e760024986c9488aaa75143363999d31ee0e
 MISC metadata.xml 477 BLAKE2B 558f76b13892756e818b9931e72c1e9f2262bd214c1a8d08cd48775a474e6dd95b3a4099e5bd8ce7582560f40804fbbe93006932ac245b72f90aa54a78c9e909 SHA512 2a8912d94be88771ed0044ae823fb2027fb3f403256f8d3045b01a46f9595866a9129e85cdbc05e601a18d264b92c88648e8acc78a50ce52a4810ee7d5532999
diff --git a/www-apps/roundup/files/roundup-1.6.0-configparser.patch b/www-apps/roundup/files/roundup-1.6.0-configparser.patch
new file mode 100644
index 000000000000..6bdfc8dfaaad
--- /dev/null
+++ b/www-apps/roundup/files/roundup-1.6.0-configparser.patch
@@ -0,0 +1,40 @@
+changeset:   5625:99175953520e
+branch:      maint-1.6
+parent:      5537:d698d3d843a9
+user:        Joseph Myers <jsm@polyomino.org.uk>
+date:        Mon Aug 20 00:50:16 2018 +0000
+files:       CHANGES.txt roundup/configuration.py
+description:
+Fix issue2550994: breakage caused by configparser backports.
+
+
+diff -r d698d3d843a9 -r 99175953520e roundup/configuration.py
+--- a/roundup/configuration.py	Thu Sep 06 17:04:49 2018 -0400
++++ b/roundup/configuration.py	Mon Aug 20 00:50:16 2018 +0000
+@@ -2,9 +2,15 @@
+ #
+ __docformat__ = "restructuredtext"
+ 
+-try:
++# Some systems have a backport of the Python 3 configparser module to
++# Python 2: <https://pypi.org/project/configparser/>.  That breaks
++# Roundup if used with Python 2 because it generates unicode objects
++# where not expected by the Python code.  Thus, a version check is
++# used here instead of try/except.
++import sys
++if sys.version_info[0] > 2:
+     import configparser			# Python 3
+-except ImportError:
++else:
+     import ConfigParser as configparser	# Python 2
+ 
+ import getopt
+@@ -12,7 +18,6 @@
+ import logging, logging.config
+ import os
+ import re
+-import sys
+ import time
+ import smtplib
+ 
+
diff --git a/www-apps/roundup/files/roundup-1.6.0-csrf-headers.patch b/www-apps/roundup/files/roundup-1.6.0-csrf-headers.patch
new file mode 100644
index 000000000000..8be484d5f807
--- /dev/null
+++ b/www-apps/roundup/files/roundup-1.6.0-csrf-headers.patch
@@ -0,0 +1,150 @@
+changeset:   5629:8e3df461d316
+branch:      maint-1.6
+user:        John Rouillard <rouilj@ieee.org>
+date:        Wed Feb 27 21:47:39 2019 -0500
+files:       CHANGES.txt roundup/cgi/client.py roundup/scripts/roundup_server.py test/test_cgi.py
+description:
+issue2551023: Fix CSRF headers for use with wsgi and cgi. The
+env variable array used - separators rather than _. Compare:
+HTTP_X-REQUESTED-WITH to HTTP_X_REQUESTED_WITH. The last is
+correct. Also fix roundup-server to produce the latter form. (Patch
+by Cédric Krier)
+
+
+diff -r 64ceb9c14b28 -r 8e3df461d316 roundup/cgi/client.py
+--- a/roundup/cgi/client.py	Tue Feb 12 21:31:41 2019 -0500
++++ b/roundup/cgi/client.py	Wed Feb 27 21:47:39 2019 -0500
+@@ -1026,7 +1026,7 @@
+         # If required headers are missing, raise an error
+         for header in header_names:
+             if (config["WEB_CSRF_ENFORCE_HEADER_%s"%header] == 'required'
+-                    and "HTTP_%s"%header not in self.env):
++                    and "HTTP_%s" % header.replace('-', '_') not in self.env):
+                 logger.error(self._("csrf header %s required but missing for user%s."), header, current_user)
+                 raise Unauthorised, self._("Missing header: %s")%header
+                 
+@@ -1062,9 +1062,9 @@
+                 header_pass += 1
+                 
+         enforce=config['WEB_CSRF_ENFORCE_HEADER_X-FORWARDED-HOST']
+-        if 'HTTP_X-FORWARDED-HOST' in self.env:
++        if 'HTTP_X_FORWARDED_HOST' in self.env:
+             if enforce != "no":
+-                host = self.env['HTTP_X-FORWARDED-HOST']
++                host = self.env['HTTP_X_FORWARDED_HOST']
+                 foundat = self.base.find('://' + host + '/')
+                 # 4 means self.base has http:/ prefix, 5 means https:/ prefix
+                 if foundat not in [4, 5]:
+@@ -1111,7 +1111,7 @@
+                 # Note we do not use CSRF nonces for xmlrpc requests.
+                 #
+                 # see: https://www.owasp.org/index.php/Cross-Site_Request_Forgery_(CSRF)_Prevention_Cheat_Sheet#Protecting_REST_Services:_Use_of_Custom_Request_Headers
+-                if 'HTTP_X-REQUESTED-WITH' not in self.env:
++                if 'HTTP_X_REQUESTED_WITH' not in self.env:
+                     logger.error(self._("csrf X-REQUESTED-WITH xmlrpc required header check failed for user%s."), current_user)
+                     raise UsageError, self._("Required Header Missing")
+ 
+diff -r 64ceb9c14b28 -r 8e3df461d316 roundup/scripts/roundup_server.py
+--- a/roundup/scripts/roundup_server.py	Tue Feb 12 21:31:41 2019 -0500
++++ b/roundup/scripts/roundup_server.py	Wed Feb 27 21:47:39 2019 -0500
+@@ -384,8 +384,8 @@
+             # If behind a proxy, this is the hostname supplied
+             # via the Host header to the proxy. Used by core code.
+             # Controlled by the CSRF settings.
+-            env['HTTP_X-FORWARDED-HOST'] = xfh
+-        xff = self.headers.getheader('X-Forwarded-For', None)
++            env['HTTP_X_FORWARDED_HOST'] = xfh
++        xff = self.headers.get('X-Forwarded-For', None)
+         if xff:
+             # xff is a list of ip addresses for original client/proxies:
+             # X-Forwarded-For: clientIP, proxy1IP, proxy2IP
+@@ -394,8 +394,8 @@
+             # Made available for extensions if the user trusts it.
+             # E.g. you may wish to disable recaptcha validation extension
+             # if the ip of the client matches 172.16.0.0.
+-            env['HTTP_X-FORWARDED-FOR'] = xff
+-        xfp = self.headers.getheader('X-Forwarded-Proto', None)
++            env['HTTP_X_FORWARDED_FOR'] = xff
++        xfp = self.headers.get('X-Forwarded-Proto', None)
+         if xfp:
+             # xfp is the protocol (http/https) seen by proxies in the
+             # path of the request. I am not sure if there is only
+@@ -408,8 +408,8 @@
+             # May not be trustworthy. Do not use in core without
+             # config option to control its use.
+             # Made available for extensions if the user trusts it.
+-            env['HTTP_X-FORWARDED-PROTO'] = xfp
+-        if os.environ.has_key('CGI_SHOW_TIMING'):
++            env['HTTP_X_FORWARDED_PROTO'] = xfp
++        if 'CGI_SHOW_TIMING' in os.environ:
+             env['CGI_SHOW_TIMING'] = os.environ['CGI_SHOW_TIMING']
+         env['HTTP_ACCEPT_LANGUAGE'] = self.headers.get('accept-language')
+         referer = self.headers.get('Referer')
+@@ -420,8 +420,8 @@
+             env['HTTP_ORIGIN'] = origin
+         xrw = self.headers.get('x-requested-with')
+         if xrw:
+-            env['HTTP_X-REQUESTED-WITH'] = xrw
+-        range = self.headers.getheader('range')
++            env['HTTP_X_REQUESTED_WITH'] = xrw
++        range = self.headers.get('range')
+         if range:
+             env['HTTP_RANGE'] = range
+ 
+diff -r 64ceb9c14b28 -r 8e3df461d316 test/test_cgi.py
+--- a/test/test_cgi.py	Tue Feb 12 21:31:41 2019 -0500
++++ b/test/test_cgi.py	Wed Feb 27 21:47:39 2019 -0500
+@@ -888,7 +888,7 @@
+         del(cl.env['HTTP_ORIGIN'])
+         del(out[0])
+ 
+-        cl.env['HTTP_X-FORWARDED-HOST'] = 'whoami.com'
++        cl.env['HTTP_X_FORWARDED_HOST'] = 'whoami.com'
+         # if there is an X-FORWARDED-HOST header it is used and
+         # HOST header is ignored. X-FORWARDED-HOST should only be
+         # passed/set by a proxy. In this case the HOST header is
+@@ -899,7 +899,7 @@
+         match_at=out[0].find('Redirecting to <a href="http://whoami.com/path/issue1?@ok_message')
+         print "result of subtest 4:", out[0]
+         self.assertNotEqual(match_at, -1)
+-        del(cl.env['HTTP_X-FORWARDED-HOST'])
++        del(cl.env['HTTP_X_FORWARDED_HOST'])
+         del(cl.env['HTTP_HOST'])
+         del(out[0])
+ 
+@@ -912,14 +912,14 @@
+         del(out[0])
+ 
+         # try failing headers
+-        cl.env['HTTP_X-FORWARDED-HOST'] = 'whoami.net'
++        cl.env['HTTP_X_FORWARDED_HOST'] = 'whoami.net'
+         # this raises an error as the header check passes and 
+         # it did the edit and tries to send mail.
+         cl.inner_main()
+         match_at=out[0].find('Invalid X-FORWARDED-HOST whoami.net')
+         print "result of subtest 6:", out[0]
+         self.assertNotEqual(match_at, -1)
+-        del(cl.env['HTTP_X-FORWARDED-HOST'])
++        del(cl.env['HTTP_X_FORWARDED_HOST'])
+         del(out[0])
+ 
+         # header checks succeed
+@@ -1031,7 +1031,7 @@
+                             'CONTENT_TYPE': 'text/plain',
+                             'HTTP_AUTHORIZATION': 'Basic YWRtaW46YWRtaW4=',
+                             'HTTP_REFERER': 'http://whoami.com/path/',
+-                            'HTTP_X-REQUESTED-WITH': "XMLHttpRequest"
++                            'HTTP_X_REQUESTED_WITH': "XMLHttpRequest"
+                         }, form)
+         cl.db = self.db
+         cl.base = 'http://whoami.com/path/'
+@@ -1059,7 +1059,7 @@
+         del(out[0])
+ 
+         # remove the X-REQUESTED-WITH header and get an xmlrpc fault returned
+-        del(cl.env['HTTP_X-REQUESTED-WITH'])
++        del(cl.env['HTTP_X_REQUESTED_WITH'])
+         cl.handle_xmlrpc()
+         output="<?xml version='1.0'?>\n<methodResponse>\n<fault>\n<value><struct>\n<member>\n<name>faultCode</name>\n<value><int>1</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>&lt;class 'roundup.exceptions.UsageError'&gt;:Required Header Missing</string></value>\n</member>\n</struct></value>\n</fault>\n</methodResponse>\n"
+         print out[0]
+
diff --git a/www-apps/roundup/files/roundup-1.6.0-xss.patch b/www-apps/roundup/files/roundup-1.6.0-xss.patch
new file mode 100644
index 000000000000..44a607e0c46b
--- /dev/null
+++ b/www-apps/roundup/files/roundup-1.6.0-xss.patch
@@ -0,0 +1,35 @@
+changeset:   5665:ab37c1705dbf
+branch:      maint-1.6
+parent:      5635:ea35ab75a4c0
+user:        John Rouillard <rouilj@ieee.org>
+date:        Fri Mar 22 18:16:11 2019 -0400
+files:       CHANGES.txt frontends/roundup.cgi roundup/cgi/wsgi_handler.py
+description:
+Fix fix XSS issue in wsgi and cgi when handing url not found/404. issue2551035
+
+
+diff -r ea35ab75a4c0 -r ab37c1705dbf frontends/roundup.cgi
+--- a/frontends/roundup.cgi	Thu Mar 07 15:42:21 2019 +0100
++++ b/frontends/roundup.cgi	Fri Mar 22 18:16:11 2019 -0400
+@@ -179,7 +179,7 @@
+                 request.send_response(404)
+                 request.send_header('Content-Type', 'text/html')
+                 request.end_headers()
+-                out.write('Not found: %s'%client.path)
++                out.write('Not found: %s'%cgi.escape(client.path))
+ 
+     else:
+         import urllib
+diff -r ea35ab75a4c0 -r ab37c1705dbf roundup/cgi/wsgi_handler.py
+--- a/roundup/cgi/wsgi_handler.py	Thu Mar 07 15:42:21 2019 +0100
++++ b/roundup/cgi/wsgi_handler.py	Fri Mar 22 18:16:11 2019 -0400
+@@ -66,7 +66,7 @@
+             client.main()
+         except roundup.cgi.client.NotFound:
+             request.start_response([('Content-Type', 'text/html')], 404)
+-            request.wfile.write('Not found: %s'%client.path)
++            request.wfile.write('Not found: %s'%cgi.escape(client.path))
+ 
+         # all body data has been written using wfile
+         return []
+
diff --git a/www-apps/roundup/roundup-1.6.0.ebuild b/www-apps/roundup/roundup-1.6.0-r1.ebuild
index bb623df06580..4e1c93d0283a 100644
--- a/www-apps/roundup/roundup-1.6.0.ebuild
+++ b/www-apps/roundup/roundup-1.6.0-r1.ebuild
@@ -19,6 +19,12 @@ RDEPEND="${DEPEND}"
 
 DOCS="CHANGES.txt doc/*.txt"
 
+PATCHES=(
+	"${FILESDIR}/${P}-configparser.patch"
+	"${FILESDIR}/${P}-csrf-headers.patch"
+	"${FILESDIR}/${P}-xss.patch"
+)
+
 python_install_all() {
 	distutils-r1_python_install_all
 	rm -r "${ED}"/usr/share/doc/${PN} || die
diff --git a/www-apps/zeppelin-bin/Manifest b/www-apps/zeppelin-bin/Manifest
new file mode 100644
index 000000000000..101d3c2c0a20
--- /dev/null
+++ b/www-apps/zeppelin-bin/Manifest
@@ -0,0 +1,4 @@
+AUX zeppelin.init.d 492 BLAKE2B f6a551375b34ffc8ab0c2f5fe259614a8dd7024e6578919943755121d796ffc815678133446ce65b0c7eadbe18bcd0441327e29fb4cd8226f949a769f1f7e1bd SHA512 a70788870d766256c3e515748d9680e19ea0a574b81c47e5a4456a81179701db551079e2a066e5dba69c3db5d10509250780b6e54f2b43f5fc8602252292ab1b
+DIST zeppelin-bin-0.8.1.tgz 992975720 BLAKE2B 13bae89054a5be0570d0550cfc875d989de66dcdc6fe2aa3c8b71b452782d8cf2c8f6cf030b47f1b9050899912f75136cef7d9ef1b80c8957ad8a260fc7050c5 SHA512 b8302b36acc5cc8859f4341329bcb4d038bbb91d4493be191606df94da08a2fa37940958ceae507e6cdbe22fc338111ac9bee580cb41ee74198911469552df02
+EBUILD zeppelin-bin-0.8.1.ebuild 918 BLAKE2B 37a1afb39b64bc5a04c4eb8c4a8b51cf1b161e17244fdbd7d9be5c7f1f4e65e72c7c343aed1e2a7ef1f3f99a9b5b4e0c27af6bf590851726ed01f33aff61c685 SHA512 14a66d142d0f83c2e295c6e1072d33bfc600f1dcde07e39fc731a7d9fa8f8eb00058e83e00d3679b6687908c33e71f67e61a75b98c41c604899f2309df57782d
+MISC metadata.xml 331 BLAKE2B d3c2a6f490848f29f26ce31bb281d8b5ccb39463be72a40228a91ab5e4b91f5797dba1a6b5e789f977a3485c4b0fdc6bd7c112d95b527546688ecf91a1c60291 SHA512 0ae77f77f2563a7885f4d037432ac7b75728af9144fc58dd9069a4dc8f8b74ad9425600d43d39e6801dc225d3f4f6fc93cb393ba3c2cdd40d6788d2d22d184f0
diff --git a/www-apps/zeppelin-bin/files/zeppelin.init.d b/www-apps/zeppelin-bin/files/zeppelin.init.d
new file mode 100644
index 000000000000..03ddd6beabc7
--- /dev/null
+++ b/www-apps/zeppelin-bin/files/zeppelin.init.d
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Web-based interactive data analytics notebook launcher"
+command="/opt/zeppelin/bin/zeppelin-daemon.sh"
+logfile="/var/log/zeppelin/zeppelin-gentoo.log"
+
+start() {
+    ebegin "Starting Apache Zeppelin ..."
+    bash $command start >> $logfile
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping Apache Zeppelin ..."
+    bash $command stop >> $logfile
+    eend $?
+}
diff --git a/www-apps/zeppelin-bin/metadata.xml b/www-apps/zeppelin-bin/metadata.xml
new file mode 100644
index 000000000000..5c85a44abf8e
--- /dev/null
+++ b/www-apps/zeppelin-bin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">apache/zeppelin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/zeppelin-bin/zeppelin-bin-0.8.1.ebuild b/www-apps/zeppelin-bin/zeppelin-bin-0.8.1.ebuild
new file mode 100644
index 000000000000..6b80c178e624
--- /dev/null
+++ b/www-apps/zeppelin-bin/zeppelin-bin-0.8.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2 user
+
+MY_PN="zeppelin"
+MY_P="${MY_PN}-${PV}-bin-all"
+
+DESCRIPTION="Web-based interactive data analytics notebook launcher"
+HOMEPAGE="https://zeppelin.apache.org"
+SRC_URI="mirror://apache/zeppelin/${MY_PN}-${PV}/${MY_P}.tgz -> ${P}.tgz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+INSTALL_DIR="/opt/${P}"
+
+pkg_setup() {
+	enewgroup zeppelin
+	enewuser zeppelin -1 /bin/sh /home/zeppelin zeppelin
+}
+
+src_install() {
+	keepdir /var/log/zeppelin
+	fowners -R zeppelin:zeppelin /var/log/zeppelin
+
+	newinitd "${FILESDIR}/zeppelin.init.d" zeppelin
+
+	dodir "${INSTALL_DIR}"
+	cp -pRP * "${ED}/${INSTALL_DIR}" || die
+	dosym "${ED}/${INSTALL_DIR}" /opt/zeppelin
+	fowners -R zeppelin:zeppelin "${INSTALL_DIR}"
+}