bit of cleanup

(Portage version: 2.0.51.19)

3 files changed, 16 insertions, 28 deletions

diff --git a/net-mail/mailbase/ChangeLog b/net-mail/mailbase/ChangeLog
index 58a75813365d..62d1f18d82e3 100644
--- a/net-mail/mailbase/ChangeLog
+++ b/net-mail/mailbase/ChangeLog
@@ -1,6 +1,9 @@
 # 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.45 2005/04/29 16:37:33 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailbase/ChangeLog,v 1.46 2005/05/22 19:32:38 ferdy Exp $
+
+  22 May 2005; Fernando J. Pereda <ferdy@gentoo.org> mailbase-1.ebuild:
+  bit of cleanup
 
   29 Apr 2005; Fernando J. Pereda <ferdy@gentoo.org> mailbase-1.ebuild:
   make it respect USE pam, wrt #90870. Reported by: Nuno Alexandre
diff --git a/net-mail/mailbase/Manifest b/net-mail/mailbase/Manifest
index e6e955dd950e..e5c9432788fb 100644
--- a/net-mail/mailbase/Manifest
+++ b/net-mail/mailbase/Manifest
@@ -1,11 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d5b004fb1c539c147780c7bc7c86629e mailbase-0.00-r9.ebuild 2434
 MD5 78fc96c16b9dc1d4902c62927e664ce9 mailbase-0.00-r4.ebuild 773
 MD5 d70889cf9ee474b30325789a31c253a9 mailbase-0.00-r6.ebuild 902
 MD5 9199352cf76278406a943618dd4a54ef mailbase-0.00-r8.ebuild 2262
-MD5 8450c167e0f430a9d6aaa139066f7942 mailbase-1.ebuild 2465
+MD5 5464919e49edbe8fdab5b78e5248fd7d mailbase-1.ebuild 2440
 MD5 f224d58950c57b4f07888966ad00cd9a mailbase-0.00-r5.ebuild 877
 MD5 a5d2b893cb09235e3c253d9d0c50f3fa mailbase-0.00-r7.ebuild 1922
 MD5 0b1009512817c9a477bcd122050df9ac ChangeLog 5838
@@ -21,10 +18,3 @@ MD5 9850ca185823a3094ae3f6c2a057a3fb files/common-pamd-include 362
 MD5 df65e6e407e866c7e6721e79f731ae6a files/mailcap 2235
 MD5 a5623a262865054bd43c914e740a2e52 files/aliases 809
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mailbase-1 0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCcmLnViELBEf1JB0RAuQzAJ4x9ND8JE1BGjHzEAS+DsRAE/Z0wQCffolZ
-BNNfgIaclVu5J8gn5WTQ4Qg=
-=pzZz
------END PGP SIGNATURE-----
diff --git a/net-mail/mailbase/mailbase-1.ebuild b/net-mail/mailbase/mailbase-1.ebuild
index 2754b7a5b87f..ab6774b3f70e 100644
--- a/net-mail/mailbase/mailbase-1.ebuild
+++ b/net-mail/mailbase/mailbase-1.ebuild
@@ -1,6 +1,6 @@
 # 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-1.ebuild,v 1.2 2005/04/29 16:37:33 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailbase/mailbase-1.ebuild,v 1.3 2005/05/22 19:32:38 ferdy Exp $
 
 DESCRIPTION="MTA layout package"
 SRC_URI=""
@@ -16,37 +16,32 @@ RDEPEND="pam? ( virtual/pam )"
 S=${WORKDIR}
 
 pkg_setup() {
-	if use pam;
-	then
-		local filestoremove=0;
-		local lineorig=`head -n 1 ${FILESDIR}/common-pamd`
-		local lineold=""
+	if use pam ; then
+		local filestoremove=0 lineold=""
+		local lineorig=$(head -n 1 ${FILESDIR}/common-pamd)
 
 		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}`"
+		for i in pop{,3}{,s} imap{,4}{,s} ; do
+			if [[ -e ${ROOT}/etc/pam.d/${i} ]] ; then
+				lineold=$(head -n 1 ${ROOT}/etc/pam.d/${i})
 
-				if [[ "${lineorig}" != "${lineold}" ]]
-				then
+				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
+		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}
+			echo
+			echo ${lineorig}
 			die "Can't be installed, files will collide"
 		else
 			einfo "... everything looks ok"