Merge updates from master

2 files changed, 15 insertions, 15 deletions

diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 7c918466c461..d940ff42be55 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -1,8 +1,8 @@
-DIST munin-2.0.49-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
-DIST munin-2.0.49.tar.gz 2257501 BLAKE2B f2852357e3aa0c1ca3e217b66c3e2d1c0d9c70bf1f8487517ee913e2223ca1c5ae9b922c07f83754522c51fddd0f72f87f5ceea9b7e9642a44aab04ead44538f SHA512 e8bf652000ab76f16bc3b18a16c5231ffb5523fe9f78a90bec97ca31e46ff73566e1cbbf0a3616931d0b46ceb6f5a2b5d4fdc68c797539419a2217dccf643762
 DIST munin-2.0.52-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
 DIST munin-2.0.52.tar.gz 2266820 BLAKE2B 41233cd28ce4d682dfd47895061426404540c6b1c65798609a2d509d39ad5359b22087027662e7c03848e5676815843c34d078b782e3d0ab3a6a29b6a22e058b SHA512 7439ea10006a94227b71328d06411378f6855f23f17815a433b3a1c40ea23da5a25a366d48f911b9cfdc43c4b98f3bb9777b67db2b894441eb8941e84ede379c
 DIST munin-2.0.54-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
 DIST munin-2.0.54.tar.gz 2270295 BLAKE2B d0f573a46eedf9e9a7de61428de6c2261f6c9fddd3aa5696966c2ffdaa82a432dca72d60cd2e4b75601f312ad07918090a9dd45a10e3c9c81371b97200e28b12 SHA512 b9a8c7403b34d393115d833ee41e3b5c325e072729b66f6b8b7fd3546ab4660e59e59c6f192eabb706e2bc9c73aea9c50c880c2c36826c5f2962bca46098e732
 DIST munin-2.0.56-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
 DIST munin-2.0.56.tar.gz 2271203 BLAKE2B f3df227b905ab794e2253637d367819eff2625f9e0f2355d23916b033b3b23d14bb64a78bf6a334f0c7a1859e60c227d1f754a2689bf291cc5f43a46986d35fe SHA512 111b9b8d88474f480eac1e304a92a52c2295d72a1c6709bb2942ff6ee0ba26a56d25dc5d0cf08ddb98a23d6d9693ad0cddb2185e10df83d553655d017d102b1d
+DIST munin-2.0.57-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
+DIST munin-2.0.57.tar.gz 2272894 BLAKE2B 8daff79d4c9224d83ea91d4583a1c11cdc0d2de05c536da5717cf31555f1d2c87475e4de541688e4b542267a6b8a534911149a7edd6469bd13de79838fae3aed SHA512 d00cfaf450dc4be5fe52f30440fc14ee49f021fe46c1a641ffd2e60682056051b6b2fc8713bd14ae9f9e5aaf28dbf335b6a2e9ec53f8518178888442c069298c
diff --git a/net-analyzer/munin/munin-2.0.49.ebuild b/net-analyzer/munin/munin-2.0.57.ebuild
index 1e0ed2049704..80f46fab8967 100644
--- a/net-analyzer/munin/munin-2.0.49.ebuild
+++ b/net-analyzer/munin/munin-2.0.57.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PATCHSET=1
 
-inherit user java-pkg-opt-2 systemd
+inherit java-pkg-opt-2 systemd
 
 MY_P=${P/_/-}
 
@@ -17,16 +17,19 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
-RESTRICT="!test? ( test )"
 REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
+RESTRICT="!test? ( test )"
 
 # Upstream's listing of required modules is NOT correct!
 # Some of the postgres plugins use DBD::Pg, while others call psql directly.
 # Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
 # We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
 DEPEND_COM="
+	acct-user/munin
+	acct-user/munin-async
+	acct-group/munin
 	dev-lang/perl:=[berkdb]
 	dev-perl/DBI
 	dev-perl/Date-Manip
@@ -104,16 +107,11 @@ RDEPEND="${DEPEND_COM}
 			virtual/cron
 			media-fonts/dejavu
 		)
-		selinux? ( sec-policy/selinux-munin )
-		!<sys-apps/openrc-0.11.8"
+		selinux? ( sec-policy/selinux-munin )"
 
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
-	enewgroup munin
-	enewuser munin 177 -1 /var/lib/munin munin
-	enewuser munin-async -1 /bin/sh /var/spool/munin-async
-	esethome munin-async /var/spool/munin-async
 	java-pkg-opt-2_pkg_setup
 }
 
@@ -147,7 +145,7 @@ src_configure() {
 	DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
 	SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
 	LOGDIR=\$(DESTDIR)/var/log/munin
-	PERLSITELIB=$(perl -V:vendorlib | cut -d"'" -f2)
+	PERLLIB=\$(DESTDIR)$(perl -V:vendorlib | cut -d"'" -f2)
 	JCVALID=$(usex java yes no)
 	STATEDIR=\$(DESTDIR)/run/munin
 	EOF
@@ -177,6 +175,8 @@ src_install() {
 	local dirs="
 		/var/log/munin
 		/var/lib/munin/plugin-state
+		/var/lib/munin-node/plugin-state
+		/var/www/localhost/htdocs/munin
 		/etc/munin/plugin-conf.d
 		/etc/munin/plugins"
 	use minimal || dirs+=" /etc/munin/munin-conf.d/"
@@ -186,7 +186,7 @@ src_install() {
 
 	# parallel install doesn't work and it's also pointless to have this
 	# run in parallel for now (because it uses internal loops).
-	emake -j1 DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
+	emake -j1 CHOWN=true DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
 
 	# we remove /run from the install, as it's not the package's to deal
 	# with.