--- /usr/portage/net-mail/mailman/mailman-2.1.9-r2.ebuild	2007-09-28 07:36:11.000000000 +0000
+++ mailman-2.1.9-r3.ebuild	2007-10-22 14:08:21.000000000 +0000
@@ -22,13 +22,17 @@
 	INSTALLDIR=${MAILMAN_PREFIX:-"/usr/lib/mailman"}
 	VAR_PREFIX=${MAILMAN_VAR_PREFIX:-"/var/lib/mailman"}
 	CGIGID=${MAILMAN_CGIGID:-81}
+	MAILUSR=${MAILMAN_MAILUSR:-mailman}
+	MAILUID=${MAILMAN_MAILUID:-280}
+	MAILGRP=${MAILMAN_MAILGRP:-mailman}
 	MAILGID=${MAILMAN_MAILGID:-280}
 
+
 	# Bug #58526: switch to enew{group,user}.
 	# need to add mailman here for compile process.
 	# Duplicated at pkg_postinst() for binary install.
-	enewgroup mailman 280
-	enewuser mailman 280 /bin/bash ${INSTALLDIR} mailman -G cron -c mailman
+	enewgroup ${MAILGRP} ${MAILGID}
+	enewuser  ${MAILUSR} ${MAILUID} /bin/bash ${INSTALLDIR} mailman -G cron -c "mailman"
 }
 
 src_unpack() {
@@ -43,6 +47,8 @@
 		--with-mail-gid=${MAILGID} \
 		--with-cgi-gid=${CGIGID} \
 		--with-var-prefix=${VAR_PREFIX} \
+		--with-username=${MAILUSR} \
+		--with-groupname=${MAILGRP} \
 	|| die "configure failed"
 
 	emake || die "make failed"
@@ -86,7 +92,7 @@
 	keepdir ${VAR_PREFIX}/lists
 	keepdir ${VAR_PREFIX}/qfiles
 
-	chown -R mailman:mailman ${D}/${VAR_PREFIX} ${D}/${INSTALLDIR} ${D}/etc/mailman/*
+	chown -R ${MAILUSR}:${MAILGRP} ${D}/${VAR_PREFIX} ${D}/${INSTALLDIR} ${D}/etc/mailman/*
 	chmod 2775 ${D}/${INSTALLDIR} ${D}/${INSTALLDIR}/templates/* \
 		${D}/${INSTALLDIR}/messages/* ${D}/${VAR_PREFIX} ${D}/${VAR_PREFIX}/{logs,lists,spam,locks,archives/public}
 	chmod 2750 ${D}/${VAR_PREFIX}/archives/private
@@ -98,8 +104,8 @@
 pkg_postinst() {
 	python_mod_optimize ${INSTALLDIR}/bin/ ${INSTALLDIR}/Mailman
 
-	enewgroup mailman 280
-	enewuser mailman 280 -1 ${INSTALLDIR} mailman -G cron -c "mailman"
+	enewgroup ${MAILGRP} ${MAILGID}
+	enewuser  ${MAILUSR} ${MAILUID} -1 ${INSTALLDIR} mailman -G cron -c "mailman"
 	elog
 	elog "Please read /usr/share/doc/${PF}/README.gentoo.gz for additional"
 	elog "Setup information, mailman will NOT run unless you follow"
@@ -118,6 +124,9 @@
 	ewarn "MAILMAN_INSTALLDIR (default: /usr/lib/mailman)"
 	ewarn "MAILMAN_VAR_PREFIX (default: /var/lib/mailman)"
 	ewarn "MAILMAN_CGIGID (default: 81)"
+	ewarn "MAILMAN_MAILUSR (default: mailman)"
+	ewarn "MAILMAN_MAILUID (default: 280)"
+	ewarn "MAILMAN_MAILGRP (default: mailman)"
 	ewarn "MAILMAN_MAILGID (default: 280)"
 	ewarn
 	ewarn "Config file is now symlinked in /etc/mailman, so etc-update works."