chappa-all patch update.

Package-Manager: portage-2.0.51.22-r2

6 files changed, 201 insertions, 12 deletions

diff --git a/mail-client/pine/ChangeLog b/mail-client/pine/ChangeLog
index d0b02344ef4b..95173fbe8e13 100644
--- a/mail-client/pine/ChangeLog
+++ b/mail-client/pine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/pine
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.61 2005/08/01 20:51:53 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.62 2005/08/14 00:31:52 ticho Exp $
+
+*pine-4.63-r3 (14 Aug 2005)
+
+  14 Aug 2005; Andrej Kacian <ticho@gentoo.org> pine-4.63-r1.ebuild,
+  pine-4.63-r2.ebuild, +pine-4.63-r3.ebuild:
+  chappa-all patch update.
 
   01 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org> pine-4.63-r2.ebuild:
   stable on alpha
diff --git a/mail-client/pine/Manifest b/mail-client/pine/Manifest
index 91da8cc2d682..6951517dd54b 100644
--- a/mail-client/pine/Manifest
+++ b/mail-client/pine/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 bfa5409b149751b87fc7aeec9ffd60ee pine-4.63-r3.ebuild 5496
 MD5 df36c8865a5c3109974fb630251fe32d pine-4.62-r1.ebuild 5252
 MD5 80055259213721a085dd8a1987e39bb7 pine-4.62.ebuild 5790
-MD5 a818e2772ab173b4b89c2986e97f25ac pine-4.63-r2.ebuild 5403
+MD5 799d62d736e828ff8edb15451744518e pine-4.63-r2.ebuild 5402
 MD5 cf1187ddd78dc5f02054c93585efef96 pine-4.62-r2.ebuild 5404
 MD5 f1759a695182611038a02645cdfc3826 pine-4.63.ebuild 5396
 MD5 918f11739d9028dd2425ad4381504d9a pine-4.61-r5.ebuild 4999
-MD5 8d9f81d40dd95006b8f561265675e37e ChangeLog 17049
-MD5 d73512e5eebacf947b7b04496068c4d4 pine-4.63-r1.ebuild 5402
+MD5 9eb719cbaa74a1a2750afaed2416ef13 ChangeLog 17220
+MD5 0bd68adface8003f4aa7d13b452150cf pine-4.63-r1.ebuild 5401
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 de52689ee75160c695bf4659ee956845 files/imap-4.7c2-flock_4.60.patch 537
 MD5 8f1d4661a745dab7f2113e7068c6e04e files/digest-pine-4.61-r5 139
@@ -16,6 +17,7 @@ MD5 1d3052dda4b361277ca31ce465a29626 files/digest-pine-4.62-r1 139
 MD5 b3fd3bd534ef04e16efb8755b8e845be files/digest-pine-4.62-r2 139
 MD5 c7651a3cca5bd40222c73914af4d78e6 files/digest-pine-4.63-r1 139
 MD5 9895c58228a8cf15d6e8134bcc205a7c files/digest-pine-4.63-r2 139
+MD5 703bc17b1c6091139b0675429d414550 files/digest-pine-4.63-r3 139
 MD5 921f1e2837b3d3aaaff0ff9b78432e92 files/pine-4.30-ldap.patch 420
 MD5 3803bda87f35ee20456ab2b363460db9 files/pine-4.31-segfix.patch 460
 MD5 17031d0e1279dabd445a3deb5d19287c files/pine-4.61-largeterminal.patch 526
@@ -29,9 +31,9 @@ MD5 fa3a8604150ceb9b876b6c5f1f2309ab files/digest-pine-4.62 206
 MD5 be569e295d14d9e251fb8bccc270cd35 files/digest-pine-4.63 136
 MD5 3eb735b51e3192ee78b7b556e83256b3 files/transparency.patch 447
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC7owBViELBEf1JB0RAggOAJ0cZ7hHy17kJJxbUZkt1+dHDz94UQCfQYy8
-xuHEBkuKF/ILucSQEhex7LM=
-=gEXw
+iD8DBQFC/pEJQlM6RnzZP+IRAsGyAKCIxJpT4z/gwvypuQHZriMbhlQTswCfeThD
+1aPfRSJRUJD/onk1tgPlQjw=
+=Xlkm
 -----END PGP SIGNATURE-----
diff --git a/mail-client/pine/files/digest-pine-4.63-r3 b/mail-client/pine/files/digest-pine-4.63-r3
new file mode 100644
index 000000000000..d0508533b039
--- /dev/null
+++ b/mail-client/pine/files/digest-pine-4.63-r3
@@ -0,0 +1,2 @@
+MD5 e881f439f38039b310d22554ab08feb4 pine4.63.tar.bz2 3083721
+MD5 fb579abea4ec3359875de10da41ff45e pine-4.63-r3-chappa-all.patch.gz 169850
diff --git a/mail-client/pine/pine-4.63-r1.ebuild b/mail-client/pine/pine-4.63-r1.ebuild
index 4c82664db1f5..bfc4b9d7b711 100644
--- a/mail-client/pine/pine-4.63-r1.ebuild
+++ b/mail-client/pine/pine-4.63-r1.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/mail-client/pine/pine-4.63-r1.ebuild,v 1.1 2005/05/07 17:49:18 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.63-r1.ebuild,v 1.2 2005/08/14 00:31:52 ticho Exp $
 
 inherit eutils
 
@@ -46,7 +46,7 @@ maildir_warn() {
 	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 "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/"
diff --git a/mail-client/pine/pine-4.63-r2.ebuild b/mail-client/pine/pine-4.63-r2.ebuild
index 37de582bd66e..d97609325e07 100644
--- a/mail-client/pine/pine-4.63-r2.ebuild
+++ b/mail-client/pine/pine-4.63-r2.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/mail-client/pine/pine-4.63-r2.ebuild,v 1.5 2005/08/01 20:51:53 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.63-r2.ebuild,v 1.6 2005/08/14 00:31:52 ticho Exp $
 
 inherit eutils
 
@@ -46,7 +46,7 @@ maildir_warn() {
 	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 "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/"
diff --git a/mail-client/pine/pine-4.63-r3.ebuild b/mail-client/pine/pine-4.63-r3.ebuild
new file mode 100644
index 000000000000..354dd68da0bc
--- /dev/null
+++ b/mail-client/pine/pine-4.63-r3.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2005 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.1 2005/08/14 00:31:52 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://www.math.washington.edu/~chappa/pine/patches/"
+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 ~ppc-macos ~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() {
+	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
+}
+
+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 ppc-macos; then
+		target=osx
+	else
+		if use pam ; then
+			target=lnp
+		else
+			target=slx
+		fi
+	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() {
+	maildir_warn
+}