Moved from net-mail/pine to mail-client/pine.

26 files changed, 1205 insertions, 0 deletions

diff --git a/mail-client/pine/ChangeLog b/mail-client/pine/ChangeLog
new file mode 100644
index 000000000000..7be42c94f8d6
--- /dev/null
+++ b/mail-client/pine/ChangeLog
@@ -0,0 +1,225 @@
+# ChangeLog for net-mail/pine
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.1 2004/05/30 02:56:38 seemant Exp $
+
+*pine-4.58-r2 (29 May 2004)
+
+  29 May 2004; Seemant Kulleen <seemant@gentoo.org> +metadata.xml,
+  +files/flock.c, +files/imap-2000-time.patch,
+  +files/imap-4.7c2-flock+maildir.patch, +files/imap-4.7c2-flock.patch,
+  +files/pine-4.21-fixhome.patch, +files/pine-4.21-passwd.patch,
+  +files/pine-4.30-ldap.patch, +files/pine-4.31-segfix.patch,
+  +files/pine-4.33-whitespace.patch, +files/pine-4.40-boguswarning.patch,
+  +files/pine-4.40-lockfile-perm.patch, +files/pine-4.56-passfile.patch,
+  +files/transparency.patch, +pine-4.50-r4.ebuild, +pine-4.58-r1.ebuild,
+  +pine-4.58-r2.ebuild, +pine-4.58-r3.ebuild, +pine-4.58.ebuild:
+  Moved from net-mail/pine to mail-client/pine.
+
+  25 Mar 2004; Jason Huebel,,, <jhuebel@gentoo.org> pine-4.58.ebuild:
+  stable on amd64
+
+*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
+
+*pine-4.58-r2 (19 Sep 2003)
+
+  19 Sep 2003; Max Kalika <max@gentoo.org> pine-4.58-r2.ebuild,
+  files/pine-4.56-passfile.patch:
+  Massive cleanup and add the PASSFILE feature controlled by a new local USE
+  flag.
+
+*pine-4.58-r1 (16 Sep 2003)
+
+  16 Sep 2003; Rajiv Aaron Manglani <rajiv@gentoo.org> pine-4.58-r1.ebuild:
+  chappa patches are back. now using his 'all' set for 4.58 as of 2003-09-15.
+  keyworded for testing.
+
+*pine-4.58 (16 Sep 2003)
+
+  16 Sep 2003; Rajiv Aaron Manglani <rajiv@gentoo.org> pine-4.58.ebuild:
+  version bump, fixes security problems. temporarily removed chappa patches
+  until we get versions which work with pine 4.58.
+
+  11 Jul 2003; Nick Hadaway <raker@gentoo.org> pine-4.56.ebuild:
+  Marked stable for x86
+
+  08 Jul 2003; Nick Hadaway <raker@gentoo.org> pine-4.56.ebuild:
+  Added a little patch for making pine transparent in terms that support 
+  it.
+
+  19 Jun 2003; <msterret@gentoo.org> pine-4.56.ebuild:
+  use dohtml instead of dodoc for html (bug 23048)
+  use sed -i
+
+*pine-4.56 (09 Jun 2003)
+
+  09 Jun 2003; Nick Hadaway <raker@gentoo.org> pine-4.56.ebuild,
+  files/pine-4.56-chappa-20030609.patch.bz2, files/digest-pine-4.56:
+  Version bump.  The bogus-whitespace patch no longer is needed.
+
+*pine-4.53-r4 (14 Feb 2003)
+
+  15 Apr 2003; Martin Holzer <mholzer@gentoo.org> pine-4.53-r4.ebuild:
+  Removed net-www/lynx from depend. Closes #16314.
+
+  15 Apr 2003; Tavis Ormandy <taviso@gentoo.org> pine-4.53-r4.ebuild:
+  added ~alpha #19260
+
+  04 Apr 2003; Jason Wever <weeve@gentoo.org> pine-4.53-r4.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  14 Feb 2003; Nick Hadaway <raker@gentoo.org> pine-4.53-r4.ebuild,
+  files/digest-pine-4.53-r4, files/pine-4.53-chappa-20030214.patch.bz2 :
+  Happy Singles Awareness Day (SAD) to ya'll. :)  Here's an
+  I love pine gift for everyone.  An updated patch with rules.c and
+  rules.h included so the configure script doesn't try to wget
+  the files.  This closes bug #15455.
+
+*pine-4.53-r3 (04 Feb 2003)
+
+  04 Feb 2003; Nick Hadaway <raker@gentoo.org> pine-4.53-r3.ebuild,
+  files/digest-pine-4.53-r3 :
+  Moved the default location of pine{.conf,.conf.fixed,.info} to /etc
+  Also made a local mirror of the patch so we aren't subject to the
+  random upstream changes with no filename change.
+
+*pine-4.53-r2 (04 Feb 2003)
+
+  04 Feb 2003; Nick Hadaway <raker@gentoo.org> pine-4.53-r2.ebuild,
+  files/digest-pine-4.53-r2 :
+  A new patch added on the chappa build.
+
+*pine-4.53-r1 (28 Jan 2003)
+
+  28 Jan 2003; Nick Hadaway <raker@gentoo.org> pine-4.53-r1.ebuild,
+  files/digest-pine-4.53-r1 :
+  Chappa updated the patches upstream.  Release -r1 to account for the
+  changes.  New digest file, ebuild is still the same.
+
+*pine-4.53 (17 Jan 2003)
+
+  15 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest,
+  pine-4.50-r4.ebuild, pine-4.53-r1.ebuild, pine-4.53-r1.ebuild,
+  pine-4.53-r2.ebuild, pine-4.53-r2.ebuild, pine-4.53-r3.ebuild,
+  pine-4.53-r3.ebuild, pine-4.53.ebuild, pine-4.53.ebuild,
+  files/pine-4.50-maildir.patch:
+  Removed old crusty ebuilds, moved pine-4.50-maildir.patch to distfiles,
+  changed ebuild to use epatch.
+
+  17 Jan 2003; Nick Hadaway <raker@gentoo.org> pine-4.53.ebuild,
+  files/digest-pine-4.53 :
+  Version bump.  Minor cleanups.
+
+*pine-4.52 (12 Jan 2003)
+
+  13 Jan 2003; Nick Hadaway <raker@gentoo.org> pine-4.52.ebuild :
+  Now conflicts with net-mail/pine-maildir.
+
+  12 Jan 2003; Nick Hadaway <raker@gentoo.org> pine-4.52.ebuild,
+  files/digest-pine-4.52 :
+  Another version bump.  A hand picked group of patches from the chappa
+  collection.
+
+*pine-4.51 (03 Jan 2002)
+
+  03 Jan 2002; Martin Holzer <mholzer@gentoo.org> pine-4.51.ebuild files/digest-pine-4.51 ChangeLog :
+  Added lynx dep. Changed from tar.gz to tar.bz2. Closes #13157
+
+  03 Jan 2002; Nick Hadaway <raker@gentoo.org> pine-4.51.ebuild,
+  files/digest-pine-4.51 :
+  Version bump.  No maildir patch yet. Includes the entire Eduardo
+  Chappa patch collection for 4.51.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*pine-4.50-r4 (05 Dec 2002)
+
+  05 Dec 2002; Nick Hadaway <raker@gentoo.org> pine-4.50-r4.ebuild,
+  files/digest-pine-4.50-r4 :
+  Fixed ssl certs directory as noted on bug #11638 and fixed some
+  compile-time warnings.
+
+*pine-4.50-r3 (03 Dec 2002)
+
+  03 Dec 2002; Nick Hadaway <raker@gentoo.org> pine-4.50-r3.ebuild,
+  files/digest-pine-4.50-r3, files/imap-4.7c2-flock+maildir.patch,
+  files/pine-4.50-maildir.patch :
+  Incorporated the mbox use variable and split up the patches again.
+
+*pine-4.50-r2 (03 Dec 2002)
+
+  03 Dec 2002; Nick Hadaway <raker@gentoo.org> pine-4.50-r2.ebuild :
+  Updated the mega patch to remove the unstable multibyte char patch
+  portion.
+
+*pine-4.50-r1 (25 Nov 2002)
+
+  01 Dec 2002; Nick Hadaway <raker@gentoo.org> pine-4.50-r1.ebuild :
+  Marked stable.
+
+  25 Nov 2002; Nick Hadaway <raker@gentoo.org> pine-4.50-r1.ebuild,
+  files/digest-pine-4.50-r1, files/4.50-gentoo.diff :
+  Now supports maildir!  This ebuild uses just one diff which is based
+  off the diff provided by Michael Grubb on bug #8474.  I updated it
+  to work with pine-4.50 and changed the reference to .maildir instead
+  of Maildir to work with the gentoo standard.
+
+*pine-4.50 (22 Nov 2002)
+
+  25 Nov 2002; Nick Hadaway <raker@gentoo.org> pine-4.50.ebuild :
+  Added ability to compile with/without debugging.  Fixed the 
+  ssl certs directory (openssl-0.9.6-r1 style)
+
+  22 Nov 2002; Nick Hadaway <raker@gentoo.org> pine-4.50.ebuild,
+  files/digest-pine-4.50 :
+  Version bump.  lots of fixes.  Threaded index is included.
+  Some SSL cleanup.  Updated a sed statement.  Sorted through
+  patches.
+
+*pine-4.44-r5 (17 Nov 2002)
+
+  17 Nov 2002; Nick Hadaway <raker@gentoo.org> pine-4.44-r5.ebuild,
+  files/fancy.patch.bz2, files/digest-pine-4.44-r5 :
+  New pine ebuild with the threaded index patch and got rid of some
+  compile warnings.
+
+*pine-4.44-r4 (15 Apr 2002)
+
+  20 Oct 2002; Seemant Kulleen <seemant@gentoo.org> :
+
+  the multibyte patch causes instability. RH removed it from their followup
+  rpm.  Closes bug #3719 by ftobin@neverending.org (Frank Tobin)
+
+  12 Aug 2002; Mark Guertin <gerk@gentoo.org> :
+  Added ppc to keywords
+
+  15 Apr 2002; Jared H. Hudson <jhhudso@gentoo.org> :
+
+  Changed the ebuild so that it no longer PROVIDEs virtual/imapUW or
+  the imap headers. These imap headers and static library will be provided
+  by net-mail/uw-imap exclusively now.
+	
+*pine-4.44-r1 (21 Feb 2002)
+
+  21 Feb 2002; Grant Goodyear <g2boojum@gentoo.org> :
+
+  Revamped our ebuild to use RH patches so that I could
+  include SSL and LDAP support (both controlled by use variables).  I don't
+  know enough about pine to test it properly.
+  
+*pine-4.44 (1 Feb 2002)
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way. This changelog is targetted to users. This means that the
+  comments should well explained and written in clean English. The details about
+  writing correct changelogs are explained in the skel.ChangeLog file which you
+  can find in the root directory of the portage repository.
diff --git a/mail-client/pine/Manifest b/mail-client/pine/Manifest
new file mode 100644
index 000000000000..84b8fdf4cb07
--- /dev/null
+++ b/mail-client/pine/Manifest
@@ -0,0 +1,25 @@
+MD5 7c900c8a4f62ed0f020a10688c1f436f ChangeLog 7788
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 4c37407d8c7106315e06cc267b1806dc pine-4.50-r4.ebuild 3509
+MD5 a33d9cf73ee99c67dd5f075639c47a23 pine-4.58-r1.ebuild 3430
+MD5 07729afe998d1fcf6626acc61cefda5b pine-4.58-r2.ebuild 3354
+MD5 01daf276dd0e66e83c8f3d2442a883e1 pine-4.58-r3.ebuild 4368
+MD5 a3022583c8f5ad2cc5ccc5590f46cff7 pine-4.58.ebuild 3320
+MD5 c47b08cab6132957eef9c0d61862f951 files/digest-pine-4.50-r4 131
+MD5 0493455a84ab45910a606f0f4f9f4dfd files/digest-pine-4.58 62
+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 e2791bad5a20d4429dcd4a928714558f files/flock.c 1182
+MD5 c0d53400c157de12da7e429dd0f21185 files/imap-2000-time.patch 1646
+MD5 36fbad9153bc6b61adb00767d199d284 files/imap-4.7c2-flock+maildir.patch 551
+MD5 4239f06fa5f26e5cf181bb4cd5d96035 files/imap-4.7c2-flock.patch 531
+MD5 5eb69ed43326ebdca20e77b988d0b19b files/pine-4.21-fixhome.patch 830
+MD5 b0aee0d39a268c8f0c85e774f7408509 files/pine-4.21-passwd.patch 448
+MD5 921f1e2837b3d3aaaff0ff9b78432e92 files/pine-4.30-ldap.patch 420
+MD5 3803bda87f35ee20456ab2b363460db9 files/pine-4.31-segfix.patch 460
+MD5 aed38f617192b6de2ada1847c48cabe7 files/pine-4.33-whitespace.patch 337
+MD5 e11e8fb4fba9fc54b7c0f302d79458bf files/pine-4.40-boguswarning.patch 512
+MD5 6fca405df4fd22a5708ddf83e8081716 files/pine-4.40-lockfile-perm.patch 932
+MD5 dadc9e153e023ad3b24d8cefd4bf5a2b files/pine-4.56-passfile.patch 504
+MD5 3eb735b51e3192ee78b7b556e83256b3 files/transparency.patch 447
diff --git a/mail-client/pine/files/digest-pine-4.50-r4 b/mail-client/pine/files/digest-pine-4.50-r4
new file mode 100644
index 000000000000..a4e0d5157b71
--- /dev/null
+++ b/mail-client/pine/files/digest-pine-4.50-r4
@@ -0,0 +1,2 @@
+MD5 5f517297242f625de9a9ccbaf48578f0 pine4.50.tar.gz 3772620
+MD5 2eb6c7d0da3b7d49705f7dce9f731b7f pine-4.50-maildir.patch.gz 14385
diff --git a/mail-client/pine/files/digest-pine-4.58 b/mail-client/pine/files/digest-pine-4.58
new file mode 100644
index 000000000000..e93e20d21699
--- /dev/null
+++ b/mail-client/pine/files/digest-pine-4.58
@@ -0,0 +1 @@
+MD5 6135222a12f06b2dfceea5c1b736891e pine4.58.tar.bz2 2837321
diff --git a/mail-client/pine/files/digest-pine-4.58-r1 b/mail-client/pine/files/digest-pine-4.58-r1
new file mode 100644
index 000000000000..c14d43b95bde
--- /dev/null
+++ b/mail-client/pine/files/digest-pine-4.58-r1
@@ -0,0 +1,2 @@
+MD5 6135222a12f06b2dfceea5c1b736891e pine4.58.tar.bz2 2837321
+MD5 f52ba0a0bd3ad18d09d0df287be397ba pine-4.58-chappa-all-20030915.patch.gz 106988
diff --git a/mail-client/pine/files/digest-pine-4.58-r2 b/mail-client/pine/files/digest-pine-4.58-r2
new file mode 100644
index 000000000000..c14d43b95bde
--- /dev/null
+++ b/mail-client/pine/files/digest-pine-4.58-r2
@@ -0,0 +1,2 @@
+MD5 6135222a12f06b2dfceea5c1b736891e pine4.58.tar.bz2 2837321
+MD5 f52ba0a0bd3ad18d09d0df287be397ba pine-4.58-chappa-all-20030915.patch.gz 106988
diff --git a/mail-client/pine/files/digest-pine-4.58-r3 b/mail-client/pine/files/digest-pine-4.58-r3
new file mode 100644
index 000000000000..d61357652939
--- /dev/null
+++ b/mail-client/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/mail-client/pine/files/flock.c b/mail-client/pine/files/flock.c
new file mode 100644
index 000000000000..1b042be27fb4
--- /dev/null
+++ b/mail-client/pine/files/flock.c
@@ -0,0 +1,63 @@
+/* One of many ways to emulate flock() on top of real (good) POSIX locks. */
+
+#ident "$RH: flock.c,v 1.2 2000/08/23 17:07:00 nalin Exp $"
+
+#include <sys/types.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+int flock(int fd, int operation)
+{
+	int i, cmd;
+	struct flock l = {0, 0, 0, 0, 0};
+	if(operation & LOCK_NB) {
+		cmd = F_SETLK;
+	} else {
+		cmd = F_SETLKW;
+	}
+	l.l_whence = SEEK_SET;
+	switch(operation & (~LOCK_NB)) {
+		case LOCK_EX:
+			l.l_type = F_WRLCK;
+			i = fcntl(fd, cmd, &l);
+			if(i == -1) {
+				if((errno == EAGAIN) || (errno == EACCES)) {
+					errno = EWOULDBLOCK;
+				}
+			}
+			break;
+		case LOCK_SH:
+			l.l_type = F_RDLCK;
+			i = fcntl(fd, cmd, &l);
+			if(i == -1) {
+				if((errno == EAGAIN) || (errno == EACCES)) {
+					errno = EWOULDBLOCK;
+				}
+			}
+			break;
+		case LOCK_UN:
+			l.l_type = F_UNLCK;
+			i = fcntl(fd, cmd, &l);
+			if(i == -1) {
+				if((errno == EAGAIN) || (errno == EACCES)) {
+					errno = EWOULDBLOCK;
+				}
+			}
+			break;
+		default:
+			i = -1;
+			errno = EINVAL;
+			break;
+	}
+	return i; 
+}
+
+#ifdef FLOCK_EMULATE_IS_MAIN
+int main(int argc, char **argv)
+{
+	int fd = open(argv[1], O_WRONLY);
+	flock(fd, LOCK_EX);
+	return 0;
+}
+#endif
diff --git a/mail-client/pine/files/imap-2000-time.patch b/mail-client/pine/files/imap-2000-time.patch
new file mode 100644
index 000000000000..751d1ff50611
--- /dev/null
+++ b/mail-client/pine/files/imap-2000-time.patch
@@ -0,0 +1,56 @@
+--- pine4.33/imap/src/osdep/unix/os_lnx.c.time	Wed Feb 14 12:25:06 2001
++++ pine4.33/imap/src/osdep/unix/os_lnx.c	Wed Feb 14 12:25:16 2001
+@@ -23,6 +23,7 @@
+ #include "osdep.h"
+ #include <stdio.h>
+ #include <sys/time.h>
++#include <time.h>
+ #include <sys/stat.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+--- pine4.33/imap/src/osdep/unix/news.c.time	Thu Jan 18 21:28:33 2001
++++ pine4.33/imap/src/osdep/unix/news.c	Wed Feb 14 12:24:34 2001
+@@ -21,7 +21,7 @@
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <errno.h>
+-extern int errno;		/* just in case */
++#include <time.h>
+ #include "mail.h"
+ #include "osdep.h"
+ #include <sys/stat.h>
+--- pine4.33/imap/src/osdep/unix/phile.c.time	Thu Jan 18 21:31:20 2001
++++ pine4.33/imap/src/osdep/unix/phile.c	Wed Feb 14 12:24:34 2001
+@@ -21,8 +21,8 @@
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <errno.h>
+-extern int errno;		/* just in case */
+ #include <signal.h>
++#include <time.h>
+ #include "mail.h"
+ #include "osdep.h"
+ #include <pwd.h>
+--- pine4.33/imap/src/osdep/unix/mh.c.time	Thu Jan 18 21:27:37 2001
++++ pine4.33/imap/src/osdep/unix/mh.c	Wed Feb 14 12:24:34 2001
+@@ -21,7 +21,8 @@
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <errno.h>
+-extern int errno;		/* just in case */
++#include <time.h>
++
+ #include "mail.h"
+ #include "osdep.h"
+ #include <pwd.h>
+--- pine4.33/imap/src/osdep/unix/mx.c.time	Thu Jan 18 21:28:09 2001
++++ pine4.33/imap/src/osdep/unix/mx.c	Wed Feb 14 12:24:34 2001
+@@ -21,7 +21,7 @@
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <errno.h>
+-extern int errno;		/* just in case */
++#include <time.h>
+ #include "mail.h"
+ #include "osdep.h"
+ #include <pwd.h>
diff --git a/mail-client/pine/files/imap-4.7c2-flock+maildir.patch b/mail-client/pine/files/imap-4.7c2-flock+maildir.patch
new file mode 100644
index 000000000000..263b43355507
--- /dev/null
+++ b/mail-client/pine/files/imap-4.7c2-flock+maildir.patch
@@ -0,0 +1,14 @@
+--- imap/src/osdep/unix/Makefile.flock	Wed Aug 23 05:51:40 2000
++++ imap/src/osdep/unix/Makefile	Wed Aug 23 05:51:44 2000
+@@ -103,7 +103,7 @@
+ BINARIES=mail.o misc.o newsrc.o smanager.o osdep.o utf8.o siglocal.o \
+  dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
+  rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
+- unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o maildir.o
+-CFLAGS=-g
++ unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o maildir.o flock.o
++CFLAGS=$(BASECFLAGS) $(EXTRACFLAGS)
+ 
+ CAT=cat
+ MAKE=make
+ MV=mv
diff --git a/mail-client/pine/files/imap-4.7c2-flock.patch b/mail-client/pine/files/imap-4.7c2-flock.patch
new file mode 100644
index 000000000000..0debc7a5e02a
--- /dev/null
+++ b/mail-client/pine/files/imap-4.7c2-flock.patch
@@ -0,0 +1,14 @@
+--- imap/src/osdep/unix/Makefile.flock	Wed Aug 23 05:51:40 2000
++++ imap/src/osdep/unix/Makefile	Wed Aug 23 05:51:44 2000
+@@ -103,7 +103,7 @@
+ BINARIES=mail.o misc.o newsrc.o smanager.o osdep.o utf8.o siglocal.o \
+  dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
+  rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
+- unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
+-CFLAGS=-g
++ unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o flock.o
++CFLAGS=$(BASECFLAGS) $(EXTRACFLAGS)
+ 
+ CAT=cat
+ MAKE=make
+ MV=mv
diff --git a/mail-client/pine/files/pine-4.21-fixhome.patch b/mail-client/pine/files/pine-4.21-fixhome.patch
new file mode 100644
index 000000000000..7572dc9ae4cb
--- /dev/null
+++ b/mail-client/pine/files/pine-4.21-fixhome.patch
@@ -0,0 +1,26 @@
+--- pine4.21/pico/osdep/term.cap.fixhome	Tue Mar  7 16:12:39 2000
++++ pine4.21/pico/osdep/term.cap	Tue Mar  7 16:13:30 2000
+@@ -133,8 +133,8 @@
+      */
+     kpinsert("\033[4J", KEY_PGUP, 1);
+     kpinsert("\033[3J", KEY_PGDN, 1);
+-    kpinsert("\033[2J", KEY_HOME, 1);
+-    kpinsert("\033[N",  KEY_END, 1);
++    kpinsert("\033[1~", KEY_HOME, 1);
++    kpinsert("\033[4~", KEY_END, 1);
+ 
+     /* 
+      * ANSI mode.
+--- pine4.21/pico/osdep/term.inf.fixhome	Tue Mar  7 16:13:09 2000
++++ pine4.21/pico/osdep/term.inf	Tue Mar  7 16:13:20 2000
+@@ -137,8 +137,8 @@
+      */
+     kpinsert("\033[4J", KEY_PGUP, 1);
+     kpinsert("\033[3J", KEY_PGDN, 1);
+-    kpinsert("\033[2J", KEY_HOME, 1);
+-    kpinsert("\033[N",  KEY_END, 1);
++    kpinsert("\033[1~", KEY_HOME, 1);
++    kpinsert("\033[4~", KEY_END, 1);
+ 
+     /* 
+      * ANSI mode.
diff --git a/mail-client/pine/files/pine-4.21-passwd.patch b/mail-client/pine/files/pine-4.21-passwd.patch
new file mode 100644
index 000000000000..3919a01872a3
--- /dev/null
+++ b/mail-client/pine/files/pine-4.21-passwd.patch
@@ -0,0 +1,12 @@
+diff -uNr pine4.21.orig/pine/osdep/os-lnx.h pine4.21/pine/osdep/os-lnx.h
+--- pine4.21.orig/pine/osdep/os-lnx.h	Thu Sep  7 15:41:48 2000
++++ pine4.21/pine/osdep/os-lnx.h	Thu Sep  7 15:57:17 2000
+@@ -223,7 +223,7 @@
+ 
+ 
+ /*--------- Program employed by users to change their password ---------*/
+-#define	PASSWD_PROG	"/bin/passwd"
++#define	PASSWD_PROG	"/usr/bin/passwd"
+ 
+ 
+ /*-------------- A couple constants used to size arrays ----------------*/
diff --git a/mail-client/pine/files/pine-4.30-ldap.patch b/mail-client/pine/files/pine-4.30-ldap.patch
new file mode 100644
index 000000000000..6b920ade519d
--- /dev/null
+++ b/mail-client/pine/files/pine-4.30-ldap.patch
@@ -0,0 +1,11 @@
+--- pine4.30/build.ldap	Fri Oct 27 12:48:05 2000
++++ pine4.30/build	Fri Oct 27 12:49:00 2000
+@@ -249,7 +249,7 @@
+ 	  case "$?" in
+ 	    1) if [ "$LLIBS" != "1" ]
+ 	       then
+-		 L1="'LDAPLIBS=../ldap/libraries/libldap.a ../ldap/libraries/liblber.a'"
++		 L1="'LDAPLIBS=../ldap/libraries/libldap.so ../ldap/libraries/liblber.so ../ldap/libraries/libresolv.so'"
+ 	       fi
+ 	       if [ "$LFLAGS" != "1" ]
+ 	       then
diff --git a/mail-client/pine/files/pine-4.31-segfix.patch b/mail-client/pine/files/pine-4.31-segfix.patch
new file mode 100644
index 000000000000..f65aa6029432
--- /dev/null
+++ b/mail-client/pine/files/pine-4.31-segfix.patch
@@ -0,0 +1,17 @@
+diff -urN pine4.31.orig/pine/osdep/lstcmpnt pine4.31/pine/osdep/lstcmpnt
+--- pine4.31.orig/pine/osdep/lstcmpnt	Mon Oct 30 17:45:08 2000
++++ pine4.31/pine/osdep/lstcmpnt	Tue Dec 12 06:33:53 2000
+@@ -9,10 +9,10 @@
+ last_cmpnt(filename)
+     char *filename;
+ {
+-    register char *p = NULL, *q = filename;
++    char *p = NULL, *q = filename;
+ 
+-    if(!q)
+-      return(q);
++    if(filename == 0)
++      return 0;
+ 
+     while(q = strchr(q, '/'))
+       if(*++q)
diff --git a/mail-client/pine/files/pine-4.33-whitespace.patch b/mail-client/pine/files/pine-4.33-whitespace.patch
new file mode 100644
index 000000000000..68b0159c8644
--- /dev/null
+++ b/mail-client/pine/files/pine-4.33-whitespace.patch
@@ -0,0 +1,11 @@
+--- pine4.30/pico/pico.c.strip	Sun Jan 14 15:26:47 2001
++++ pine4.30/pico/pico.c	Sun Jan 14 15:16:44 2001
+@@ -216,7 +216,7 @@
+ 	    switch(pico_all_done){	/* prepare for/handle final events */
+ 	      case COMP_EXIT :		/* already confirmed */
+ 		packheader();
+-		stripwhitespace();
++//		stripwhitespace();
+ 		c |= COMP_EXIT;
+ 		break;
+ 
diff --git a/mail-client/pine/files/pine-4.40-boguswarning.patch b/mail-client/pine/files/pine-4.40-boguswarning.patch
new file mode 100644
index 000000000000..58d426001582
--- /dev/null
+++ b/mail-client/pine/files/pine-4.40-boguswarning.patch
@@ -0,0 +1,11 @@
+--- imap/src/osdep/unix/env_unix.c.boguswarning	Mon Jun 25 23:10:04 2001
++++ imap/src/osdep/unix/env_unix.c	Thu Oct  4 05:12:36 2001
+@@ -48,7 +48,7 @@
+ 				/* flock() emulator is a no-op */
+ static short disableFcntlLock = NIL;
+ 				/* warning on EACCES errors on .lock files */
+-static short lockEaccesError = T;
++static short lockEaccesError = NIL;
+ static short hideDotFiles = NIL;/* hide files whose names start with . */
+ 				/* 1 = disable plaintext, 2 = if not SSL */
+ static long disablePlaintext = NIL;
diff --git a/mail-client/pine/files/pine-4.40-lockfile-perm.patch b/mail-client/pine/files/pine-4.40-lockfile-perm.patch
new file mode 100644
index 000000000000..3cf564ef5f34
--- /dev/null
+++ b/mail-client/pine/files/pine-4.40-lockfile-perm.patch
@@ -0,0 +1,22 @@
+--- imap/src/osdep/unix/env_unix.h.lock_protection_fix	Thu Oct  4 05:26:33 2001
++++ imap/src/osdep/unix/env_unix.h	Thu Oct  4 05:30:33 2001
+@@ -46,12 +46,15 @@
+ 
+ 
+ /*
+- * Attention: all sorcerer's apprentices who think that 0666 is a mistake.
+- * You are wrong.  Read the FAQ.  Do not meddle in the affairs of wizards,
+- * for they are subtle and quick to anger.
++ * Attention: all people who do not care about OS security, and think that
++ * mode 0666 is a correct.  You are wrong.  In modern multiuser systems,
++ * both remote and local security is critically important.  Allowing 0666
++ * lockfiles, allows all sorts of security problems to occur.  Feel free to
++ * meddle with it however, if you do not care about local security.
+  */
+ 
+-#define MANDATORYLOCKPROT 0666	/* don't change this */
++/* Change this only if you do not want a secure multiuser system */
++#define MANDATORYLOCKPROT 0600	
+ 
+ /* Function prototypes */
+ 
diff --git a/mail-client/pine/files/pine-4.56-passfile.patch b/mail-client/pine/files/pine-4.56-passfile.patch
new file mode 100644
index 000000000000..2b218e3fb9c5
--- /dev/null
+++ b/mail-client/pine/files/pine-4.56-passfile.patch
@@ -0,0 +1,12 @@
+--- pine/osdep/os-lnx.h.orig	2003-07-23 07:23:26.000000000 -0700
++++ pine/osdep/os-lnx.h	2003-07-23 07:23:30.000000000 -0700
+@@ -295,5 +295,9 @@
+ #define MAX_ADDR_EXPN   (1000)  /* Longest expanded addr                    */
+ #define MAX_ADDR_FIELD (10000)  /* Longest fully-expanded addr field        */
+ 
++/*----------------------------------------------------------------------
++    Allow for caching of passwords between connections.
++ ----*/
++#define PASSFILE ".pinepw"
+ 
+ #endif /* _OS_INCLUDED */
diff --git a/mail-client/pine/files/transparency.patch b/mail-client/pine/files/transparency.patch
new file mode 100644
index 000000000000..890cf13f6c57
--- /dev/null
+++ b/mail-client/pine/files/transparency.patch
@@ -0,0 +1,14 @@
+diff -ru pine4.55-orig/pico/osdep/unix pine4.55/pico/osdep/unix
+--- pine4.55-orig/pico/osdep/unix	2003-04-15 17:20:22.000000000 -0500
++++ pine4.55/pico/osdep/unix	2003-06-23 13:05:19.000000000 -0500
+@@ -998,7 +998,9 @@
+     if(ANSI_COLOR()){
+ 	char buf[10];
+ 
+-	if(color < 8)
++	if(color == 0)
++	  memcpy(buf, "\033[49m", 6);
++	else if(color < 8)
+ 	  sprintf(buf, "\033[4%cm",  color + '0');
+ 	else
+ 	  sprintf(buf, "\033[10%cm", (color-8) + '0');
diff --git a/mail-client/pine/metadata.xml b/mail-client/pine/metadata.xml
new file mode 100644
index 000000000000..51f94e3fbe0e
--- /dev/null
+++ b/mail-client/pine/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+</pkgmetadata>
diff --git a/mail-client/pine/pine-4.50-r4.ebuild b/mail-client/pine/pine-4.50-r4.ebuild
new file mode 100644
index 000000000000..a628dad5140b
--- /dev/null
+++ b/mail-client/pine/pine-4.50-r4.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.50-r4.ebuild,v 1.1 2004/05/30 02:56:38 seemant Exp $
+
+inherit eutils
+
+DESCRIPTION="tool for reading, sending and managing electronic messages"
+HOMEPAGE="http://www.washington.edu/pine/"
+SRC_URI="ftp://ftp.cac.washington.edu/${PN}/${PN}${PV}.tar.gz
+	mirror://gentoo/pine-4.50-maildir.patch.gz"
+
+LICENSE="PICO"
+SLOT="0"
+KEYWORDS="x86 ppc sparc"
+IUSE="ssl ldap debug"
+
+DEPEND="virtual/glibc
+	>=sys-libs/ncurses-5.1
+	>=sys-libs/pam-0.72
+	ssl? ( dev-libs/openssl )
+	ldap? ( net-nds/openldap )"
+
+S=${WORKDIR}/${PN}${PV}
+
+src_unpack() {
+	unpack ${A}
+	unpack pine-4.50-maildir.patch.gz
+	cd ${S}
+
+	if [ "`use mbox`" ] ; then
+		epatch ${FILESDIR}/imap-4.7c2-flock.patch
+	else
+		epatch ${FILESDIR}/pine-4.50-maildir.patch
+		epatch ${FILESDIR}/imap-4.7c2-flock+maildir.patch
+	fi
+
+	# fix for Home and End keys
+	epatch ${FILESDIR}/pine-4.21-fixhome.patch
+
+	# flock() emulation
+	cp ${FILESDIR}/flock.c ${S}/imap/src/osdep/unix
+
+	# change /bin/passwd to /usr/bin/passwd
+	epatch ${FILESDIR}/pine-4.21-passwd.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
+
+	# small flock() related fix
+	epatch ${FILESDIR}/pine-4.40-boguswarning.patch
+
+	# segfix? not sure what this is for but it still applies
+	epatch ${FILESDIR}/pine-4.31-segfix.patch
+
+	# change lock files from 0666 to 0600
+	epatch ${FILESDIR}/pine-4.40-lockfile-perm.patch
+
+	# add missing needed time.h includes
+	epatch ${FILESDIR}/imap-2000-time.patch
+
+	# gets rid of a call to stripwhitespace()
+	epatch ${FILESDIR}/pine-4.33-whitespace.patch
+
+	if [ `use debug` ]; then
+		cd ${S}/pine
+		cp makefile.lnx makefile.orig
+		sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS} -g -DDEBUG -DDEBUGJOURNAL:" \
+			< makefile.orig > makefile.lnx
+		cd ${S}/pico
+		cp makefile.lnx makefile.orig
+		sed -e "s:-g -DDEBUG:${CFLAGS} -g -DDEBUG:" \
+			< makefile.orig > makefile.lnx
+	else
+		cd ${S}/pine
+		cp makefile.lnx makefile.orig
+		sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS}:" \
+			< makefile.orig > makefile.lnx
+		cd ${S}/pico
+		cp makefile.lnx makefile.orig
+		sed -e "s:-g -DDEBUG:${CFLAGS}:" makefile.orig > makefile.lnx
+	fi
+
+}
+
+src_compile() {
+	BUILDOPTS=""
+	if [ "`use ssl`" ]
+	then
+		BUILDOPTS="${BUILDOPTS} SSLDIR=/usr SSLTYPE=unix SSLCERTS=/etc/ssl/certs"
+		cd ${S}/imap/src/osdep/unix
+		cp Makefile Makefile.orig
+		sed \
+			-e "s:\$(SSLDIR)/certs:/etc/ssl/certs:" \
+			-e "s:\$(SSLCERTS):/etc/ssl/certs:" \
+			-e "s:-I\$(SSLINCLUDE) ::" \
+			< Makefile.orig > Makefile
+		cd ${S}
+	else
+		BUILDOPTS="${BUILDOPTS} NOSSL"
+	fi
+	if [ "`use ldap`" ]
+	then
+		./contrib/ldap-setup lnp lnp
+		BUILDOPTS="${BUILDOPTS} LDAPCFLAGS=-DENABLE_LDAP"
+	else
+		BUILDOPTS="${BUILDOPTS} NOLDAP"
+	fi
+
+	./build ${BUILDOPTS} lnp || die
+}
+
+src_install() {
+	into /usr
+	dobin bin/pine bin/pico bin/pilot bin/mtest bin/rpdump bin/rpload
+
+	doman doc/pine.1 doc/pico.1 doc/pilot.1 doc/rpdump.1 doc/rpload.1
+
+	insinto /etc
+	doins doc/mime.types
+	donewins doc/mailcap.unx mailcap
+
+	dodoc CPYRIGHT README doc/brochure.txt doc/tech-notes.txt
+	use mbox || dodoc README.maildir
+
+	docinto imap
+	dodoc imap/docs/*.txt imap/docs/CONFIG imap/docs/FAQ imap/docs/RELNOTES
+
+	docinto imap/rfc
+	dodoc imap/docs/rfc/*.txt
+
+	docinto html/tech-notes
+	dodoc doc/tech-notes/*.html
+}
diff --git a/mail-client/pine/pine-4.58-r1.ebuild b/mail-client/pine/pine-4.58-r1.ebuild
new file mode 100644
index 000000000000..f6e9c62102b5
--- /dev/null
+++ b/mail-client/pine/pine-4.58-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.58-r1.ebuild,v 1.1 2004/05/30 02:56:38 seemant 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-20030915.patch.gz"
+
+LICENSE="PICO"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+IUSE="ssl ldap debug"
+
+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 )
+	!net-mail/pine-maildir"
+
+S=${WORKDIR}/${PN}${PV}
+
+src_unpack() {
+	unpack ${PN}${PV}.tar.bz2
+	cd ${S}
+
+	epatch ${DISTDIR}/${P}-chappa-all-20030915.patch.gz || die
+
+	epatch ${FILESDIR}/pine-4.21-fixhome.patch || die
+
+	epatch ${FILESDIR}/imap-4.7c2-flock.patch
+	cp ${FILESDIR}/flock.c ${S}/imap/src/osdep/unix
+
+	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
+
+	# Don't appear to need this anymore; as of pine-4.56
+	#epatch ${FILESDIR}/pine-4.40-boguswarning.patch
+
+	epatch ${FILESDIR}/pine-4.31-segfix.patch
+
+	epatch ${FILESDIR}/pine-4.40-lockfile-perm.patch
+
+	epatch ${FILESDIR}/imap-2000-time.patch
+
+	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
+		cd ${S}/pine
+		sed -i \
+			-e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS} -g -DDEBUG -DDEBUGJOURNAL:" \
+			makefile.lnx || die "sed pine/makefile.lnx failed"
+		cd ${S}/pico
+		sed -i \
+			-e "s:-g -DDEBUG:${CFLAGS} -g -DDEBUG:" \
+			makefile.lnx || die "sed pico/makefile.lnx failed"
+	else
+		cd ${S}/pine
+		cp makefile.lnx makefile.orig
+		sed -i \
+			-e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS}:" \
+			makefile.lnx || die "sed pine/makefile.lnx failed"
+		cd ${S}/pico
+		sed -i \
+			-e "s:-g -DDEBUG:${CFLAGS}:" \
+			makefile.lnx || die "sed pico/makefile.lnx failed"
+	fi
+	cd ${S}/pine/osdep
+	sed -i \
+		-e "s:/usr/local/lib/pine.conf:/etc/pine.conf:" \
+		os-lnx.h || die "sed os-lnx.h failed"
+}
+
+src_compile() {
+	BUILDOPTS=""
+	if [ "`use ssl`" ]
+	then
+		BUILDOPTS="${BUILDOPTS} SSLDIR=/usr SSLTYPE=unix SSLCERTS=/etc/ssl/certs"
+		cd ${S}/imap/src/osdep/unix
+		sed -i \
+			-e "s:\$(SSLDIR)/certs:/etc/ssl/certs:" \
+			-e "s:\$(SSLCERTS):/etc/ssl/certs:" \
+			-e "s:-I\$(SSLINCLUDE) ::" \
+			Makefile || die "sed Makefile failed"
+		cd ${S}
+	else
+		BUILDOPTS="${BUILDOPTS} NOSSL"
+	fi
+	if [ "`use ldap`" ]
+	then
+		./contrib/ldap-setup lnp lnp
+		BUILDOPTS="${BUILDOPTS} LDAPCFLAGS=-DENABLE_LDAP"
+	else
+		BUILDOPTS="${BUILDOPTS} NOLDAP"
+	fi
+
+	./build ${BUILDOPTS} lnp || die
+}
+
+src_install() {
+	into /usr
+	dobin bin/pine bin/pico bin/pilot bin/mtest bin/rpdump bin/rpload
+
+	doman doc/pine.1 doc/pico.1 doc/pilot.1 doc/rpdump.1 doc/rpload.1
+
+	insinto /etc
+	doins doc/mime.types
+	donewins doc/mailcap.unx mailcap
+
+	dodoc CPYRIGHT README doc/brochure.txt doc/tech-notes.txt
+
+	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/
+}
diff --git a/mail-client/pine/pine-4.58-r2.ebuild b/mail-client/pine/pine-4.58-r2.ebuild
new file mode 100644
index 000000000000..e2a02ab4ea64
--- /dev/null
+++ b/mail-client/pine/pine-4.58-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.58-r2.ebuild,v 1.1 2004/05/30 02:56:38 seemant Exp $
+
+inherit eutils
+
+DESCRIPTION="A tool for reading, sending and managing electronic messages."
+SRC_URI="ftp://ftp.cac.washington.edu/pine/${PN}${PV}.tar.bz2
+	mirror://gentoo/${P}-chappa-all-20030915.patch.gz"
+HOMEPAGE="http://www.washington.edu/pine/
+	http://www.math.washington.edu/~chappa/pine/patches/"
+
+LICENSE="PICO"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+IUSE="ssl ldap 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 )
+	!net-mail/pine-maildir"
+
+S="${WORKDIR}/${PN}${PV}"
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	epatch "${WORKDIR}/${P}-chappa-all-20030915.patch"
+	epatch "${FILESDIR}/pine-4.21-fixhome.patch"
+	epatch "${FILESDIR}/imap-4.7c2-flock.patch"
+	cp "${FILESDIR}/flock.c" "${S}/imap/src/osdep/unix"
+
+	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 passfile`" ] ; then
+		epatch "${FILESDIR}/pine-4.56-passfile.patch"
+	fi
+
+	epatch "${FILESDIR}/pine-4.31-segfix.patch"
+	epatch "${FILESDIR}/pine-4.40-lockfile-perm.patch"
+	epatch "${FILESDIR}/imap-2000-time.patch"
+	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 BUILDOPTS
+
+	if [ "`use ssl`" ] ; then
+		BUILDOPTS="${BUILDOPTS} 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
+		BUILDOPTS="${BUILDOPTS} NOSSL"
+	fi
+
+	if [ "`use ldap`" ] ; then
+		./contrib/ldap-setup lnp lnp
+		BUILDOPTS="${BUILDOPTS} LDAPCFLAGS=-DENABLE_LDAP"
+	else
+		BUILDOPTS="${BUILDOPTS} NOLDAP"
+	fi
+
+	./build ${BUILDOPTS} lnp || die "compile problem"
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe 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
+
+	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/
+}
diff --git a/mail-client/pine/pine-4.58-r3.ebuild b/mail-client/pine/pine-4.58-r3.ebuild
new file mode 100644
index 000000000000..9ebd941cb1b3
--- /dev/null
+++ b/mail-client/pine/pine-4.58-r3.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.58-r3.ebuild,v 1.1 2004/05/30 02:56:38 seemant 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/
+}
diff --git a/mail-client/pine/pine-4.58.ebuild b/mail-client/pine/pine-4.58.ebuild
new file mode 100644
index 000000000000..9195e009d28d
--- /dev/null
+++ b/mail-client/pine/pine-4.58.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.58.ebuild,v 1.1 2004/05/30 02:56:38 seemant 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"
+
+LICENSE="PICO"
+SLOT="0"
+KEYWORDS="x86 ~ppc sparc ~alpha amd64"
+IUSE="ssl ldap debug"
+
+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 )
+	!net-mail/pine-maildir"
+
+S=${WORKDIR}/${PN}${PV}
+
+src_unpack() {
+	unpack ${PN}${PV}.tar.bz2
+	cd ${S}
+
+	epatch ${FILESDIR}/pine-4.21-fixhome.patch || die
+
+	epatch ${FILESDIR}/imap-4.7c2-flock.patch
+	cp ${FILESDIR}/flock.c ${S}/imap/src/osdep/unix
+
+	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
+
+	# Don't appear to need this anymore; as of pine-4.56
+	#epatch ${FILESDIR}/pine-4.40-boguswarning.patch
+
+	epatch ${FILESDIR}/pine-4.31-segfix.patch
+
+	epatch ${FILESDIR}/pine-4.40-lockfile-perm.patch
+
+	epatch ${FILESDIR}/imap-2000-time.patch
+
+	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
+		cd ${S}/pine
+		sed -i \
+			-e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS} -g -DDEBUG -DDEBUGJOURNAL:" \
+			makefile.lnx || die "sed pine/makefile.lnx failed"
+		cd ${S}/pico
+		sed -i \
+			-e "s:-g -DDEBUG:${CFLAGS} -g -DDEBUG:" \
+			makefile.lnx || die "sed pico/makefile.lnx failed"
+	else
+		cd ${S}/pine
+		cp makefile.lnx makefile.orig
+		sed -i \
+			-e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS}:" \
+			makefile.lnx || die "sed pine/makefile.lnx failed"
+		cd ${S}/pico
+		sed -i \
+			-e "s:-g -DDEBUG:${CFLAGS}:" \
+			makefile.lnx || die "sed pico/makefile.lnx failed"
+	fi
+	cd ${S}/pine/osdep
+	sed -i \
+		-e "s:/usr/local/lib/pine.conf:/etc/pine.conf:" \
+		os-lnx.h || die "sed os-lnx.h failed"
+}
+
+src_compile() {
+	BUILDOPTS=""
+	if [ "`use ssl`" ]
+	then
+		BUILDOPTS="${BUILDOPTS} SSLDIR=/usr SSLTYPE=unix SSLCERTS=/etc/ssl/certs"
+		cd ${S}/imap/src/osdep/unix
+		sed -i \
+			-e "s:\$(SSLDIR)/certs:/etc/ssl/certs:" \
+			-e "s:\$(SSLCERTS):/etc/ssl/certs:" \
+			-e "s:-I\$(SSLINCLUDE) ::" \
+			Makefile || die "sed Makefile failed"
+		cd ${S}
+	else
+		BUILDOPTS="${BUILDOPTS} NOSSL"
+	fi
+	if [ "`use ldap`" ]
+	then
+		./contrib/ldap-setup lnp lnp
+		BUILDOPTS="${BUILDOPTS} LDAPCFLAGS=-DENABLE_LDAP"
+	else
+		BUILDOPTS="${BUILDOPTS} NOLDAP"
+	fi
+
+	./build ${BUILDOPTS} lnp || die
+}
+
+src_install() {
+	into /usr
+	dobin bin/pine bin/pico bin/pilot bin/mtest bin/rpdump bin/rpload
+
+	doman doc/pine.1 doc/pico.1 doc/pilot.1 doc/rpdump.1 doc/rpload.1
+
+	insinto /etc
+	doins doc/mime.types
+	donewins doc/mailcap.unx mailcap
+
+	dodoc CPYRIGHT README doc/brochure.txt doc/tech-notes.txt
+
+	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/
+}