Removed mailcap install to fix Bug 50433 in all versions

8 files changed, 46 insertions, 29 deletions

diff --git a/mail-client/pine/ChangeLog b/mail-client/pine/ChangeLog
index 5d2bbc29e363..f6af00954ba0 100644
--- a/mail-client/pine/ChangeLog
+++ b/mail-client/pine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/pine
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.5 2004/06/24 22:17:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.6 2004/06/30 06:58:58 merlin Exp $
+
+  30 Jun 2004; Cory Visi <merlin@gentoo.org> pine-4.50-r4.ebuild,
+  pine-4.58-r1.ebuild, pine-4.58-r2.ebuild, pine-4.58-r3.ebuild,
+  pine-4.58.ebuild, pine-4.60.ebuild:
+  Removed mailcap install to fix Bug 50433 in all versions
 
   10 Jun 2004; Aron Griffis <agriffis@gentoo.org> pine-4.60.ebuild:
   Fix use invocation
diff --git a/mail-client/pine/Manifest b/mail-client/pine/Manifest
index bc4bca58fdb6..b65c4876e175 100644
--- a/mail-client/pine/Manifest
+++ b/mail-client/pine/Manifest
@@ -1,28 +1,28 @@
-MD5 baea5ea7adb587a03995ace85da51e21 pine-4.58-r2.ebuild 3316
-MD5 07a98f107914cbd7a534cfe23966b231 pine-4.58.ebuild 3288
-MD5 e986eef7983d026f726491c42d0d3835 pine-4.50-r4.ebuild 3465
-MD5 6e4fa646896980a70dece585655e3026 pine-4.58-r1.ebuild 3400
-MD5 f1442fcd5187e0617da95380ab840150 pine-4.58-r3.ebuild 4292
-MD5 f30f22f83e95531f338c3228dbaf81be ChangeLog 8936
+MD5 06822d2776fe0e1c8bfb6732a20737ea ChangeLog 9163
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 55281c3fc699bb116e4b6a8b381c8576 pine-4.60.ebuild 4639
-MD5 de52689ee75160c695bf4659ee956845 files/imap-4.7c2-flock_4.60.patch 537
+MD5 3568a0947e7d9ebdb1bd0133996ee214 pine-4.50-r4.ebuild 3510
+MD5 be2eb068c8d83726c585ff9caf1bab32 pine-4.58-r1.ebuild 3445
+MD5 bb67b099537541eb3ab16fd2ca77d1a2 pine-4.58-r2.ebuild 3361
+MD5 c10207a569f740ccd62083f621416b2b pine-4.58-r3.ebuild 4337
+MD5 8500599921add4df76064755a1a85845 pine-4.58.ebuild 3333
+MD5 9a42c8d06d1606f91d31311e7b5df66e pine-4.60.ebuild 4684
 MD5 c47b08cab6132957eef9c0d61862f951 files/digest-pine-4.50-r4 131
+MD5 0493455a84ab45910a606f0f4f9f4dfd files/digest-pine-4.58 62
 MD5 da5a30f5086db88f8dd801212f512e77 files/digest-pine-4.58-r1 145
 MD5 da5a30f5086db88f8dd801212f512e77 files/digest-pine-4.58-r2 145
 MD5 21aa4bed99713a0b9c9971226fda0807 files/digest-pine-4.58-r3 429
-MD5 921f1e2837b3d3aaaff0ff9b78432e92 files/pine-4.30-ldap.patch 420
-MD5 36fbad9153bc6b61adb00767d199d284 files/imap-4.7c2-flock+maildir.patch 551
-MD5 3803bda87f35ee20456ab2b363460db9 files/pine-4.31-segfix.patch 460
+MD5 74f43c70f061a3fb9378d7800b64ccaa files/digest-pine-4.60 136
+MD5 e2791bad5a20d4429dcd4a928714558f files/flock.c 1182
 MD5 c0d53400c157de12da7e429dd0f21185 files/imap-2000-time.patch 1646
+MD5 36fbad9153bc6b61adb00767d199d284 files/imap-4.7c2-flock+maildir.patch 551
 MD5 4239f06fa5f26e5cf181bb4cd5d96035 files/imap-4.7c2-flock.patch 531
-MD5 aed38f617192b6de2ada1847c48cabe7 files/pine-4.33-whitespace.patch 337
+MD5 de52689ee75160c695bf4659ee956845 files/imap-4.7c2-flock_4.60.patch 537
 MD5 5eb69ed43326ebdca20e77b988d0b19b files/pine-4.21-fixhome.patch 830
+MD5 b0aee0d39a268c8f0c85e774f7408509 files/pine-4.21-passwd.patch 448
+MD5 921f1e2837b3d3aaaff0ff9b78432e92 files/pine-4.30-ldap.patch 420
+MD5 3803bda87f35ee20456ab2b363460db9 files/pine-4.31-segfix.patch 460
+MD5 aed38f617192b6de2ada1847c48cabe7 files/pine-4.33-whitespace.patch 337
 MD5 e11e8fb4fba9fc54b7c0f302d79458bf files/pine-4.40-boguswarning.patch 512
-MD5 e2791bad5a20d4429dcd4a928714558f files/flock.c 1182
 MD5 6fca405df4fd22a5708ddf83e8081716 files/pine-4.40-lockfile-perm.patch 932
 MD5 dadc9e153e023ad3b24d8cefd4bf5a2b files/pine-4.56-passfile.patch 504
-MD5 b0aee0d39a268c8f0c85e774f7408509 files/pine-4.21-passwd.patch 448
-MD5 0493455a84ab45910a606f0f4f9f4dfd files/digest-pine-4.58 62
-MD5 74f43c70f061a3fb9378d7800b64ccaa files/digest-pine-4.60 136
 MD5 3eb735b51e3192ee78b7b556e83256b3 files/transparency.patch 447
diff --git a/mail-client/pine/pine-4.50-r4.ebuild b/mail-client/pine/pine-4.50-r4.ebuild
index 92900bc224b1..16249424b2cf 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.3 2004/06/24 22:17:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.50-r4.ebuild,v 1.4 2004/06/30 06:58:58 merlin Exp $
 
 inherit eutils
 
@@ -122,7 +122,9 @@ src_install() {
 
 	insinto /etc
 	doins doc/mime.types
-	donewins doc/mailcap.unx mailcap
+
+	# 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
diff --git a/mail-client/pine/pine-4.58-r1.ebuild b/mail-client/pine/pine-4.58-r1.ebuild
index 189aed062fed..0353a5a0a2cc 100644
--- a/mail-client/pine/pine-4.58-r1.ebuild
+++ b/mail-client/pine/pine-4.58-r1.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-r1.ebuild,v 1.4 2004/06/24 22:17:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.58-r1.ebuild,v 1.5 2004/06/30 06:58:58 merlin Exp $
 
 inherit eutils
 
@@ -118,7 +118,9 @@ src_install() {
 
 	insinto /etc
 	doins doc/mime.types
-	donewins doc/mailcap.unx mailcap
+
+	# Only mailbase should install /etc/mailcap
+#	donewins doc/mailcap.unx mailcap
 
 	dodoc CPYRIGHT README doc/brochure.txt doc/tech-notes.txt
 
diff --git a/mail-client/pine/pine-4.58-r2.ebuild b/mail-client/pine/pine-4.58-r2.ebuild
index 7ee0c8b51feb..ad492b2427b0 100644
--- a/mail-client/pine/pine-4.58-r2.ebuild
+++ b/mail-client/pine/pine-4.58-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.58-r2.ebuild,v 1.4 2004/06/24 22:17:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.58-r2.ebuild,v 1.5 2004/06/30 06:58:58 merlin Exp $
 
 inherit eutils
 
@@ -97,7 +97,9 @@ src_install() {
 
 	insinto /etc
 	doins doc/mime.types
-	donewins doc/mailcap.unx mailcap
+
+	# 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
diff --git a/mail-client/pine/pine-4.58-r3.ebuild b/mail-client/pine/pine-4.58-r3.ebuild
index 726b47d4f68e..91a0aa250a2a 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.3 2004/06/24 22:17:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.58-r3.ebuild,v 1.4 2004/06/30 06:58:58 merlin Exp $
 
 inherit eutils
 
@@ -121,7 +121,9 @@ src_install() {
 
 	insinto /etc
 	doins doc/mime.types
-	donewins doc/mailcap.unx mailcap
+
+	# 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
diff --git a/mail-client/pine/pine-4.58.ebuild b/mail-client/pine/pine-4.58.ebuild
index 94e8b0e1d6e1..0dd50fbe8c66 100644
--- a/mail-client/pine/pine-4.58.ebuild
+++ b/mail-client/pine/pine-4.58.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.ebuild,v 1.4 2004/06/24 22:17:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.58.ebuild,v 1.5 2004/06/30 06:58:58 merlin Exp $
 
 inherit eutils
 
@@ -115,7 +115,9 @@ src_install() {
 
 	insinto /etc
 	doins doc/mime.types
-	donewins doc/mailcap.unx mailcap
+
+	# Only mailbase should install /etc/mailcap
+#	donewins doc/mailcap.unx mailcap
 
 	dodoc CPYRIGHT README doc/brochure.txt doc/tech-notes.txt
 
diff --git a/mail-client/pine/pine-4.60.ebuild b/mail-client/pine/pine-4.60.ebuild
index 4e076600fb9c..40a04d617f6a 100644
--- a/mail-client/pine/pine-4.60.ebuild
+++ b/mail-client/pine/pine-4.60.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.60.ebuild,v 1.3 2004/06/24 22:17:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.60.ebuild,v 1.4 2004/06/30 06:58:58 merlin Exp $
 
 inherit eutils
 
@@ -116,7 +116,9 @@ src_install() {
 
 	insinto /etc
 	doins doc/mime.types
-	donewins doc/mailcap.unx mailcap
+
+	# 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