only unpack patch unless bogofilter flag is set. fixes #126747

(Portage version: 2.1_pre6-r3)

4 files changed, 17 insertions, 13 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 636bb32582f4..f179bbe1b279 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/evolution
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.114 2006/03/18 22:42:56 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.115 2006/03/19 01:39:56 allanonjl Exp $
+
+  19 Mar 2006; John N. Laliberte <allanonjl@gentoo.org>
+  evolution-2.6.0.ebuild:
+  only unpack patch unless bogofilter flag is set. fixes #126747
 
 *evolution-2.6.0 (18 Mar 2006)
 
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 638541d3d928..5ddc08fdf4bd 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,6 +1,6 @@
-MD5 4dca662e623f8e21a60fb1dcd024faac ChangeLog 32834
-RMD160 891e5fd0819d00029377a603932d9c7524685f17 ChangeLog 32834
-SHA256 3563f4641a4b6685f32d94a6ee286f1e0f2b464995b376ff75559e50b3b9f400 ChangeLog 32834
+MD5 a8ccc53669e49d177e525a0494f7d051 ChangeLog 32982
+RMD160 b4aa246f1fe94e3ecf664c6d57c69d285a6b9741 ChangeLog 32982
+SHA256 c58813c9228c878a25d5c82c8b7216b583e35d6a79167d2cf6610483606ec30b ChangeLog 32982
 MD5 95f6cf79b236723dc8e09937391dd4de evolution-1.2.4.ebuild 6245
 RMD160 5539a866e6b196898af7bd91fca67f3576a4f9f9 evolution-1.2.4.ebuild 6245
 SHA256 f2bdfdf19456786a2053b44b5a5b4a67db949790eac29cde7f626d9b8a67e3f0 evolution-1.2.4.ebuild 6245
@@ -22,9 +22,9 @@ SHA256 bdb9b441fa2edd27f8f1370edd52332cf7ad52646ddc953f0374617bf97a3c58 evolutio
 MD5 69340630836c71c73ff1fa374ff69ad3 evolution-2.4.2.ebuild 5663
 RMD160 d0a1781003d2920ef61c006bfff52fb45df5bf88 evolution-2.4.2.ebuild 5663
 SHA256 8b457aa42a973db38865303f27e8545f22c7ebbede54fdf9371799f4c88b333b evolution-2.4.2.ebuild 5663
-MD5 0b267aceef226a82863af1a55cf54a0b evolution-2.6.0.ebuild 6015
-RMD160 8f100c5778401209e7f4999235e6e37b97219da9 evolution-2.6.0.ebuild 6015
-SHA256 4893936308763fa2eda3587c64c660386cd407747f4cf6b9282c99e7fd721d19 evolution-2.6.0.ebuild 6015
+MD5 74781356c14ee639785d1275b239944d evolution-2.6.0.ebuild 6033
+RMD160 097ba9e5fe81dfc3e69114b25d2fd8be23d15378 evolution-2.6.0.ebuild 6033
+SHA256 aba5b9385257e7a15e7d7a56bdd3690e134604f7449bc393e255ef20ca8d8b38 evolution-2.6.0.ebuild 6033
 MD5 457d67c67b8f0b497d3f667be6e92577 files/digest-evolution-1.2.4 131
 RMD160 614d61109a19c2394fbfa3fe224838d949b2536b files/digest-evolution-1.2.4 131
 SHA256 beeb63042d60398528a1ecf13f8942476f91af281d12755d4db6758f9851cc65 files/digest-evolution-1.2.4 131
@@ -46,9 +46,9 @@ SHA256 2b5fceafd090f4a6db3b2e7a67599c9a908482d17b1c269d3da1942a479a33fb files/di
 MD5 c26dc1fd2762cde6c32c4c52d3ce9644 files/digest-evolution-2.4.2.1 262
 RMD160 59ab19f6fa13bb17b8756d4ea326d9827b839bf8 files/digest-evolution-2.4.2.1 262
 SHA256 66512ea95e1843f7da7daff072e06ae1c770a51c57cf954c66d8924ba2c9213c files/digest-evolution-2.4.2.1 262
-MD5 b7135bdb52f97014752d5b38603dff6c files/digest-evolution-2.6.0 533
-RMD160 0356403d31a87ee66ad947d6a3c9c6ae5f3c0213 files/digest-evolution-2.6.0 533
-SHA256 c9b2f3e30b0cd1b7dd81baddb73e424b997a4b7e32a1930bfcbd2d163fc0f768 files/digest-evolution-2.6.0 533
+MD5 4d96f0604fbf63cae8b7db920eb660df files/digest-evolution-2.6.0 533
+RMD160 6e406ba51587014f98db105eedf93b3540223355 files/digest-evolution-2.6.0 533
+SHA256 452a151688ab03b4f544215d77e6c1e0e4bce7f3e165c2d5e3c5b802767751cf files/digest-evolution-2.6.0 533
 MD5 c837abd50d990dea46fcea32b8a1b001 files/evolution-1.1.90-kde.patch 689
 RMD160 64dd8efc58e99c0c2037ac47ffe6c6db5a15aafe files/evolution-1.1.90-kde.patch 689
 SHA256 efe5df721db55743cb9e63aca62ce03c77d82755ac57dd486eef3269adce0836 files/evolution-1.1.90-kde.patch 689
diff --git a/mail-client/evolution/evolution-2.6.0.ebuild b/mail-client/evolution/evolution-2.6.0.ebuild
index a4be0d416c0a..19a787554f9a 100644
--- a/mail-client/evolution/evolution-2.6.0.ebuild
+++ b/mail-client/evolution/evolution-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.6.0.ebuild,v 1.1 2006/03/18 22:42:56 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.6.0.ebuild,v 1.2 2006/03/19 01:39:56 allanonjl Exp $
 
 inherit eutils flag-o-matic alternatives gnome2 autotools
 
@@ -134,7 +134,7 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${P}.tar.bz2
-	unpack ${PN}-2.5.5.1-bf-junk.tar.bz2
+	use bogofilter && unpack ${PN}-2.5.5.1-bf-junk.tar.bz2
 	cd "${S}"
 
 	gnome2_omf_fix help/omf.make
diff --git a/mail-client/evolution/files/digest-evolution-2.6.0 b/mail-client/evolution/files/digest-evolution-2.6.0
index 902ed13539ac..2529f1432c79 100644
--- a/mail-client/evolution/files/digest-evolution-2.6.0
+++ b/mail-client/evolution/files/digest-evolution-2.6.0
@@ -1,6 +1,6 @@
-MD5 31456188591167083628df719adc8f22 evolution-2.5.5.1-bf-junk.tar.bz2 10771
 RMD160 7ae764761607d50024fbec32680bc57e04ac7879 evolution-2.5.5.1-bf-junk.tar.bz2 10771
 SHA256 b8988b28836a201606d8fa651f48722ebac8c984dcc171f7f7a3b860d0f7a045 evolution-2.5.5.1-bf-junk.tar.bz2 10771
+MD5 31456188591167083628df719adc8f22 evolution-2.5.5.1-bf-junk.tar.bz2 10771
 MD5 5c98650b2ccf3581e7cf5af3927b95d1 evolution-2.6.0.tar.bz2 12072895
 RMD160 7f01966a6ff8b02ab5f5bf74a120e452cbc32f4d evolution-2.6.0.tar.bz2 12072895
 SHA256 9565772416a42ed779d33b55f56183c51baabbf5db6109f1e0d63611d76e7d7d evolution-2.6.0.tar.bz2 12072895