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

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

commit:     a444883a44c8b7b474430f3ac1499c0f991e6583
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  6 07:23:59 2017 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Thu Jul  6 07:23:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a444883a

www-apps/grafana-bin: Add v4.4.1, drop 4.1.2

 www-apps/grafana-bin/Manifest                 |  1 +
 www-apps/grafana-bin/grafana-bin-4.1.2.ebuild | 50 ---------------------
 www-apps/grafana-bin/grafana-bin-4.4.1.ebuild | 62 +++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 50 deletions(-)

diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 002dcad179b..6cf3dc30d73 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,3 +1,4 @@
 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.2.tar.gz 47036583 SHA256 0c835229d1dcba43cbb79014ef0782edbd7b58d156a6aa2886a07bb52232666e SHA512 3c941bb589637d7b917794f5e655427ce5516a4dc97d87e696c8c9b7d00604dc147726d14ec8635d9e51f9db82f13748deb28556737568504f16bbf3f8349bab WHIRLPOOL fc7b00644c360359583bcd371ab2f0bc0375e8c018707f2887b483b60ca2d03b1cd7d6121b8a7abaa2157d84820de6713f131b08ca98a0aa017e3fad2599b9c5
+DIST grafana-bin-4.4.1.tar.gz 47275422 SHA256 700aa0e5c68129c112f784d63d39102af23d5a247ac97ecab71e0370f43f14aa SHA512 062d9a7586a1d376855129ef9aee914aaae42f1e60ce6d1851f8fdceca61a45a29396274b772fe1c06adb8a55dae631be9a00cbce4e75787562048e36d65056d WHIRLPOOL 39596546125befdae05e036076a5ac5accd16e0ce7436a06bcb2265149ecf9f7390a3b7069df0ee668170f09df8c569406eeea3bcaa3d0ec943b6fa3099b77dd

diff --git a/www-apps/grafana-bin/grafana-bin-4.1.2.ebuild b/www-apps/grafana-bin/grafana-bin-4.1.2.ebuild
deleted file mode 100644
index 73721d0c82c..00000000000
--- a/www-apps/grafana-bin/grafana-bin-4.1.2.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.2-1486989747"
-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.4.1.ebuild b/www-apps/grafana-bin/grafana-bin-4.4.1.ebuild
new file mode 100644
index 00000000000..3a8308e2d6d
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-4.4.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit user systemd
+
+MY_PN=${PN/-bin/}
+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_PN}-${PV}.linux-x64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+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 vendor
+
+	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."
+}