gentoo resync : 05.12.2021

4 files changed, 2 insertions, 134 deletions

diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 1b2c0bce10fc..ade69a1b5852 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -2,11 +2,7 @@ AUX grafana-r1.confd 870 BLAKE2B e222e17f5a14dc48f9bbc922250754d88610a951b1e6230
 AUX grafana.initd 1498 BLAKE2B ac97391c228c09353ef11efb0de37f25802484fbbf71bccedfc9858079ca679ba1567a2a7a40e250ed1fa7477189c30b8c5f175e607b455ae755566a9d89098d SHA512 c3ef1926fabe53728adca6954eb48e8d69c33b4238795e2d0d0406e55e08b3f84760b1abfec556f258af3184e10e6fa116c1b21c704575a54f88050a5266ec87
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
 DIST grafana-bin-7.5.11.tar.gz 52218943 BLAKE2B 5c8faef6ccc5460f33e7b2ba876270739a4ad4a2cc036760e3b5c0f84130bd74895f38df3ab9cbf9b85221f66565b8f526392238585d88bf8d8e643a300f5533 SHA512 fa1c228f5c54a4563268192388a43762fcee90f8093caa25ad656de4ba49444944809c03b7934e7f78aefd642432a1bd5fdb6ce93da2ec0d3f3547c46af8fb6a
-DIST grafana-bin-8.1.6.tar.gz 55983069 BLAKE2B 91c4cba7595e6d0dc303f246907330707f51ee7c7bd0f983cde4a87806e8cd92bb16b5014df7dfa6103ab47bf71f7bf2adb1a55ab3d9d5d01776f72d2c2b27f7 SHA512 84b1186fe5160a6c7d5a7ec5ffb96e4bd0fef821b381b196301910a74890307833a06cd3cb133eb5efb93c49744d4646a6cbd52fa0e1dc87afa8fb41dfbcea73
-DIST grafana-bin-8.1.7.tar.gz 56240059 BLAKE2B 69cc05433c19330521920af1ff1816830a66d098db4fc8999bdc267a438be3a033a827dc06ffec5e8c587c552c1b310048b75706127eecfed52285f2f6f380b1 SHA512 5f32601db056b29ece2dae28b19547a7eb93b2068cf8cf17dfb743a83d326f00689375be7bec3e4fb08d215a3b2387565d338c5943e29e2664ec93482b157494
-DIST grafana-bin-8.2.3.tar.gz 66431029 BLAKE2B 1a62bcb23e5668f2ddaf3ccb210d23a6b7a384be924f749f89ad949112b08a0e3f791c266be7355190abab1006cbd0f5bf4787300c2a1fdccfa0307d82cfeb7b SHA512 0b2a00df2733799ab1ef3e50da2a31025d37f63caa5d1883ac2d350766b6e803cf0fd36b16474d42e645ac08acee67866b523ce4a4b387b02554c0fae1ea4a19
+DIST grafana-bin-8.2.4.tar.gz 67219378 BLAKE2B 59c04a3cbfd5f9da47fd43c255c1c63891dddb81aa30077132a76229ca521f7d2319fc986c522926c8e0a0a9e8893c1784f16af332d95d0553a149c46bcf20c4 SHA512 c4e6f87952dffc7197b8c0e276315a2cfcd4d8437fb19da0b8d240be3261f079d6f6e1bba3d50ff2a3e75677b0f14ea246ddc411f859b46746472aa276ffa1a3
 EBUILD grafana-bin-7.5.11.ebuild 1769 BLAKE2B 3bd77424413b8d75af2c3e1f80320e4da3dcdd64a73a913bc11f967c27aa7aabc6f7d9c7d613bf2e979431f76ca4cac41ef45c3ab89081c1b8ae07533289f37d SHA512 89c164f2a54014d85e1cdaa46b52423c9880d581c7adda836afa787a6d7554f7dc8bd060141503cff1da5751be9cc166defe53aeb21b14fa38727fd6ab6e14dc
-EBUILD grafana-bin-8.1.6.ebuild 1769 BLAKE2B 3bd77424413b8d75af2c3e1f80320e4da3dcdd64a73a913bc11f967c27aa7aabc6f7d9c7d613bf2e979431f76ca4cac41ef45c3ab89081c1b8ae07533289f37d SHA512 89c164f2a54014d85e1cdaa46b52423c9880d581c7adda836afa787a6d7554f7dc8bd060141503cff1da5751be9cc166defe53aeb21b14fa38727fd6ab6e14dc
-EBUILD grafana-bin-8.1.7.ebuild 1769 BLAKE2B 3bd77424413b8d75af2c3e1f80320e4da3dcdd64a73a913bc11f967c27aa7aabc6f7d9c7d613bf2e979431f76ca4cac41ef45c3ab89081c1b8ae07533289f37d SHA512 89c164f2a54014d85e1cdaa46b52423c9880d581c7adda836afa787a6d7554f7dc8bd060141503cff1da5751be9cc166defe53aeb21b14fa38727fd6ab6e14dc
-EBUILD grafana-bin-8.2.3.ebuild 1769 BLAKE2B 3bd77424413b8d75af2c3e1f80320e4da3dcdd64a73a913bc11f967c27aa7aabc6f7d9c7d613bf2e979431f76ca4cac41ef45c3ab89081c1b8ae07533289f37d SHA512 89c164f2a54014d85e1cdaa46b52423c9880d581c7adda836afa787a6d7554f7dc8bd060141503cff1da5751be9cc166defe53aeb21b14fa38727fd6ab6e14dc
+EBUILD grafana-bin-8.2.4.ebuild 1769 BLAKE2B 3bd77424413b8d75af2c3e1f80320e4da3dcdd64a73a913bc11f967c27aa7aabc6f7d9c7d613bf2e979431f76ca4cac41ef45c3ab89081c1b8ae07533289f37d SHA512 89c164f2a54014d85e1cdaa46b52423c9880d581c7adda836afa787a6d7554f7dc8bd060141503cff1da5751be9cc166defe53aeb21b14fa38727fd6ab6e14dc
 MISC metadata.xml 219 BLAKE2B e366b8552425c0b7293381e047210130af3c96a6be5877911f2e3ee77b0c80a475854ec7d59e1a5dea75e9d07cefcb3636947fa0af121357cfe7db12e05e6c34 SHA512 b5fce0d3f0f5fa2729808fad339e6843c6bdf814451d2b65b9b67b4b715194e6de20ad2702c9b5a08d260c97641ab9478d978486e702d85034cfb95d7ceab954
diff --git a/www-apps/grafana-bin/grafana-bin-8.1.7.ebuild b/www-apps/grafana-bin/grafana-bin-8.1.7.ebuild
deleted file mode 100644
index 937332ec5f09..000000000000
--- a/www-apps/grafana-bin/grafana-bin-8.1.7.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="acct-group/grafana
-	acct-user/grafana"
-RDEPEND="${DEPEND}
-	media-libs/fontconfig"
-
-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.2.3.ebuild b/www-apps/grafana-bin/grafana-bin-8.2.3.ebuild
deleted file mode 100644
index 937332ec5f09..000000000000
--- a/www-apps/grafana-bin/grafana-bin-8.2.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="acct-group/grafana
-	acct-user/grafana"
-RDEPEND="${DEPEND}
-	media-libs/fontconfig"
-
-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.1.6.ebuild b/www-apps/grafana-bin/grafana-bin-8.2.4.ebuild
index 937332ec5f09..937332ec5f09 100644
--- a/www-apps/grafana-bin/grafana-bin-8.1.6.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-8.2.4.ebuild