gentoo resync : 14.05.2020

3 files changed, 2 insertions, 75 deletions

diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 8cb92cc41e65..b68f50edc07b 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,8 +1,6 @@
 AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e871a86738f21b8b3ee68caf1e2b437343f739564dac5ef91db5dcb6b2f31b49a936f9d4e6a62cca4 SHA512 13b9868a4c0a5a7209e6f4aa1206a93a0fb33b0234c4c0a6942bdab9d1cf139049181c066e01c49f639165ea422259fa7cab9e0bdf21537b3722bd86691d9b2c
 AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743e94fc59f76ef77220610d2fd02950ad0157b9ebbfd8380a489cd0da33b5b25102fbaa936c1212e2f SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
-DIST grafana-bin-6.5.3.tar.gz 61041681 BLAKE2B 624abf5fa31271eb81182bd36377eef0e643a4fda2c6ecc00545d941318ecf4b526fa4753ab6e3cc820fb22b1bf3768cdec946fd13483ef7137f1672aa7b63b6 SHA512 4f672c0fc4a74fff904bd3b297e40c06c616157bb9d3e2783950339d20c551f580dea7a59fb0ff58480010047d34088c51c3ec3175039b9510acb0a18ef52546
-DIST grafana-bin-6.7.2.tar.gz 65075053 BLAKE2B 80a92ec55820363dfd56048db81a5be448ccdba6e0396e22b7b68dff3eb11d4d0c11c35d540c607eef7ef7ddba74a9ac147b6e7edce5fc34894b090a3042a5cd SHA512 ec46a5f9ce39c807f50ee93eda0ddb19bf58d5fb3d3dc188250dfe09323bf10108088cd79ee7787c77e88244b239b5dbb6e50f5e4c69c6d099d5f20dc6bafa7c
-EBUILD grafana-bin-6.5.3.ebuild 1969 BLAKE2B b871590d26c2be2d591be5a35c4b06ed5f3a820315f9661bbe1da3fe4f6c369987b7a51afc73456fcd10c08e26aee07bd5116b69075add4ddb07bb76a9f289a3 SHA512 c7091e34535a4fbedda19751d7a8ce7497ba6c00a5957d85130c6eed881d57a2d40ff0188aa3b632c1c42ac9b6ba9ebe6a9a073f2be6c4f20c401c4e5c592f2e
-EBUILD grafana-bin-6.7.2.ebuild 1969 BLAKE2B b871590d26c2be2d591be5a35c4b06ed5f3a820315f9661bbe1da3fe4f6c369987b7a51afc73456fcd10c08e26aee07bd5116b69075add4ddb07bb76a9f289a3 SHA512 c7091e34535a4fbedda19751d7a8ce7497ba6c00a5957d85130c6eed881d57a2d40ff0188aa3b632c1c42ac9b6ba9ebe6a9a073f2be6c4f20c401c4e5c592f2e
+DIST grafana-bin-6.7.3.tar.gz 65083849 BLAKE2B b567885d58f4e28d2873feb4bdbfd364697d3c742039441d12df0f7a76ed8703ef2a08450125feeb576c539e7e2a84d193da92436cbd82601b65a5d42862a7a3 SHA512 15d02ed101088d845ed94fb88c629428f2a899a23dff509ec82cb148689bda07b56883765be145d5a5769ed0e3d3b9d98e50fc940c95a1074f5b5e3adac19f30
+EBUILD grafana-bin-6.7.3.ebuild 1969 BLAKE2B b871590d26c2be2d591be5a35c4b06ed5f3a820315f9661bbe1da3fe4f6c369987b7a51afc73456fcd10c08e26aee07bd5116b69075add4ddb07bb76a9f289a3 SHA512 c7091e34535a4fbedda19751d7a8ce7497ba6c00a5957d85130c6eed881d57a2d40ff0188aa3b632c1c42ac9b6ba9ebe6a9a073f2be6c4f20c401c4e5c592f2e
 MISC metadata.xml 218 BLAKE2B 2189d142b4baed0b8edb49fcc98f7397610a257a4cb5f87873272b284f84290420f0950c8b41d1d050ca7a1e0486c6e00344672a3f0479d1d382c14bf7f18485 SHA512 882f7787b97aa780dd3ba4112b9e1dcc84986e2a17704cba9a557ec3a3f9211bcf93532b92d42f60157b56b457ee9ee17e5409066230e54d48931b91bd6786cd
diff --git a/www-apps/grafana-bin/grafana-bin-6.7.2.ebuild b/www-apps/grafana-bin/grafana-bin-6.7.2.ebuild
deleted file mode 100644
index 58b22b14471e..000000000000
--- a/www-apps/grafana-bin/grafana-bin-6.7.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user systemd
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_beta/-beta}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	media-libs/fontconfig"
-
-QA_EXECSTACK="usr/share/grafana/tools/phantomjs/phantomjs"
-QA_PREBUILT="usr/bin/grafana-* ${QA_EXECSTACK}"
-QA_PRESTRIPPED=${QA_PREBUILT}
-
-pkg_setup() {
-	enewgroup grafana
-	enewuser grafana -1 -1 /usr/share/grafana grafana
-}
-
-src_install() {
-	keepdir /etc/grafana
-	insinto /etc/grafana
-	newins "${S}"/conf/sample.ini grafana.ini
-	rm "${S}"/conf/sample.ini || die
-
-	# Frontend assets
-	insinto /usr/share/${MY_PN}
-	doins -r public conf
-
-	dobin bin/grafana-cli
-	dobin bin/grafana-server
-
-	exeinto /usr/share/grafana/tools/phantomjs
-	doexe tools/phantomjs/phantomjs
-
-	insinto /usr/share/grafana/tools/phantomjs
-	doins tools/phantomjs/render.js
-
-	newconfd "${FILESDIR}"/grafana.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd.3 grafana
-	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
-
-	keepdir /var/{lib,log}/grafana
-	keepdir /var/lib/grafana/{dashboards,plugins}
-	fowners grafana:grafana /var/{lib,log}/grafana
-	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
-	fperms 0750 /var/{lib,log}/grafana
-	fperms 0750 /var/lib/grafana/{dashboards,plugins}
-}
-
-postinst() {
-	elog "${PN} has built-in log rotation. Please see [log.file] section of"
-	elog "/etc/grafana/grafana.ini for related settings."
-	elog
-	elog "You may add your own custom configuration for app-admin/logrotate if you"
-	elog "wish to use external rotation of logs. In this case, you also need to make"
-	elog "sure the built-in rotation is turned off."
-}
diff --git a/www-apps/grafana-bin/grafana-bin-6.5.3.ebuild b/www-apps/grafana-bin/grafana-bin-6.7.3.ebuild
index 58b22b14471e..58b22b14471e 100644
--- a/www-apps/grafana-bin/grafana-bin-6.5.3.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-6.7.3.ebuild