commit: 8af9c1c0305a69819f92a6193c7cfe624e019676 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Mon Mar 4 01:32:09 2019 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Mon Mar 4 01:32:09 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8af9c1c0
www-apps/grafana-bin: fix render image Reported & patch suggested by Denis Pershin. Reported-By: Denis Pershin <bazukajo <AT> 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 <AT> gentoo.org> ...afana-bin-5.4.3.ebuild => grafana-bin-5.4.3-r1.ebuild} | 15 +++++++++++---- ...afana-bin-6.0.0.ebuild => grafana-bin-6.0.0-r1.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 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 7a42364c3e0..7e9781fe83c 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 b252435ffde..f5baddc3529 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
