gentoo resync : 25.11.2020

3 files changed, 29 insertions, 29 deletions

diff --git a/net-mail/mailgraph/Manifest b/net-mail/mailgraph/Manifest
index 6aa9446334d0..f4b103250099 100644
--- a/net-mail/mailgraph/Manifest
+++ b/net-mail/mailgraph/Manifest
@@ -1,6 +1,7 @@
+AUX mailgraph-1.14-homedir.patch 558 BLAKE2B e558f8a236c80517f81c24913c88ed867759fa454f01eeaa63c4271e338f6dcb9f806ba8b161d911aba8734271ba7110671e9def34c08a5406202b31e9436e32 SHA512 5603c2b8b783b07a809f4cefd4e561f92924b881f1e1c5ff87c4abe0cf32f42a148def08cec95d78de67f07800768e11a434680a9ecaea8442c472570343d660
 AUX mailgraph.confd-new 646 BLAKE2B 8c6c55b46340f2909308350c944d4f07ece13da3574800e0d1b6ce32c8a8e3e5ede958175fbeb8c41d2dbec4f4ca7468085ec05305fc3910e0c47b77424cf584 SHA512 1f5b7f35db859be48aa935ba3936fea34653a1c8eaeeb8be0bb01fbc3644a10eaa636a508bfa5b987509ad59d390a52118f5b323a25044184b9e9a8046882710
 AUX mailgraph.initd-new 984 BLAKE2B ea3a6eac4eb9694dc48f33365eb846cfbd3f9f75eedae1dd62f05ad355c6cfc8136b899e7f045440700fe3c10a478dae2eb888e876767b1fc135c3bef32c9822 SHA512 e859488178bbb3f229a86f0f61bf0537664c1f6fd0761195e0111458671d8dc69998dad206f629e0dbe9c82248186075655a522b16b969ffd1c50d8ba825d3f1
 AUX mailgraph.logrotate-new 773 BLAKE2B 392128208bb8209e93d8802f133cb7b8f3ac0a6ae4453469da1cb3152820910de6b1a4b465166da3c2976faaf06c603cdf453ec9c53aba037bfa5eef4169b46a SHA512 a8fde20eb24964a0ab7efbe5e6ce0adc02e0d91daee519f4dd70049ac2f92fb53f63322128ae8716b64fb1aa28b7a2c55a8c647028ac73aff1687ad312d20baa
 DIST mailgraph-1.14.tar.gz 22014 BLAKE2B a4d72a557bc7718576d85aed930a0037cb7d83edcba62397d6e9a51ec7967c6ffdf6d310e6bf9b881839313ed4cf1969e40eae1a923bbae45ac71b9593f1805f SHA512 3df0dae010ad166a157eb34a8b1fcf837ab42445d417855ea58937a75b74ca55c06044eefb6077a6117073c39a087bcdf5f58fe35c0e4d9c7d6b18bded7a0193
-EBUILD mailgraph-1.14-r2.ebuild 3340 BLAKE2B a21f4665d70ac4c1504c7a34b248c8a8ecacbf4743d184a6db3618ffc98ddcccaefee8ce7645a0fa9588d5d6bdbfded8813051d65059f1c5c3400814a17e703d SHA512 1aa3f3a13e8767709c4bd75a9a40e3cac6209b7e55854a80086e3ef234eb8ad65a79fecb9f3142d64610b31ead947e02d143b66da5e5e659ebe4a6ffc7a995c3
+EBUILD mailgraph-1.14-r2.ebuild 2805 BLAKE2B 62f5546a58e381dcf60eb5bfccffb11e777bfdfb8bcd326cd07af866a8dffc066084b9623f8f80eddeaddaac3baacf40ef0bf7da5bf4bc1e8da8fdc2f7ea623a SHA512 16f31d92c8d4e14232724b97cb7870828261ca93168888f74c6a777eb37c8f02390fc5aa1b3ce6df76e48d977f31bde98f410e51913af3387a47d21f47029bbc
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/net-mail/mailgraph/files/mailgraph-1.14-homedir.patch b/net-mail/mailgraph/files/mailgraph-1.14-homedir.patch
new file mode 100644
index 000000000000..3d1154f36266
--- /dev/null
+++ b/net-mail/mailgraph/files/mailgraph-1.14-homedir.patch
@@ -0,0 +1,13 @@
+--- a/mailgraph.cgi
++++ b/mailgraph.cgi
+@@ -16,8 +16,8 @@
+ my $points_per_sample = 3;
+ my $ypoints = 160;
+ my $ypoints_err = 96;
+-my $rrd = 'mailgraph.rrd'; # path to where the RRD database is
+-my $rrd_virus = 'mailgraph_virus.rrd'; # path to where the Virus RRD database is
++my $rrd = '/var/lib/mailgraph/mailgraph.rrd'; # path to where the RRD database is
++my $rrd_virus = '/var/lib/mailgraph/mailgraph_virus.rrd'; # path to where the Virus RRD database is
+ my $tmp_dir = '/tmp/mailgraph'; # temporary directory where to store the images
+ 
+ my @graphs = (
diff --git a/net-mail/mailgraph/mailgraph-1.14-r2.ebuild b/net-mail/mailgraph/mailgraph-1.14-r2.ebuild
index 9d60fa3552b1..76c14702b18f 100644
--- a/net-mail/mailgraph/mailgraph-1.14-r2.ebuild
+++ b/net-mail/mailgraph/mailgraph-1.14-r2.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils user
+EAPI=7
 
 DESCRIPTION="A mail statistics RRDtool frontend for Postfix"
 HOMEPAGE="http://mailgraph.schweikert.ch/"
@@ -12,36 +11,20 @@ LICENSE="GPL-2"
 # Change SLOT to 0 when appropriate
 SLOT="1.14"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-RDEPEND="dev-lang/perl
+# for the RRDs
+DEPEND="
+	acct-group/mgraph
+	acct-user/mgraph"
+RDEPEND="
+	${DEPEND}
+	dev-lang/perl
 	dev-perl/File-Tail
 	>=net-analyzer/rrdtool-1.2.2[graph,perl]"
-DEPEND=">=sys-apps/sed-4"
 
-pkg_setup() {
-	# add user and group for mailgraph daemon
-	# also add mgraph to the group adm so it's able to
-	# read syslog logfile /var/log/messages (should be owned by
-	# root:adm with permission 0640)
-	enewgroup mgraph
-	enewuser mgraph -1 -1 /var/empty mgraph,adm
-}
-
-src_prepare() {
-	sed -i \
-		-e "s|\(my \$rrd = '\).*'|\1/var/lib/mailgraph/mailgraph.rrd'|" \
-		-e "s|\(my \$rrd_virus = '\).*'|\1/var/lib/mailgraph/mailgraph_virus.rrd'|" \
-		mailgraph.cgi || die "sed mailgraph.cgi failed"
-}
+PATCHES=( "${FILESDIR}"/${PN}-1.14-homedir.patch )
 
 src_install() {
-	# for the RRDs
-	dodir /var/lib
-	diropts -omgraph -gmgraph -m0750
-	dodir /var/lib/mailgraph
-	keepdir /var/lib/mailgraph
-
 	# log and pid file
 	diropts ""
 	dodir /var/log
@@ -61,9 +44,9 @@ src_install() {
 	newbin mailgraph.pl mailgraph
 
 	# mailgraph CGI script
-	exeinto /usr/share/${PN}
+	exeinto /usr/share/mailgraph
 	doexe mailgraph.cgi
-	insinto  /usr/share/${PN}
+	insinto /usr/share/mailgraph
 	doins mailgraph.css
 
 	# init/conf files for mailgraph daemon
@@ -79,6 +62,7 @@ pkg_postinst() {
 	elog "This can be changed in /etc/conf.d/mailgraph if it doesn't fit."
 	elog "Remember to adjust MG_DAEMON_LOG, MG_DAEMON_PID and MG_DAEMON_RRD"
 	elog "as well!"
+
 	ewarn "Please make sure the MG_LOGFILE (default: /var/log/messages) is readable"
 	ewarn "by group adm or change MG_DAEMON_GID in /etc/conf.d/mailgraph accordingly!"
 	ewarn
@@ -86,6 +70,7 @@ pkg_postinst() {
 	ewarn "go to the file /var/log/messages or change MG_LOGFILE in"
 	ewarn "/etc/conf.d/mailgraph accordingly! Otherwise mailgraph won't get to know"
 	ewarn "the corresponding events (virus/spam mail found etc.)."
+
 	elog
 	elog "Checking for user apache:"
 	if egetent passwd apache >&/dev/null; then
@@ -105,6 +90,7 @@ pkg_postinst() {
 		elog
 		elog "\tgpasswd -a <user> mgraph"
 	fi
+
 	ewarn
 	ewarn "mailgraph.cgi is installed in /usr/share/${PN}/"
 	ewarn "You need to put it somewhere accessible though a web-server."