Old ebuild cleanup.

Package-Manager: portage-2.1_pre4-r1

14 files changed, 12 insertions, 1127 deletions

diff --git a/mail-client/pine/ChangeLog b/mail-client/pine/ChangeLog
index ca66b12323ed..b30ef77558f0 100644
--- a/mail-client/pine/ChangeLog
+++ b/mail-client/pine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/pine
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.79 2006/02/23 05:50:01 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.80 2006/02/23 05:54:34 ticho Exp $
+
+  23 Feb 2006; Andrej Kacian <ticho@gentoo.org> -pine-4.62.ebuild,
+  -pine-4.62-r1.ebuild, -pine-4.62-r2.ebuild, -pine-4.63.ebuild,
+  -pine-4.63-r1.ebuild, -pine-4.63-r2.ebuild:
+  Old ebuild cleanup.
 
 *pine-4.64-r3 (23 Feb 2006)
 
diff --git a/mail-client/pine/Manifest b/mail-client/pine/Manifest
index 7e403f3601a2..96f13180067b 100644
--- a/mail-client/pine/Manifest
+++ b/mail-client/pine/Manifest
@@ -1,30 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0199ab2c6d3a38cb96c113ded5963d28 ChangeLog 19108
-RMD160 9acb69714c7584892358ee0376e9d30cdc9d9e0b ChangeLog 19108
-SHA256 dde7250dc13bde1051a052569d471e51e085c5532800a2372618f7db489d9f08 ChangeLog 19108
+MD5 45bff54516131165a7802ab4616c5f4c ChangeLog 19309
+RMD160 90aaba70c196d09f4511bc7a49e43b4a1bafbe57 ChangeLog 19309
+SHA256 cc38a27d53a4d66b1ed0c95d4eaccad97d373b4e8718e9a6cddc607428f85865 ChangeLog 19309
 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
@@ -76,27 +58,9 @@ SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata
 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
@@ -109,7 +73,7 @@ SHA256 68dbe9181a569a1fef0740c369e7cf183a792d30cd6fb9bc961dc51f1f72de72 pine-4.6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFD/U0aQlM6RnzZP+IRAobxAKCG694S1BkClauATrk+w1+fWoI2eQCgtdF8
-0d+9YsfopY8nTzxP0gUuWJ8=
-=/A1m
+iD4DBQFD/U4qQlM6RnzZP+IRAt74AKCagbXmC1W0AdCqVIS7wOvU+dOzBgCYugZV
+6a5S8EH03k4pXgsDwcKGHw==
+=/8PB
 -----END PGP SIGNATURE-----
diff --git a/mail-client/pine/files/digest-pine-4.62 b/mail-client/pine/files/digest-pine-4.62
deleted file mode 100644
index 395c32616c0e..000000000000
--- a/mail-client/pine/files/digest-pine-4.62
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 60e58c0676b4761d1e9bd3570dd7c222 pine4.62.tar.bz2 3079348
-MD5 af45730ebd12554c7a5a1aad7c4d63be pine-4.62-chappa-all.patch.gz 152817
-MD5 14f1a54e7b822a8a032f387861968599 pine-4.62-maildir.patch.gz 20892
diff --git a/mail-client/pine/files/digest-pine-4.62-r1 b/mail-client/pine/files/digest-pine-4.62-r1
deleted file mode 100644
index 948e0471bc20..000000000000
--- a/mail-client/pine/files/digest-pine-4.62-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 60e58c0676b4761d1e9bd3570dd7c222 pine4.62.tar.bz2 3079348
-MD5 7bb6a3626fb2958f5a34c4ff444a6b6c pine-4.62-r1-chappa-all.patch.gz 162558
diff --git a/mail-client/pine/files/digest-pine-4.62-r2 b/mail-client/pine/files/digest-pine-4.62-r2
deleted file mode 100644
index 980668a7532f..000000000000
--- a/mail-client/pine/files/digest-pine-4.62-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 60e58c0676b4761d1e9bd3570dd7c222 pine4.62.tar.bz2 3079348
-MD5 b066689674b5dd7ea3239b5b6c6cc333 pine-4.62-r2-chappa-all.patch.gz 165504
diff --git a/mail-client/pine/files/digest-pine-4.63 b/mail-client/pine/files/digest-pine-4.63
deleted file mode 100644
index c11dcac230c4..000000000000
--- a/mail-client/pine/files/digest-pine-4.63
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e881f439f38039b310d22554ab08feb4 pine4.63.tar.bz2 3083721
-MD5 84eb7da3609e22df1f5a1f066fa97ff0 pine-4.63-chappa-all.patch.gz 165951
diff --git a/mail-client/pine/files/digest-pine-4.63-r1 b/mail-client/pine/files/digest-pine-4.63-r1
deleted file mode 100644
index 28ffc476b035..000000000000
--- a/mail-client/pine/files/digest-pine-4.63-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e881f439f38039b310d22554ab08feb4 pine4.63.tar.bz2 3083721
-MD5 dbe2d43416c671a9f15ceeedd5befeff pine-4.63-r1-chappa-all.patch.gz 165867
diff --git a/mail-client/pine/files/digest-pine-4.63-r2 b/mail-client/pine/files/digest-pine-4.63-r2
deleted file mode 100644
index 71f56ae8eb47..000000000000
--- a/mail-client/pine/files/digest-pine-4.63-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e881f439f38039b310d22554ab08feb4 pine4.63.tar.bz2 3083721
-MD5 d4d25084e614e434ad20c218be0dae87 pine-4.63-r2-chappa-all.patch.gz 165856
diff --git a/mail-client/pine/pine-4.62-r1.ebuild b/mail-client/pine/pine-4.62-r1.ebuild
deleted file mode 100644
index e6e6d29cce64..000000000000
--- a/mail-client/pine/pine-4.62-r1.ebuild
+++ /dev/null
@@ -1,175 +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.62-r1.ebuild,v 1.8 2005/04/21 19:16:42 hansmi Exp $
-
-inherit eutils
-
-# Using this ugly hack, since we're making our own versioned copies of chappa 
-# patch, as upstream doesn't version them. (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/${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="x86 ppc sparc ~alpha amd64 ~ppc-macos ia64"
-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}"
-
-	# Various fixes and features.
-	epatch "${WORKDIR}/${CHAPPA_PF}-chappa-all.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
-	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"
-	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 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
-}
diff --git a/mail-client/pine/pine-4.62-r2.ebuild b/mail-client/pine/pine-4.62-r2.ebuild
deleted file mode 100644
index 6085f1109fe5..000000000000
--- a/mail-client/pine/pine-4.62-r2.ebuild
+++ /dev/null
@@ -1,178 +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.62-r2.ebuild,v 1.2 2005/04/03 20:28:54 j4rg0n Exp $
-
-inherit eutils
-
-# Using this ugly hack, since we're making our own versioned copies of chappa 
-# patch, as upstream doesn't version them. (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/${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="~x86 ~ppc ~sparc ~alpha ~amd64 ~ppc-macos ~ia64"
-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}/${P}-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
-}
diff --git a/mail-client/pine/pine-4.62.ebuild b/mail-client/pine/pine-4.62.ebuild
deleted file mode 100644
index 503a7195f215..000000000000
--- a/mail-client/pine/pine-4.62.ebuild
+++ /dev/null
@@ -1,184 +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.62.ebuild,v 1.6 2005/03/05 07:05:25 josejx Exp $
-
-inherit eutils
-
-# Using this ugly hack, since we're making our own versioned copies of chappa
-# patch, as upstream doesn't version them. (see #59573)
-CHAPPA_PF="${P}"
-
-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
-	!maildir? ( http://dev.gentoo.org/~ticho/portage/pine-4.62-maildir.patch.gz )"
-# using my webspace until the patch gets fully distributed to mirrors  -Ticho
-#	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 ia64"
-#IUSE="ipv6 maildir ssl ldap kerberos passfile"
-IUSE="ssl ldap kerberos largeterminal pam passfile debug maildir"
-
-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
-	use maildir && {
-		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 "This build of pine has Maildir support disabled."
-		einfo "To enable it, turn on \"maildir\" USE flag."
-	}
-	einfo
-}
-
-pkg_setup() {
-	maildir_warn
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	# Various fixes and features.
-	epatch "${WORKDIR}/${CHAPPA_PF}-chappa-all.patch"
-	# Revert maildir patch if maildir USE flag is not set
-	# 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"
-	use maildir || {
-		einfo "Reverse-applying the maildir patch to remove maildir support brought in by"
-		einfo "the chappa-all patch. Ignore any warnings."
-		patch -s -R -t -p1 <${WORKDIR}/${PN}-4.62-maildir.patch || die "reverse patch failed"
-	}
-	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
-	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"
-	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() {
-	maildir_warn
-}
diff --git a/mail-client/pine/pine-4.63-r1.ebuild b/mail-client/pine/pine-4.63-r1.ebuild
deleted file mode 100644
index bfc4b9d7b711..000000000000
--- a/mail-client/pine/pine-4.63-r1.ebuild
+++ /dev/null
@@ -1,178 +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.63-r1.ebuild,v 1.2 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. (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/${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="x86 ppc sparc alpha amd64 ~ppc-macos ia64"
-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
-}
diff --git a/mail-client/pine/pine-4.63-r2.ebuild b/mail-client/pine/pine-4.63-r2.ebuild
deleted file mode 100644
index 2a9d238949f9..000000000000
--- a/mail-client/pine/pine-4.63-r2.ebuild
+++ /dev/null
@@ -1,178 +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.63-r2.ebuild,v 1.7 2005/08/24 16:15:13 agriffis Exp $
-
-inherit eutils
-
-# Using this ugly hack, since we're making our own versioned copies of chappa 
-# patch, as upstream doesn't version them. (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/${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
-}
diff --git a/mail-client/pine/pine-4.63.ebuild b/mail-client/pine/pine-4.63.ebuild
deleted file mode 100644
index eeb6960dd29e..000000000000
--- a/mail-client/pine/pine-4.63.ebuild
+++ /dev/null
@@ -1,178 +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.63.ebuild,v 1.6 2005/05/06 22:50:41 herbs Exp $
-
-inherit eutils
-
-# Using this ugly hack, since we're making our own versioned copies of chappa 
-# patch, as upstream doesn't version them. (see #59573) 
-CHAPPA_PF="${P}"
-
-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="x86 ppc sparc alpha amd64 ~ppc-macos ia64"
-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
-}