gentoo auto-resync : 10:11:2022 - 03:27:06

5 files changed, 3 insertions, 207 deletions

diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 8621730ef5a4..1fb951e2bf55 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,12 +1,6 @@
 AUX grafana-r1.confd 870 BLAKE2B e222e17f5a14dc48f9bbc922250754d88610a951b1e6230736fffc0624a24a140bd9a9f11c6900e0f57b652ce3f334963ea453a5db5ee667863c6b69acc0f207 SHA512 cb6836ba69b9d1f0c50778823c507eaffd963341edbc4ea5409d0b068cfcecececfacac71e34b1d546a85674f67b12db99f384e5c6aa2186abe86814818d5db1
 AUX grafana.initd 1498 BLAKE2B ac97391c228c09353ef11efb0de37f25802484fbbf71bccedfc9858079ca679ba1567a2a7a40e250ed1fa7477189c30b8c5f175e607b455ae755566a9d89098d SHA512 c3ef1926fabe53728adca6954eb48e8d69c33b4238795e2d0d0406e55e08b3f84760b1abfec556f258af3184e10e6fa116c1b21c704575a54f88050a5266ec87
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
-DIST grafana-bin-8.5.14.tar.gz 77799742 BLAKE2B a4e61135f4eea5e5b06cb75f38de2350f36c2a103dad87d0900c0862c20024345bab6aae78553b0d7e5c10764473c465351a4c7b614b77a5f0af785a05a27087 SHA512 fbf9600184ef425b26144a09e252d4e4301546da5ca471e142a278502e6d3174974dead7bbed58f841c683d7df27fc923c65f79cebdbf0931c1f2def472c82b4
-DIST grafana-bin-9.0.9.tar.gz 79913712 BLAKE2B 9c3a088c5d01a514738dac598e254ef4a10769aecb8a43cc62bab74516337fddd592ac655a9260d661784ed27f14c0ba764de83183a47ed35c98629a9e40c8ea SHA512 dd496f6a52f10c1f579cb5cb13ce92297c3e9a3b2685f0e5d995bf27236ff09c95af662c5613eb4b9d4cf7224995dbb2be27f1a0d63f963f535b281b1be765b6
-DIST grafana-bin-9.1.8.tar.gz 82490356 BLAKE2B 8c6cd47d9de5a3331903566e144d9bbbd876de822d869774c4fab717c05f1b10571af9c3a520d8c1ac319e39b3c8ba444453d7264883749bd5a3b41e6838141e SHA512 6aff45a8ca178c1b0cf42dccf2ec34447c5c3318c7f0e04324c7b4a1a274218cf408ff06f23f423dfdfa24ef63d88e4a25354a87e69b88d383993b0ced282cfc
-DIST grafana-bin-9.2.0.tar.gz 96845048 BLAKE2B 7e1755624232fc316b11c7d37f3cfb6641f79dc92d22405127e98d596c2f4974110ae926715a313602b6d300b121a7621a1ecb6c6ddbfd1e27b2cc763daa6d85 SHA512 ebd74bb144e65b778bbabd7f13ee4a3fb479854a49b1a4ebb1d28cda736edbc8b68bb3e8f44d89f94a5656bf9064b3902b297d8185c2e986d1ce0467efcfbc5b
-EBUILD grafana-bin-8.5.14.ebuild 1802 BLAKE2B ee10580bc8f821fc324e8b3357e968bd5099191e1426d796d053977e7d2dfd8e049cab7ac0516c747308caabf3836b508d4201f0c7db2727c67af9b18e6fafb6 SHA512 b2e1e66d5c57d1d3112c6952c0b322f9542cf20b3bb18b85ecea2eeb3f2758fe74f3bea7823a9af8274c633eeb1232676449484fa9abcae55e958643dbd055ae
-EBUILD grafana-bin-9.0.9.ebuild 1802 BLAKE2B ee10580bc8f821fc324e8b3357e968bd5099191e1426d796d053977e7d2dfd8e049cab7ac0516c747308caabf3836b508d4201f0c7db2727c67af9b18e6fafb6 SHA512 b2e1e66d5c57d1d3112c6952c0b322f9542cf20b3bb18b85ecea2eeb3f2758fe74f3bea7823a9af8274c633eeb1232676449484fa9abcae55e958643dbd055ae
-EBUILD grafana-bin-9.1.8.ebuild 1802 BLAKE2B ee10580bc8f821fc324e8b3357e968bd5099191e1426d796d053977e7d2dfd8e049cab7ac0516c747308caabf3836b508d4201f0c7db2727c67af9b18e6fafb6 SHA512 b2e1e66d5c57d1d3112c6952c0b322f9542cf20b3bb18b85ecea2eeb3f2758fe74f3bea7823a9af8274c633eeb1232676449484fa9abcae55e958643dbd055ae
-EBUILD grafana-bin-9.2.0.ebuild 1802 BLAKE2B ee10580bc8f821fc324e8b3357e968bd5099191e1426d796d053977e7d2dfd8e049cab7ac0516c747308caabf3836b508d4201f0c7db2727c67af9b18e6fafb6 SHA512 b2e1e66d5c57d1d3112c6952c0b322f9542cf20b3bb18b85ecea2eeb3f2758fe74f3bea7823a9af8274c633eeb1232676449484fa9abcae55e958643dbd055ae
+DIST grafana-bin-9.2.4.tar.gz 96905343 BLAKE2B bb4f55e166f01123cbfcd1a940a4a42736195f208578889393d66aad35a42726a95908ad793f84769b5483e3bd0de861c5ce7f1375506d2a616f78c836d263e1 SHA512 094d1d131f22f63d8e96a1a61b52440910cb82a9790b502b30375901fcaf48b8b45db52040c9e43667c96e710266f2df77c0ce6542755656e28f84668210f4e9
+EBUILD grafana-bin-9.2.4.ebuild 1806 BLAKE2B 874e8d2ddc17eca0512231ed58b018230b1a59797820d57a5e7eda97db4f152b7029bf890612a23a1f4cd6d8c7a10e8866eaf5a9d24cd76c62ec2f639e2a0b1e SHA512 bb4063c8c87104da3b55d8c849fc7fb5e1ab68fcf2a087eaf262f6cf6493967281ca72e5ab8dc1850dffe640ab9e87380f8f484e04fe505b8bed92ac851355d5
 MISC metadata.xml 219 BLAKE2B e366b8552425c0b7293381e047210130af3c96a6be5877911f2e3ee77b0c80a475854ec7d59e1a5dea75e9d07cefcb3636947fa0af121357cfe7db12e05e6c34 SHA512 b5fce0d3f0f5fa2729808fad339e6843c6bdf814451d2b65b9b67b4b715194e6de20ad2702c9b5a08d260c97641ab9478d978486e702d85034cfb95d7ceab954
diff --git a/www-apps/grafana-bin/grafana-bin-9.0.9.ebuild b/www-apps/grafana-bin/grafana-bin-9.0.9.ebuild
deleted file mode 100644
index 34a49d80d06a..000000000000
--- a/www-apps/grafana-bin/grafana-bin-9.0.9.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}
-}
-
-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.1.8.ebuild b/www-apps/grafana-bin/grafana-bin-9.1.8.ebuild
deleted file mode 100644
index 34a49d80d06a..000000000000
--- a/www-apps/grafana-bin/grafana-bin-9.1.8.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}
-}
-
-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.2.0.ebuild b/www-apps/grafana-bin/grafana-bin-9.2.0.ebuild
deleted file mode 100644
index 34a49d80d06a..000000000000
--- a/www-apps/grafana-bin/grafana-bin-9.2.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}
-}
-
-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-8.5.14.ebuild b/www-apps/grafana-bin/grafana-bin-9.2.4.ebuild
index 34a49d80d06a..0143a5740601 100644
--- a/www-apps/grafana-bin/grafana-bin-8.5.14.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-9.2.4.ebuild
@@ -52,7 +52,7 @@ src_install() {
 	fperms 0750 /var/lib/grafana/{dashboards,plugins}
 }
 
-postinst() {
+pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		# This is a new installation