Stable on x86 and amd64. Removed older stuff.

Package-Manager: portage-2.0.51.22-r1

10 files changed, 13 insertions, 497 deletions

diff --git a/mail-client/pine/ChangeLog b/mail-client/pine/ChangeLog
index 15fd5a78b972..976b26981065 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.57 2005/05/20 10:56:49 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.58 2005/07/07 15:47:39 ticho Exp $
+
+  07 Jul 2005; Andrej Kacian <ticho@gentoo.org>
+  -files/imap-4.7c2-flock.patch, -pine-4.61-r2.ebuild, -pine-4.61-r3.ebuild,
+  -pine-4.61-r4.ebuild, pine-4.63-r2.ebuild:
+  Stable on amd64 and x86. Removed older ebuilds and unused patches.
 
 *pine-4.63-r2 (20 May 2005)
 
diff --git a/mail-client/pine/Manifest b/mail-client/pine/Manifest
index 74f4f0d8ef45..d696cb61d920 100644
--- a/mail-client/pine/Manifest
+++ b/mail-client/pine/Manifest
@@ -1,22 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d3210060048b2a6df3bbb18110bec61e pine-4.61-r2.ebuild 4688
 MD5 df36c8865a5c3109974fb630251fe32d pine-4.62-r1.ebuild 5252
 MD5 80055259213721a085dd8a1987e39bb7 pine-4.62.ebuild 5790
-MD5 aea7c27e48e4596559d988cf9e1db87f pine-4.61-r4.ebuild 4810
-MD5 4f028907e38d58e3eb092044c6603f81 pine-4.63-r2.ebuild 5408
-MD5 c516777e49f054e9c720e48d340d804e pine-4.61-r3.ebuild 4691
+MD5 4dabcfcd8aed65d8bb2aec4374b1e69a pine-4.63-r2.ebuild 5406
 MD5 cf1187ddd78dc5f02054c93585efef96 pine-4.62-r2.ebuild 5404
 MD5 f1759a695182611038a02645cdfc3826 pine-4.63.ebuild 5396
 MD5 918f11739d9028dd2425ad4381504d9a pine-4.61-r5.ebuild 4999
-MD5 0e6a5d2389e6ba965afcdcc5459ac1a6 ChangeLog 16531
+MD5 fcce049759ece4ab9f8af6766c4eaa83 ChangeLog 16771
 MD5 d73512e5eebacf947b7b04496068c4d4 pine-4.63-r1.ebuild 5402
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 de52689ee75160c695bf4659ee956845 files/imap-4.7c2-flock_4.60.patch 537
-MD5 4c1ce6a4925676bcfe5c53a2cf05b7f7 files/digest-pine-4.61-r2 139
-MD5 8f1d4661a745dab7f2113e7068c6e04e files/digest-pine-4.61-r3 139
-MD5 8f1d4661a745dab7f2113e7068c6e04e files/digest-pine-4.61-r4 139
 MD5 8f1d4661a745dab7f2113e7068c6e04e files/digest-pine-4.61-r5 139
 MD5 1d3052dda4b361277ca31ce465a29626 files/digest-pine-4.62-r1 139
 MD5 b3fd3bd534ef04e16efb8755b8e845be files/digest-pine-4.62-r2 139
@@ -27,7 +21,6 @@ MD5 3803bda87f35ee20456ab2b363460db9 files/pine-4.31-segfix.patch 460
 MD5 17031d0e1279dabd445a3deb5d19287c files/pine-4.61-largeterminal.patch 526
 MD5 c0d53400c157de12da7e429dd0f21185 files/imap-2000-time.patch 1646
 MD5 7e8bb5286b4b14ec695fce340f8bb6b5 files/pine-4.62-spooldir-permissions.patch 488
-MD5 4239f06fa5f26e5cf181bb4cd5d96035 files/imap-4.7c2-flock.patch 531
 MD5 e2791bad5a20d4429dcd4a928714558f files/flock.c 1182
 MD5 6fca405df4fd22a5708ddf83e8081716 files/pine-4.40-lockfile-perm.patch 932
 MD5 1057540bd7b50f92e88b3af6f8d69c99 files/pine-4.61-subjectlength.patch 2363
@@ -38,7 +31,7 @@ MD5 3eb735b51e3192ee78b7b556e83256b3 files/transparency.patch 447
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCjcKJQlM6RnzZP+IRAsV5AJ0SqjrOHo1Q+TzwMF8oxhJ4x1JDnACfQY6D
-gJyhatsUKb8zCrukOeKt5M8=
-=q9oD
+iD8DBQFCzU62QlM6RnzZP+IRAivwAKCEmSQqQdOGUE0Q9jDCXe7Qo/Kv7gCfXnzK
+kEmUZidQPzp4q3xGHwmgVA4=
+=ehxS
 -----END PGP SIGNATURE-----
diff --git a/mail-client/pine/files/digest-pine-4.61-r2 b/mail-client/pine/files/digest-pine-4.61-r2
deleted file mode 100644
index 2beace03c42e..000000000000
--- a/mail-client/pine/files/digest-pine-4.61-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 885c6aa4f4f16fcb83a49ef6c025307e pine4.61.tar.bz2 3032253
-MD5 00a2bc8a5cae7e35e315e28f2b8f25a7 pine-4.61-r1-chappa-all.patch.gz 150169
diff --git a/mail-client/pine/files/digest-pine-4.61-r3 b/mail-client/pine/files/digest-pine-4.61-r3
deleted file mode 100644
index d7429f16d1a9..000000000000
--- a/mail-client/pine/files/digest-pine-4.61-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 885c6aa4f4f16fcb83a49ef6c025307e pine4.61.tar.bz2 3032253
-MD5 f8a98b202010698fc680e1ff06b8e425 pine-4.61-r2-chappa-all.patch.gz 160672
diff --git a/mail-client/pine/files/digest-pine-4.61-r4 b/mail-client/pine/files/digest-pine-4.61-r4
deleted file mode 100644
index d7429f16d1a9..000000000000
--- a/mail-client/pine/files/digest-pine-4.61-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 885c6aa4f4f16fcb83a49ef6c025307e pine4.61.tar.bz2 3032253
-MD5 f8a98b202010698fc680e1ff06b8e425 pine-4.61-r2-chappa-all.patch.gz 160672
diff --git a/mail-client/pine/files/imap-4.7c2-flock.patch b/mail-client/pine/files/imap-4.7c2-flock.patch
deleted file mode 100644
index 0debc7a5e02a..000000000000
--- a/mail-client/pine/files/imap-4.7c2-flock.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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/pine-4.61-r2.ebuild b/mail-client/pine/pine-4.61-r2.ebuild
deleted file mode 100644
index 2b13cf4d2aa0..000000000000
--- a/mail-client/pine/pine-4.61-r2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# 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.61-r2.ebuild,v 1.12 2005/01/03 22:39:21 ticho Exp $
-
-inherit eutils
-
-# Using this ugly hack, since we're using chappa patch revision 1 (see #59573)
-CHAPPA_PF="${P}-r1"
-
-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"
-	# 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"
-	# 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
-}
diff --git a/mail-client/pine/pine-4.61-r3.ebuild b/mail-client/pine/pine-4.61-r3.ebuild
deleted file mode 100644
index 0ad394025c08..000000000000
--- a/mail-client/pine/pine-4.61-r3.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# 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.61-r3.ebuild,v 1.5 2005/04/03 20:28:54 j4rg0n 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"
-	# 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"
-	# 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
-}
diff --git a/mail-client/pine/pine-4.61-r4.ebuild b/mail-client/pine/pine-4.61-r4.ebuild
deleted file mode 100644
index f6a55106738c..000000000000
--- a/mail-client/pine/pine-4.61-r4.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# 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.61-r4.ebuild,v 1.5 2005/04/03 20:28:54 j4rg0n 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"
-	# 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"
-	# Bug #23336 - makes pine transparent in terms that support it.
-	epatch "${FILESDIR}/transparency.patch"
-
-	# Bug #72861 - relaxes subject length for base64-encoded subjects
-	epatch "${FILESDIR}/pine-4.61-subjectlength.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
-}
diff --git a/mail-client/pine/pine-4.63-r2.ebuild b/mail-client/pine/pine-4.63-r2.ebuild
index 3375dbe46aa9..572e861fd43c 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.1 2005/05/20 10:56:49 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.63-r2.ebuild,v 1.2 2005/07/07 15:47:39 ticho Exp $
 
 inherit eutils
 
@@ -20,7 +20,7 @@ SRC_URI="ftp://ftp.cac.washington.edu/pine/${P/-/}.tar.bz2
 
 LICENSE="PICO"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ppc-macos ~ia64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha amd64 ~ppc-macos ~ia64"
 IUSE="ssl ldap kerberos largeterminal pam passfile debug"
 
 DEPEND="virtual/libc