gentoo resync : 04.05.2019

8 files changed, 7 insertions, 373 deletions

diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 7ed907d341d5..630dd5f73036 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -2,21 +2,11 @@ AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e87
 AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743e94fc59f76ef77220610d2fd02950ad0157b9ebbfd8380a489cd0da33b5b25102fbaa936c1212e2f SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
 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
-DIST grafana-bin-6.1.2.tar.gz 56563484 BLAKE2B bc04657c3ce40256b3840848c63a4d864a037733c94689ab6f26eb23fed977ee8926a0e14d2dd233cd94ec97f0ecc5075ce46275b4838234316721063fb6c295 SHA512 701df226db9550802dd72f482e3cb3ce6b753cb9769cea5acca961867adb6ac0cc0b7e161f727689f0a6bea6c872f11745a872eeca1302ce23abc5b02ab1c402
-DIST grafana-bin-6.1.3.tar.gz 56563318 BLAKE2B a2063e4308fe2d2b97e6f6aed80506d2ac39b4b0879d0c4a02a3e75e7d5c5fb8e0a03e9c3d09ee2e638ce3f85bb953f34b5808e4a0be1234a066f451d7f98eb8 SHA512 2d42f578780b37cf0fa31ab2f0f4ecec3c7960d9deae4e3de0543f4015446656746f9ac5f25534b8ee7063b539752df06864e28fd800ee1f12f5060fb5aa53e5
+DIST grafana-bin-5.4.4.tar.gz 55227302 BLAKE2B f80fcf4447de6eb2f8a450650eb054da6a426e61142c2882cb5faef91b1d9779b77016b822d2f9082c81fe7b6ec14f23996132d880067bd956ac6260b171388e SHA512 c95a3e9b40fdd8fff88c01a66efdda1fc64c258a768bdf65f738562b0c039020de1aa2500cbaa93dff4220715c57ce803ca0ff01344d63a9b8548e4d27dc1af1
 DIST grafana-bin-6.1.4.tar.gz 56564647 BLAKE2B 277a51f056faee911adb46f80673bde05dd872cc2d1387e67066806c8b749e434cb0bf2cd0e55338081814c19edf025927dd2379064aca2acb1e718dc89140af SHA512 7d27dfcc689c4e96f4ea9276c75581ac0762556759c8a70a5f87199a9cdd49493b40b7e44bbcf069b0cb2b4ca60d4b8157c7d977673253db9a80c9c785b4b344
+DIST grafana-bin-6.1.6.tar.gz 56569580 BLAKE2B b8122e5ec6104ba211d7d331fd99e3caaea6b4bc2cdeae3315ea84abc6634723d106fb19b27f68ad5f5f0ff84648f8ea84254a3b0c96519702349acfeb6bd753 SHA512 b8851df5a00b752777c168446326603c5e00ed66e7217551c75a976961c9de1f5a5bf0d262068866ecd0dae685a09ac8829db2bb5201c32e1ecaed6bafc149e4
 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
-EBUILD grafana-bin-6.1.2.ebuild 2000 BLAKE2B a2aded1295055013836375d7dcc73efa0c198030ec7653e07d3288792e284bba24db7e01b575c89421bd21155529c8f6e99add702929bbb45a5ff7ba16254161 SHA512 1790f63faba64a441f2527f1cbdab6ed3685b23f0b5032f3d3208851d491e077dc01edff00dc60ce81e25ce7b0b59b3e70ab480b065295fc6c05c4d0710216e4
-EBUILD grafana-bin-6.1.3.ebuild 2000 BLAKE2B a2aded1295055013836375d7dcc73efa0c198030ec7653e07d3288792e284bba24db7e01b575c89421bd21155529c8f6e99add702929bbb45a5ff7ba16254161 SHA512 1790f63faba64a441f2527f1cbdab6ed3685b23f0b5032f3d3208851d491e077dc01edff00dc60ce81e25ce7b0b59b3e70ab480b065295fc6c05c4d0710216e4
+EBUILD grafana-bin-5.4.4.ebuild 1944 BLAKE2B be7426448610d8b2875bd13a8f37d7c771193e236f572699224dced158835b1fb050573fc425e1d1c8ff4b216aab730ceccd666052c3467d86cca0b88a57fae2 SHA512 ae168b08b5f7c14b0f54d94be5e10fb9ef2c2c4875c8db7b2299cf087734687dc448d08b5f4fdd06ad2c219c29dd5a82802e7e2f68dd0be0daf698fdded24ccd
 EBUILD grafana-bin-6.1.4.ebuild 2000 BLAKE2B a2aded1295055013836375d7dcc73efa0c198030ec7653e07d3288792e284bba24db7e01b575c89421bd21155529c8f6e99add702929bbb45a5ff7ba16254161 SHA512 1790f63faba64a441f2527f1cbdab6ed3685b23f0b5032f3d3208851d491e077dc01edff00dc60ce81e25ce7b0b59b3e70ab480b065295fc6c05c4d0710216e4
+EBUILD grafana-bin-6.1.6.ebuild 1971 BLAKE2B f8d887e76e958c29296e441bb7165590d910ec9e43c717244e264bd266abdf4874c5ac63c789a61afdf81c5602ac2411cf992507d03b3a941a28a870a3f00051 SHA512 cad905e8e9aa9a8f02431b6fe3c0f780cba7c2ddf3db9477a48bbc0fae8f3b800407e95a926b203b34414be2386bcc21c6b590d9657266f709be95a5e6ed1305
 MISC metadata.xml 416 BLAKE2B ff5bdf7e202aa96bbf615df2f86c6542bb7d291e6d564dfac683a2e54002380dd80ef3f1ca0b6c1f398de0115e26398903256b9d64e353127f25c3e97e5b21c8 SHA512 db2cbd25cf9b21664db93dc8f9719bf7f9a2fd632c5231d0f296bb32f3f6af3e08307c8a662081cc68f33638d70f6512094fad76073a5de4ceba02eeb3d1188b
diff --git a/www-apps/grafana-bin/grafana-bin-6.0.1.ebuild b/www-apps/grafana-bin/grafana-bin-5.4.4.ebuild
index f5baddc3529b..33385776ece0 100644
--- a/www-apps/grafana-bin/grafana-bin-6.0.1.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-5.4.4.ebuild
@@ -6,12 +6,11 @@ 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"
-SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${MY_PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/www-apps/grafana-bin/grafana-bin-6.0.2.ebuild b/www-apps/grafana-bin/grafana-bin-6.0.2.ebuild
deleted file mode 100644
index f5baddc3529b..000000000000
--- a/www-apps/grafana-bin/grafana-bin-6.0.2.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://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
deleted file mode 100644
index f5baddc3529b..000000000000
--- a/www-apps/grafana-bin/grafana-bin-6.1.0.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://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
deleted file mode 100644
index f5baddc3529b..000000000000
--- a/www-apps/grafana-bin/grafana-bin-6.1.1.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://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.2.ebuild b/www-apps/grafana-bin/grafana-bin-6.1.2.ebuild
deleted file mode 100644
index f5baddc3529b..000000000000
--- a/www-apps/grafana-bin/grafana-bin-6.1.2.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://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.3.ebuild b/www-apps/grafana-bin/grafana-bin-6.1.3.ebuild
deleted file mode 100644
index f5baddc3529b..000000000000
--- a/www-apps/grafana-bin/grafana-bin-6.1.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://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.0.0-r1.ebuild b/www-apps/grafana-bin/grafana-bin-6.1.6.ebuild
index f5baddc3529b..7760f27c61fd 100644
--- a/www-apps/grafana-bin/grafana-bin-6.0.0-r1.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-6.1.6.ebuild
@@ -11,7 +11,7 @@ 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"
+SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"