[gentoo-commits] repo/gentoo:master commit in: www-apps/grafana-bin/

["Tobias Klausmann" <klausman@gentoo.org>]

commit:     88ca99b1f3d8b29beaa1ad97cf6aedf47c73eda3
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Wed May 31 11:09:21 2017 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Wed May 31 11:09:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88ca99b1

www-apps/grafana-bin: Add v4.3.1 and clean up old versions

 www-apps/grafana-bin/Manifest                      |  1 +
 www-apps/grafana-bin/grafana-bin-4.0.1.ebuild      | 50 ----------------------
 www-apps/grafana-bin/grafana-bin-4.1.1.ebuild      | 50 ----------------------
 ...a-bin-4.2.0.ebuild => grafana-bin-4.3.1.ebuild} | 12 +++++-
 4 files changed, 11 insertions(+), 102 deletions(-)

diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 1c9562d30ab..d8701226838 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -2,3 +2,4 @@ DIST grafana-bin-4.0.1.tar.gz 42179027 SHA256 910327d0d7b7597cb471a697766baea170
 DIST grafana-bin-4.1.1.tar.gz 45019506 SHA256 51464c7569638bbfd7c6a7397c8f5f296c6839a113360ff5f908d454a9643aeb SHA512 74df71c1f4b8d84046ed94447d01a759197486232ff4818a10e5e4656c6fd025c9aa224df8c8f02770a77a7483398c881aebfd40a1da12e8d83d8ec97980d3db WHIRLPOOL b8f8d4c59d49303bdb9f53de9d67481083e41ff2d9be43dab2cacfc6bee742bf310cabba0766c58c80c7d42a7aad7e2633d3e57d4603ea23a1fd4a14faba7e16
 DIST grafana-bin-4.1.2.tar.gz 45024995 SHA256 b8111cd014e9c202dd1b168b924731a140161e9e43e32f3ca7ae18db850af6c4 SHA512 4a0825c99eebb4185036cf5e1fd2ec26ff12913e474ac6014bb677329e1c92ee866be4ff53bd2560d91ebe38d7d7e3ae310e05b221e415046afbafd7a164e3cf WHIRLPOOL 6c4eda846cdd4ff4ef0ef34a0fd3b45da45cbc0aa0fa46d707616809c3fed322146b89678dcd11de2d31bf6ca94efa6afb7cd9f9423b5cac1847da209b7bae6c
 DIST grafana-bin-4.2.0.tar.gz 45741731 SHA256 e9927baaaf6cbcab64892dedd11ccf509e4edea54670db4250b9e7568466ec61 SHA512 8c100f5d61b8ebac2abb3894d3f37e926c6fd81eb3ab68fd966d2bc38d9ec2386fee15dd745f5efe7c0e52de06321f3e983fdab0185b3da3f28562b54c60994f WHIRLPOOL 08d00ab71ae8dba828c98661c4250b5e4a014f75d25b9eb80daee445570b972b2babd6da89f5aba76ca1d32b1d6e71376066c6387d6bb92c1f7299fbc7087d4b
+DIST grafana-bin-4.3.1.tar.gz 47036155 SHA256 c046fa8259a218b10bbba530380361434df04a207f61e2a0185596067ff4659f SHA512 7c91a7cc79edbc82a038fe21e1e993e8426c9a384aef2648522c130b775f13a7aee6e53a8fbb6546be4713b17cf8c210ff09cad29f519dad94b3f9bf670aef77 WHIRLPOOL 3369e6616c6de1efab23dedc2617a64a2c77a758c5f300988d897b35749f5cab4726b2bea6243eb1d837370448cd77aa265e198ef5a1bd5a3954c4f05be96efd

diff --git a/www-apps/grafana-bin/grafana-bin-4.0.1.ebuild b/www-apps/grafana-bin/grafana-bin-4.0.1.ebuild
deleted file mode 100644
index 6c7c80a25b6..00000000000
--- a/www-apps/grafana-bin/grafana-bin-4.0.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit user
-MY_PN=${PN/-bin/}
-MY_PV="4.0.1-1480694114"
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="http://grafana.org"
-SRC_URI="https://grafanarel.s3.amazonaws.com/builds/${MY_PN}-${MY_PV}.linux-x64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=dev-lang/go-1.5
-	net-libs/nodejs
-"
-
-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
-
-	# Frontend assets
-	insinto /usr/share/${MY_PN}
-	doins -r public conf vendor
-
-	dobin bin/grafana-cli
-	dobin bin/grafana-server
-
-	newconfd "${FILESDIR}"/grafana.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd.2 grafana
-
-	keepdir /var/{lib,log}/grafana
-	fowners grafana:grafana /var/{lib,log}/grafana
-	fperms 0750 /var/{lib,log}/grafana
-}

diff --git a/www-apps/grafana-bin/grafana-bin-4.1.1.ebuild b/www-apps/grafana-bin/grafana-bin-4.1.1.ebuild
deleted file mode 100644
index 51a609044a8..00000000000
--- a/www-apps/grafana-bin/grafana-bin-4.1.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit user
-MY_PN=${PN/-bin/}
-MY_PV="4.1.1-1484211277"
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="http://grafana.org"
-SRC_URI="https://grafanarel.s3.amazonaws.com/builds/${MY_PN}-${MY_PV}.linux-x64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=dev-lang/go-1.5
-	net-libs/nodejs
-"
-
-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
-
-	# Frontend assets
-	insinto /usr/share/${MY_PN}
-	doins -r public conf vendor
-
-	dobin bin/grafana-cli
-	dobin bin/grafana-server
-
-	newconfd "${FILESDIR}"/grafana.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd.2 grafana
-
-	keepdir /var/{lib,log}/grafana
-	fowners grafana:grafana /var/{lib,log}/grafana
-	fperms 0750 /var/{lib,log}/grafana
-}

diff --git a/www-apps/grafana-bin/grafana-bin-4.2.0.ebuild b/www-apps/grafana-bin/grafana-bin-4.3.1.ebuild
similarity index 77%
rename from www-apps/grafana-bin/grafana-bin-4.2.0.ebuild
rename to www-apps/grafana-bin/grafana-bin-4.3.1.ebuild
index 51e04d5e97c..3a8308e2d6d 100644
--- a/www-apps/grafana-bin/grafana-bin-4.2.0.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-4.3.1.ebuild
@@ -15,7 +15,6 @@ SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
 DEPEND=""
 RDEPEND="${DEPEND}"
@@ -32,7 +31,7 @@ src_install() {
 	keepdir /etc/grafana
 	insinto /etc/grafana
 	newins "${S}"/conf/sample.ini grafana.ini
-	rm "${S}"/conf/sample.ini
+	rm "${S}"/conf/sample.ini || die
 
 	# Frontend assets
 	insinto /usr/share/${MY_PN}
@@ -52,3 +51,12 @@ src_install() {
 	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."
+}