Auto sync net-mail/mailbase (2007-11-15 20:02:39.448296689 +0100)

(Portage version: 2.2.00.8470-prefix/SVN/SunOS 5.10 i386)

3 files changed, 31 insertions, 27 deletions

diff --git a/net-mail/mailbase/ChangeLog b/net-mail/mailbase/ChangeLog
index a49faf8afd..e877c62d14 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/Manifest b/net-mail/mailbase/Manifest
index ae3f8528f6..cc33612f79 100644
--- a/net-mail/mailbase/Manifest
+++ b/net-mail/mailbase/Manifest
@@ -3,6 +3,6 @@ AUX common-pamd 417 RMD160 3a1e4ab95deb3e4326337403cb3d05912e130cd3 SHA1 40744d2
 AUX common-pamd-include 362 RMD160 a2615a3f09be6039430851bcf52f6ae77414aa20 SHA1 62ce37bdd86d18f10867d4b57ffcc46f751327fd SHA256 31b97438e6735ee4754051b95d926468f59fe8e15490e8bf34debaeaf3f8c651
 AUX mailcap 2235 RMD160 cb84573fec9e1c78f43a8eed2f9a0898c3817097 SHA1 f6405002211445186e2178ca23773695666bc2ce SHA256 99dcf0c43b9aa26625a8ff7e375e13f85cc0d677a93e90da62a868d8a2162cda
 AUX mailcap-prefix.patch 3086 RMD160 eccffab5feff2966ca6d10b980b5166db07d99a7 SHA1 6e79ff765a29cefe691453b548279c0b6ce3cd0e SHA256 e8339bb5c56ad789d9bf034c68dba66620085222714229ed40fb0f8c8c837b57
-EBUILD mailbase-1.ebuild 1833 RMD160 dbf558631eb7a0fe1de1e8a13e38986279ec45a8 SHA1 cf8365c44f84229e066806df2b9e137e53430ee9 SHA256 0dcf9f41eb1eea7adf2b525a58365c25ba7dce6badf60ea418d05609c5e925fa
-MISC ChangeLog 8441 RMD160 e182159c03308e436a9890232be6062edd3ce1bb SHA1 d89ba749c3b6e687d8e091c14401118c7f0b17a1 SHA256 d683eef13153ccc2b321fc9c1fc6f59cf2ed5c8fa68682103d03c99c425bdf98
+EBUILD mailbase-1.ebuild 1773 RMD160 e0410c28c5135e57d4532cc31086aa2ade25fa81 SHA1 d82fb59c7e75c2aabc916727d0978a0ef53b3fb7 SHA256 ff385a56342afcba6cbe48c7829537c51570c8f11616e4e3e287b8f1bbc32659
+MISC ChangeLog 8577 RMD160 40b9a7637ff661a70e4f175d83ef0c9bf304b366 SHA1 a967aa2521c062dc62f4efffac28a6419c6818e4 SHA256 c2d3f73c9cfb22fb9456f5d5d6dc4a950e7c4b687f77400e9fad32e56bb72fbe
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
diff --git a/net-mail/mailbase/mailbase-1.ebuild b/net-mail/mailbase/mailbase-1.ebuild
index 542e3d81d1..c4c0e86c90 100644
--- a/net-mail/mailbase/mailbase-1.ebuild
+++ b/net-mail/mailbase/mailbase-1.ebuild
@@ -1,10 +1,10 @@
 # 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 $
 
 EAPI="prefix"
 
-inherit eutils
+inherit pam eutils
 
 DESCRIPTION="MTA layout package"
 SRC_URI=""
@@ -19,18 +19,16 @@ RDEPEND="pam? ( virtual/pam )"
 
 S=${WORKDIR}
 
-get_permissions_oct() {
-	if [[ ${USERLAND} = GNU ]] || [[ ${EPREFIX%/} != "" ]] ; then
-		stat -c%a "${EROOT}$1"
-	elif [[ ${USERLAND} = BSD ]] ; then
-		stat -f%p "${EROOT}$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
+	doins "${FILESDIR}"/aliases
 	cp "${FILESDIR}"/mailcap .
 	epatch "${FILESDIR}"/mailcap-prefix.patch
 	eprefixify mailcap
@@ -42,21 +40,24 @@ src_install() {
 	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 "${EROOT}$1"
+	elif [[ ${USERLAND} = BSD ]] ; then
+		stat -f%p "${EROOT}$1" | cut -c 3-
 	fi
 }