gentoo resync : 09.03.2018

3 files changed, 4 insertions, 69 deletions

diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 19882dd28c57..65fc7a4b8559 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,10 +1,8 @@
 AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e871a86738f21b8b3ee68caf1e2b437343f739564dac5ef91db5dcb6b2f31b49a936f9d4e6a62cca4 SHA512 13b9868a4c0a5a7209e6f4aa1206a93a0fb33b0234c4c0a6942bdab9d1cf139049181c066e01c49f639165ea422259fa7cab9e0bdf21537b3722bd86691d9b2c
 AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743e94fc59f76ef77220610d2fd02950ad0157b9ebbfd8380a489cd0da33b5b25102fbaa936c1212e2f SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442
 AUX grafana.service 651 BLAKE2B dcf0ddfcd2cbbc457f0dc7142a64c403c7657c30a7f85ab103828758c16fce8c6fc2e80a4f2f943393f3c226f873a2bce4b6df999fa4b178b3e95bf213688d86 SHA512 7bda41f0c6ee9ec0947ef6b8d4591453f797ac0256f9b67800249a6edf699e55855a9bd6f46501a86ffec5b5d2e1d8ac735657a0c63600683f61044e0bbc35d4
-DIST grafana-bin-4.5.2.tar.gz 50374607 BLAKE2B 0cb4fb5c6b2b465e7cc9ce1f99bf102cd8fc5bc1fad1d995393923e0d6e0e16dd3bd9858b6ad93fc178092e6ef32c1000d4928187d67ab2cdd4f8e9d5a0c71eb SHA512 9b650e204f90dfec7ea3ff723a937a3332064c3b5a00bebf3aca4cffe1fdccf83efbe5040c954dc82bc3389a4f5d72f7fa47941f43d022cbdf40e067f9c5adf7
 DIST grafana-bin-4.6.3.tar.gz 47187988 BLAKE2B 8d09f6569c8cc7b880fe852e0696b5d8b811d91a8aed360dffb40dc033e8ca756f7b37c6f2fd16d9925c33f2b7fcc4d279e31611fdb5aa7e4b24eee88cea0d38 SHA512 dad2c26b998910519cc462aa3dc91bd6d7ab6b7fdea9e1aa3c54ed5eb86830e9b8484434a5fd307f7ff490549509df97486249b301ccd84a7bd5b2de11ffe929
-DIST grafana-bin-5.0.0_beta4.tar.gz 51499427 BLAKE2B fe00d9f1ef5e248bcb33f338aba7294751f4f635ac96841a8902e5dfc988918505a204a0d733c68c2993bc72a61b769fff946421e8172152043baf279caa9b74 SHA512 b07c7e42d47e1782afa00f04805a1d4b7b119270602a885d93095ccb3455c99bb0c067c07442f973302069480a60c3c4cde51386ecc8cf0e5c40304ed1a9c21b
-EBUILD grafana-bin-4.5.2.ebuild 1750 BLAKE2B cb822beb7365474a21f49de6aedd9ffe31c80f99a5c3817b4c87f12cbc8390310cda5ec0f756e543d7d71970c809b5d21aff3a6a3dd377909e453e2f81c03730 SHA512 7b0aac0e0e288f00d29e4a1b770ebc0ebea629cb1760c4c99ea6531f746b6a571d58a0ac1a8001a1668dc1d4527510fe3ecc7b02e70247df9589fde6ece9a2f4
+DIST grafana-bin-5.0.0.tar.gz 51530668 BLAKE2B e916c67a5eedb5cd852d994e81d90fbbdf0be31bdfef1030ea62997892b55ec0c234a88c8843d2e9490ea50f248df78ad8140406e4bd4e0de403b447950a81ec SHA512 1b6a49a296215558218d7fe6d40da1fafd2e4a1a902f1b1950bdc2ca50825eb09b100ad8d2e47c786cdee8926e1f902aae2da97e53c4d62ccaa716d9377910b7
 EBUILD grafana-bin-4.6.3.ebuild 1750 BLAKE2B cb822beb7365474a21f49de6aedd9ffe31c80f99a5c3817b4c87f12cbc8390310cda5ec0f756e543d7d71970c809b5d21aff3a6a3dd377909e453e2f81c03730 SHA512 7b0aac0e0e288f00d29e4a1b770ebc0ebea629cb1760c4c99ea6531f746b6a571d58a0ac1a8001a1668dc1d4527510fe3ecc7b02e70247df9589fde6ece9a2f4
-EBUILD grafana-bin-5.0.0_beta4.ebuild 1764 BLAKE2B 4054bb9e0cf6f4c05504e35a10f569aa1d0faedb1b69b74bd968314e694f1a3c7ac7d5d6502afdb9c41c6f6775c58b9af0a145cc8bd94fab7162dd54602561ca SHA512 9e5b68ab1cdf549e6b909857975bdddff860e240a333c946911f38b260e6235d129e4c2707922234fbff36fa4b51a894c714c203dcd58c6a612091cf15fa209d
+EBUILD grafana-bin-5.0.0.ebuild 1743 BLAKE2B 385c60aed3d8d62051195cc0eda569c6ea90468b4d13d52020f5157f1c8d62c6c280f1562f7493c223a2bdf35373c639c33df84dc2df4d72754a8c8b5663787a SHA512 583109ec025c8bdc5da5d7a459cb847d6422e0d5540c882cf9055fd3edccd2eeaf479b4d312b7f70f348227ad06c8de68ba785b229ac9b04bb1a37f1d9c51640
 MISC metadata.xml 299 BLAKE2B f907a1d524382aed556259ab450e2e6b9c927b7b07a975d468867855e3dc184d7d296a4f6f098a65598b377b2c46cab1c90dced667c7b0cdad16e156949807b1 SHA512 3c543eb4a0465af174a2a80650a542daead9f89685993575eef9ab826b98c84585184152f8ebc5e81fdafd9bbe24d63f467b251a4c9aeaaeef52408a1a3812df
diff --git a/www-apps/grafana-bin/grafana-bin-4.5.2.ebuild b/www-apps/grafana-bin/grafana-bin-5.0.0.ebuild
index 3a8308e2d6d7..c1e847d3902b 100644
--- a/www-apps/grafana-bin/grafana-bin-4.5.2.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-5.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -35,7 +35,7 @@ src_install() {
 
 	# Frontend assets
 	insinto /usr/share/${MY_PN}
-	doins -r public conf vendor
+	doins -r public conf
 
 	dobin bin/grafana-cli
 	dobin bin/grafana-server
diff --git a/www-apps/grafana-bin/grafana-bin-5.0.0_beta4.ebuild b/www-apps/grafana-bin/grafana-bin-5.0.0_beta4.ebuild
deleted file mode 100644
index cbcca07e13c1..000000000000
--- a/www-apps/grafana-bin/grafana-bin-5.0.0_beta4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit user systemd
-
-MY_PN=${PN/-bin/}
-MY_SRC="${MY_PN}-${PV/_/-}.linux-x64.tar.gz"
-S=${WORKDIR}/${MY_PN}-${PV/_/-}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="http://grafana.org"
-SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_SRC} -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs"
-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."
-}