From: Pedro Arizmendi <dwosky@pm.me>
Date: Sat, 22 Feb 2020 12:17:37 +0000 (+0100)
Subject: www-misc/monitorix: Update for GLEP 81
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f4aae350929ea7c9e93d5c0cdfb2b504fbfd30a8;p=gentoo.git

www-misc/monitorix: Update for GLEP 81

Closes: https://bugs.gentoo.org/694676
Signed-off-by: Pedro Arizmendi <dwosky@pm.me>
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Closes: https://github.com/gentoo/gentoo/pull/14739
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
---

diff --git a/www-misc/monitorix/monitorix-3.11.0.ebuild b/www-misc/monitorix/monitorix-3.11.0.ebuild
index 601b94df62ba..56fc67975677 100644
--- a/www-misc/monitorix/monitorix-3.11.0.ebuild
+++ b/www-misc/monitorix/monitorix-3.11.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit systemd user
+inherit systemd
 
 DESCRIPTION="A lightweight system monitoring tool"
 HOMEPAGE="https://www.monitorix.org/"
@@ -14,7 +14,10 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="dev-perl/Config-General
+RDEPEND="
+	acct-user/monitorix
+	acct-group/monitorix
+	dev-perl/Config-General
 	dev-perl/DBI
 	dev-perl/HTTP-Server-Simple
 	dev-perl/IO-Socket-SSL
@@ -24,11 +27,6 @@ RDEPEND="dev-perl/Config-General
 	net-analyzer/rrdtool[graph,perl]
 	dev-perl/CGI"
 
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
 src_prepare() {
 	# Put better Gentoo defaults in the configuration file.
 	sed -e "s|\(base_dir.*\)/usr/share/${PN}|\1/usr/share/${PN}/htdocs|" \
@@ -45,7 +43,7 @@ src_compile() { :; }
 src_install() {
 	dosbin ${PN}
 
-	newinitd ${FILESDIR}/monitorix ${PN}
+	newinitd "${FILESDIR}/monitorix" ${PN}
 
 	insinto /etc/monitorix
 	doins ${PN}.conf