From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A2759138334 for ; Mon, 4 Mar 2019 01:36:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2AED0E089D; Mon, 4 Mar 2019 01:36:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E42E1E089F for ; Mon, 4 Mar 2019 01:36:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6C0EC335D40 for ; Mon, 4 Mar 2019 01:36:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 43DDC566 for ; Mon, 4 Mar 2019 01:35:59 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1551663129.8af9c1c0305a69819f92a6193c7cfe624e019676.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/grafana-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-apps/grafana-bin/grafana-bin-5.4.3-r1.ebuild www-apps/grafana-bin/grafana-bin-5.4.3.ebuild www-apps/grafana-bin/grafana-bin-6.0.0-r1.ebuild www-apps/grafana-bin/grafana-bin-6.0.0.ebuild X-VCS-Directories: www-apps/grafana-bin/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 8af9c1c0305a69819f92a6193c7cfe624e019676 X-VCS-Branch: master Date: Mon, 4 Mar 2019 01:35:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f2315228-bdd0-40e5-933f-48ad5c583da3 X-Archives-Hash: 86a5a2596dcef029123e341f29e261e6 commit: 8af9c1c0305a69819f92a6193c7cfe624e019676 Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Mar 4 01:32:09 2019 +0000 Commit: Thomas Deutschmann gentoo 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 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 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