Move mail user/group and postmaster user here from baselayout.

(Portage version: 2.1.3.19)

2 files changed, 32 insertions, 26 deletions

diff --git a/net-mail/mailbase/ChangeLog b/net-mail/mailbase/ChangeLog
index a49faf8afdbc..e877c62d14ac 100644
--- a/net-mail/mailbase/ChangeLog
+++ b/net-mail/mailbase/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-mail/mailbase
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailbase/ChangeLog,v 1.73 2007/06/17 19:41:28 ferdy Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailbase/ChangeLog,v 1.74 2007/11/14 07:57:49 vapier Exp $
+
+  14 Nov 2007; Mike Frysinger <vapier@gentoo.org> mailbase-1.ebuild:
+  Move mail user/group and postmaster user here from baselayout.
 
   17 Jun 2007; Fernando J. Pereda <ferdy@gentoo.org> mailbase-1.ebuild:
   Don't mix ewarn and echo as per bug #182348
diff --git a/net-mail/mailbase/mailbase-1.ebuild b/net-mail/mailbase/mailbase-1.ebuild
index 46895179154f..7ac0df58b181 100644
--- a/net-mail/mailbase/mailbase-1.ebuild
+++ b/net-mail/mailbase/mailbase-1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailbase/mailbase-1.ebuild,v 1.18 2007/06/17 19:41:28 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailbase/mailbase-1.ebuild,v 1.19 2007/11/14 07:57:49 vapier Exp $
+
+inherit pam eutils
 
 DESCRIPTION="MTA layout package"
 SRC_URI=""
@@ -15,41 +17,42 @@ RDEPEND="pam? ( virtual/pam )"
 
 S=${WORKDIR}
 
-get_permissions_oct() {
-	if [[ ${USERLAND} = GNU ]] ; then
-		stat -c%a "${ROOT}$1"
-	elif [[ ${USERLAND} = BSD ]] ; then
-		stat -f%p "${ROOT}$1" | cut -c 3-
-	fi
+pkg_setup() {
+	enewgroup mail 12
+	enewuser mail 8 -1 /var/spool/mail mail
+	enewuser postmaster 14 -1 /var/spool/mail
 }
 
 src_install() {
 	dodir /etc/mail
 	insinto /etc/mail
-	doins ${FILESDIR}/aliases
-	insinto /etc/
-	doins ${FILESDIR}/mailcap
+	doins "${FILESDIR}"/aliases || die
+	insinto /etc
+	doins "${FILESDIR}"/mailcap || die
 
 	keepdir /var/spool/mail
 	fowners root:mail /var/spool/mail
 	fperms 0775 /var/spool/mail
 	dosym /var/spool/mail /var/mail
 
-	if use pam;
-	then
-		insinto /etc/pam.d/
-
-		# pop file and its symlinks
-		newins ${FILESDIR}/common-pamd-include pop
-		dosym /etc/pam.d/pop /etc/pam.d/pop3
-		dosym /etc/pam.d/pop /etc/pam.d/pop3s
-		dosym /etc/pam.d/pop /etc/pam.d/pops
+	newpamd "${FILESDIR}"/common-pamd-include pop
+	newpamd "${FILESDIR}"/common-pamd-include imap
+	if use pam ; then
+		local p
+		for p in pop3 pop3s pops ; do
+			dosym pop /etc/pam.d/${p} || die
+		done
+		for p in imap4 imap4s imaps ; do
+			dosym imap /etc/pam.d/${p} || die
+		done
+	fi
+}
 
-		# imap file and its symlinks
-		newins ${FILESDIR}/common-pamd-include imap
-		dosym /etc/pam.d/imap /etc/pam.d/imap4
-		dosym /etc/pam.d/imap /etc/pam.d/imap4s
-		dosym /etc/pam.d/imap /etc/pam.d/imaps
+get_permissions_oct() {
+	if [[ ${USERLAND} = GNU ]] ; then
+		stat -c%a "${ROOT}$1"
+	elif [[ ${USERLAND} = BSD ]] ; then
+		stat -f%p "${ROOT}$1" | cut -c 3-
 	fi
 }