From 8af9c1c0305a69819f92a6193c7cfe624e019676 Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Mon, 4 Mar 2019 02:32:09 +0100 Subject: www-apps/grafana-bin: fix render image Reported & patch suggested by Denis Pershin. Reported-By: Denis Pershin Closes: https://github.com/gentoo/gentoo/pull/11175 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann --- www-apps/grafana-bin/grafana-bin-5.4.3-r1.ebuild | 70 +++++++++++++++++++++++ www-apps/grafana-bin/grafana-bin-5.4.3.ebuild | 63 --------------------- www-apps/grafana-bin/grafana-bin-6.0.0-r1.ebuild | 71 ++++++++++++++++++++++++ www-apps/grafana-bin/grafana-bin-6.0.0.ebuild | 64 --------------------- 4 files changed, 141 insertions(+), 127 deletions(-) create mode 100644 www-apps/grafana-bin/grafana-bin-5.4.3-r1.ebuild delete mode 100644 www-apps/grafana-bin/grafana-bin-5.4.3.ebuild create mode 100644 www-apps/grafana-bin/grafana-bin-6.0.0-r1.ebuild delete mode 100644 www-apps/grafana-bin/grafana-bin-6.0.0.ebuild (limited to 'www-apps/grafana-bin') diff --git a/www-apps/grafana-bin/grafana-bin-5.4.3-r1.ebuild b/www-apps/grafana-bin/grafana-bin-5.4.3-r1.ebuild new file mode 100644 index 000000000000..7e9781fe83c7 --- /dev/null +++ b/www-apps/grafana-bin/grafana-bin-5.4.3-r1.ebuild @@ -0,0 +1,70 @@ +# 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/} +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}-${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-5.4.3.ebuild b/www-apps/grafana-bin/grafana-bin-5.4.3.ebuild deleted file mode 100644 index 7a42364c3e03..000000000000 --- a/www-apps/grafana-bin/grafana-bin-5.4.3.ebuild +++ /dev/null @@ -1,63 +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/} -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}-${PV}.linux-amd64.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_PREBUILT="usr/bin/grafana-*" -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." -} diff --git a/www-apps/grafana-bin/grafana-bin-6.0.0-r1.ebuild b/www-apps/grafana-bin/grafana-bin-6.0.0-r1.ebuild new file mode 100644 index 000000000000..f5baddc3529b --- /dev/null +++ b/www-apps/grafana-bin/grafana-bin-6.0.0-r1.ebuild @@ -0,0 +1,71 @@ +# 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.ebuild b/www-apps/grafana-bin/grafana-bin-6.0.0.ebuild deleted file mode 100644 index b252435ffde3..000000000000 --- a/www-apps/grafana-bin/grafana-bin-6.0.0.ebuild +++ /dev/null @@ -1,64 +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}" - -QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs" -QA_PREBUILT="usr/bin/grafana-*" -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." -} -- cgit v1.2.3-65-gdbad