commit: 7f6f2e9b4456669c74284b19985492f649597345
Author: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 08:15:16 2017 +0000
Commit: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 08:15:16 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f6f2e9b
www-apps/grafana-bin: Add 4.4.3 and do some cleanup
Package-Manager: Portage-2.3.8, Repoman-2.3.3
www-apps/grafana-bin/Manifest | 3 +-
www-apps/grafana-bin/files/grafana.initd.2 | 34 ------------
www-apps/grafana-bin/grafana-bin-4.4.1.ebuild | 62 ----------------------
...in-4.2.0-r2.ebuild => grafana-bin-4.4.3.ebuild} | 0
4 files changed, 1 insertion(+), 98 deletions(-)
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 8c36ae2eb8b..f17711ee3ad 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,3 +1,2 @@
-DIST grafana-bin-4.2.0.tar.gz 45741731 SHA256
e9927baaaf6cbcab64892dedd11ccf509e4edea54670db4250b9e7568466ec61 SHA512
8c100f5d61b8ebac2abb3894d3f37e926c6fd81eb3ab68fd966d2bc38d9ec2386fee15dd745f5efe7c0e52de06321f3e983fdab0185b3da3f28562b54c60994f
WHIRLPOOL
08d00ab71ae8dba828c98661c4250b5e4a014f75d25b9eb80daee445570b972b2babd6da89f5aba76ca1d32b1d6e71376066c6387d6bb92c1f7299fbc7087d4b
DIST grafana-bin-4.3.2.tar.gz 47036583 SHA256
0c835229d1dcba43cbb79014ef0782edbd7b58d156a6aa2886a07bb52232666e SHA512
3c941bb589637d7b917794f5e655427ce5516a4dc97d87e696c8c9b7d00604dc147726d14ec8635d9e51f9db82f13748deb28556737568504f16bbf3f8349bab
WHIRLPOOL
fc7b00644c360359583bcd371ab2f0bc0375e8c018707f2887b483b60ca2d03b1cd7d6121b8a7abaa2157d84820de6713f131b08ca98a0aa017e3fad2599b9c5
-DIST grafana-bin-4.4.1.tar.gz 47275422 SHA256
700aa0e5c68129c112f784d63d39102af23d5a247ac97ecab71e0370f43f14aa SHA512
062d9a7586a1d376855129ef9aee914aaae42f1e60ce6d1851f8fdceca61a45a29396274b772fe1c06adb8a55dae631be9a00cbce4e75787562048e36d65056d
WHIRLPOOL
39596546125befdae05e036076a5ac5accd16e0ce7436a06bcb2265149ecf9f7390a3b7069df0ee668170f09df8c569406eeea3bcaa3d0ec943b6fa3099b77dd
+DIST grafana-bin-4.4.3.tar.gz 47282503 SHA256
90d0c53f6a9edb5f6fb5acb58265a167ef41f5b06701301eafc30bafa28566dc SHA512
21eea944931a9d4a7120d6f2e27fb5300f747ba0ff12cc93b160d38133400548701e342e6481e647f4252d34740aa49a7ebbe8c63a2a30a9fa6a057b90deb87a
WHIRLPOOL
d5fffbf9dc21fbb0711335a6234233a95bcd801bc3701e1b1be8b037977a291d77e668e950f6bf2c7f848c2395ccfe424b9abf97062f8d1b08b3b676e24f0f81
diff --git a/www-apps/grafana-bin/files/grafana.initd.2
b/www-apps/grafana-bin/files/grafana.initd.2
deleted file mode 100644
index 13dd8ff8fdc..00000000000
--- a/www-apps/grafana-bin/files/grafana.initd.2
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need localmount
-}
-
-start() {
- ebegin "Starting grafana server"
-
- start-stop-daemon --start -b \
- --make-pidfile \
- --pidfile /run/grafana.pid \
- --chdir /usr/share/grafana \
- --user ${GRAFANA_USER}:${GRAFANA_GROUP} \
- --exec /usr/bin/grafana-server -- \
- -config=/etc/grafana/grafana.ini \
- cfg:default.paths.data=/var/lib/grafana \
- cfg:default.paths.logs=/var/log/grafana
-
- eend $?
-}
-
-stop() {
- ebegin "Stopping grafana server"
-
- start-stop-daemon --stop \
- --pidfile /run/grafana.pid \
- --user "${GRAFANA_USER}" \
- --retry=TERM/20/KILL/5
-
- eend $?
-}
diff --git a/www-apps/grafana-bin/grafana-bin-4.4.1.ebuild
b/www-apps/grafana-bin/grafana-bin-4.4.1.ebuild
deleted file mode 100644
index 3a8308e2d6d..00000000000
--- a/www-apps/grafana-bin/grafana-bin-4.4.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit user systemd
-
-MY_PN=${PN/-bin/}
-S=${WORKDIR}/${MY_PN}-${PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB
& OpenTSDB"
-HOMEPAGE="http://grafana.org";
-SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${PV}.linux-x64.tar.gz
-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs"
-QA_PRESTRIPPED=${QA_EXECSTACK}
-
-pkg_setup() {
- enewgroup grafana
- enewuser grafana -1 -1 /usr/share/grafana grafana
-}
-
-src_install() {
- keepdir /etc/grafana
- insinto /etc/grafana
- newins "${S}"/conf/sample.ini grafana.ini
- rm "${S}"/conf/sample.ini || die
-
- # Frontend assets
- insinto /usr/share/${MY_PN}
- doins -r public conf vendor
-
- dobin bin/grafana-cli
- dobin bin/grafana-server
-
- newconfd "${FILESDIR}"/grafana.confd grafana
- newinitd "${FILESDIR}"/grafana.initd.3 grafana
- systemd_newunit "${FILESDIR}"/grafana.service grafana.service
-
- keepdir /var/{lib,log}/grafana
- keepdir /var/lib/grafana/{dashboards,plugins}
- fowners grafana:grafana /var/{lib,log}/grafana
- fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
- fperms 0750 /var/{lib,log}/grafana
- fperms 0750 /var/lib/grafana/{dashboards,plugins}
-}
-
-postinst() {
- elog "${PN} has built-in log rotation. Please see [log.file] section of"
- elog "/etc/grafana/grafana.ini for related settings."
- elog
- elog "You may add your own custom configuration for app-admin/logrotate
if you"
- elog "wish to use external rotation of logs. In this case, you also
need to make"
- elog "sure the built-in rotation is turned off."
-}
diff --git a/www-apps/grafana-bin/grafana-bin-4.2.0-r2.ebuild
b/www-apps/grafana-bin/grafana-bin-4.4.3.ebuild
similarity index 100%
rename from www-apps/grafana-bin/grafana-bin-4.2.0-r2.ebuild
rename to www-apps/grafana-bin/grafana-bin-4.4.3.ebuild
