diff options
| author |   Fernando J. Pereda <ferdy@gentoo.org> | 2005-05-22 19:32:38 +0000 |
|---|---|---|
| committer | Fernando J. Pereda <ferdy@gentoo.org> | 2005-05-22 19:32:38 +0000 |
| commit | 5ffd896fd22995db6551c4c4f0117a959d1ae211 (patch) | |
| tree | ce8926e99d8c30b7ac27aa89e36d113744589852 /net-mail | |
| parent | Stable on SPARC. (diff) | |
| download | historical-5ffd896fd22995db6551c4c4f0117a959d1ae211.tar.gz historical-5ffd896fd22995db6551c4c4f0117a959d1ae211.tar.bz2 historical-5ffd896fd22995db6551c4c4f0117a959d1ae211.zip | |
bit of cleanup
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'net-mail')
| -rw-r--r-- | net-mail/mailbase/ChangeLog | 5 | ||||
| -rw-r--r-- | net-mail/mailbase/Manifest | 10 | ||||
| -rw-r--r-- | net-mail/mailbase/mailbase-1.ebuild | 27 |
3 files changed, 20 insertions, 22 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..03e2ae7fbff7 100644 --- a/net-mail/mailbase/Manifest +++ b/net-mail/mailbase/Manifest @@ -5,10 +5,10 @@ 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 18187be20c66b663f9f95a457a8a281e mailbase-1.ebuild 2436 MD5 f224d58950c57b4f07888966ad00cd9a mailbase-0.00-r5.ebuild 877 MD5 a5d2b893cb09235e3c253d9d0c50f3fa mailbase-0.00-r7.ebuild 1922 -MD5 0b1009512817c9a477bcd122050df9ac ChangeLog 5838 +MD5 0139aae4a8ec58d1fcdf8d97ee4c88a1 ChangeLog 5928 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161 MD5 e75c39fbdac8eec750d84a7183ac6721 files/common-pamd 417 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mailbase-0.00-r4 0 @@ -24,7 +24,7 @@ MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mailbase-1 0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFCcmLnViELBEf1JB0RAuQzAJ4x9ND8JE1BGjHzEAS+DsRAE/Z0wQCffolZ -BNNfgIaclVu5J8gn5WTQ4Qg= -=pzZz +iD8DBQFCkN52ViELBEf1JB0RAo4SAJkBiy1m821q4/vqcUXRlbDzlvNO8gCeOCJ6 +wT/7iLHBewzo6wvdN/GN+OQ= +=b1pD -----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" |