Revision bump. Handle instalation of pam.d files with newins instead of using cp

Package-Manager: portage-2.0.51-r15

4 files changed, 95 insertions, 5 deletions

diff --git a/net-mail/mailbase/ChangeLog b/net-mail/mailbase/ChangeLog
index ca3fabab8d9a..08b15f135770 100644
--- a/net-mail/mailbase/ChangeLog
+++ b/net-mail/mailbase/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/mailbase
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailbase/ChangeLog,v 1.33 2005/02/10 23:02:29 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailbase/ChangeLog,v 1.34 2005/02/11 13:29:53 ferdy Exp $
+
+*mailbase-0.00-r8 (11 Feb 2005)
+
+  11 Feb 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +mailbase-0.00-r8.ebuild:
+  Handle instalation of pam.d files with newins instead of copying
 
   10 Feb 2005; Fernando J. Pereda <ferdy@gentoo.org>
   mailbase-0.00-r7.ebuild:
diff --git a/net-mail/mailbase/Manifest b/net-mail/mailbase/Manifest
index 9b27ea2d9923..5791b3138599 100644
--- a/net-mail/mailbase/Manifest
+++ b/net-mail/mailbase/Manifest
@@ -3,21 +3,23 @@ Hash: SHA1
 
 MD5 78fc96c16b9dc1d4902c62927e664ce9 mailbase-0.00-r4.ebuild 773
 MD5 d70889cf9ee474b30325789a31c253a9 mailbase-0.00-r6.ebuild 902
+MD5 71c1922ec675cb3eeece82dec0f7ada4 mailbase-0.00-r8.ebuild 1913
 MD5 f224d58950c57b4f07888966ad00cd9a mailbase-0.00-r5.ebuild 877
 MD5 a5d2b893cb09235e3c253d9d0c50f3fa mailbase-0.00-r7.ebuild 1922
-MD5 b211645a1303f7af867e93bd3adc4395 ChangeLog 4258
+MD5 42f7333b2e0380757d63b670e068df10 ChangeLog 4440
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 e75c39fbdac8eec750d84a7183ac6721 files/common-pamd 417
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mailbase-0.00-r4 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mailbase-0.00-r5 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mailbase-0.00-r6 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mailbase-0.00-r7 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mailbase-0.00-r8 0
 MD5 df65e6e407e866c7e6721e79f731ae6a files/mailcap 2235
 MD5 a5623a262865054bd43c914e740a2e52 files/aliases 809
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCC+gQViELBEf1JB0RAlElAJ9SLXqYqw4nHl4B2gPAq0+7fZe3tgCbBXys
-GOP3h1qxnL3Jm17FJCNBjCQ=
-=gTFd
+iD8DBQFCDLNcViELBEf1JB0RAgYbAKCCvsfqJaB0m+bjn40wrRQtJfuzIgCfayJS
+f+/TYnp7UbOiBgrFt+7CpZ8=
+=M60v
 -----END PGP SIGNATURE-----
diff --git a/net-mail/mailbase/files/digest-mailbase-0.00-r8 b/net-mail/mailbase/files/digest-mailbase-0.00-r8
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/net-mail/mailbase/files/digest-mailbase-0.00-r8
diff --git a/net-mail/mailbase/mailbase-0.00-r8.ebuild b/net-mail/mailbase/mailbase-0.00-r8.ebuild
new file mode 100644
index 000000000000..9bab4f2f8354
--- /dev/null
+++ b/net-mail/mailbase/mailbase-0.00-r8.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailbase/mailbase-0.00-r8.ebuild,v 1.1 2005/02/11 13:29:53 ferdy Exp $
+
+DESCRIPTION="MTA layout package"
+SRC_URI=""
+HOMEPAGE="http://www.gentoo.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390 ~ppc-macos"
+IUSE=""
+
+DEPEND=""
+
+S=${WORKDIR}
+
+pkg_setup() {
+	local filestoremove=0;
+	local lineorig=`head -n 1 ${FILESDIR}/common-pamd`
+	local lineold=""
+
+	einfo "Checking for possible file collisions..."
+
+	for i in pop pop3 pop3s pops imap imap4 imap4s imaps;
+	do
+		if [[ -e ${ROOT}/etc/pam.d/${i} ]]
+		then
+			lineold="`head -n 1 ${ROOT}/etc/pam.d/${i}`"
+
+			if [[ "${lineorig}" != "${lineold}" ]]
+			then
+				ewarn "${ROOT}/etc/pam.d/${i} exists and wasn't provided by mailbase"
+				(( filestoremove++ ))
+			fi
+		fi
+	done
+
+	if [[ filestoremove -gt 0 ]]
+	then
+		echo
+		einfo "Those files listed above have to be removed in order to"
+		einfo " install this version of mailbase."
+		echo
+		ewarn "If you edited them, remember to backup and when restoring make"
+		ewarn " sure the first line in each file is:"
+		einfo ${lineorig}
+		die "Can't be installed, files will collide"
+	else
+		einfo "... everything looks ok"
+	fi
+}
+
+src_install() {
+	dodir /etc/mail
+	insinto /etc/mail
+	doins ${FILESDIR}/aliases
+	insinto /etc/
+	doins ${FILESDIR}/mailcap
+
+	keepdir /var/spool/mail
+	fowners root:mail /var/spool/mail
+	fperms 0775 /var/spool/mail
+	dosym /var/spool/mail /var/mail
+
+	insinto /etc/pam.d/
+	for i in pop pop3 pop3d pops imap imap4 imap4s imaps;
+	do
+		newins ${FILESDIR}/common-pamd ${i}
+	done
+}
+
+pkg_postinst() {
+	if [ ! -d ${ROOT}/var/spool/mail ]
+	then
+		mkdir -p ${ROOT}/var/spool/mail
+	fi
+
+	# Always set these to close bug #8029.
+	chown root:mail ${ROOT}/var/spool/mail
+	chmod 0775 ${ROOT}/var/spool/mail
+}