gentoo resync : 06.08.2019

5 files changed, 7 insertions, 81 deletions

diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index ffe063ee460c..8b60aebc2618 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -3,14 +3,12 @@ AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
 DIST grafana-bin-5.4.3.tar.gz 55228439 BLAKE2B 63ee14b1ab074f453c8f1b870b8c0c51365106cb2af59fa20f56805f7add7fec29bc5ecd7e2ffc1f3f6811049e839893433e14b1871cb2aea359f58537b9e0dc SHA512 781466c7477ecb4fbca59006600adc3569d0ee2158da3b75831b1934fd39456030471d4508fbf2d3296d3660dcc8b92782295d7afe458229bad1d64de88ad33b
 DIST grafana-bin-5.4.4.tar.gz 55227302 BLAKE2B f80fcf4447de6eb2f8a450650eb054da6a426e61142c2882cb5faef91b1d9779b77016b822d2f9082c81fe7b6ec14f23996132d880067bd956ac6260b171388e SHA512 c95a3e9b40fdd8fff88c01a66efdda1fc64c258a768bdf65f738562b0c039020de1aa2500cbaa93dff4220715c57ce803ca0ff01344d63a9b8548e4d27dc1af1
-DIST grafana-bin-6.1.6.tar.gz 56569580 BLAKE2B b8122e5ec6104ba211d7d331fd99e3caaea6b4bc2cdeae3315ea84abc6634723d106fb19b27f68ad5f5f0ff84648f8ea84254a3b0c96519702349acfeb6bd753 SHA512 b8851df5a00b752777c168446326603c5e00ed66e7217551c75a976961c9de1f5a5bf0d262068866ecd0dae685a09ac8829db2bb5201c32e1ecaed6bafc149e4
-DIST grafana-bin-6.2.5.tar.gz 58512371 BLAKE2B 6b56930c620e25948a6f1d662c7fb5632d3ca0a6476b605e9623d9b96e1c29e400bb3e17613e32aaf79bda5f6e7451867d0a14b7f9c1f4d47e8f92c13a226311 SHA512 b260616f0df47ce97084648d392a405b78ada4ff3aa8c8414da463ad865549e3118ab084cbba6edb7e427109dc19a5ab1ecc723d28a564e98d654df4dbb92b64
-DIST grafana-bin-6.3.2.tar.gz 58757623 BLAKE2B 91fc5a6af7076d121673d76ca13e47884dd498cdc6c9a53dfdf068f4710a8f802a64a5f81dc0c311f696285cd50d0490b5baf123a9f43eb2e5ea2e2387113852 SHA512 d758b57755a30af3eee86e8c3e302c9288473c947edbedace7dabbfa125faeb9453aa3e37ae983cd6c6954edb97235a4d4df26ea5ff65cdc903c3ef6b8c62958
-DIST grafana-bin-6.3.3.tar.gz 58755664 BLAKE2B 59c542ac033fde899e6a3fa042378ce245bf31c1ba832c3b0913256a5771316a234b98a53fdb433d0368f6169d16a1d0cb9138de4476c43b4a51e22a49b3cad4 SHA512 dc24695d77755e51718eaadfbba61627637146b3110ac8f06b76812a37e6fe16a97934d512d632fee7b61c9410454f9c867dc2c6e1206881fe1808064a6ff576
+DIST grafana-bin-5.4.5.tar.gz 55227168 BLAKE2B 23201dfc85a748b62f5289b53c5ea6549c7c3ddfe278b51a10c22f5be9ec85cc925f3fb4c130adacd1dc036c89f956a867f47d1d6e876fbd55c437aa740116e6 SHA512 861a6c082b006ee3a4cbafad0a65e117912d76aede2073faa264c34452dc6f93d3d0c727a66891bc1155924d1c8419232f794ca621aab1d768302668380c15e7
+DIST grafana-bin-6.3.4.tar.gz 58756149 BLAKE2B 847e88cc81aabbb208aeb4bb3e3c8c98346021e6445189d3dfbe526a007f3754ac1912fee8d8ced82cfb30555ac88d4a76bbb3bc9ee0bde604048c865850dddc SHA512 6ea604c25776420355e3d1daa0ac138884587ad16cb9b293e0f771edc57eb070a32691ab24dcf937fd4d8fb8f6562f3600c0663d17fb24c40ecffc33b0320d69
+DIST grafana-bin-6.3.5.tar.gz 58756804 BLAKE2B ffa96e5fd067dbe3590c8102c8ac93337679d968c19ec0decf44a39118d4473da82ac2f6702400cc57c22ea7703af3e7cd39aad9a1c63f41c5613b3d5bbe2bed SHA512 0298894f845fa6e322f3fa51364ba24617f3847c2f597a336ba3c1e761165a11efb9a884c3cce8856281bcb8ea3b66341c5ba301f58ce6bf2a8d0328ecd774bd
 EBUILD grafana-bin-5.4.3-r1.ebuild 1969 BLAKE2B f90d9c8c479edfd60eff8a4c6823fad5ba9683411a6e9b4e137a77990f528d6184ecf0f917520209dd4497e1cfef9198fe305bb76a9c6c4911cd09204481a69a SHA512 d674745ae0614747c945e96990c17c89c1c7e027e909c92a8e08a898d9567d531900e56ea5f2714128549b2094fdc568da3949b6578fd9bb84f3d78c4b339a10
 EBUILD grafana-bin-5.4.4.ebuild 1944 BLAKE2B be7426448610d8b2875bd13a8f37d7c771193e236f572699224dced158835b1fb050573fc425e1d1c8ff4b216aab730ceccd666052c3467d86cca0b88a57fae2 SHA512 ae168b08b5f7c14b0f54d94be5e10fb9ef2c2c4875c8db7b2299cf087734687dc448d08b5f4fdd06ad2c219c29dd5a82802e7e2f68dd0be0daf698fdded24ccd
-EBUILD grafana-bin-6.1.6.ebuild 1971 BLAKE2B f8d887e76e958c29296e441bb7165590d910ec9e43c717244e264bd266abdf4874c5ac63c789a61afdf81c5602ac2411cf992507d03b3a941a28a870a3f00051 SHA512 cad905e8e9aa9a8f02431b6fe3c0f780cba7c2ddf3db9477a48bbc0fae8f3b800407e95a926b203b34414be2386bcc21c6b590d9657266f709be95a5e6ed1305
-EBUILD grafana-bin-6.2.5.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
-EBUILD grafana-bin-6.3.2.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
-EBUILD grafana-bin-6.3.3.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
+EBUILD grafana-bin-5.4.5.ebuild 1944 BLAKE2B be7426448610d8b2875bd13a8f37d7c771193e236f572699224dced158835b1fb050573fc425e1d1c8ff4b216aab730ceccd666052c3467d86cca0b88a57fae2 SHA512 ae168b08b5f7c14b0f54d94be5e10fb9ef2c2c4875c8db7b2299cf087734687dc448d08b5f4fdd06ad2c219c29dd5a82802e7e2f68dd0be0daf698fdded24ccd
+EBUILD grafana-bin-6.3.4.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
+EBUILD grafana-bin-6.3.5.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
 MISC metadata.xml 416 BLAKE2B ff5bdf7e202aa96bbf615df2f86c6542bb7d291e6d564dfac683a2e54002380dd80ef3f1ca0b6c1f398de0115e26398903256b9d64e353127f25c3e97e5b21c8 SHA512 db2cbd25cf9b21664db93dc8f9719bf7f9a2fd632c5231d0f296bb32f3f6af3e08307c8a662081cc68f33638d70f6512094fad76073a5de4ceba02eeb3d1188b
diff --git a/www-apps/grafana-bin/grafana-bin-6.1.6.ebuild b/www-apps/grafana-bin/grafana-bin-5.4.5.ebuild
index 7760f27c61fd..33385776ece0 100644
--- a/www-apps/grafana-bin/grafana-bin-6.1.6.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-5.4.5.ebuild
@@ -6,8 +6,7 @@ EAPI="7"
 inherit user systemd
 
 MY_PN=${PN/-bin/}
-MY_PV=${PV/_beta/-beta}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
+S=${WORKDIR}/${MY_PN}-${PV}
 
 DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
 HOMEPAGE="https://grafana.org"
diff --git a/www-apps/grafana-bin/grafana-bin-6.3.3.ebuild b/www-apps/grafana-bin/grafana-bin-6.3.3.ebuild
deleted file mode 100644
index ed520bacd97a..000000000000
--- a/www-apps/grafana-bin/grafana-bin-6.3.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user systemd
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_beta/-beta}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	media-libs/fontconfig"
-
-QA_EXECSTACK="usr/share/grafana/tools/phantomjs/phantomjs"
-QA_PREBUILT="usr/bin/grafana-* ${QA_EXECSTACK}"
-QA_PRESTRIPPED=${QA_PREBUILT}
-
-pkg_setup() {
-	enewgroup grafana
-	enewuser grafana -1 -1 /usr/share/grafana grafana
-}
-
-src_install() {
-	keepdir /etc/grafana
-	insinto /etc/grafana
-	newins "${S}"/conf/sample.ini grafana.ini
-	rm "${S}"/conf/sample.ini || die
-
-	# Frontend assets
-	insinto /usr/share/${MY_PN}
-	doins -r public conf
-
-	dobin bin/grafana-cli
-	dobin bin/grafana-server
-
-	exeinto /usr/share/grafana/tools/phantomjs
-	doexe tools/phantomjs/phantomjs
-
-	insinto /usr/share/grafana/tools/phantomjs
-	doins tools/phantomjs/render.js
-
-	newconfd "${FILESDIR}"/grafana.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd.3 grafana
-	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
-
-	keepdir /var/{lib,log}/grafana
-	keepdir /var/lib/grafana/{dashboards,plugins}
-	fowners grafana:grafana /var/{lib,log}/grafana
-	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
-	fperms 0750 /var/{lib,log}/grafana
-	fperms 0750 /var/lib/grafana/{dashboards,plugins}
-}
-
-postinst() {
-	elog "${PN} has built-in log rotation. Please see [log.file] section of"
-	elog "/etc/grafana/grafana.ini for related settings."
-	elog
-	elog "You may add your own custom configuration for app-admin/logrotate if you"
-	elog "wish to use external rotation of logs. In this case, you also need to make"
-	elog "sure the built-in rotation is turned off."
-}
diff --git a/www-apps/grafana-bin/grafana-bin-6.2.5.ebuild b/www-apps/grafana-bin/grafana-bin-6.3.4.ebuild
index ed520bacd97a..ed520bacd97a 100644
--- a/www-apps/grafana-bin/grafana-bin-6.2.5.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-6.3.4.ebuild
diff --git a/www-apps/grafana-bin/grafana-bin-6.3.2.ebuild b/www-apps/grafana-bin/grafana-bin-6.3.5.ebuild
index ed520bacd97a..ed520bacd97a 100644
--- a/www-apps/grafana-bin/grafana-bin-6.3.2.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-6.3.5.ebuild