tidy wrt # 60345.

5 files changed, 8 insertions, 136 deletions

diff --git a/mail-client/pine/ChangeLog b/mail-client/pine/ChangeLog
index ecb699dc9b6b..5348b3a00d63 100644
--- a/mail-client/pine/ChangeLog
+++ b/mail-client/pine/ChangeLog
@@ -1,6 +1,10 @@
 # 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.17 2004/08/09 12:39:59 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.18 2004/08/14 21:02:29 langthang Exp $
+
+  14 Aug 2004; Tuan Van <langthang@gentoo.org> pine-4.50-r4.ebuild,
+  pine-4.58-r3.ebuild, -pine-4.58.ebuild:
+  tidy wrt # 60345.
 
   09 Aug 2004; Tom Martin <slarti@gentoo.org> pine-4.50-r4.ebuild,
   pine-4.58-r3.ebuild, pine-4.58.ebuild, pine-4.60.ebuild,
diff --git a/mail-client/pine/files/digest-pine-4.58 b/mail-client/pine/files/digest-pine-4.58
deleted file mode 100644
index e93e20d21699..000000000000
--- a/mail-client/pine/files/digest-pine-4.58
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6135222a12f06b2dfceea5c1b736891e pine4.58.tar.bz2 2837321
diff --git a/mail-client/pine/pine-4.50-r4.ebuild b/mail-client/pine/pine-4.50-r4.ebuild
index c63b21cc0616..0320dfd4795a 100644
--- a/mail-client/pine/pine-4.50-r4.ebuild
+++ b/mail-client/pine/pine-4.50-r4.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.50-r4.ebuild,v 1.7 2004/08/09 12:39:59 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.50-r4.ebuild,v 1.8 2004/08/14 21:02:29 langthang Exp $
 
 inherit eutils
 
@@ -25,13 +25,12 @@ 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 ${WORKDIR}/pine-4.50-maildir.patch
 		epatch ${FILESDIR}/imap-4.7c2-flock+maildir.patch
 	fi
 
diff --git a/mail-client/pine/pine-4.58-r3.ebuild b/mail-client/pine/pine-4.58-r3.ebuild
index 94ec7e42cf53..26c31924f681 100644
--- a/mail-client/pine/pine-4.58-r3.ebuild
+++ b/mail-client/pine/pine-4.58-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.58-r3.ebuild,v 1.8 2004/08/09 12:39:59 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.58-r3.ebuild,v 1.9 2004/08/14 21:02:29 langthang Exp $
 
 inherit eutils
 
diff --git a/mail-client/pine/pine-4.58.ebuild b/mail-client/pine/pine-4.58.ebuild
deleted file mode 100644
index 33f2cce3377a..000000000000
--- a/mail-client/pine/pine-4.58.ebuild
+++ /dev/null
@@ -1,130 +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.ebuild,v 1.7 2004/08/09 12:39:59 slarti 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/libc
-	>=sys-apps/sed-4
-	>=sys-libs/ncurses-5.1
-	>=sys-libs/pam-0.72
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )
-	!mail-client/pine-maildir"
-RDEPEND="app-misc/mime-types"
-
-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
-
-	# Only mailbase should install /etc/mailcap
-#	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/
-}