Updated chappa-all patch.

(Portage version: 2.1_pre4-r1)

4 files changed, 265 insertions, 12 deletions

diff --git a/mail-client/pine/ChangeLog b/mail-client/pine/ChangeLog
index 31c7e5ceeb8e..76b704a38c57 100644
--- a/mail-client/pine/ChangeLog
+++ b/mail-client/pine/ChangeLog
@@ -1,6 +1,11 @@
 # 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.77 2005/10/12 14:58:21 josejx Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.78 2006/02/03 19:22:10 ticho Exp $
+
+*pine-4.64-r2 (03 Feb 2006)
+
+  03 Feb 2006; Andrej Kacian <ticho@gentoo.org> +pine-4.64-r2.ebuild:
+  Updated chappa-all patch.
 
   12 Oct 2005; Joseph Jezak <josejx@gentoo.org> pine-4.64-r1.ebuild:
   Marked ppc stable for bug #108647.
diff --git a/mail-client/pine/Manifest b/mail-client/pine/Manifest
index 270faef57139..01a31e38e945 100644
--- a/mail-client/pine/Manifest
+++ b/mail-client/pine/Manifest
@@ -1,43 +1,105 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 e43b0e0aaa5d3c455bdf663801ebcea7 ChangeLog 18762
+RMD160 021a1d2b7758a106fdcd4d1995f2cb60c32287ad ChangeLog 18762
+SHA256 7ea86ee3f8075f9be4fdedcd4d842df3c0c2a0fbf1c5630efa97ffede7caa5cf ChangeLog 18762
 MD5 8f1d4661a745dab7f2113e7068c6e04e files/digest-pine-4.61-r5 139
+RMD160 069ba53cb198f1f7fd0f3b94007b8ed7c3c013fd files/digest-pine-4.61-r5 139
+SHA256 29ba1e553525e601b1bd55786028e93723429d7d66323571d9b01077c146d416 files/digest-pine-4.61-r5 139
 MD5 fa3a8604150ceb9b876b6c5f1f2309ab files/digest-pine-4.62 206
+RMD160 a80c66cf5dc2c3605231e87dcaee89e2bef4e2de files/digest-pine-4.62 206
+SHA256 be368d10097ab45732495d985aa2e39e693f710009e3cf605248a474dd9caea8 files/digest-pine-4.62 206
 MD5 1d3052dda4b361277ca31ce465a29626 files/digest-pine-4.62-r1 139
+RMD160 673822fb8ff1f08bf92689a7842a91d6aa486e56 files/digest-pine-4.62-r1 139
+SHA256 5994d011b4a2559a61436a1586935b5d169cc0fc9f65af5b2247ee4d9033b5d8 files/digest-pine-4.62-r1 139
 MD5 b3fd3bd534ef04e16efb8755b8e845be files/digest-pine-4.62-r2 139
+RMD160 f36975226e0d45b4977affbf63923e68096e9a20 files/digest-pine-4.62-r2 139
+SHA256 5a4f11ac31983c50f4e5315dbb22aaccc34fb0b4d787d1c91471689bde05a37f files/digest-pine-4.62-r2 139
 MD5 be569e295d14d9e251fb8bccc270cd35 files/digest-pine-4.63 136
+RMD160 af7c6e9f38053efc1fbb1ce08d8072d393c2a353 files/digest-pine-4.63 136
+SHA256 f2613d5c89ba7a66c1d4927e0d3d28dfd6d4b6f7a18eaef1a979ecc51ade4f26 files/digest-pine-4.63 136
 MD5 c7651a3cca5bd40222c73914af4d78e6 files/digest-pine-4.63-r1 139
+RMD160 602a0c89538c22a4197a37631e8a744a86ceb737 files/digest-pine-4.63-r1 139
+SHA256 27900de31b7740415774bdfe681a557e6111552d46fcece4643e53fc023bb52b files/digest-pine-4.63-r1 139
 MD5 9895c58228a8cf15d6e8134bcc205a7c files/digest-pine-4.63-r2 139
+RMD160 9643c803aaa2b67a8d17e2ec126c531ae609f6ac files/digest-pine-4.63-r2 139
+SHA256 bc1b4d554d5eee2f4fee6e5f37ec5532179f3a798f5929bea13ce4d533fd5cc4 files/digest-pine-4.63-r2 139
 MD5 703bc17b1c6091139b0675429d414550 files/digest-pine-4.63-r3 139
+RMD160 b1f3d9388ff3b08e891ebe7dc13ce69f89d8f26b files/digest-pine-4.63-r3 139
+SHA256 93f1098c263c5ac18bc4cae62248070c817ac528cff8c7bda4e92a1631b8414d files/digest-pine-4.63-r3 139
 MD5 a50836ac78a3102200de7fd430d157d2 files/digest-pine-4.64 136
+RMD160 ddecb2c2617aa7af701c653a1dab66b69929e5a8 files/digest-pine-4.64 136
+SHA256 147f828ff71e5a744f2c99afa34bf9314b21e03c89921618ece77bc6633aaefd files/digest-pine-4.64 136
 MD5 e38bdd4d3ae7aa4e12fa84e663604ffd files/digest-pine-4.64-r1 139
+RMD160 ed1f0af75c8f6fd03f297e5496431e8c367a9cc1 files/digest-pine-4.64-r1 139
+SHA256 3aaef7554a838d363f603a366589554c954a481ae2f494d0fd42281365fec174 files/digest-pine-4.64-r1 139
+MD5 64acc74241632b6b897e9ade822367a6 files/digest-pine-4.64-r2 509
+RMD160 3fea71bd12852a2bcc4e995327a5378f42cb6a66 files/digest-pine-4.64-r2 509
+SHA256 276cdc2e9c4603e2dce0356c01345d49b7b63d9f6bed7fd7e63a400ef5df2df0 files/digest-pine-4.64-r2 509
 MD5 e2791bad5a20d4429dcd4a928714558f files/flock.c 1182
+RMD160 d79b7f1cf11c8f1c18faa86636e8d392dea53782 files/flock.c 1182
+SHA256 136dc7dcc6373b85719185a3224f0dd7d2a419047543cb262388ee6cc573c7f1 files/flock.c 1182
 MD5 c0d53400c157de12da7e429dd0f21185 files/imap-2000-time.patch 1646
+RMD160 46eae0bb784862029321efbad63ba436a57283f4 files/imap-2000-time.patch 1646
+SHA256 4597e21037c834ca886ac808293ee8fcca1f81840c6840fc7e21cdf22b6d3664 files/imap-2000-time.patch 1646
 MD5 de52689ee75160c695bf4659ee956845 files/imap-4.7c2-flock_4.60.patch 537
+RMD160 602988309237dca090eb7443937b173448ac9b11 files/imap-4.7c2-flock_4.60.patch 537
+SHA256 7a14d930808e8b4c144540b24c3fa1ac718bff798df931e232d3d8baa51c3891 files/imap-4.7c2-flock_4.60.patch 537
 MD5 921f1e2837b3d3aaaff0ff9b78432e92 files/pine-4.30-ldap.patch 420
+RMD160 33c78dc3cbe4b2c0b496fed18c1badffb8b5f890 files/pine-4.30-ldap.patch 420
+SHA256 d76cbb53443794f890aa79c3be66857963b92e67ac8d31101fce11388ad4e953 files/pine-4.30-ldap.patch 420
 MD5 3803bda87f35ee20456ab2b363460db9 files/pine-4.31-segfix.patch 460
+RMD160 a3d0718adcbf709ac936454c9eb0d1f6e5d2c793 files/pine-4.31-segfix.patch 460
+SHA256 954e99df827b43a14c40f94705cb26405bca1670154716a76b44e21aeaee8362 files/pine-4.31-segfix.patch 460
 MD5 6fca405df4fd22a5708ddf83e8081716 files/pine-4.40-lockfile-perm.patch 932
+RMD160 b298294d1804c80c0e694d21d09cfb4c5989199c files/pine-4.40-lockfile-perm.patch 932
+SHA256 5a111d6f7f480e0f026a77cd2112dab93e3b59319e9ce8521f0a8eedce739b18 files/pine-4.40-lockfile-perm.patch 932
 MD5 dadc9e153e023ad3b24d8cefd4bf5a2b files/pine-4.56-passfile.patch 504
+RMD160 57e58ed0f42ccea60dc5059bad591e06dbc8ed8a files/pine-4.56-passfile.patch 504
+SHA256 4b7d16282833edd74afd19ec4bcf762f32a85981f8410f217701cda079fe70fc files/pine-4.56-passfile.patch 504
 MD5 17031d0e1279dabd445a3deb5d19287c files/pine-4.61-largeterminal.patch 526
+RMD160 a77f2d1adfbd35bbf0e451da391ad16928e6e69a files/pine-4.61-largeterminal.patch 526
+SHA256 dbb21976cb0962b3a5b0e22cd6c209fbd4850a14df9d041e9d25bf9cebdedbd8 files/pine-4.61-largeterminal.patch 526
 MD5 1057540bd7b50f92e88b3af6f8d69c99 files/pine-4.61-subjectlength.patch 2363
+RMD160 634e03b7f0d2f12ed4d1c192287fe909d928175d files/pine-4.61-subjectlength.patch 2363
+SHA256 42955b934a89440f15a1c85e9fcc344ba8f74d399e90304e0425074aef4fccb0 files/pine-4.61-subjectlength.patch 2363
 MD5 7e8bb5286b4b14ec695fce340f8bb6b5 files/pine-4.62-spooldir-permissions.patch 488
+RMD160 e286a3e588ab8440d6d33cc9eeb81dbc17298afb files/pine-4.62-spooldir-permissions.patch 488
+SHA256 88eb08e815586a51ab453f709b0aae7bc2a5c09f5f7f74544c4cdcf718853c9b files/pine-4.62-spooldir-permissions.patch 488
 MD5 3eb735b51e3192ee78b7b556e83256b3 files/transparency.patch 447
+RMD160 47005c14ec0efb7fc484b164da7d6df6fe2f4e90 files/transparency.patch 447
+SHA256 404a615f1c88a6e781fb4bd8ba87657dd4c505d566c2678fd7b15bd198efca00 files/transparency.patch 447
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
+SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
 MD5 918f11739d9028dd2425ad4381504d9a pine-4.61-r5.ebuild 4999
+RMD160 173d6408e3d35f85b8c64d0eabf36add34b60f4f pine-4.61-r5.ebuild 4999
+SHA256 421a909abf5e23056e19b3af0379d0fe919165988ea1f1ee6bd36abf9fe2c637 pine-4.61-r5.ebuild 4999
 MD5 df36c8865a5c3109974fb630251fe32d pine-4.62-r1.ebuild 5252
+RMD160 c886b18664108d9bf05c1bfe0786595157e9cb67 pine-4.62-r1.ebuild 5252
+SHA256 56c8bff74bded7f8bf37ec4fdf06c7d55ca452996075a007256e15d9e9aaef88 pine-4.62-r1.ebuild 5252
 MD5 cf1187ddd78dc5f02054c93585efef96 pine-4.62-r2.ebuild 5404
+RMD160 165cbf7ba5bb71b085af5e7c7bb1fcd82a46a0ce pine-4.62-r2.ebuild 5404
+SHA256 cd0244e1353e0356d720267eeefd73fa20e74cf9cdc1b373ab3e68f8ad656fec pine-4.62-r2.ebuild 5404
 MD5 80055259213721a085dd8a1987e39bb7 pine-4.62.ebuild 5790
+RMD160 22b80411b8ffc0c99a53ffc8974e89622811d8db pine-4.62.ebuild 5790
+SHA256 c549d94509d5010f63009387a9e6ab296f01cf49669026aa5a3181105ad3bc54 pine-4.62.ebuild 5790
 MD5 0bd68adface8003f4aa7d13b452150cf pine-4.63-r1.ebuild 5401
+RMD160 d69a112efc9d3012f37e9a315480c08f12927870 pine-4.63-r1.ebuild 5401
+SHA256 8b72de94262cc95ccea5e3f217af883abad6c3cf62b159bee771033d6705deb3 pine-4.63-r1.ebuild 5401
 MD5 39ea4ca073f9ab5b6a90fa942993830a pine-4.63-r2.ebuild 5404
+RMD160 70df1004cc69fa3e446f47d365d55c2349b72764 pine-4.63-r2.ebuild 5404
+SHA256 f9eb10d3bd2cdf63bb00bbe22196d59f74f54abb076bc742f9022794022a5982 pine-4.63-r2.ebuild 5404
 MD5 68514ee5deb5aa96b92f1560495a3fa7 pine-4.63-r3.ebuild 5492
+RMD160 7eabfb11857efe113c2d35fecb96a31e3d99bc07 pine-4.63-r3.ebuild 5492
+SHA256 748f9a843ff2a247d0d4503efd519a3d2931761ddd06137a455c22256b1212b1 pine-4.63-r3.ebuild 5492
 MD5 f1759a695182611038a02645cdfc3826 pine-4.63.ebuild 5396
+RMD160 6b7078ad9dc9dce7196b4fb9254a335ff236b14a pine-4.63.ebuild 5396
+SHA256 ae5e7ff46c80340bc02b28ad6a505170efa5027e8b99f44114d5339daeaf1f0e pine-4.63.ebuild 5396
 MD5 cc2ba54bc815796d07fad7f889ae4983 pine-4.64-r1.ebuild 5451
+RMD160 c6089d2f99bc8058826d9fa4976c977cca9a4709 pine-4.64-r1.ebuild 5451
+SHA256 cce28f7f32dabb65dc63df3190732e555485749da5b9f094034c63ba4cf9c865 pine-4.64-r1.ebuild 5451
+MD5 b643f0418d6a27985007dad9d6f52c8d pine-4.64-r2.ebuild 5356
+RMD160 2289188c1532a87432a0b893dc6961dc24c70e6e pine-4.64-r2.ebuild 5356
+SHA256 736158d39db9131a62b9696c74477ded80eb1122ad47e3ea0a74f0a5fbd080af pine-4.64-r2.ebuild 5356
 MD5 f5c3b6e2fcc8955980d54be53436e01e pine-4.64.ebuild 5489
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDTSSpcsIHjyDViGQRAj3mAJ9NEeFRToymhJq99WomcXL+11fitQCg1inN
-cq0AvC0qEsswb2469hJL5ek=
-=Jg0N
------END PGP SIGNATURE-----
+RMD160 30bb63d99b45066e1822930976712885c4aca611 pine-4.64.ebuild 5489
+SHA256 68dbe9181a569a1fef0740c369e7cf183a792d30cd6fb9bc961dc51f1f72de72 pine-4.64.ebuild 5489
diff --git a/mail-client/pine/files/digest-pine-4.64-r2 b/mail-client/pine/files/digest-pine-4.64-r2
new file mode 100644
index 000000000000..78beed5c480a
--- /dev/null
+++ b/mail-client/pine/files/digest-pine-4.64-r2
@@ -0,0 +1,6 @@
+MD5 f9a8949c6a2bd77543c58b2efe0f36bb pine-4.64-r2-chappa-all.patch.gz 172695
+RMD160 961867617cc4060c9b55a225a9fe797e015ec07f pine-4.64-r2-chappa-all.patch.gz 172695
+SHA256 18463e662d2d626ece054100396a13ff703229fc94ce8b20970b269237050583 pine-4.64-r2-chappa-all.patch.gz 172695
+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-r2.ebuild b/mail-client/pine/pine-4.64-r2.ebuild
new file mode 100644
index 000000000000..e014876ba1ee
--- /dev/null
+++ b/mail-client/pine/pine-4.64-r2.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64-r2.ebuild,v 1.1 2006/02/03 19:22:10 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://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 ~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() {
+	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/rpdump bin/rpload
+
+	# 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
+	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
+}