gentoo resync : 25.11.2020

3 files changed, 18 insertions, 25 deletions

diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index e13b3f46fbde..b6a40424ac36 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,8 +1,8 @@
 AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e871a86738f21b8b3ee68caf1e2b437343f739564dac5ef91db5dcb6b2f31b49a936f9d4e6a62cca4 SHA512 13b9868a4c0a5a7209e6f4aa1206a93a0fb33b0234c4c0a6942bdab9d1cf139049181c066e01c49f639165ea422259fa7cab9e0bdf21537b3722bd86691d9b2c
 AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743e94fc59f76ef77220610d2fd02950ad0157b9ebbfd8380a489cd0da33b5b25102fbaa936c1212e2f SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
-DIST grafana-bin-6.7.4.tar.gz 65083442 BLAKE2B c619432325ac5254c78ec08579f048483dfd1b28fbf8a9b919517277ad887b238f953ba796366af5c9f29a53daeade160c55a2255cfe75bf767b4ddd57474f87 SHA512 fe412966558529f114b70a5cb42f82c37dce67b2b04739ddba0d9821a3e12a5f1e44757df19d283a9b486737a411ca759adab9beaca6d0f14259945675218df4
-DIST grafana-bin-7.1.3.tar.gz 52611015 BLAKE2B 15f66a1cbe1669df4ae6b14347c4a7df8825780b9f01c090e3facea6ebbc375a79d25a50c8047a91c96d3d0f3c05800159dc40c9d4df3a6c9e7405a006ee6c11 SHA512 556211cd2d32068c0f6be6ea8c88144dc2d7c3577c2ab8661cc4f4d330a7c62df7fc98e3d222a7693d1b1d92207af694514faa1c3c2d5507780fdba731bd0bf8
-EBUILD grafana-bin-6.7.4.ebuild 1969 BLAKE2B b871590d26c2be2d591be5a35c4b06ed5f3a820315f9661bbe1da3fe4f6c369987b7a51afc73456fcd10c08e26aee07bd5116b69075add4ddb07bb76a9f289a3 SHA512 c7091e34535a4fbedda19751d7a8ce7497ba6c00a5957d85130c6eed881d57a2d40ff0188aa3b632c1c42ac9b6ba9ebe6a9a073f2be6c4f20c401c4e5c592f2e
-EBUILD grafana-bin-7.1.3.ebuild 1768 BLAKE2B 23986d4f829d0bcddc32ff228a71e3855652f0d990222d307d25b5e17cd96c6dee2680654d6538178c9197bafd777eec7c0b7da14b12d2bcd45d13684c12767d SHA512 ec778d6f7768395692eb0db5287b9c8203b73bad269a8109fb71b462987732bafbf39995ac6c18753042a6245773c8b0bf870cb51af6437651f0d857bf39cadd
+DIST grafana-bin-7.3.1.tar.gz 53950606 BLAKE2B 16e0253371cb267876772e788e00d2330c664e3f0fea7f3891dbf5d4300e0baf99dd626ac2801201fda87f967d0013a151c672b341179e355acd43430f51acaa SHA512 0436b5bec58e52582542bb1efe7825ffc7abd5289d82916c6a54c6aee77a7350060ef877734b32332a5f3935cf1a3404b670e5f9344a8bb9b5c91d95ad81e214
+DIST grafana-bin-7.3.3.tar.gz 53921906 BLAKE2B 7fff1f6d1ef833815011505ec712e625fca59718ecdc8855bf5495c252b76f7d3dfe7ef28b6c66bd219750817c03a55921e6658c318ec3a227531641e9eb489a SHA512 0b982ac893f31c898865349f41efcb60ccf5789108d573677d9f33a5baf3cb532a8e80704bbd00154062de4d201a3e203f58569f1fd291fec2edfc0a2f434dfb
+EBUILD grafana-bin-7.3.1.ebuild 1768 BLAKE2B 23986d4f829d0bcddc32ff228a71e3855652f0d990222d307d25b5e17cd96c6dee2680654d6538178c9197bafd777eec7c0b7da14b12d2bcd45d13684c12767d SHA512 ec778d6f7768395692eb0db5287b9c8203b73bad269a8109fb71b462987732bafbf39995ac6c18753042a6245773c8b0bf870cb51af6437651f0d857bf39cadd
+EBUILD grafana-bin-7.3.3.ebuild 1768 BLAKE2B 23986d4f829d0bcddc32ff228a71e3855652f0d990222d307d25b5e17cd96c6dee2680654d6538178c9197bafd777eec7c0b7da14b12d2bcd45d13684c12767d SHA512 ec778d6f7768395692eb0db5287b9c8203b73bad269a8109fb71b462987732bafbf39995ac6c18753042a6245773c8b0bf870cb51af6437651f0d857bf39cadd
 MISC metadata.xml 218 BLAKE2B 2189d142b4baed0b8edb49fcc98f7397610a257a4cb5f87873272b284f84290420f0950c8b41d1d050ca7a1e0486c6e00344672a3f0479d1d382c14bf7f18485 SHA512 882f7787b97aa780dd3ba4112b9e1dcc84986e2a17704cba9a557ec3a3f9211bcf93532b92d42f60157b56b457ee9ee17e5409066230e54d48931b91bd6786cd
diff --git a/www-apps/grafana-bin/grafana-bin-7.1.3.ebuild b/www-apps/grafana-bin/grafana-bin-7.3.1.ebuild
index d666b4c9db30..d666b4c9db30 100644
--- a/www-apps/grafana-bin/grafana-bin-7.1.3.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-7.3.1.ebuild
diff --git a/www-apps/grafana-bin/grafana-bin-6.7.4.ebuild b/www-apps/grafana-bin/grafana-bin-7.3.3.ebuild
index 58b22b14471e..d666b4c9db30 100644
--- a/www-apps/grafana-bin/grafana-bin-6.7.4.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-7.3.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit user systemd
+inherit systemd
 
 MY_PN=${PN/-bin/}
 MY_PV=${PV/_beta/-beta}
@@ -17,19 +17,14 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 
-DEPEND=""
+DEPEND="acct-group/grafana
+	acct-user/grafana"
 RDEPEND="${DEPEND}
 	media-libs/fontconfig"
 
-QA_EXECSTACK="usr/share/grafana/tools/phantomjs/phantomjs"
-QA_PREBUILT="usr/bin/grafana-* ${QA_EXECSTACK}"
+QA_PREBUILT="usr/bin/grafana-*"
 QA_PRESTRIPPED=${QA_PREBUILT}
 
-pkg_setup() {
-	enewgroup grafana
-	enewuser grafana -1 -1 /usr/share/grafana grafana
-}
-
 src_install() {
 	keepdir /etc/grafana
 	insinto /etc/grafana
@@ -43,12 +38,6 @@ src_install() {
 	dobin bin/grafana-cli
 	dobin bin/grafana-server
 
-	exeinto /usr/share/grafana/tools/phantomjs
-	doexe tools/phantomjs/phantomjs
-
-	insinto /usr/share/grafana/tools/phantomjs
-	doins tools/phantomjs/render.js
-
 	newconfd "${FILESDIR}"/grafana.confd grafana
 	newinitd "${FILESDIR}"/grafana.initd.3 grafana
 	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
@@ -62,10 +51,14 @@ src_install() {
 }
 
 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."
+	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
 }