From 8af9c1c0305a69819f92a6193c7cfe624e019676 Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Mon, 4 Mar 2019 02:32:09 +0100 Subject: [PATCH] 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 --- ...n-5.4.3.ebuild => grafana-bin-5.4.3-r1.ebuild} | 15 +++++++++++---- ...n-6.0.0.ebuild => grafana-bin-6.0.0-r1.ebuild} | 15 +++++++++++---- 2 files changed, 22 insertions(+), 8 deletions(-) rename www-apps/grafana-bin/{grafana-bin-5.4.3.ebuild => grafana-bin-5.4.3-r1.ebuild} (82%) rename www-apps/grafana-bin/{grafana-bin-6.0.0.ebuild => grafana-bin-6.0.0-r1.ebuild} (83%) diff --git a/www-apps/grafana-bin/grafana-bin-5.4.3.ebuild b/www-apps/grafana-bin/grafana-bin-5.4.3-r1.ebuild similarity index 82% rename from www-apps/grafana-bin/grafana-bin-5.4.3.ebuild rename to www-apps/grafana-bin/grafana-bin-5.4.3-r1.ebuild index 7a42364c3e03..7e9781fe83c7 100644 --- a/www-apps/grafana-bin/grafana-bin-5.4.3.ebuild +++ b/www-apps/grafana-bin/grafana-bin-5.4.3-r1.ebuild @@ -17,11 +17,12 @@ SLOT="0" KEYWORDS="amd64" DEPEND="" -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + media-libs/fontconfig" -QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs" -QA_PREBUILT="usr/bin/grafana-*" -QA_PRESTRIPPED=${QA_EXECSTACK} +QA_EXECSTACK="usr/share/grafana/tools/phantomjs/phantomjs" +QA_PREBUILT="usr/bin/grafana-* ${QA_EXECSTACK}" +QA_PRESTRIPPED=${QA_PREBUILT} pkg_setup() { enewgroup grafana @@ -41,6 +42,12 @@ 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 diff --git a/www-apps/grafana-bin/grafana-bin-6.0.0.ebuild b/www-apps/grafana-bin/grafana-bin-6.0.0-r1.ebuild similarity index 83% rename from www-apps/grafana-bin/grafana-bin-6.0.0.ebuild rename to www-apps/grafana-bin/grafana-bin-6.0.0-r1.ebuild index b252435ffde3..f5baddc3529b 100644 --- a/www-apps/grafana-bin/grafana-bin-6.0.0.ebuild +++ b/www-apps/grafana-bin/grafana-bin-6.0.0-r1.ebuild @@ -18,11 +18,12 @@ SLOT="0" KEYWORDS="~amd64" DEPEND="" -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + media-libs/fontconfig" -QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs" -QA_PREBUILT="usr/bin/grafana-*" -QA_PRESTRIPPED=${QA_EXECSTACK} +QA_EXECSTACK="usr/share/grafana/tools/phantomjs/phantomjs" +QA_PREBUILT="usr/bin/grafana-* ${QA_EXECSTACK}" +QA_PRESTRIPPED=${QA_PREBUILT} pkg_setup() { enewgroup grafana @@ -42,6 +43,12 @@ 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 -- 2.26.2