Some more unused patches cleanup.

8 files changed, 17 insertions, 72 deletions

diff --git a/mail-client/pine/ChangeLog b/mail-client/pine/ChangeLog
index 6a4a70ea3ada..b2f46e122665 100644
--- a/mail-client/pine/ChangeLog
+++ b/mail-client/pine/ChangeLog
@@ -1,6 +1,12 @@
 # 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.28 2004/11/30 01:16:10 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.29 2004/11/30 01:24:48 ticho Exp $
+
+  30 Nov 2004; Andrej Kacian <ticho@gentoo.org>
+  -files/imap-4.7c2-flock+maildir.patch, -files/pine-4.21-fixhome.patch,
+  -files/pine-4.21-passwd.patch, pine-4.61-r2.ebuild, pine-4.61-r3.ebuild,
+  pine-4.61-r4.ebuild:
+  Some more unused patches cleanup.
 
 *pine-4.61-r4 (30 Nov 2004)
 
diff --git a/mail-client/pine/Manifest b/mail-client/pine/Manifest
index 4f92b35ee14d..467a6580f648 100644
--- a/mail-client/pine/Manifest
+++ b/mail-client/pine/Manifest
@@ -1,31 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 51a62237930dedbf93328b828a23893e ChangeLog 12557
-MD5 9ba30318f121171a155a73e291914831 pine-4.61-r2.ebuild 4783
+MD5 7edd5bb27c749353d60396b557c7550f ChangeLog 12813
+MD5 407fdc430b8b1f297014cdb02a584138 pine-4.61-r2.ebuild 4688
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 35b1dff40cc3317314c7ece3c1538451 pine-4.61-r3.ebuild 4787
-MD5 b2e97315fe4966a25b33a13bdf79c367 pine-4.61-r4.ebuild 4907
+MD5 060b03674ff5afa8abd22d41c1556423 pine-4.61-r3.ebuild 4692
+MD5 9f75424cdbdb679b60c74cdc7784505f pine-4.61-r4.ebuild 4812
 MD5 8f1d4661a745dab7f2113e7068c6e04e files/digest-pine-4.61-r3 139
 MD5 8f1d4661a745dab7f2113e7068c6e04e files/digest-pine-4.61-r4 139
 MD5 3eb735b51e3192ee78b7b556e83256b3 files/transparency.patch 447
 MD5 4c1ce6a4925676bcfe5c53a2cf05b7f7 files/digest-pine-4.61-r2 139
-MD5 b0aee0d39a268c8f0c85e774f7408509 files/pine-4.21-passwd.patch 448
 MD5 4239f06fa5f26e5cf181bb4cd5d96035 files/imap-4.7c2-flock.patch 531
 MD5 e2791bad5a20d4429dcd4a928714558f files/flock.c 1182
-MD5 5eb69ed43326ebdca20e77b988d0b19b files/pine-4.21-fixhome.patch 830
 MD5 921f1e2837b3d3aaaff0ff9b78432e92 files/pine-4.30-ldap.patch 420
 MD5 c0d53400c157de12da7e429dd0f21185 files/imap-2000-time.patch 1646
 MD5 6fca405df4fd22a5708ddf83e8081716 files/pine-4.40-lockfile-perm.patch 932
 MD5 de52689ee75160c695bf4659ee956845 files/imap-4.7c2-flock_4.60.patch 537
-MD5 36fbad9153bc6b61adb00767d199d284 files/imap-4.7c2-flock+maildir.patch 551
 MD5 3803bda87f35ee20456ab2b363460db9 files/pine-4.31-segfix.patch 460
 MD5 dadc9e153e023ad3b24d8cefd4bf5a2b files/pine-4.56-passfile.patch 504
 MD5 1057540bd7b50f92e88b3af6f8d69c99 files/pine-4.61-subjectlength.patch 2363
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBq8njQlM6RnzZP+IRAlp+AJ9pf4Gx88e7QZ7OeXVJT8WRTNdaVACfYT3P
-AeUcKb2OtSWqysF5NQcYzlM=
-=wE/l
+iD8DBQFBq8voQlM6RnzZP+IRAtbTAJ49G2j+OclJD2mfrKq6ev4XgiIusgCgvETF
+vDM8EPntDoFvZydXedKMuBs=
+=lxUC
 -----END PGP SIGNATURE-----
diff --git a/mail-client/pine/files/imap-4.7c2-flock+maildir.patch b/mail-client/pine/files/imap-4.7c2-flock+maildir.patch
deleted file mode 100644
index 263b43355507..000000000000
--- a/mail-client/pine/files/imap-4.7c2-flock+maildir.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 maildir.o
--CFLAGS=-g
-+ unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o maildir.o flock.o
-+CFLAGS=$(BASECFLAGS) $(EXTRACFLAGS)
- 
- CAT=cat
- MAKE=make
- MV=mv
diff --git a/mail-client/pine/files/pine-4.21-fixhome.patch b/mail-client/pine/files/pine-4.21-fixhome.patch
deleted file mode 100644
index 7572dc9ae4cb..000000000000
--- a/mail-client/pine/files/pine-4.21-fixhome.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- pine4.21/pico/osdep/term.cap.fixhome	Tue Mar  7 16:12:39 2000
-+++ pine4.21/pico/osdep/term.cap	Tue Mar  7 16:13:30 2000
-@@ -133,8 +133,8 @@
-      */
-     kpinsert("\033[4J", KEY_PGUP, 1);
-     kpinsert("\033[3J", KEY_PGDN, 1);
--    kpinsert("\033[2J", KEY_HOME, 1);
--    kpinsert("\033[N",  KEY_END, 1);
-+    kpinsert("\033[1~", KEY_HOME, 1);
-+    kpinsert("\033[4~", KEY_END, 1);
- 
-     /* 
-      * ANSI mode.
---- pine4.21/pico/osdep/term.inf.fixhome	Tue Mar  7 16:13:09 2000
-+++ pine4.21/pico/osdep/term.inf	Tue Mar  7 16:13:20 2000
-@@ -137,8 +137,8 @@
-      */
-     kpinsert("\033[4J", KEY_PGUP, 1);
-     kpinsert("\033[3J", KEY_PGDN, 1);
--    kpinsert("\033[2J", KEY_HOME, 1);
--    kpinsert("\033[N",  KEY_END, 1);
-+    kpinsert("\033[1~", KEY_HOME, 1);
-+    kpinsert("\033[4~", KEY_END, 1);
- 
-     /* 
-      * ANSI mode.
diff --git a/mail-client/pine/files/pine-4.21-passwd.patch b/mail-client/pine/files/pine-4.21-passwd.patch
deleted file mode 100644
index 3919a01872a3..000000000000
--- a/mail-client/pine/files/pine-4.21-passwd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr pine4.21.orig/pine/osdep/os-lnx.h pine4.21/pine/osdep/os-lnx.h
---- pine4.21.orig/pine/osdep/os-lnx.h	Thu Sep  7 15:41:48 2000
-+++ pine4.21/pine/osdep/os-lnx.h	Thu Sep  7 15:57:17 2000
-@@ -223,7 +223,7 @@
- 
- 
- /*--------- Program employed by users to change their password ---------*/
--#define	PASSWD_PROG	"/bin/passwd"
-+#define	PASSWD_PROG	"/usr/bin/passwd"
- 
- 
- /*-------------- A couple constants used to size arrays ----------------*/
diff --git a/mail-client/pine/pine-4.61-r2.ebuild b/mail-client/pine/pine-4.61-r2.ebuild
index c2429cf45b49..9dcf34264142 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.10 2004/11/26 10:18:10 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.61-r2.ebuild,v 1.11 2004/11/30 01:24:48 ticho Exp $
 
 inherit eutils
 
@@ -39,8 +39,6 @@ src_unpack() {
 
 	# Various fixes and features.
 	epatch "${WORKDIR}/${CHAPPA_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.
diff --git a/mail-client/pine/pine-4.61-r3.ebuild b/mail-client/pine/pine-4.61-r3.ebuild
index d3f764ef469c..e25caa2dcc65 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.2 2004/11/26 10:18:10 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.61-r3.ebuild,v 1.3 2004/11/30 01:24:48 ticho Exp $
 
 inherit eutils
 
@@ -39,8 +39,6 @@ src_unpack() {
 
 	# Various fixes and features.
 	epatch "${WORKDIR}/${CHAPPA_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.
diff --git a/mail-client/pine/pine-4.61-r4.ebuild b/mail-client/pine/pine-4.61-r4.ebuild
index d6acca591d9e..71af367f176d 100644
--- a/mail-client/pine/pine-4.61-r4.ebuild
+++ b/mail-client/pine/pine-4.61-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.61-r4.ebuild,v 1.1 2004/11/30 01:16:10 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.61-r4.ebuild,v 1.2 2004/11/30 01:24:48 ticho Exp $
 
 inherit eutils
 
@@ -39,8 +39,6 @@ src_unpack() {
 
 	# Various fixes and features.
 	epatch "${WORKDIR}/${CHAPPA_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.