gentoo auto-resync : 23:08:2022 - 20:45:29

5 files changed, 12 insertions, 75 deletions

diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 75af66f1ef46..4db1531fd518 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,12 +1,10 @@
 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-7.5.16.tar.gz 52223732 BLAKE2B 58cb72fb432049964bf225e483e0278c055cbce4b6c559f389f8a512d3955a1ad3eae167ca1e80225043a56165b6e9331bde982f81c6db624fb4e60deff4d10a SHA512 c422533467205b2b038372ef1c5f046a9df477b76d0e79511d10286f040647216439d635f6b504ac09c24a9128347bdc5fa9355faae0abe630f7bda98c1c3f7b
-DIST grafana-bin-8.5.3.tar.gz 77677429 BLAKE2B 3f362d3c8815a22c248f405c1f606901980b227e82d67ab3dc0890df2f9b774e37d9fb189b0276483bfbc12d36c47da24e598956f29c2f2738bb9ca7ab617b2c SHA512 05f27b95d9daadb4f2c82a4606407bea0a3bdc6f29e5645ef9ca40533cda617bacc91c7d119c8d133abf180603ed4c881d4c207b83d2e5c19d35bd5ba2c0efd8
-DIST grafana-bin-8.5.6.tar.gz 77787381 BLAKE2B eac943ecd6ee07cd1f0ff639439b337e5923892b0d2b2c8c3e1b95c9f8cf0b71d0b06b6bf8a5ddde0804c58da655a4740ecf9d392505f0d4ea9919c38d8392fc SHA512 a9deb41f60fe47e83ccb45fdd2e5dd6ab3de288ef1caa3147408dedff371a43e3ca0018c1c37e7692abb0a37e7987b1934733e5b636f575012da759d8c93a893
-DIST grafana-bin-9.0.2.tar.gz 79887781 BLAKE2B f86c770d88203f5a4bd6926a8a2a0adf25cc76a5f4038e2ed52d25fdf9f839ddfb870df3fd049d33c8b97844cc2be10ff427af2bfec683b0b11da53cac812caf SHA512 342539b0848daea442d2c70f1237e40a03743dc22114ea08949e5fe40738eda5753ed2bd5cfd2574008b20d3e87e2dce532527a0d7dd07db080bdb24dd845b88
-EBUILD grafana-bin-7.5.16.ebuild 1769 BLAKE2B 5eeb7b9385f4bf3f453f634cadb0b26f16cbafdadae1131652fdae2dcc21243a655403e7f5d222ef254acdb42ba814af82819f5a618c4e0f338bf90c74128404 SHA512 c00131c4f3938c6fa65f227cb012c37f717f1205269216c4eca6df1cf647168aef7ab91483fffa3c464cdaae0f8d030aaed30d7cf51c38498269f57b59b9fa7f
-EBUILD grafana-bin-8.5.3.ebuild 1769 BLAKE2B 5eeb7b9385f4bf3f453f634cadb0b26f16cbafdadae1131652fdae2dcc21243a655403e7f5d222ef254acdb42ba814af82819f5a618c4e0f338bf90c74128404 SHA512 c00131c4f3938c6fa65f227cb012c37f717f1205269216c4eca6df1cf647168aef7ab91483fffa3c464cdaae0f8d030aaed30d7cf51c38498269f57b59b9fa7f
-EBUILD grafana-bin-8.5.6.ebuild 1769 BLAKE2B 5eeb7b9385f4bf3f453f634cadb0b26f16cbafdadae1131652fdae2dcc21243a655403e7f5d222ef254acdb42ba814af82819f5a618c4e0f338bf90c74128404 SHA512 c00131c4f3938c6fa65f227cb012c37f717f1205269216c4eca6df1cf647168aef7ab91483fffa3c464cdaae0f8d030aaed30d7cf51c38498269f57b59b9fa7f
-EBUILD grafana-bin-9.0.2.ebuild 1769 BLAKE2B 5eeb7b9385f4bf3f453f634cadb0b26f16cbafdadae1131652fdae2dcc21243a655403e7f5d222ef254acdb42ba814af82819f5a618c4e0f338bf90c74128404 SHA512 c00131c4f3938c6fa65f227cb012c37f717f1205269216c4eca6df1cf647168aef7ab91483fffa3c464cdaae0f8d030aaed30d7cf51c38498269f57b59b9fa7f
+DIST grafana-bin-8.5.10.tar.gz 77786221 BLAKE2B e55ee8d25f2969c0534bb765856f9d2d05cd1aec85a93eb12a317e0c2275f916ee41013bc48dbf10671b43c27f85e211ce5682631fb58197c677cd0f43542154 SHA512 ede73ee8591497b1855b5a98950914d84ab5dacdaf0d0a061117706352a2baece4c45d72031199764ec81ebfd60de4f52c5610bb2351e3bd8cb4b9232dc8efcb
+DIST grafana-bin-9.0.7.tar.gz 79906083 BLAKE2B adc2dda480ad6510319c6b8c430554980ee7502ad1b980205dffde3715aca2a8ee2f2988dd5f16d2ec6ec1da01900e296942b36ddf07a3bed4383c41f3cb3a02 SHA512 1014e5fbe29a40a16378154bbf17048eee41854e983617846e6d17c0e7a3c9375806e750b4079e234d31bf9658e9fe18b624ff862adc48a6a6319d767f26f290
+DIST grafana-bin-9.1.0.tar.gz 80916961 BLAKE2B 48ce6dfa2213568a33b49bdff135e5705bdd27a37d1654a6a2939b482876914d670ac635a9aa1d16f3be0e6040b92e5b433344650c3dbc46404ce73a7ce3664b SHA512 bbc10da41b3fdecfdf2106787392c72121ed6f11937eb80e9900e611a0af1de7edd3ec1fa8c4a4b2faf0fb34ad55e32b52a8aa7bb34fbab8f4ab2981eabc246d
+EBUILD grafana-bin-8.5.10.ebuild 1783 BLAKE2B 1bad6b42b8558fab4b315bb4cd172c1b4086a27c6944d51bf42bb64ba6dcbaf122e5b70e41c72971d6e602d2e4e5f6fd3378c017acd537c10322eeb7c57128fe SHA512 20d7badd2a36ce3a76493a086c4ad353b3f37717a21eb4207917e547f4d8a1c61ad574afde0833f41ba6547742337713d0c867abea9ec7c05ddb9d8fdc4a0deb
+EBUILD grafana-bin-9.0.7.ebuild 1783 BLAKE2B 1bad6b42b8558fab4b315bb4cd172c1b4086a27c6944d51bf42bb64ba6dcbaf122e5b70e41c72971d6e602d2e4e5f6fd3378c017acd537c10322eeb7c57128fe SHA512 20d7badd2a36ce3a76493a086c4ad353b3f37717a21eb4207917e547f4d8a1c61ad574afde0833f41ba6547742337713d0c867abea9ec7c05ddb9d8fdc4a0deb
+EBUILD grafana-bin-9.1.0.ebuild 1783 BLAKE2B 1bad6b42b8558fab4b315bb4cd172c1b4086a27c6944d51bf42bb64ba6dcbaf122e5b70e41c72971d6e602d2e4e5f6fd3378c017acd537c10322eeb7c57128fe SHA512 20d7badd2a36ce3a76493a086c4ad353b3f37717a21eb4207917e547f4d8a1c61ad574afde0833f41ba6547742337713d0c867abea9ec7c05ddb9d8fdc4a0deb
 MISC metadata.xml 219 BLAKE2B e366b8552425c0b7293381e047210130af3c96a6be5877911f2e3ee77b0c80a475854ec7d59e1a5dea75e9d07cefcb3636947fa0af121357cfe7db12e05e6c34 SHA512 b5fce0d3f0f5fa2729808fad339e6843c6bdf814451d2b65b9b67b4b715194e6de20ad2702c9b5a08d260c97641ab9478d978486e702d85034cfb95d7ceab954
diff --git a/www-apps/grafana-bin/grafana-bin-7.5.16.ebuild b/www-apps/grafana-bin/grafana-bin-8.5.10.ebuild
index b15b8f8775d4..654f61258eec 100644
--- a/www-apps/grafana-bin/grafana-bin-7.5.16.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-8.5.10.ebuild
@@ -13,7 +13,8 @@ DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB &
 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"
+RESTRICT="mirror"
+LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 
diff --git a/www-apps/grafana-bin/grafana-bin-9.0.2.ebuild b/www-apps/grafana-bin/grafana-bin-9.0.2.ebuild
deleted file mode 100644
index b15b8f8775d4..000000000000
--- a/www-apps/grafana-bin/grafana-bin-9.0.2.ebuild
+++ /dev/null
@@ -1,64 +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"
-
-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.5.3.ebuild b/www-apps/grafana-bin/grafana-bin-9.0.7.ebuild
index b15b8f8775d4..654f61258eec 100644
--- a/www-apps/grafana-bin/grafana-bin-8.5.3.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-9.0.7.ebuild
@@ -13,7 +13,8 @@ DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB &
 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"
+RESTRICT="mirror"
+LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 
diff --git a/www-apps/grafana-bin/grafana-bin-8.5.6.ebuild b/www-apps/grafana-bin/grafana-bin-9.1.0.ebuild
index b15b8f8775d4..654f61258eec 100644
--- a/www-apps/grafana-bin/grafana-bin-8.5.6.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-9.1.0.ebuild
@@ -13,7 +13,8 @@ DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB &
 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"
+RESTRICT="mirror"
+LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64"