gentoo resync : 10.02.2019

3 files changed, 68 insertions, 2 deletions

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."
+}