commit: 19fbe71dc67a48543f3a86cbce9b3405e1070bdc Author: Patrick Lauer <patrick <AT> gentoo <DOT> org> AuthorDate: Mon Mar 27 04:55:17 2023 +0000 Commit: 罗百科 <patrick <AT> gentoo <DOT> org> CommitDate: Mon Mar 27 04:55:17 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19fbe71d
www-apps/grafana-bin: Add 9.3.11 9.4.7 Also remove old Bug: https://bugs.gentoo.org/903143 Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org> www-apps/grafana-bin/Manifest | 7 +-- www-apps/grafana-bin/files/grafana.initd | 36 ------------ www-apps/grafana-bin/grafana-bin-9.3.0.ebuild | 66 ---------------------- ...n-9.3.8-r1.ebuild => grafana-bin-9.3.11.ebuild} | 0 www-apps/grafana-bin/grafana-bin-9.3.2.ebuild | 66 ---------------------- www-apps/grafana-bin/grafana-bin-9.3.6.ebuild | 66 ---------------------- ...in-9.4.3-r1.ebuild => grafana-bin-9.4.7.ebuild} | 0 7 files changed, 2 insertions(+), 239 deletions(-) diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest index 4dce2f7eaa7f..91c6b9c62b83 100644 --- a/www-apps/grafana-bin/Manifest +++ b/www-apps/grafana-bin/Manifest @@ -1,5 +1,2 @@ -DIST grafana-bin-9.3.0.tar.gz 88847005 BLAKE2B 4c37dc077b7f9fb8f9256a2a85094eef5ae2dabe693d039b7c5509ec2662ec544d307dc1cf0043301fb4c3525107bddfac0a7f7a67f0efb8b333936c1b96192d SHA512 1489d3f948259dd3db6403e95f176fea664cb5bfc83a6f22e57ffbe075cc07257a463c4b1d1fd8aa94fbad5473b29608f0c3fc6fdf0c08bcb72f3beeff5163c7 -DIST grafana-bin-9.3.2.tar.gz 89322650 BLAKE2B b9256b6468aa4eff1d77a7bce1f701ab61a372baf2f239572921b04a5624933e57c881035de9a0a86a5ff17b942e2965a7807ae2c183a60cfabb4bd4bf546acb SHA512 9d13624f728b5f5845c9780372b9334d81faadf03b47034b0de708fe87e50db3daff95f61e5649548cf6a4181253cc39f6d523dde5651833e72df42fe3577f16 -DIST grafana-bin-9.3.6.tar.gz 89397564 BLAKE2B 1095be4f4fd4cedb70ddc0500b7ec84466d6db5a9be8154e5675fa47cdef0082cd57f5c03e0035f84989e639df2f30ced644c270b0d1189d7a00c54f5dd8ca66 SHA512 2619a6fef8bfaafdd45469198b7b7542def77d795e9c58a03a0308cce1e21db0dda936966a098e750304e6cc5a3576ba059d13aad0fd5f59ca24cf3074dba921 -DIST grafana-bin-9.3.8.tar.gz 69932750 BLAKE2B 57c1ad7910145f81b552cdb68fb835bfa0de45c73f69cdff9fdc6565827d73c957513bb02aba31871895d641457c8dc68e19689af4b476ff659d1ab2b84d67dd SHA512 4e321d007011452dac57daf0dfad55430f46b96f04be7d4f779809900c2dd81b3817123419c9570c84eb9496e3bd38f73af4a63a6c00e95a9d6c252afeda1ccf -DIST grafana-bin-9.4.3.tar.gz 83780585 BLAKE2B b8b609bb701b63262e0b70e551b608e4923721664a40ce4eb91a50c60f0978f93c53dd05d5e0e7758ecd7a38f3a459cf695175912c5806f6cfda3e4109114c7e SHA512 bd315ab4ddd52ad7d9cbf81bce9d04fb00fdf418d2148c84385a47649b76df3e2f36c5664692bfe99038b6f4a280176152d508627f57b7f4402767c03f73f7a6 +DIST grafana-bin-9.3.11.tar.gz 70182266 BLAKE2B dd1a1eb95cfe356a77975fdb5af75b8f4a6f5b0b9f3245311b269911061e25a8b07c55e13e9f2364328c847170813e1dfdf8bf27108e7423a6969ff23bc1bf11 SHA512 47ce7f321e94495fd53c2fa292edd63ecf75bcd7dd1e5dd67d78fe9cb28e4ae423da5e7071b57ecaacbe6cf7b4ce6cd321022a61eca4c2e083e68729de1e5bf1 +DIST grafana-bin-9.4.7.tar.gz 83744269 BLAKE2B a34d1e0761b6e16673ac8d4ad0e25cb6caadde06af0986053cb455edd143cc5aa6b70672e43afd6c1381658136ce2243e03ef871416969a26e346a99e1ddbb11 SHA512 7511bdb68e9a3c15e318a7d0d98b3b9df4c8827793498aadd45a12aac92646a8888ab8c1b6d97422b6473553ab62d8f0dcb9e797d9c3df150a877e61182fca32 diff --git a/www-apps/grafana-bin/files/grafana.initd b/www-apps/grafana-bin/files/grafana.initd deleted file mode 100644 index ec72725100f8..000000000000 --- a/www-apps/grafana-bin/files/grafana.initd +++ /dev/null @@ -1,36 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -GRAFANA_USER="${GRAFANA_USER:-"grafana"}" -GRAFANA_GROUP="${GRAFANA_GROUP:-"grafana"}" -GRAFANA_CONFIGFILE="${GRAFANA_CONFIGFILE:-"/etc/grafana/${RC_SVCNAME}.ini"}" -GRAFANA_DATADIR="${GRAFANA_DATADIR:-"/var/lib/grafana"}" -GRAFANA_LOGDIR="${GRAFANA_LOGDIR:-"/var/log/grafana"}" -GRAFANA_PIDFILE="${GRAFANA_PIDFILE:-"/run/${RC_SVCNAME}.pid"}" -GRAFANA_SSDARGS=${GRAFANA_SSDARGS:-"--wait 1000"} -GRAFANA_TERMTIMEOUT=${GRFANA_TERMTIMEOUT:-"TERM/60/KILL/5"} - -command="/usr/bin/grafana-server" -command_args="-homepath=/usr/share/grafana" -command_args="${command_args} -config=\"${GRAFANA_CONFIGFILE}\"" -command_args="${command_args} cfg:default.paths.data=\"${GRAFANA_DATADIR}\"" -command_args="${command_args} cfg:default.paths.logs=\"${GRAFANA_LOGDIR}\"" -command_background="yes" -pidfile="${GRAFANA_PIDFILE}" -retry="${GRAFANA_TERMTIMEOUT}" -start_stop_daemon_args="--user ${GRAFANA_USER}:${GRAFANA_GROUP} ${GRAFANA_SSDARGS}" - -description="Grafana server, feature rich metrics dashboard and graph editor." - -required_files="${GRAFANA_CONFIGFILE}" - -depend() { - need localmount -} - -start_pre() { - checkpath -d -o "${GRAFANA_USER}:${GRAFANA_GROUP}" -m750 "${GRAFANA_DATADIR}" || return 1 - checkpath -d -o "${GRAFANA_USER}:${GRAFANA_GROUP}" -m750 "${GRAFANA_DATADIR}/dashboards" || return 1 - checkpath -d -o "${GRAFANA_USER}:${GRAFANA_GROUP}" -m750 "${GRAFANA_DATADIR}/plugins" || return 1 -} diff --git a/www-apps/grafana-bin/grafana-bin-9.3.0.ebuild b/www-apps/grafana-bin/grafana-bin-9.3.0.ebuild deleted file mode 100644 index 0143a5740601..000000000000 --- a/www-apps/grafana-bin/grafana-bin-9.3.0.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd - -MY_PN=${PN/-bin/} -MY_PV=${PV/_beta/-beta} -S=${WORKDIR}/${MY_PN}-${MY_PV} - -DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB" -HOMEPAGE="https://grafana.org"; -SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz" - -RESTRICT="mirror" -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="-* ~amd64" - -DEPEND="acct-group/grafana - acct-user/grafana" -RDEPEND="${DEPEND} - media-libs/fontconfig - sys-libs/glibc" - -QA_PREBUILT="usr/bin/grafana-*" -QA_PRESTRIPPED=${QA_PREBUILT} - -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 - - dobin bin/grafana-cli - dobin bin/grafana-server - - newconfd "${FILESDIR}"/grafana-r1.confd grafana - newinitd "${FILESDIR}"/grafana.initd 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} -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - - 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." - fi -} diff --git a/www-apps/grafana-bin/grafana-bin-9.3.8-r1.ebuild b/www-apps/grafana-bin/grafana-bin-9.3.11.ebuild similarity index 100% rename from www-apps/grafana-bin/grafana-bin-9.3.8-r1.ebuild rename to www-apps/grafana-bin/grafana-bin-9.3.11.ebuild diff --git a/www-apps/grafana-bin/grafana-bin-9.3.2.ebuild b/www-apps/grafana-bin/grafana-bin-9.3.2.ebuild deleted file mode 100644 index 0e8aae35965c..000000000000 --- a/www-apps/grafana-bin/grafana-bin-9.3.2.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd - -MY_PN=${PN/-bin/} -MY_PV=${PV/_beta/-beta} -S=${WORKDIR}/${MY_PN}-${MY_PV} - -DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB" -HOMEPAGE="https://grafana.org"; -SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz" - -RESTRICT="mirror" -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="-* ~amd64" - -DEPEND="acct-group/grafana - acct-user/grafana" -RDEPEND="${DEPEND} - media-libs/fontconfig - sys-libs/glibc" - -QA_PREBUILT="usr/bin/grafana-*" -QA_PRESTRIPPED=${QA_PREBUILT} - -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 - - dobin bin/grafana-cli - dobin bin/grafana-server - - newconfd "${FILESDIR}"/grafana-r1.confd grafana - newinitd "${FILESDIR}"/grafana.initd 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} -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - - 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." - fi -} diff --git a/www-apps/grafana-bin/grafana-bin-9.3.6.ebuild b/www-apps/grafana-bin/grafana-bin-9.3.6.ebuild deleted file mode 100644 index 0e8aae35965c..000000000000 --- a/www-apps/grafana-bin/grafana-bin-9.3.6.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd - -MY_PN=${PN/-bin/} -MY_PV=${PV/_beta/-beta} -S=${WORKDIR}/${MY_PN}-${MY_PV} - -DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB" -HOMEPAGE="https://grafana.org"; -SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz" - -RESTRICT="mirror" -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="-* ~amd64" - -DEPEND="acct-group/grafana - acct-user/grafana" -RDEPEND="${DEPEND} - media-libs/fontconfig - sys-libs/glibc" - -QA_PREBUILT="usr/bin/grafana-*" -QA_PRESTRIPPED=${QA_PREBUILT} - -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 - - dobin bin/grafana-cli - dobin bin/grafana-server - - newconfd "${FILESDIR}"/grafana-r1.confd grafana - newinitd "${FILESDIR}"/grafana.initd 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} -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - - 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." - fi -} diff --git a/www-apps/grafana-bin/grafana-bin-9.4.3-r1.ebuild b/www-apps/grafana-bin/grafana-bin-9.4.7.ebuild similarity index 100% rename from www-apps/grafana-bin/grafana-bin-9.4.3-r1.ebuild rename to www-apps/grafana-bin/grafana-bin-9.4.7.ebuild
