Updated chappa-all patchset.

(Portage version: 2.1.3_rc8)

8 files changed, 57 insertions, 416 deletions

diff --git a/mail-client/pine/ChangeLog b/mail-client/pine/ChangeLog
index 2f86028701dc..40b399a10611 100644
--- a/mail-client/pine/ChangeLog
+++ b/mail-client/pine/ChangeLog
@@ -1,6 +1,12 @@
 # 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.100 2007/08/06 13:32:17 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.101 2007/09/01 05:12:37 ticho Exp $
+
+*pine-4.64-r7 (01 Sep 2007)
+
+  01 Sep 2007; Andrej Kacian <ticho@gentoo.org> -pine-4.64.ebuild,
+  -pine-4.64-r1.ebuild, -pine-4.64-r3.ebuild, +pine-4.64-r7.ebuild:
+  Updated chappa-all patchset.
 
   06 Aug 2007; Roy Marples <uberlord@gentoo.org> pine-4.64-r6.ebuild:
   Fix building on FreeBSD and keyword ~x86-fbsd, #104760.
diff --git a/mail-client/pine/files/digest-pine-4.64 b/mail-client/pine/files/digest-pine-4.64
deleted file mode 100644
index 1d0e24bde6d2..000000000000
--- a/mail-client/pine/files/digest-pine-4.64
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 c8656670bd48405e74f40abe15887cab pine-4.64-chappa-all.patch.gz 168807
-RMD160 f06525b5946076cd4b82c6c9538eb1f06670f25d pine-4.64-chappa-all.patch.gz 168807
-SHA256 6443a6f6ccdd37acfe65598473815ec025b03cf69a843662e7130464cef60665 pine-4.64-chappa-all.patch.gz 168807
-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/digest-pine-4.64-r1 b/mail-client/pine/files/digest-pine-4.64-r1
deleted file mode 100644
index 4d988669d7cf..000000000000
--- a/mail-client/pine/files/digest-pine-4.64-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 00abffc3fa1b2e2f0ded49ae9a017bb2 pine-4.64-r1-chappa-all.patch.gz 168825
-RMD160 e2fdf167f9eb449641bc335d873246eb0b21f597 pine-4.64-r1-chappa-all.patch.gz 168825
-SHA256 dda66e3ec162fb41aac55be9c208537543c8f326784d7ab3e87851ba469084fe pine-4.64-r1-chappa-all.patch.gz 168825
-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/digest-pine-4.64-r3 b/mail-client/pine/files/digest-pine-4.64-r3
deleted file mode 100644
index 73562e9bf5e2..000000000000
--- a/mail-client/pine/files/digest-pine-4.64-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 8cff8e2fc8733236fe3e3c3c6971e33f pine-4.64-r3-chappa-all.patch.gz 172627
-RMD160 f0682f3d8baf555f7940f0c2764a3b5870407a0d pine-4.64-r3-chappa-all.patch.gz 172627
-SHA256 6570a5b5daf5fec0c75feb90e5d9e561c33bff9223d60d01a32ade92754880fc pine-4.64-r3-chappa-all.patch.gz 172627
-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/digest-pine-4.64-r7 b/mail-client/pine/files/digest-pine-4.64-r7
new file mode 100644
index 000000000000..9e62d53002b7
--- /dev/null
+++ b/mail-client/pine/files/digest-pine-4.64-r7
@@ -0,0 +1,6 @@
+MD5 b10b772c5db8ffdd0cbefbb7c0e0d956 pine-4.64-r7-chappa-all.patch.gz 187959
+RMD160 2e30b604eaaeec257adb39ed4716f8063f77aaa2 pine-4.64-r7-chappa-all.patch.gz 187959
+SHA256 c52d002038a697cc4ffb2bbca6a60b5d170c976752b7f4185b47e1ac4e67a47d pine-4.64-r7-chappa-all.patch.gz 187959
+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/pine-4.64-r1.ebuild b/mail-client/pine/pine-4.64-r1.ebuild
deleted file mode 100644
index 8267d9989314..000000000000
--- a/mail-client/pine/pine-4.64-r1.ebuild
+++ /dev/null
@@ -1,183 +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-r1.ebuild,v 1.13 2007/06/26 02:08:16 mr_bones_ 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}-r1"
-
-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
-
-	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-r7.ebuild
index 4f30f64e6558..59dee1570097 100644
--- a/mail-client/pine/pine-4.64-r3.ebuild
+++ b/mail-client/pine/pine-4.64-r7.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.11 2007/06/26 02:08:16 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64-r7.ebuild,v 1.1 2007/09/01 05:12:37 ticho Exp $
 
 inherit eutils
 
@@ -21,13 +21,13 @@ SRC_URI="ftp://ftp.cac.washington.edu/pine/${P/-/}.tar.bz2
 
 LICENSE="PICO"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
 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 )
+	pam? ( virtual/pam )
 	ssl? ( dev-libs/openssl )
 	ldap? ( net-nds/openldap )
 	kerberos? ( app-crypt/mit-krb5 )"
@@ -39,21 +39,21 @@ RDEPEND="${DEPEND}
 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/"
+	einfo
+	einfo "This build of Pine has Maildir support built in as"
+	einfo "part of the chappa-all patch."
+	einfo
+	einfo "If you have a maildir at ~/Maildir it will be your"
+	einfo "default INBOX. The path may be changed with the"
+	einfo "\"maildir-location\" setting in Pine."
+	einfo
+	einfo "To use /var/spool/mail INBOX again, set"
+	einfo "\"disable-these-drivers=md\" in your .pinerc file."
+	einfo
+	einfo "Alternately, you might want to read following webpage, which explains how to"
+	einfo "use multiple mailboxes simultaneously:"
+	echo
+	echo "http://www.math.washington.edu/~chappa/pine/pine-info/collections/incoming-folders/"
 	echo
 }
 
@@ -64,17 +64,17 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A} && cd "${S}"
 
-	epatch "${FILESDIR}/pine-4.62-spooldir-permissions.patch" || die
+	epatch "${FILESDIR}/pine-4.62-spooldir-permissions.patch"
 
 	# Various fixes and features.
-	epatch "${WORKDIR}/${CHAPPA_PF}-chappa-all.patch" || die
+	epatch "${WORKDIR}/${CHAPPA_PF}-chappa-all.patch"
 	# 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
+	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" || die
+		epatch "${FILESDIR}/pine-4.30-ldap.patch"
 		mkdir "${S}/ldap"
 		ln -s /usr/lib "${S}/ldap/libraries"
 		ln -s /usr/include "${S}/ldap/include"
@@ -84,24 +84,25 @@ src_unpack() {
 #	fi
 	if use passfile ; then
 		#Is this really the correct place to define it?
-		epatch "${FILESDIR}/pine-4.56-passfile.patch" || die
+		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" || die
+		epatch "${FILESDIR}/pine-4.61-largeterminal.patch"
 	fi
 
 	# Something from RedHat.
-	epatch "${FILESDIR}/pine-4.31-segfix.patch" || die
+	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" || die
+	epatch "${FILESDIR}/pine-4.40-lockfile-perm.patch"
 	# Add missing time.h includes.
-	epatch "${FILESDIR}/imap-2000-time.patch" || die
+	epatch "${FILESDIR}/imap-2000-time.patch"
 	# Bug #23336 - makes pine transparent in terms that support it.
-	epatch "${FILESDIR}/transparency.patch" || die
-
+	epatch "${FILESDIR}/transparency.patch"
 	# Bug #72861 - relaxes subject length for base64-encoded subjects
-	epatch "${FILESDIR}/pine-4.61-subjectlength.patch" || die
+	epatch "${FILESDIR}/pine-4.61-subjectlength.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:" \
@@ -117,6 +118,15 @@ src_unpack() {
 
 	sed -e "s:/usr/local/lib/pine.conf:/etc/pine.conf:" \
 		-i "${S}/pine/osdep/os-lnx.h" || die "sed os-lnx.h failed"
+
+	sed -e "s:/usr/local/lib/pine.conf:/etc/pine.conf:" \
+		-i "${S}/pine/osdep/os-bsf.h" || die "sed os-bsf.h failed"
+
+	# We use ncurses for FreeBSD
+	for x in "${S}"/*/makefile.bsf ; do
+		sed -e "s/-ltermcap/-lcurses/g" -e "s/-ltermlib/-lcurses/g" \
+			-i "${x}" || die "sed ${x} failed"
+	done
 }
 
 src_compile() {
@@ -125,7 +135,7 @@ src_compile() {
 		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) ::" \
+			-e "s:-I\$(SSLINCLUDE):-I/usr/include/openssl:" \
 			-i "${S}/imap/src/osdep/unix/Makefile" || die "sed Makefile failed"
 	else
 		myconf="${myconf} NOSSL"
@@ -140,7 +150,9 @@ src_compile() {
 		myconf="${myconf} EXTRAAUTHENTICATORS=gss"
 	fi
 
-	if use pam ; then
+	if use elibc_FreeBSD ; then
+		target=bsf
+	elif use pam ; then
 		target=lnp
 	else
 		target=slx
diff --git a/mail-client/pine/pine-4.64.ebuild b/mail-client/pine/pine-4.64.ebuild
deleted file mode 100644
index 9cdb46fa8996..000000000000
--- a/mail-client/pine/pine-4.64.ebuild
+++ /dev/null
@@ -1,182 +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.ebuild,v 1.10 2007/06/26 02:08:16 mr_bones_ 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}"
-
-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/"
-	elog
-}
-
-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
-
-	if use passfile ; then
-		elog
-		elog "Pine will cache passwords between connections."
-		elog "File ~/.pinepw will be used for this."
-		elog
-	fi
-}