Update chappa patch pack.

4 files changed, 190 insertions, 22 deletions

diff --git a/mail-client/pine/ChangeLog b/mail-client/pine/ChangeLog
index 0db953818c1e..eb20975339d2 100644
--- a/mail-client/pine/ChangeLog
+++ b/mail-client/pine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/pine
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.23 2004/11/23 20:53:55 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.24 2004/11/25 01:11:03 ticho Exp $
+
+*pine-4.61-r3 (25 Nov 2004)
+
+  25 Nov 2004; Andrej Kacian <ticho@gentoo.org> +pine-4.61-r3.ebuild:
+  Updated chappa patch pack.
 
   23 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org> pine-4.61-r2.ebuild:
   Stable on amd64, bug #72268
diff --git a/mail-client/pine/Manifest b/mail-client/pine/Manifest
index a54752fc4e6e..8ac076377cc5 100644
--- a/mail-client/pine/Manifest
+++ b/mail-client/pine/Manifest
@@ -1,36 +1,38 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a9075d829cdc9276922f0a210fdf6f06 pine-4.61-r2.ebuild 4963
+MD5 730ed31a0e78d27762841272a62acb9c ChangeLog 11678
+MD5 b8350765f0144bf65c8276feed3224c3 pine-4.60.ebuild 4700
 MD5 f623f7141b8ee7869d27f6ba2b5a9151 pine-4.50-r4.ebuild 3482
+MD5 a9075d829cdc9276922f0a210fdf6f06 pine-4.61-r2.ebuild 4963
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 75179604ac64f4cbf6325ac71a96e536 pine-4.61-r1.ebuild 4777
 MD5 3cae58d7b2e4d49133262affba989f9f pine-4.58-r3.ebuild 4350
-MD5 fb6e45c547f230353fd7863a95fbc36d ChangeLog 11553
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 b8350765f0144bf65c8276feed3224c3 pine-4.60.ebuild 4700
-MD5 de52689ee75160c695bf4659ee956845 files/imap-4.7c2-flock_4.60.patch 537
-MD5 c47b08cab6132957eef9c0d61862f951 files/digest-pine-4.50-r4 131
-MD5 21aa4bed99713a0b9c9971226fda0807 files/digest-pine-4.58-r3 429
-MD5 4c1ce6a4925676bcfe5c53a2cf05b7f7 files/digest-pine-4.61-r1 139
-MD5 4c1ce6a4925676bcfe5c53a2cf05b7f7 files/digest-pine-4.61-r2 139
-MD5 921f1e2837b3d3aaaff0ff9b78432e92 files/pine-4.30-ldap.patch 420
-MD5 36fbad9153bc6b61adb00767d199d284 files/imap-4.7c2-flock+maildir.patch 551
-MD5 3803bda87f35ee20456ab2b363460db9 files/pine-4.31-segfix.patch 460
-MD5 c0d53400c157de12da7e429dd0f21185 files/imap-2000-time.patch 1646
-MD5 4239f06fa5f26e5cf181bb4cd5d96035 files/imap-4.7c2-flock.patch 531
+MD5 d01180f999c62051d9c5f778e3f8e828 pine-4.61-r3.ebuild 4962
+MD5 8f1d4661a745dab7f2113e7068c6e04e files/digest-pine-4.61-r3 139
+MD5 3eb735b51e3192ee78b7b556e83256b3 files/transparency.patch 447
 MD5 aed38f617192b6de2ada1847c48cabe7 files/pine-4.33-whitespace.patch 337
-MD5 5eb69ed43326ebdca20e77b988d0b19b files/pine-4.21-fixhome.patch 830
+MD5 4c1ce6a4925676bcfe5c53a2cf05b7f7 files/digest-pine-4.61-r2 139
+MD5 4c1ce6a4925676bcfe5c53a2cf05b7f7 files/digest-pine-4.61-r1 139
+MD5 b0aee0d39a268c8f0c85e774f7408509 files/pine-4.21-passwd.patch 448
 MD5 e11e8fb4fba9fc54b7c0f302d79458bf files/pine-4.40-boguswarning.patch 512
+MD5 4239f06fa5f26e5cf181bb4cd5d96035 files/imap-4.7c2-flock.patch 531
 MD5 e2791bad5a20d4429dcd4a928714558f files/flock.c 1182
+MD5 5eb69ed43326ebdca20e77b988d0b19b files/pine-4.21-fixhome.patch 830
+MD5 921f1e2837b3d3aaaff0ff9b78432e92 files/pine-4.30-ldap.patch 420
+MD5 c0d53400c157de12da7e429dd0f21185 files/imap-2000-time.patch 1646
+MD5 21aa4bed99713a0b9c9971226fda0807 files/digest-pine-4.58-r3 429
 MD5 6fca405df4fd22a5708ddf83e8081716 files/pine-4.40-lockfile-perm.patch 932
-MD5 dadc9e153e023ad3b24d8cefd4bf5a2b files/pine-4.56-passfile.patch 504
-MD5 b0aee0d39a268c8f0c85e774f7408509 files/pine-4.21-passwd.patch 448
+MD5 de52689ee75160c695bf4659ee956845 files/imap-4.7c2-flock_4.60.patch 537
+MD5 36fbad9153bc6b61adb00767d199d284 files/imap-4.7c2-flock+maildir.patch 551
+MD5 3803bda87f35ee20456ab2b363460db9 files/pine-4.31-segfix.patch 460
+MD5 c47b08cab6132957eef9c0d61862f951 files/digest-pine-4.50-r4 131
 MD5 74f43c70f061a3fb9378d7800b64ccaa files/digest-pine-4.60 136
-MD5 3eb735b51e3192ee78b7b556e83256b3 files/transparency.patch 447
+MD5 dadc9e153e023ad3b24d8cefd4bf5a2b files/pine-4.56-passfile.patch 504
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBo6NvZ/iYVBmujdURAl9WAJ9VBfhjqOl9kceyoxEvuTHc94wfQACgn2my
-mIT4KKtNQ1/JEn+2MZH7GrY=
-=ljB6
+iD8DBQFBpTFl10xuJSrg3/sRAueXAJ0btqgwAxkOml9C6gS1rv6FGf/ILwCeMFjH
+0AtFpd94d/R5IpqW6Fj+mf4=
+=CqNF
 -----END PGP SIGNATURE-----
diff --git a/mail-client/pine/files/digest-pine-4.61-r3 b/mail-client/pine/files/digest-pine-4.61-r3
new file mode 100644
index 000000000000..d7429f16d1a9
--- /dev/null
+++ b/mail-client/pine/files/digest-pine-4.61-r3
@@ -0,0 +1,2 @@
+MD5 885c6aa4f4f16fcb83a49ef6c025307e pine4.61.tar.bz2 3032253
+MD5 f8a98b202010698fc680e1ff06b8e425 pine-4.61-r2-chappa-all.patch.gz 160672
diff --git a/mail-client/pine/pine-4.61-r3.ebuild b/mail-client/pine/pine-4.61-r3.ebuild
new file mode 100644
index 000000000000..042476610d29
--- /dev/null
+++ b/mail-client/pine/pine-4.61-r3.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.61-r3.ebuild,v 1.1 2004/11/25 01:11:03 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://www.math.washington.edu/~chappa/pine/patches/"
+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 ~ppc-macos"
+#IUSE="ipv6 maildir ssl ldap kerberos passfile"
+IUSE="ssl ldap kerberos 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"
+	# Fix Home and End keys. Seems to work anyway?
+	#epatch "${FILESDIR}/pine-4.21-fixhome.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
+
+	# 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"
+	# Get rid of stripwhitespace() calls.
+	# Fixed with changed default behaviour and options.
+	# Patch does not apply anymore.
+	#epatch "${FILESDIR}/pine-4.33-whitespace.patch"
+	# Bug #23336 - makes pine transparent in terms that support it.
+	epatch "${FILESDIR}/transparency.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
+#	donewins 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() {
+	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 "If you don't have any maildirs Pine works as before"
+	einfo "with the INBOX at /var/spool/mail/."
+	einfo
+}