New experimental version with lots of new freatures: UTF8 support (bug 29093), Maildir support (bugs 28877 and hopefully 23232), Kerberos gssapi support (bug 32713), IPV6 support, and a new chappa patch.

4 files changed, 172 insertions, 16 deletions

diff --git a/net-mail/pine/ChangeLog b/net-mail/pine/ChangeLog
index ba37f186e057..a7296084855f 100644
--- a/net-mail/pine/ChangeLog
+++ b/net-mail/pine/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/pine
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/pine/ChangeLog,v 1.38 2003/10/02 17:44:32 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/pine/ChangeLog,v 1.39 2003/11/09 07:46:59 max Exp $
+
+*pine-4.58-r3 (08 Nov 2003)
+
+  08 Nov 2003; <max@gentoo.org> pine-4.58-r3.ebuild:
+  New experimental version with lots of new freatures: UTF8 support (bug 29093),
+  Maildir support (bugs 28877 and hopefully 23232), Kerberos gssapi support (bug
+  32713), IPV6 support, and a new chappa patch.
 
   02 Oct 2003; Brad House <brad_mssw@gentoo.org> pine-4.58.ebuild:
   add ~amd64 flag
diff --git a/net-mail/pine/Manifest b/net-mail/pine/Manifest
index 136821be617b..2545a19e2bca 100644
--- a/net-mail/pine/Manifest
+++ b/net-mail/pine/Manifest
@@ -1,23 +1,25 @@
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 9aa0edbd9d6e593488bb9d0c299c4a24 pine-4.58.ebuild 3323
 MD5 07729afe998d1fcf6626acc61cefda5b pine-4.58-r2.ebuild 3354
-MD5 a33d9cf73ee99c67dd5f075639c47a23 pine-4.58-r1.ebuild 3430
+MD5 9aa0edbd9d6e593488bb9d0c299c4a24 pine-4.58.ebuild 3323
 MD5 4c37407d8c7106315e06cc267b1806dc pine-4.50-r4.ebuild 3509
-MD5 a360e5ccf48055e19fb4e4f56b03c16b ChangeLog 7408
-MD5 da5a30f5086db88f8dd801212f512e77 files/digest-pine-4.58-r2 145
-MD5 da5a30f5086db88f8dd801212f512e77 files/digest-pine-4.58-r1 145
-MD5 3eb735b51e3192ee78b7b556e83256b3 files/transparency.patch 447
-MD5 e2791bad5a20d4429dcd4a928714558f files/flock.c 1182
+MD5 a33d9cf73ee99c67dd5f075639c47a23 pine-4.58-r1.ebuild 3430
+MD5 9d85830087b706bf00cc4cf3b8a2630c pine-4.58-r3.ebuild 4370
+MD5 e7378c6de5cb832dadbf7053a6c6488c ChangeLog 7695
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 c47b08cab6132957eef9c0d61862f951 files/digest-pine-4.50-r4 131
-MD5 3803bda87f35ee20456ab2b363460db9 files/pine-4.31-segfix.patch 460
+MD5 da5a30f5086db88f8dd801212f512e77 files/digest-pine-4.58-r1 145
+MD5 da5a30f5086db88f8dd801212f512e77 files/digest-pine-4.58-r2 145
+MD5 21aa4bed99713a0b9c9971226fda0807 files/digest-pine-4.58-r3 429
+MD5 921f1e2837b3d3aaaff0ff9b78432e92 files/pine-4.30-ldap.patch 420
 MD5 36fbad9153bc6b61adb00767d199d284 files/imap-4.7c2-flock+maildir.patch 551
-MD5 dadc9e153e023ad3b24d8cefd4bf5a2b files/pine-4.56-passfile.patch 504
+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 aed38f617192b6de2ada1847c48cabe7 files/pine-4.33-whitespace.patch 337
 MD5 5eb69ed43326ebdca20e77b988d0b19b files/pine-4.21-fixhome.patch 830
+MD5 e11e8fb4fba9fc54b7c0f302d79458bf files/pine-4.40-boguswarning.patch 512
+MD5 e2791bad5a20d4429dcd4a928714558f files/flock.c 1182
 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 c0d53400c157de12da7e429dd0f21185 files/imap-2000-time.patch 1646
 MD5 0493455a84ab45910a606f0f4f9f4dfd files/digest-pine-4.58 62
-MD5 e11e8fb4fba9fc54b7c0f302d79458bf files/pine-4.40-boguswarning.patch 512
-MD5 aed38f617192b6de2ada1847c48cabe7 files/pine-4.33-whitespace.patch 337
-MD5 4239f06fa5f26e5cf181bb4cd5d96035 files/imap-4.7c2-flock.patch 531
-MD5 921f1e2837b3d3aaaff0ff9b78432e92 files/pine-4.30-ldap.patch 420
+MD5 3eb735b51e3192ee78b7b556e83256b3 files/transparency.patch 447
diff --git a/net-mail/pine/files/digest-pine-4.58-r3 b/net-mail/pine/files/digest-pine-4.58-r3
new file mode 100644
index 000000000000..d61357652939
--- /dev/null
+++ b/net-mail/pine/files/digest-pine-4.58-r3
@@ -0,0 +1,6 @@
+MD5 6135222a12f06b2dfceea5c1b736891e pine4.58.tar.bz2 2837321
+MD5 08a9f151d1588413e36a12c8a6d534a8 pine-4.58-chappa-all-20031108.patch.gz 113702
+MD5 60d840b1980373a7227d28cbf1f3799b pine4.58-utf8-to-singlebyte.patch 7214
+MD5 b19fe167da5a74aefbb3d8ed17f10107 pine-4.58-maildir.patch 46380
+MD5 50522624eb4a22df748ba7215b28290a pine-4.58-v6-20031001.diff 18943
+MD5 35c12ee84973f7672dbab6f59afbffab readme.pine-4.58-v6-20031001 6514
diff --git a/net-mail/pine/pine-4.58-r3.ebuild b/net-mail/pine/pine-4.58-r3.ebuild
new file mode 100644
index 000000000000..1c539024a8ac
--- /dev/null
+++ b/net-mail/pine/pine-4.58-r3.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/pine/pine-4.58-r3.ebuild,v 1.1 2003/11/09 07:46:59 max Exp $
+
+inherit eutils
+
+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/${P}-chappa-all-20031108.patch.gz
+	http://www.softwolves.pp.se/tmp/${PN}${PV}-utf8-to-singlebyte.patch
+	maildir? ( http://hico.fphil.uniba.sk/pine_patches/${P}-maildir.patch )
+	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"
+IUSE="ipv6 maildir ssl ldap kerberos passfile"
+
+DEPEND="virtual/glibc
+	>=sys-apps/sed-4
+	>=sys-libs/ncurses-5.1
+	>=sys-libs/pam-0.72
+	ssl? ( dev-libs/openssl )
+	ldap? ( net-nds/openldap )
+	kerberos? ( app-crypt/mit-krb5 )"
+
+S="${WORKDIR}/${PN}${PV}"
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	# Various fixes and features.
+	epatch "${WORKDIR}/${P}-chappa-all-20031108.patch"
+	# Fix Home and End keys.
+	epatch "${FILESDIR}/pine-4.21-fixhome.patch"
+	# UTF8 support.
+	epatch "${DISTDIR}/${PN}${PV}-utf8-to-singlebyte.patch"
+	# Fix flock() emulation.
+	cp "${FILESDIR}/flock.c" "${S}/imap/src/osdep/unix"
+
+	if [ "`use maildir`" ] ; then
+		epatch "${DISTDIR}/${P}-maildir.patch"
+		# Build the flock() emulation.
+		epatch "${FILESDIR}/imap-4.7c2-flock+maildir.patch"
+	else
+		# Build the flock() emulation.
+		epatch "${FILESDIR}/imap-4.7c2-flock.patch"
+	fi
+	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
+		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.
+	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
+
+	./build ${myconf} lnp || die "compile problem"
+}
+
+src_install() {
+	dobin bin/pine bin/pico bin/pilot bin/mtest bin/rpdump bin/rpload
+
+	insinto /etc
+	doins doc/mime.types
+	donewins 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/
+	die
+}