www-apps/grafana-bin: fix render image

Reported & patch suggested by Denis Pershin.

Reported-By: Denis Pershin <bazukajo@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11175
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

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 7a42364c3e03c14a6a208f632b7ff01799f6ad5d..7e9781fe83c7a59b9098eb3732ae9847d085e6c5 100644 (file)
--- 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 b252435ffde3604af09cca13f243b336f54c5bcf..f5baddc3529b0c6bdbf12f5683cafa5d71d8bbea 100644 (file)
--- 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