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

[Thomas Deutschmann]

commit:     77439a6401a71baa4f5531618182b52947c13708
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 00:02:59 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 00:03:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77439a64

www-apps/grafana-bin: bump to v7.1.3

Closes: https://bugs.gentoo.org/701238
Closes: https://bugs.gentoo.org/730336
Bug: https://bugs.gentoo.org/725110
Bug: https://bugs.gentoo.org/726946
Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 www-apps/grafana-bin/grafana-bin-7.1.3.ebuild | 35 +++++++++++----------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/www-apps/grafana-bin/grafana-bin-7.1.3.ebuild b/www-apps/grafana-bin/grafana-bin-7.1.3.ebuild
index 58b22b14471..d666b4c9db3 100644
--- a/www-apps/grafana-bin/grafana-bin-7.1.3.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-7.1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit user systemd
+inherit systemd
 
 MY_PN=${PN/-bin/}
 MY_PV=${PV/_beta/-beta}
@@ -17,19 +17,14 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 
-DEPEND=""
+DEPEND="acct-group/grafana
+	acct-user/grafana"
 RDEPEND="${DEPEND}
 	media-libs/fontconfig"
 
-QA_EXECSTACK="usr/share/grafana/tools/phantomjs/phantomjs"
-QA_PREBUILT="usr/bin/grafana-* ${QA_EXECSTACK}"
+QA_PREBUILT="usr/bin/grafana-*"
 QA_PRESTRIPPED=${QA_PREBUILT}
 
-pkg_setup() {
-	enewgroup grafana
-	enewuser grafana -1 -1 /usr/share/grafana grafana
-}
-
 src_install() {
 	keepdir /etc/grafana
 	insinto /etc/grafana
@@ -43,12 +38,6 @@ src_install() {
 	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
@@ -62,10 +51,14 @@ src_install() {
 }
 
 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."
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		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."
+	fi
 }