gentoo auto-resync : 02:12:2024 - 02:07:07

3 files changed, 16 insertions, 26 deletions

diff --git a/net-mail/mailgraph/Manifest b/net-mail/mailgraph/Manifest
index e0f01b38de3c..24cdd62581e9 100644
--- a/net-mail/mailgraph/Manifest
+++ b/net-mail/mailgraph/Manifest
@@ -3,5 +3,5 @@ AUX mailgraph.confd-new 646 BLAKE2B 8c6c55b46340f2909308350c944d4f07ece13da35748
 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-r3.ebuild 2824 BLAKE2B 53e2e091100e88f98924d09e762fe70ca1af32ed2bedc9815247d9cc4d263cf3eb29871fb311b5c566380468f43b8a1bea9f04ff579657a75ac0363580c88b7e SHA512 892c525719ca47527fad3bd38c8ef055f0e2c08d043b21582c09ea0e66304281dac1befbeca2317788d21d542e0e60746b05d817a93c925f99f42f8f8de871fe
-MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
+EBUILD mailgraph-1.14-r4.ebuild 2476 BLAKE2B ab3f121253bca4597dcc6039ebc1f7f7980a7b8ec653fd63ce45db5fb9197278ccd0bd0944a17bd9fba05bdfaa1b242085336144d6ab2cee754f4fe7bfcfb5d0 SHA512 3ec51a10234f9e6fc3e22c034bc2d951e6c3440bf7b29c07feb735e6794cb3922cb9130e5851c17e098c83fb56c1f47b1860822a45e1157659b5851b5bb99a83
+MISC metadata.xml 234 BLAKE2B d70fe9baf5eb149c0583ef8c953fef9ad0ca63e6ef113a5c063580df15ea14813bd768c35f6fbb3eac2995228f7f28b3ba0958a0817f2965724b17982a492986 SHA512 1c9c5a0bd28e351c07168c90739ada01f417d195d86447b626b6351a909931ee45032b7a973c6c1981c039653cbf1000a45a85a5b80ce213f5049d9190557a85
diff --git a/net-mail/mailgraph/mailgraph-1.14-r3.ebuild b/net-mail/mailgraph/mailgraph-1.14-r4.ebuild
index 3622c4e6396c..868fe0fd041a 100644
--- a/net-mail/mailgraph/mailgraph-1.14-r3.ebuild
+++ b/net-mail/mailgraph/mailgraph-1.14-r4.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-inherit user-info
+EAPI=8
 
 DESCRIPTION="A mail statistics RRDtool frontend for Postfix"
-HOMEPAGE="http://mailgraph.schweikert.ch/"
-SRC_URI="http://mailgraph.schweikert.ch//pub/${P}.tar.gz"
+HOMEPAGE="https://mailgraph.schweikert.ch/"
+SRC_URI="https://mailgraph.schweikert.ch/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 # Change SLOT to 0 when appropriate
 SLOT="1.14"
 KEYWORDS="amd64 x86"
+IUSE="apache2 nginx"
 
 # for the RRDs
 DEPEND="
@@ -20,6 +19,8 @@ DEPEND="
 	acct-user/mgraph"
 RDEPEND="
 	${DEPEND}
+	apache2? ( acct-user/apache[mgraph] )
+	nginx? ( acct-user/nginx[mgraph] )
 	dev-lang/perl
 	dev-perl/File-Tail
 	>=net-analyzer/rrdtool-1.2.2[graph,perl]"
@@ -73,25 +74,11 @@ pkg_postinst() {
 	ewarn "/etc/conf.d/mailgraph accordingly! Otherwise mailgraph won't get to know"
 	ewarn "the corresponding events (virus/spam mail found etc.)."
 
+	elog "If you are using neither apache nor nginx and the included CGI script"
+	elog "is unable to read the mailgraph RRD files, please add the user for"
+	elog "that webserver to the group mgraph manually:"
 	elog
-	elog "Checking for user apache:"
-	if egetent passwd apache >&/dev/null; then
-		elog "Adding user apache to group mgraph so the included"
-		elog "CGI script is able to read the mailgraph RRD files"
-		if ! gpasswd -a apache mgraph >&/dev/null; then
-			eerror "Failed to add user apache to group mgraph!"
-			eerror "Please check manually."
-		fi
-	else
-		elog
-		elog "User apache not found, maybe we will be running a"
-		elog "webserver with a different UID?"
-		elog "If that's the case, please add that user to the"
-		elog "group mgraph manually to enable the included"
-		elog "CGI script to read the mailgraph RRD files:"
-		elog
-		elog "\tgpasswd -a <user> mgraph"
-	fi
+	elog "\tgpasswd -a <user> mgraph"
 
 	ewarn
 	ewarn "mailgraph.cgi is installed in /usr/share/${PN}/"
diff --git a/net-mail/mailgraph/metadata.xml b/net-mail/mailgraph/metadata.xml
index bef24d2c2337..e8707cb9b9a7 100644
--- a/net-mail/mailgraph/metadata.xml
+++ b/net-mail/mailgraph/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
+  <use>
+    <flag name="nginx">Add nginx support</flag>
+  </use>
 </pkgmetadata>