Add a note about passfile feature and used file name in pkg_postinst(). Suggested by Rob Scott <rscott13 at comcast.net> in bug #171831. Unneeded ebuilds cleanup.

(Portage version: 2.1.2.2)

13 files changed, 48 insertions, 542 deletions

diff --git a/mail-client/pine/ChangeLog b/mail-client/pine/ChangeLog
index 590aac0f2e40..7e9dc215c869 100644
--- a/mail-client/pine/ChangeLog
+++ b/mail-client/pine/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-client/pine
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.93 2007/03/20 14:06:09 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.94 2007/03/23 21:22:07 ticho Exp $
+
+  23 Mar 2007; Andrej Kacian <ticho@gentoo.org>
+  +files/pine-4.64-rename-symlink.patch, -files/rename-symlink.patch,
+  -pine-4.61-r5.ebuild, -pine-4.63-r3.ebuild, pine-4.64.ebuild,
+  pine-4.64-r1.ebuild, pine-4.64-r3.ebuild, -pine-4.64-r4.ebuild,
+  pine-4.64-r5.ebuild, pine-4.64-r6.ebuild:
+  Add a note about passfile feature and used file name in pkg_postinst().
+  Suggested by Rob Scott <rscott13 at comcast.net> in bug #171831. Unneeded
+  ebuilds cleanup.
 
   20 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org> pine-4.64-r5.ebuild:
   Stable on sparc wrt #170301
diff --git a/mail-client/pine/files/digest-pine-4.61-r5 b/mail-client/pine/files/digest-pine-4.61-r5
deleted file mode 100644
index 29777e50c9a0..000000000000
--- a/mail-client/pine/files/digest-pine-4.61-r5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 f8a98b202010698fc680e1ff06b8e425 pine-4.61-r2-chappa-all.patch.gz 160672
-RMD160 77bb10cbe3263252a96d5b6d2d5f43f5346d36c7 pine-4.61-r2-chappa-all.patch.gz 160672
-SHA256 e136ee6d3f4d38cb8ee9ea905b801c466deb1450a8e8b4646e5dec54adae026d pine-4.61-r2-chappa-all.patch.gz 160672
-MD5 885c6aa4f4f16fcb83a49ef6c025307e pine4.61.tar.bz2 3032253
-RMD160 02c3e6998fb269535410f9d669d8a0f30f96cccd pine4.61.tar.bz2 3032253
-SHA256 6d1478b018c358379997c03262b401f7e69164e92345687248feb5251300c56c pine4.61.tar.bz2 3032253
diff --git a/mail-client/pine/files/digest-pine-4.63-r3 b/mail-client/pine/files/digest-pine-4.63-r3
deleted file mode 100644
index c15df67c4cbb..000000000000
--- a/mail-client/pine/files/digest-pine-4.63-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 fb579abea4ec3359875de10da41ff45e pine-4.63-r3-chappa-all.patch.gz 169850
-RMD160 0f3974c72d14dcf6cc849569a91ce796c043076d pine-4.63-r3-chappa-all.patch.gz 169850
-SHA256 7700a780bac67b8131f1ee19b8ea448f7756589c20c413d0c3683ce4d0ac8d16 pine-4.63-r3-chappa-all.patch.gz 169850
-MD5 e881f439f38039b310d22554ab08feb4 pine4.63.tar.bz2 3083721
-RMD160 b04a6f5134aeae6b0a5663acbfa4e812c3fc7762 pine4.63.tar.bz2 3083721
-SHA256 86c5914c6d45ca7490035e39dd4eb2a52d8ae0fec2e05d71fdaa6bd4448f1f8f pine4.63.tar.bz2 3083721
diff --git a/mail-client/pine/files/digest-pine-4.64-r4 b/mail-client/pine/files/digest-pine-4.64-r4
deleted file mode 100644
index e14b67a475d6..000000000000
--- a/mail-client/pine/files/digest-pine-4.64-r4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 0684c783061a2e1d48b8f340288ce9fd pine-4.64-r4-chappa-all.patch.gz 181492
-RMD160 12cc42e20e23ef275cc302961e4e75c4d443666b pine-4.64-r4-chappa-all.patch.gz 181492
-SHA256 68ce52ec065997c9f273518c2149b5810bf9866ad6280a79515215eb346da2be pine-4.64-r4-chappa-all.patch.gz 181492
-MD5 39ca07b3d305b4cd0d6aaf4585123275 pine4.64.tar.bz2 3110790
-RMD160 8661cd3c0875e46c8cd5eafa7c7c964f79a3b3fd pine4.64.tar.bz2 3110790
-SHA256 5a697f1ffed84bba2dddb3534d0829eab6dacd169ea0122621e6b3dd522eb783 pine4.64.tar.bz2 3110790
diff --git a/mail-client/pine/files/rename-symlink.patch b/mail-client/pine/files/pine-4.64-rename-symlink.patch
index 8af77448a3fd..8af77448a3fd 100644
--- a/mail-client/pine/files/rename-symlink.patch
+++ b/mail-client/pine/files/pine-4.64-rename-symlink.patch
diff --git a/mail-client/pine/pine-4.61-r5.ebuild b/mail-client/pine/pine-4.61-r5.ebuild
deleted file mode 100644
index dadce7f0c9be..000000000000
--- a/mail-client/pine/pine-4.61-r5.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.61-r5.ebuild,v 1.10 2007/03/20 09:32:55 ticho Exp $
-
-inherit eutils
-
-# Using this ugly hack, since we're using chappa patch revision 1 (see #59573)
-CHAPPA_PF="${P}-r2"
-
-DESCRIPTION="A tool for reading, sending and managing electronic messages."
-HOMEPAGE="http://www.washington.edu/pine/
-	http://staff.washington.edu/chappa/pine/"
-SRC_URI="ftp://ftp.cac.washington.edu/pine/${PN}${PV}.tar.bz2
-	mirror://gentoo/${CHAPPA_PF}-chappa-all.patch.gz"
-#	ipv6? (
-#		http://www.ngn.euro6ix.org/IPv6/${PN}/${P}-v6-20031001.diff
-#		http://www.ngn.euro6ix.org/IPv6/${PN}/readme.${P}-v6-20031001
-#	)"
-
-LICENSE="PICO"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc alpha ~amd64"
-#IUSE="ipv6 maildir ssl ldap kerberos passfile"
-IUSE="ssl ldap kerberos largeterminal pam passfile debug"
-
-DEPEND="virtual/libc
-	>=sys-apps/sed-4
-	>=sys-libs/ncurses-5.1
-	pam? ( >=sys-libs/pam-0.72 )
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )
-	kerberos? ( app-crypt/mit-krb5 )"
-RDEPEND="${DEPEND} app-misc/mime-types"
-
-S="${WORKDIR}/${P/-/}"
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	# Various fixes and features.
-	epatch "${WORKDIR}/${CHAPPA_PF}-chappa-all.patch"
-	# UTF8 support. Not ported. 4.60 has utf8 some conversion.
-	#epatch "${DISTDIR}/${PN}${PV}-utf8-to-singlebyte.patch"
-	# Fix flock() emulation.
-	cp "${FILESDIR}/flock.c" "${S}/imap/src/osdep/unix"
-	# Build the flock() emulation.
-	epatch "${FILESDIR}/imap-4.7c2-flock_4.60.patch"
-	if use ldap ; then
-		# Link to shared ldap libs instead of static.
-		epatch "${FILESDIR}/pine-4.30-ldap.patch"
-		mkdir "${S}/ldap"
-		ln -s /usr/lib "${S}/ldap/libraries"
-		ln -s /usr/include "${S}/ldap/include"
-	fi
-#	if use ipv6 ; then
-#		epatch "${DISTDIR}/${P}-v6-20031001.diff"
-#	fi
-	if use passfile ; then
-		#Is this really the correct place to define it?
-		epatch "${FILESDIR}/pine-4.56-passfile.patch"
-	fi
-	if use largeterminal ; then
-		# Add support for large terminals by doubling the size of pine's internal display buffer
-		epatch "${FILESDIR}/pine-4.61-largeterminal.patch"
-	fi
-
-	# Something from RedHat.
-	epatch "${FILESDIR}/pine-4.31-segfix.patch"
-	# Create lockfiles with a mode of 0600 instead of 0666.
-	epatch "${FILESDIR}/pine-4.40-lockfile-perm.patch"
-	# Add missing time.h includes.
-	epatch "${FILESDIR}/imap-2000-time.patch"
-	# Bug #23336 - makes pine transparent in terms that support it.
-	epatch "${FILESDIR}/transparency.patch"
-
-	# Bug #72861 - relaxes subject length for base64-encoded subjects
-	epatch "${FILESDIR}/pine-4.61-subjectlength.patch"
-
-	if use debug ; then
-		sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS} -g -DDEBUG -DDEBUGJOURNAL:" \
-			-i "${S}/pine/makefile.lnx" || die "sed pine/makefile.lnx failed"
-		sed -e "s:-g -DDEBUG:${CFLAGS} -g -DDEBUG:" \
-			-i "${S}/pico/makefile.lnx" || die "sed pico/makefile.lnx failed"
-	else
-		sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS}:" \
-			-i "${S}/pine/makefile.lnx" || die "sed pine/makefile.lnx failed"
-		sed -e "s:-g -DDEBUG:${CFLAGS}:" \
-			-i "${S}/pico/makefile.lnx" || die "sed pico/makefile.lnx failed"
-	fi
-
-	sed -e "s:/usr/local/lib/pine.conf:/etc/pine.conf:" \
-		-i "${S}/pine/osdep/os-lnx.h" || die "sed os-lnx.h failed"
-}
-
-src_compile() {
-	local myconf
-	if use ssl ; then
-		myconf="${myconf} SSLDIR=/usr SSLTYPE=unix SSLCERTS=/etc/ssl/certs"
-		sed -e "s:\$(SSLDIR)/certs:/etc/ssl/certs:" \
-			-e "s:\$(SSLCERTS):/etc/ssl/certs:" \
-			-e "s:-I\$(SSLINCLUDE) ::" \
-			-i "${S}/imap/src/osdep/unix/Makefile" || die "sed Makefile failed"
-	else
-		myconf="${myconf} NOSSL"
-	fi
-	if use ldap ; then
-		./contrib/ldap-setup lnp lnp
-		myconf="${myconf} LDAPCFLAGS=-DENABLE_LDAP"
-	else
-		myconf="${myconf} NOLDAP"
-	fi
-	if use kerberos ; then
-		myconf="${myconf} EXTRAAUTHENTICATORS=gss"
-	fi
-	if use pam ; then
-		target=lnp
-	else
-		target=slx
-	fi
-
-	./build ${myconf} ${target} || die "compile problem"
-}
-
-src_install() {
-	dobin bin/pine bin/pico bin/pilot bin/mtest bin/rpdump bin/rpload \
-	      mailutil/mailutil
-
-	# Only mailbase should install /etc/mailcap
-#	newins doc/mailcap.unx mailcap
-
-	doman doc/pine.1 doc/pico.1 doc/pilot.1 doc/rpdump.1 doc/rpload.1 \
-	      imap/src/mailutil/mailutil.1
-	dodoc CPYRIGHT README doc/brochure.txt doc/tech-notes.txt
-#	if use ipv6 ; then
-#		dodoc "${DISTDIR}/readme.${P}-v6-20031001"
-#	fi
-
-	docinto imap
-	dodoc imap/docs/*.txt imap/docs/CONFIG imap/docs/RELNOTES
-
-	docinto imap/rfc
-	dodoc imap/docs/rfc/*.txt
-
-	docinto html/tech-notes
-	dohtml -r doc/tech-notes/
-}
-
-pkg_postinst() {
-	elog
-	elog "This build of Pine has Maildir support built in as"
-	elog "part of the chappa-all patch."
-	elog
-	elog "If you have a maildir at ~/Maildir it will be your"
-	elog "default INBOX. The path may be changed with the"
-	elog "\"maildir-location\" setting in Pine."
-	elog
-	elog "If you don't have any maildirs Pine works as before"
-	elog "with the INBOX at /var/spool/mail/."
-	elog
-}
diff --git a/mail-client/pine/pine-4.63-r3.ebuild b/mail-client/pine/pine-4.63-r3.ebuild
deleted file mode 100644
index ac0b61f2677f..000000000000
--- a/mail-client/pine/pine-4.63-r3.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.63-r3.ebuild,v 1.10 2007/03/20 09:32:55 ticho Exp $
-
-inherit eutils
-
-# Using this ugly hack, since we're making our own versioned copies of chappa 
-# patch, as upstream doesn't version them, and patch revision number doesn't
-# always have to correspond to ebuild revision number. (see #59573) 
-CHAPPA_PF="${P}-r3"
-
-DESCRIPTION="A tool for reading, sending and managing electronic messages."
-HOMEPAGE="http://www.washington.edu/pine/
-	http://staff.washington.edu/chappa/pine/"
-SRC_URI="ftp://ftp.cac.washington.edu/pine/${P/-/}.tar.bz2
-	mirror://gentoo/${CHAPPA_PF}-chappa-all.patch.gz"
-#	ipv6? (
-#		http://www.ngn.euro6ix.org/IPv6/${PN}/${P}-v6-20031001.diff
-#		http://www.ngn.euro6ix.org/IPv6/${PN}/readme.${P}-v6-20031001
-#	)"
-
-LICENSE="PICO"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ia64 ppc sparc x86"
-IUSE="ssl ldap kerberos largeterminal pam passfile debug"
-
-DEPEND="virtual/libc
-	>=sys-apps/sed-4
-	>=sys-libs/ncurses-5.1
-	pam? ( >=sys-libs/pam-0.72 )
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )
-	kerberos? ( app-crypt/mit-krb5 )"
-RDEPEND="${DEPEND} app-misc/mime-types"
-
-S="${WORKDIR}/${P/-/}"
-
-maildir_warn() {
-	elog
-	elog "This build of Pine has Maildir support built in as"
-	elog "part of the chappa-all patch."
-	elog
-	elog "If you have a maildir at ~/Maildir it will be your"
-	elog "default INBOX. The path may be changed with the"
-	elog "\"maildir-location\" setting in Pine."
-	elog
-	elog "To use /var/spool/mail INBOX again, set"
-	elog "\"disable-these-drivers=md\" in your .pinerc file."
-	elog
-	elog "Alternately, you might want to read following webpage, which explains how to"
-	elog "use multiple mailboxes simultaneously:"
-	elog
-	elog "http://www.math.washington.edu/~chappa/pine/pine-info/collections/incoming-folders/"
-	echo
-}
-
-pkg_setup() {
-	maildir_warn
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	epatch "${FILESDIR}/pine-4.62-spooldir-permissions.patch" || die
-
-	# Various fixes and features.
-	epatch "${WORKDIR}/${CHAPPA_PF}-chappa-all.patch" || die
-	# Fix flock() emulation.
-	cp "${FILESDIR}/flock.c" "${S}/imap/src/osdep/unix" || die
-	# Build the flock() emulation.
-	epatch "${FILESDIR}/imap-4.7c2-flock_4.60.patch" || die
-	if use ldap ; then
-		# Link to shared ldap libs instead of static.
-		epatch "${FILESDIR}/pine-4.30-ldap.patch" || die
-		mkdir "${S}/ldap"
-		ln -s /usr/lib "${S}/ldap/libraries"
-		ln -s /usr/include "${S}/ldap/include"
-	fi
-#	if use ipv6 ; then
-#		epatch "${DISTDIR}/${P}-v6-20031001.diff" || die
-#	fi
-	if use passfile ; then
-		#Is this really the correct place to define it?
-		epatch "${FILESDIR}/pine-4.56-passfile.patch" || die
-	fi
-	if use largeterminal ; then
-		# Add support for large terminals by doubling the size of pine's internal display buffer
-		epatch "${FILESDIR}/pine-4.61-largeterminal.patch" || die
-	fi
-
-	# Something from RedHat.
-	epatch "${FILESDIR}/pine-4.31-segfix.patch" || die
-	# Create lockfiles with a mode of 0600 instead of 0666.
-	epatch "${FILESDIR}/pine-4.40-lockfile-perm.patch" || die
-	# Add missing time.h includes.
-	epatch "${FILESDIR}/imap-2000-time.patch" || die
-	# Bug #23336 - makes pine transparent in terms that support it.
-	epatch "${FILESDIR}/transparency.patch" || die
-
-	# Bug #72861 - relaxes subject length for base64-encoded subjects
-	epatch "${FILESDIR}/pine-4.61-subjectlength.patch" || die
-
-	if use debug ; then
-		sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS} -g -DDEBUG -DDEBUGJOURNAL:" \
-			-i "${S}/pine/makefile.lnx" || die "sed pine/makefile.lnx failed"
-		sed -e "s:-g -DDEBUG:${CFLAGS} -g -DDEBUG:" \
-			-i "${S}/pico/makefile.lnx" || die "sed pico/makefile.lnx failed"
-	else
-		sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS}:" \
-			-i "${S}/pine/makefile.lnx" || die "sed pine/makefile.lnx failed"
-		sed -e "s:-g -DDEBUG:${CFLAGS}:" \
-			-i "${S}/pico/makefile.lnx" || die "sed pico/makefile.lnx failed"
-	fi
-
-	sed -e "s:/usr/local/lib/pine.conf:/etc/pine.conf:" \
-		-i "${S}/pine/osdep/os-lnx.h" || die "sed os-lnx.h failed"
-}
-
-src_compile() {
-	local myconf
-	if use ssl ; then
-		myconf="${myconf} SSLDIR=/usr SSLTYPE=unix SSLCERTS=/etc/ssl/certs"
-		sed -e "s:\$(SSLDIR)/certs:/etc/ssl/certs:" \
-			-e "s:\$(SSLCERTS):/etc/ssl/certs:" \
-			-e "s:-I\$(SSLINCLUDE) ::" \
-			-i "${S}/imap/src/osdep/unix/Makefile" || die "sed Makefile failed"
-	else
-		myconf="${myconf} NOSSL"
-	fi
-	if use ldap ; then
-		./contrib/ldap-setup lnp lnp
-		myconf="${myconf} LDAPCFLAGS=-DENABLE_LDAP"
-	else
-		myconf="${myconf} NOLDAP"
-	fi
-	if use kerberos ; then
-		myconf="${myconf} EXTRAAUTHENTICATORS=gss"
-	fi
-
-	if use pam ; then
-		target=lnp
-	else
-		target=slx
-	fi
-
-	./build ${myconf} ${target} || die "compile problem"
-}
-
-src_install() {
-	dobin bin/pine bin/pico bin/pilot bin/mtest bin/rpdump bin/rpload \
-	      mailutil/mailutil
-
-	# Only mailbase should install /etc/mailcap
-#	newins doc/mailcap.unx mailcap
-
-	doman doc/pine.1 doc/pico.1 doc/pilot.1 doc/rpdump.1 doc/rpload.1 \
-	      imap/src/mailutil/mailutil.1
-	dodoc CPYRIGHT README doc/brochure.txt doc/tech-notes.txt
-#	if use ipv6 ; then
-#		dodoc "${DISTDIR}/readme.${P}-v6-20031001"
-#	fi
-
-	docinto imap
-	dodoc imap/docs/*.txt imap/docs/CONFIG imap/docs/RELNOTES
-
-	docinto imap/rfc
-	dodoc imap/docs/rfc/*.txt
-
-	docinto html/tech-notes
-	dohtml -r doc/tech-notes/
-}
-
-pkg_postinst() {
-	maildir_warn
-}
diff --git a/mail-client/pine/pine-4.64-r1.ebuild b/mail-client/pine/pine-4.64-r1.ebuild
index 085cf87aadb8..fb0fbbf90b41 100644
--- a/mail-client/pine/pine-4.64-r1.ebuild
+++ b/mail-client/pine/pine-4.64-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64-r1.ebuild,v 1.11 2007/03/20 09:32:55 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64-r1.ebuild,v 1.12 2007/03/23 21:22:07 ticho Exp $
 
 inherit eutils
 
@@ -173,4 +173,11 @@ src_install() {
 
 pkg_postinst() {
 	maildir_warn
+
+	if use passfile ; then
+		elog
+		elog "Pine will cache passwords between connections."
+		elog "File ~/.pinepw will be used for this."
+		elog
+	fi
 }
diff --git a/mail-client/pine/pine-4.64-r3.ebuild b/mail-client/pine/pine-4.64-r3.ebuild
index 1798246f1f74..7c3ff3c23bef 100644
--- a/mail-client/pine/pine-4.64-r3.ebuild
+++ b/mail-client/pine/pine-4.64-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64-r3.ebuild,v 1.9 2007/03/20 09:32:55 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64-r3.ebuild,v 1.10 2007/03/23 21:22:07 ticho Exp $
 
 inherit eutils
 
@@ -173,4 +173,11 @@ src_install() {
 
 pkg_postinst() {
 	maildir_warn
+
+	if use passfile ; then
+		elog
+		elog "Pine will cache passwords between connections."
+		elog "File ~/.pinepw will be used for this."
+		elog
+	fi
 }
diff --git a/mail-client/pine/pine-4.64-r4.ebuild b/mail-client/pine/pine-4.64-r4.ebuild
deleted file mode 100644
index 3678508c37d9..000000000000
--- a/mail-client/pine/pine-4.64-r4.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64-r4.ebuild,v 1.5 2007/03/20 09:32:55 ticho Exp $
-
-inherit eutils
-
-# Using this ugly hack, since we're making our own versioned copies of chappa 
-# patch, as upstream doesn't version them, and patch revision number doesn't
-# always have to correspond to ebuild revision number. (see #59573) 
-CHAPPA_PF="${PF}"
-
-DESCRIPTION="A tool for reading, sending and managing electronic messages."
-HOMEPAGE="http://www.washington.edu/pine/
-	http://staff.washington.edu/chappa/pine/"
-SRC_URI="ftp://ftp.cac.washington.edu/pine/${P/-/}.tar.bz2
-	mirror://gentoo/${CHAPPA_PF}-chappa-all.patch.gz"
-#	ipv6? (
-#		http://www.ngn.euro6ix.org/IPv6/${PN}/${P}-v6-20031001.diff
-#		http://www.ngn.euro6ix.org/IPv6/${PN}/readme.${P}-v6-20031001
-#	)"
-
-LICENSE="PICO"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="ssl ldap kerberos largeterminal pam passfile debug"
-
-DEPEND="virtual/libc
-	>=sys-apps/sed-4
-	>=sys-libs/ncurses-5.1
-	pam? ( >=sys-libs/pam-0.72 )
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )
-	kerberos? ( app-crypt/mit-krb5 )"
-RDEPEND="${DEPEND}
-	app-misc/mime-types
-	net-mail/uw-mailutils
-	!<=net-mail/uw-imap-2004g"
-
-S="${WORKDIR}/${P/-/}"
-
-maildir_warn() {
-	elog
-	elog "This build of Pine has Maildir support built in as"
-	elog "part of the chappa-all patch."
-	elog
-	elog "If you have a maildir at ~/Maildir it will be your"
-	elog "default INBOX. The path may be changed with the"
-	elog "\"maildir-location\" setting in Pine."
-	elog
-	elog "To use /var/spool/mail INBOX again, set"
-	elog "\"disable-these-drivers=md\" in your .pinerc file."
-	elog
-	elog "Alternately, you might want to read following webpage, which explains how to"
-	elog "use multiple mailboxes simultaneously:"
-	elog
-	elog "http://www.math.washington.edu/~chappa/pine/pine-info/collections/incoming-folders/"
-	echo
-}
-
-pkg_setup() {
-	maildir_warn
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	epatch "${FILESDIR}/pine-4.62-spooldir-permissions.patch" || die
-
-	# Various fixes and features.
-	epatch "${WORKDIR}/${CHAPPA_PF}-chappa-all.patch" || die
-	# Fix flock() emulation.
-	cp "${FILESDIR}/flock.c" "${S}/imap/src/osdep/unix" || die
-	# Build the flock() emulation.
-	epatch "${FILESDIR}/imap-4.7c2-flock_4.60.patch" || die
-	if use ldap ; then
-		# Link to shared ldap libs instead of static.
-		epatch "${FILESDIR}/pine-4.30-ldap.patch" || die
-		mkdir "${S}/ldap"
-		ln -s /usr/lib "${S}/ldap/libraries"
-		ln -s /usr/include "${S}/ldap/include"
-	fi
-#	if use ipv6 ; then
-#		epatch "${DISTDIR}/${P}-v6-20031001.diff" || die
-#	fi
-	if use passfile ; then
-		#Is this really the correct place to define it?
-		epatch "${FILESDIR}/pine-4.56-passfile.patch" || die
-	fi
-	if use largeterminal ; then
-		# Add support for large terminals by doubling the size of pine's internal display buffer
-		epatch "${FILESDIR}/pine-4.61-largeterminal.patch" || die
-	fi
-
-	# Something from RedHat.
-	epatch "${FILESDIR}/pine-4.31-segfix.patch" || die
-	# Create lockfiles with a mode of 0600 instead of 0666.
-	epatch "${FILESDIR}/pine-4.40-lockfile-perm.patch" || die
-	# Add missing time.h includes.
-	epatch "${FILESDIR}/imap-2000-time.patch" || die
-	# Bug #23336 - makes pine transparent in terms that support it.
-	epatch "${FILESDIR}/transparency.patch" || die
-
-	# Bug #72861 - relaxes subject length for base64-encoded subjects
-	epatch "${FILESDIR}/pine-4.61-subjectlength.patch" || die
-
-	if use debug ; then
-		sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS} -g -DDEBUG -DDEBUGJOURNAL:" \
-			-i "${S}/pine/makefile.lnx" || die "sed pine/makefile.lnx failed"
-		sed -e "s:-g -DDEBUG:${CFLAGS} -g -DDEBUG:" \
-			-i "${S}/pico/makefile.lnx" || die "sed pico/makefile.lnx failed"
-	else
-		sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS}:" \
-			-i "${S}/pine/makefile.lnx" || die "sed pine/makefile.lnx failed"
-		sed -e "s:-g -DDEBUG:${CFLAGS}:" \
-			-i "${S}/pico/makefile.lnx" || die "sed pico/makefile.lnx failed"
-	fi
-
-	sed -e "s:/usr/local/lib/pine.conf:/etc/pine.conf:" \
-		-i "${S}/pine/osdep/os-lnx.h" || die "sed os-lnx.h failed"
-}
-
-src_compile() {
-	local myconf
-	if use ssl ; then
-		myconf="${myconf} SSLDIR=/usr SSLTYPE=unix SSLCERTS=/etc/ssl/certs"
-		sed -e "s:\$(SSLDIR)/certs:/etc/ssl/certs:" \
-			-e "s:\$(SSLCERTS):/etc/ssl/certs:" \
-			-e "s:-I\$(SSLINCLUDE) ::" \
-			-i "${S}/imap/src/osdep/unix/Makefile" || die "sed Makefile failed"
-	else
-		myconf="${myconf} NOSSL"
-	fi
-	if use ldap ; then
-		./contrib/ldap-setup lnp lnp
-		myconf="${myconf} LDAPCFLAGS=-DENABLE_LDAP"
-	else
-		myconf="${myconf} NOLDAP"
-	fi
-	if use kerberos ; then
-		myconf="${myconf} EXTRAAUTHENTICATORS=gss"
-	fi
-
-	if use pam ; then
-		target=lnp
-	else
-		target=slx
-	fi
-
-	./build ${myconf} ${target} || die "compile problem"
-}
-
-src_install() {
-	dobin bin/pine bin/pico bin/pilot bin/rpdump bin/rpload
-
-	# Only mailbase should install /etc/mailcap
-#	newins doc/mailcap.unx mailcap
-
-	doman doc/pine.1 doc/pico.1 doc/pilot.1 doc/rpdump.1 doc/rpload.1
-	dodoc CPYRIGHT README doc/brochure.txt doc/tech-notes.txt
-#	if use ipv6 ; then
-#		dodoc "${DISTDIR}/readme.${P}-v6-20031001"
-#	fi
-
-	docinto imap
-	dodoc imap/docs/*.txt imap/docs/CONFIG imap/docs/RELNOTES
-
-	docinto imap/rfc
-	dodoc imap/docs/rfc/*.txt
-
-	docinto html/tech-notes
-	dohtml -r doc/tech-notes/
-}
-
-pkg_postinst() {
-	maildir_warn
-}
diff --git a/mail-client/pine/pine-4.64-r5.ebuild b/mail-client/pine/pine-4.64-r5.ebuild
index f097fe192ea2..bcde51586702 100644
--- a/mail-client/pine/pine-4.64-r5.ebuild
+++ b/mail-client/pine/pine-4.64-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64-r5.ebuild,v 1.7 2007/03/20 14:06:09 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64-r5.ebuild,v 1.8 2007/03/23 21:22:07 ticho Exp $
 
 inherit eutils
 
@@ -99,11 +99,10 @@ src_unpack() {
 	epatch "${FILESDIR}/imap-2000-time.patch"
 	# Bug #23336 - makes pine transparent in terms that support it.
 	epatch "${FILESDIR}/transparency.patch"
-
 	# Bug #72861 - relaxes subject length for base64-encoded subjects
 	epatch "${FILESDIR}/pine-4.61-subjectlength.patch"
-
-	epatch "${FILESDIR}/rename-symlink.patch"
+	# Bug #58664 - preserve symlink if a file gets rewritten
+	epatch "${FILESDIR}/${P}-rename-symlink.patch"
 
 	if use debug ; then
 		sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS} -g -DDEBUG -DDEBUGJOURNAL:" \
@@ -175,4 +174,11 @@ src_install() {
 
 pkg_postinst() {
 	maildir_warn
+
+	if use passfile ; then
+		elog
+		elog "Pine will cache passwords between connections."
+		elog "File ~/.pinepw will be used for this."
+		elog
+	fi
 }
diff --git a/mail-client/pine/pine-4.64-r6.ebuild b/mail-client/pine/pine-4.64-r6.ebuild
index c5ed46c10fd3..dbc043af5b0a 100644
--- a/mail-client/pine/pine-4.64-r6.ebuild
+++ b/mail-client/pine/pine-4.64-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64-r6.ebuild,v 1.1 2007/03/20 09:32:55 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64-r6.ebuild,v 1.2 2007/03/23 21:22:07 ticho Exp $
 
 inherit eutils
 
@@ -99,11 +99,10 @@ src_unpack() {
 	epatch "${FILESDIR}/imap-2000-time.patch"
 	# Bug #23336 - makes pine transparent in terms that support it.
 	epatch "${FILESDIR}/transparency.patch"
-
 	# Bug #72861 - relaxes subject length for base64-encoded subjects
 	epatch "${FILESDIR}/pine-4.61-subjectlength.patch"
-
-	epatch "${FILESDIR}/rename-symlink.patch"
+	# Bug #58664 - preserve symlink if a file gets rewritten
+	epatch "${FILESDIR}/${P}-rename-symlink.patch"
 
 	if use debug ; then
 		sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS} -g -DDEBUG -DDEBUGJOURNAL:" \
diff --git a/mail-client/pine/pine-4.64.ebuild b/mail-client/pine/pine-4.64.ebuild
index e7669e11fcce..9252ba45c339 100644
--- a/mail-client/pine/pine-4.64.ebuild
+++ b/mail-client/pine/pine-4.64.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64.ebuild,v 1.8 2007/03/20 09:32:55 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64.ebuild,v 1.9 2007/03/23 21:22:07 ticho Exp $
 
 inherit eutils
 
@@ -51,7 +51,7 @@ maildir_warn() {
 	elog "use multiple mailboxes simultaneously:"
 	elog
 	elog "http://www.math.washington.edu/~chappa/pine/pine-info/collections/incoming-folders/"
-	echo
+	elog
 }
 
 pkg_setup() {
@@ -172,4 +172,11 @@ src_install() {
 
 pkg_postinst() {
 	maildir_warn
+
+	if use passfile ; then
+		elog
+		elog "Pine will cache passwords between connections."
+		elog "File ~/.pinepw will be used for this."
+		elog
+	fi
 }