Ebuild and files/ cleanup. Closes #72200.

13 files changed, 10 insertions, 622 deletions

diff --git a/mail-client/pine/ChangeLog b/mail-client/pine/ChangeLog
index 817676361eec..6ebe0048ba74 100644
--- a/mail-client/pine/ChangeLog
+++ b/mail-client/pine/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/pine
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.26 2004/11/25 14:29:10 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.27 2004/11/26 10:18:10 ticho Exp $
+
+  26 Nov 2004; Andrej Kacian <ticho@gentoo.org>
+  -files/pine-4.33-whitespace.patch, -files/pine-4.40-boguswarning.patch,
+  -pine-4.50-r4.ebuild, -pine-4.58-r3.ebuild, -pine-4.60.ebuild,
+  -pine-4.61-r1.ebuild, pine-4.61-r2.ebuild, pine-4.61-r3.ebuild:
+  Removed ebuilds <=4.61-r1, as well as no longer used patches from files/
+  dir. Closes bug #72200, reported by Michael <fd0man@chadeux.net>.
 
   25 Nov 2004; Jason Wever <weeve@gentoo.org> pine-4.61-r2.ebuild:
   Stable on sparc wrt bug #72268.
diff --git a/mail-client/pine/files/digest-pine-4.50-r4 b/mail-client/pine/files/digest-pine-4.50-r4
deleted file mode 100644
index a4e0d5157b71..000000000000
--- a/mail-client/pine/files/digest-pine-4.50-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-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-r3 b/mail-client/pine/files/digest-pine-4.58-r3
deleted file mode 100644
index d61357652939..000000000000
--- a/mail-client/pine/files/digest-pine-4.58-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-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/digest-pine-4.60 b/mail-client/pine/files/digest-pine-4.60
deleted file mode 100644
index c307c12f63be..000000000000
--- a/mail-client/pine/files/digest-pine-4.60
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 aece91c8a857605994829ffa91d98c9f pine4.60.tar.bz2 2996963
-MD5 0d321869aec8a6dc86e484a648c6e9ce pine-4.60-chappa-all.patch.gz 143602
diff --git a/mail-client/pine/files/digest-pine-4.61-r1 b/mail-client/pine/files/digest-pine-4.61-r1
deleted file mode 100644
index 2beace03c42e..000000000000
--- a/mail-client/pine/files/digest-pine-4.61-r1
+++ /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/pine-4.33-whitespace.patch b/mail-client/pine/files/pine-4.33-whitespace.patch
deleted file mode 100644
index 68b0159c8644..000000000000
--- a/mail-client/pine/files/pine-4.33-whitespace.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 58d426001582..000000000000
--- a/mail-client/pine/files/pine-4.40-boguswarning.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/pine-4.50-r4.ebuild b/mail-client/pine/pine-4.50-r4.ebuild
deleted file mode 100644
index 954d35d2d96b..000000000000
--- a/mail-client/pine/pine-4.50-r4.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.10 2004/10/04 20:48:07 robbat2 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="debug ldap mbox ssl"
-
-DEPEND="virtual/libc
-	>=sys-libs/ncurses-5.1
-	>=sys-libs/pam-0.72
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )"
-RDEPEND="${DEPEND} app-misc/mime-types"
-
-S="${WORKDIR}/${P/-/}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	if use mbox ; then
-		epatch ${FILESDIR}/imap-4.7c2-flock.patch
-	else
-		epatch ${WORKDIR}/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
-
-	# Only mailbase should install /etc/mailcap
-#	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-r3.ebuild b/mail-client/pine/pine-4.58-r3.ebuild
deleted file mode 100644
index 2f536442a9ea..000000000000
--- a/mail-client/pine/pine-4.58-r3.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.11 2004/10/04 20:48:07 robbat2 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 ppc64"
-IUSE="debug ipv6 kerberos ldap maildir passfile ssl"
-
-DEPEND="virtual/libc
-	>=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 )"
-RDEPEND="${DEPEND} app-misc/mime-types"
-
-S="${WORKDIR}/${P/-/}"
-
-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
-
-	# Only mailbase should install /etc/mailcap
-#	donewins doc/mailcap.unx mailcap
-
-	doman doc/pine.1 doc/pico.1 doc/pilot.1 doc/rpdump.1 doc/rpload.1
-	dodoc CPYRIGHT README doc/brochure.txt doc/tech-notes.txt
-	if use ipv6 ; then
-		dodoc "${DISTDIR}/readme.${P}-v6-20031001"
-	fi
-
-	docinto imap
-	dodoc imap/docs/*.txt imap/docs/CONFIG imap/docs/RELNOTES
-
-	docinto imap/rfc
-	dodoc imap/docs/rfc/*.txt
-
-	docinto html/tech-notes
-	dohtml -r doc/tech-notes/
-}
diff --git a/mail-client/pine/pine-4.60.ebuild b/mail-client/pine/pine-4.60.ebuild
deleted file mode 100644
index 0b516738ec54..000000000000
--- a/mail-client/pine/pine-4.60.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.60.ebuild,v 1.16 2004/11/05 23:07:43 mr_bones_ 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.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 passfile debug"
-
-DEPEND="virtual/libc
-	>=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 )"
-RDEPEND="${DEPEND} app-misc/mime-types"
-
-S="${WORKDIR}/${P/-/}"
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	# Various fixes and features.
-	epatch "${WORKDIR}/${P}-chappa-all.patch"
-	# Fix Home and End keys. Seems to work anyway?
-	#epatch "${FILESDIR}/pine-4.21-fixhome.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"
-	# Get rid of stripwhitespace() calls.
-	# Fixed with changed default behaviour and options.
-	# Patch does not apply anymore.
-	#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
-
-	# Only mailbase should install /etc/mailcap
-#	donewins doc/mailcap.unx mailcap
-
-	doman doc/pine.1 doc/pico.1 doc/pilot.1 doc/rpdump.1 doc/rpload.1
-	dodoc CPYRIGHT README doc/brochure.txt doc/tech-notes.txt
-#	if use ipv6 ; then
-#		dodoc "${DISTDIR}/readme.${P}-v6-20031001"
-#	fi
-
-	docinto imap
-	dodoc imap/docs/*.txt imap/docs/CONFIG imap/docs/RELNOTES
-
-	docinto imap/rfc
-	dodoc imap/docs/rfc/*.txt
-
-	docinto html/tech-notes
-	dohtml -r doc/tech-notes/
-}
-
-pkg_postinst() {
-	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-r1.ebuild b/mail-client/pine/pine-4.61-r1.ebuild
deleted file mode 100644
index 6c212607c7c9..000000000000
--- a/mail-client/pine/pine-4.61-r1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.61-r1.ebuild,v 1.7 2004/11/05 23:07:43 mr_bones_ 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/${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 passfile debug"
-
-DEPEND="virtual/libc
-	>=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 )"
-RDEPEND="${DEPEND} app-misc/mime-types"
-
-S="${WORKDIR}/${P/-/}"
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	# Various fixes and features.
-	epatch "${WORKDIR}/${PF}-chappa-all.patch"
-	# Fix Home and End keys. Seems to work anyway?
-	#epatch "${FILESDIR}/pine-4.21-fixhome.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"
-	# Get rid of stripwhitespace() calls.
-	# Fixed with changed default behaviour and options.
-	# Patch does not apply anymore.
-	#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 \
-	      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-r2.ebuild b/mail-client/pine/pine-4.61-r2.ebuild
index a6f714c5277c..c2429cf45b49 100644
--- a/mail-client/pine/pine-4.61-r2.ebuild
+++ b/mail-client/pine/pine-4.61-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.9 2004/11/25 14:29:10 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.61-r2.ebuild,v 1.10 2004/11/26 10:18:10 ticho Exp $
 
 inherit eutils
 
@@ -68,10 +68,6 @@ src_unpack() {
 	epatch "${FILESDIR}/pine-4.40-lockfile-perm.patch"
 	# Add missing time.h includes.
 	epatch "${FILESDIR}/imap-2000-time.patch"
-	# Get rid of stripwhitespace() calls.
-	# Fixed with changed default behaviour and options.
-	# Patch does not apply anymore.
-	#epatch "${FILESDIR}/pine-4.33-whitespace.patch"
 	# Bug #23336 - makes pine transparent in terms that support it.
 	epatch "${FILESDIR}/transparency.patch"
 
diff --git a/mail-client/pine/pine-4.61-r3.ebuild b/mail-client/pine/pine-4.61-r3.ebuild
index 042476610d29..d3f764ef469c 100644
--- a/mail-client/pine/pine-4.61-r3.ebuild
+++ b/mail-client/pine/pine-4.61-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.1 2004/11/25 01:11:03 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.61-r3.ebuild,v 1.2 2004/11/26 10:18:10 ticho Exp $
 
 inherit eutils
 
@@ -68,10 +68,6 @@ src_unpack() {
 	epatch "${FILESDIR}/pine-4.40-lockfile-perm.patch"
 	# Add missing time.h includes.
 	epatch "${FILESDIR}/imap-2000-time.patch"
-	# Get rid of stripwhitespace() calls.
-	# Fixed with changed default behaviour and options.
-	# Patch does not apply anymore.
-	#epatch "${FILESDIR}/pine-4.33-whitespace.patch"
 	# Bug #23336 - makes pine transparent in terms that support it.
 	epatch "${FILESDIR}/transparency.patch"