gentoo resync : 03.03.2021

8 files changed, 69 insertions, 268 deletions

diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 4c0813bf1440..d9afc6dc5ad5 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,16 +1,10 @@
+AUX grafana-r1.confd 870 BLAKE2B e222e17f5a14dc48f9bbc922250754d88610a951b1e6230736fffc0624a24a140bd9a9f11c6900e0f57b652ce3f334963ea453a5db5ee667863c6b69acc0f207 SHA512 cb6836ba69b9d1f0c50778823c507eaffd963341edbc4ea5409d0b068cfcecececfacac71e34b1d546a85674f67b12db99f384e5c6aa2186abe86814818d5db1
 AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e871a86738f21b8b3ee68caf1e2b437343f739564dac5ef91db5dcb6b2f31b49a936f9d4e6a62cca4 SHA512 13b9868a4c0a5a7209e6f4aa1206a93a0fb33b0234c4c0a6942bdab9d1cf139049181c066e01c49f639165ea422259fa7cab9e0bdf21537b3722bd86691d9b2c
+AUX grafana.initd 1498 BLAKE2B ac97391c228c09353ef11efb0de37f25802484fbbf71bccedfc9858079ca679ba1567a2a7a40e250ed1fa7477189c30b8c5f175e607b455ae755566a9d89098d SHA512 c3ef1926fabe53728adca6954eb48e8d69c33b4238795e2d0d0406e55e08b3f84760b1abfec556f258af3184e10e6fa116c1b21c704575a54f88050a5266ec87
 AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743e94fc59f76ef77220610d2fd02950ad0157b9ebbfd8380a489cd0da33b5b25102fbaa936c1212e2f SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
-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
-DIST grafana-bin-7.3.4.tar.gz 53996284 BLAKE2B c84efcfc0bd6229dbceb364acb418ded4e20158563253d6dc1937cf14a3bf2a4a06a1694e8f2baa2099221d14d64f09437454cdf81cf3f62299ffa0c4178b5d7 SHA512 0bf2e1e199bc2c520a3218b0691c7743ff3b2306c43e4f6821c78015863488456bf85a7fceceaa6a64152d21053b9676e47ceb7ceda02ec446d06ee1878cafb6
-DIST grafana-bin-7.3.7.tar.gz 54132750 BLAKE2B 19bd49cd254b87492e072a0a13d7dfd3b33aa19dedefd68cd1f945d58cfcd5dd0b3cd10363c5cccd5309b0bf86a088df50839c3c66cfd25e4de4c6ab84b8c5da SHA512 40d698ef0f877a9c0e692494345138cb7bc76ef75881643804f75613427fb2174fd29abbf2d3c4c11dec515b6bc2913398d1a90d6000ffcfae1e0e5eead4241a
-DIST grafana-bin-7.4.0.tar.gz 51244405 BLAKE2B a041ed84a2ba250b0d2369004471f35b0e8a51df955fc71e073f27cc2de6f885ee26715d10223d2ce2c70fd4ee7edb18f292182e796a3a31eb7c80e755990ee7 SHA512 0d81ccefbc4488b83d262191f588411afa6c2eebd7e97cd0219810a73082442ae1fc04132c6e42332b92b45f40f0c2aa3a2ccb586ae8703716d762a7179ba976
 DIST grafana-bin-7.4.1.tar.gz 51266762 BLAKE2B 8f0cc812e67ea2c91d0b1758a3d675289d6b5bedd42061fb994473073fcb3e174740d7a3546fa2b1482b39425daa45bb817f867deedf85ba56966282ee8aa9cb SHA512 f7d2e91139d32999d43cabb7843a5368eff2af1386bf865ae8aaf9c099c6c24a5b494029e4a5e4f4c7c5ecd5f23e0e0229c82fd5c142a2e01edf2c63239e5cf0
-EBUILD grafana-bin-7.3.1.ebuild 1768 BLAKE2B 23986d4f829d0bcddc32ff228a71e3855652f0d990222d307d25b5e17cd96c6dee2680654d6538178c9197bafd777eec7c0b7da14b12d2bcd45d13684c12767d SHA512 ec778d6f7768395692eb0db5287b9c8203b73bad269a8109fb71b462987732bafbf39995ac6c18753042a6245773c8b0bf870cb51af6437651f0d857bf39cadd
-EBUILD grafana-bin-7.3.3.ebuild 1768 BLAKE2B 23986d4f829d0bcddc32ff228a71e3855652f0d990222d307d25b5e17cd96c6dee2680654d6538178c9197bafd777eec7c0b7da14b12d2bcd45d13684c12767d SHA512 ec778d6f7768395692eb0db5287b9c8203b73bad269a8109fb71b462987732bafbf39995ac6c18753042a6245773c8b0bf870cb51af6437651f0d857bf39cadd
-EBUILD grafana-bin-7.3.4.ebuild 1768 BLAKE2B 23986d4f829d0bcddc32ff228a71e3855652f0d990222d307d25b5e17cd96c6dee2680654d6538178c9197bafd777eec7c0b7da14b12d2bcd45d13684c12767d SHA512 ec778d6f7768395692eb0db5287b9c8203b73bad269a8109fb71b462987732bafbf39995ac6c18753042a6245773c8b0bf870cb51af6437651f0d857bf39cadd
-EBUILD grafana-bin-7.3.7.ebuild 1768 BLAKE2B 1b643ac33f03e7a792a334017259deaa2b178ea565987cd9690439b583e5245465533fd1569c3d11b8f3fc34bece619173320cd308e6fa7ff9272df4a87acc7d SHA512 2e5f1f8f588175e72f2b167cc07add05eb33345d48618a2bf0b13a8cfb16a802b906a3d532574c558ee614b9ae7dcae5b105c3cfebecafdc503709771fd32025
-EBUILD grafana-bin-7.4.0.ebuild 1768 BLAKE2B 1b643ac33f03e7a792a334017259deaa2b178ea565987cd9690439b583e5245465533fd1569c3d11b8f3fc34bece619173320cd308e6fa7ff9272df4a87acc7d SHA512 2e5f1f8f588175e72f2b167cc07add05eb33345d48618a2bf0b13a8cfb16a802b906a3d532574c558ee614b9ae7dcae5b105c3cfebecafdc503709771fd32025
+DIST grafana-bin-7.4.2.tar.gz 51266527 BLAKE2B ce1edd1b1a718fbc8acf5e20218f1d5dc82823e5246ea6504f10c92c6309e7a89cdb270b2fa448554370acc521d5b2eb1ac8d160cb206cd9ba223be849fe4e50 SHA512 404e36d0fa4bbe2b39d6bcba0ab04a92a0f5db5878089c2b972ecb2d7b8a7409aa1b1d1fc81deec620da223b942113500661003804b93f17ddccd38f1f1ad361
 EBUILD grafana-bin-7.4.1.ebuild 1768 BLAKE2B 1b643ac33f03e7a792a334017259deaa2b178ea565987cd9690439b583e5245465533fd1569c3d11b8f3fc34bece619173320cd308e6fa7ff9272df4a87acc7d SHA512 2e5f1f8f588175e72f2b167cc07add05eb33345d48618a2bf0b13a8cfb16a802b906a3d532574c558ee614b9ae7dcae5b105c3cfebecafdc503709771fd32025
+EBUILD grafana-bin-7.4.2.ebuild 1769 BLAKE2B 5a68f16b65e6ef167c4476131b505a9947878b9f64b77e9a52240fff659f2d5ca6a0256c240a32d7d2f1b59505284a5ea974059cecae785ff5d5f0aca5c83e3d SHA512 45afd377bf5400a620744f7ad2daebcf36bd972f98a8baab270c68497d0c28662154bef6a68aac0123e6a1c382c9c77d02a28c7b0ae7a0f0e1ceb9f2a5b89bb5
 MISC metadata.xml 218 BLAKE2B 2189d142b4baed0b8edb49fcc98f7397610a257a4cb5f87873272b284f84290420f0950c8b41d1d050ca7a1e0486c6e00344672a3f0479d1d382c14bf7f18485 SHA512 882f7787b97aa780dd3ba4112b9e1dcc84986e2a17704cba9a557ec3a3f9211bcf93532b92d42f60157b56b457ee9ee17e5409066230e54d48931b91bd6786cd
diff --git a/www-apps/grafana-bin/files/grafana-r1.confd b/www-apps/grafana-bin/files/grafana-r1.confd
new file mode 100644
index 000000000000..fffd31d43b65
--- /dev/null
+++ b/www-apps/grafana-bin/files/grafana-r1.confd
@@ -0,0 +1,27 @@
+# Config file for /etc/init.d/grafana
+
+# The user to run your application as
+#GRAFANA_USER=grafana
+
+# The group to run your application as
+#GRAFANA_GROUP=grafana
+
+# Configuration file
+#GRAFANA_CONFIGFILE="/etc/grafana/${RC_SVCNAME}.ini"
+
+# PID file
+#GRAFANA_PIDFILE="/run/${RC_SVCNAME}.pid"
+
+# The grafana datadir
+#GRAFANA_DATADIR=/var/lib/grafana
+
+# You can use this configuration option to pass additional options to the
+# start-stop-daemon, see start-stop-daemon(8) for more details.
+# Per default we wait 1000ms after we have started the service to ensure
+# that the daemon is really up and running.
+#GRAFANA_SSDARGS="--wait 1000"
+
+# The termination timeout (start-stop-daemon parameter "retry") ensures
+# that the service will be terminated within a given time (60 + 5 seconds
+# per default) when you are stopping the service.
+#GRAFANA_TERMTIMEOUT="TERM/60/KILL/5"
diff --git a/www-apps/grafana-bin/files/grafana.initd b/www-apps/grafana-bin/files/grafana.initd
new file mode 100644
index 000000000000..ec72725100f8
--- /dev/null
+++ b/www-apps/grafana-bin/files/grafana.initd
@@ -0,0 +1,36 @@
+#!/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-7.3.1.ebuild b/www-apps/grafana-bin/grafana-bin-7.3.1.ebuild
deleted file mode 100644
index d666b4c9db30..000000000000
--- a/www-apps/grafana-bin/grafana-bin-7.3.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd.3 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-7.3.3.ebuild b/www-apps/grafana-bin/grafana-bin-7.3.3.ebuild
deleted file mode 100644
index d666b4c9db30..000000000000
--- a/www-apps/grafana-bin/grafana-bin-7.3.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd.3 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-7.3.4.ebuild b/www-apps/grafana-bin/grafana-bin-7.3.4.ebuild
deleted file mode 100644
index d666b4c9db30..000000000000
--- a/www-apps/grafana-bin/grafana-bin-7.3.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd.3 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-7.3.7.ebuild b/www-apps/grafana-bin/grafana-bin-7.3.7.ebuild
deleted file mode 100644
index 0de07551fc7b..000000000000
--- a/www-apps/grafana-bin/grafana-bin-7.3.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=7
-
-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.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd.3 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-7.4.0.ebuild b/www-apps/grafana-bin/grafana-bin-7.4.2.ebuild
index 0de07551fc7b..229e2a789b9e 100644
--- a/www-apps/grafana-bin/grafana-bin-7.4.0.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-7.4.2.ebuild
@@ -38,8 +38,8 @@ src_install() {
 	dobin bin/grafana-cli
 	dobin bin/grafana-server
 
-	newconfd "${FILESDIR}"/grafana.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd.3 grafana
+	newconfd "${FILESDIR}"/grafana-r1.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd grafana
 	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
 
 	keepdir /var/{lib,log}/grafana