diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2019-03-04 02:32:09 +0100 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2019-03-04 02:32:09 +0100 |
| commit | 8af9c1c0305a69819f92a6193c7cfe624e019676 (patch) | |
| tree | c21145fb5801e63d93e88557e0c661a8dafed0a0 /www-apps | |
| parent | www-servers/nginx-unit: upstream release 1.8.0 (diff) | |
| download | gentoo-8af9c1c0305a69819f92a6193c7cfe624e019676.tar.gz gentoo-8af9c1c0305a69819f92a6193c7cfe624e019676.tar.bz2 gentoo-8af9c1c0305a69819f92a6193c7cfe624e019676.zip | |
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>
Diffstat (limited to 'www-apps')
| -rw-r--r-- | www-apps/grafana-bin/grafana-bin-5.4.3-r1.ebuild (renamed from www-apps/grafana-bin/grafana-bin-5.4.3.ebuild) | 15 | ||||
| -rw-r--r-- | www-apps/grafana-bin/grafana-bin-6.0.0-r1.ebuild (renamed from www-apps/grafana-bin/grafana-bin-6.0.0.ebuild) | 15 |
2 files changed, 22 insertions, 8 deletions
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 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 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 |