From: Tom Knight <tomk@gentoo.org>
Date: Tue, 13 Mar 2007 11:20:44 +0000 (+0000)
Subject: Fixed conflicting patches
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=32dbc024ef145e63b79c6f6502861026f199354f;p=gentoo.git

Fixed conflicting patches
Package-Manager: portage-2.1.1-r1
---

diff --git a/mail-filter/spamassassin-fuzzyocr/ChangeLog b/mail-filter/spamassassin-fuzzyocr/ChangeLog
index ed215bd2eae2..1e70394ca2ed 100644
--- a/mail-filter/spamassassin-fuzzyocr/ChangeLog
+++ b/mail-filter/spamassassin-fuzzyocr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/spamassassin-fuzzyocr
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin-fuzzyocr/ChangeLog,v 1.5 2007/03/12 19:01:12 tomk Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin-fuzzyocr/ChangeLog,v 1.6 2007/03/13 11:20:44 tomk Exp $
+
+  13 Mar 2007; Tom Knight <tomk@gentoo.org> files/disableocrad.patch,
+  files/enabletesseract.patch:
+  Fixed conflicting patches
 
 *spamassassin-fuzzyocr-3.5.1 (11 Mar 2007)
 
diff --git a/mail-filter/spamassassin-fuzzyocr/Manifest b/mail-filter/spamassassin-fuzzyocr/Manifest
index 4116afb08314..9b12ecfa58e4 100644
--- a/mail-filter/spamassassin-fuzzyocr/Manifest
+++ b/mail-filter/spamassassin-fuzzyocr/Manifest
@@ -2,14 +2,14 @@ AUX disablegocr.patch 574 RMD160 78e1fb95a5758f7b4c0a9c9d40f4d4d9e1a04dbb SHA1 c
 MD5 65f6cb9656c80bf86c2a53d74d1b77b9 files/disablegocr.patch 574
 RMD160 78e1fb95a5758f7b4c0a9c9d40f4d4d9e1a04dbb files/disablegocr.patch 574
 SHA256 71914e653efba7688f2edeb396c5ff99d98e42d3541190095041d17549f5812b files/disablegocr.patch 574
-AUX disableocrad.patch 1315 RMD160 4e699fca395227a679f72723b49f159678486aad SHA1 11ba0072cf941ed29008a009699a63b0711c14d0 SHA256 a03caec630e9ed4ae435b2123c01ff848fe3a451e3a756f1bab2b0061a0ebe03
-MD5 e79daa6edbbe4df521a8c68e66d1215e files/disableocrad.patch 1315
-RMD160 4e699fca395227a679f72723b49f159678486aad files/disableocrad.patch 1315
-SHA256 a03caec630e9ed4ae435b2123c01ff848fe3a451e3a756f1bab2b0061a0ebe03 files/disableocrad.patch 1315
-AUX enabletesseract.patch 806 RMD160 908a62fe0c683058f71ae50087cbb9999a9f8341 SHA1 1cbe450861a7d60273346538c48499668eb1ad7b SHA256 df0a9914f66c203f38af42d63f75890264d54b40e3ed09f1044844d34ad1f382
-MD5 dc8b4b48bfbaa228e689cfc1bf822116 files/enabletesseract.patch 806
-RMD160 908a62fe0c683058f71ae50087cbb9999a9f8341 files/enabletesseract.patch 806
-SHA256 df0a9914f66c203f38af42d63f75890264d54b40e3ed09f1044844d34ad1f382 files/enabletesseract.patch 806
+AUX disableocrad.patch 1165 RMD160 8162db6d5687852a914c84cdc200149361aa5c51 SHA1 e166fde2208c6a6a33b8374e03a92036a4e63f46 SHA256 93020dacb93ba6c462db685dfa9db79ffe28c155ab231b56aa538d544f9f5aa5
+MD5 3b9b3e33dce065d0af0a307775ae46af files/disableocrad.patch 1165
+RMD160 8162db6d5687852a914c84cdc200149361aa5c51 files/disableocrad.patch 1165
+SHA256 93020dacb93ba6c462db685dfa9db79ffe28c155ab231b56aa538d544f9f5aa5 files/disableocrad.patch 1165
+AUX enabletesseract.patch 656 RMD160 4b6452e84815fbe8d5b47e0cdcdc736c99cfa3dd SHA1 b31f8e9f5f9733bfe3faf08671807853508cfaa5 SHA256 e988dc3fbdf6250fbdd34f8933ffc3f9304e5bb428bb3a1de49a0ce87cab8b90
+MD5 0446cf2596ffd75cee414c6b781e60ea files/enabletesseract.patch 656
+RMD160 4b6452e84815fbe8d5b47e0cdcdc736c99cfa3dd files/enabletesseract.patch 656
+SHA256 e988dc3fbdf6250fbdd34f8933ffc3f9304e5bb428bb3a1de49a0ce87cab8b90 files/enabletesseract.patch 656
 AUX fuzzyocr.logrotate 194 RMD160 1f0f601dd3874f5d0bc36249c6947cbf22960f10 SHA1 958099139c6c884ed7b72dd67edd84affe7e64b2 SHA256 ce41aa3314237d725c6173d809de2e0862c8547f26516b5dda26df684cb72fc3
 MD5 3e1403a4bdc931391ced5e11772aff66 files/fuzzyocr.logrotate 194
 RMD160 1f0f601dd3874f5d0bc36249c6947cbf22960f10 files/fuzzyocr.logrotate 194
@@ -24,10 +24,10 @@ EBUILD spamassassin-fuzzyocr-3.5.1.ebuild 5315 RMD160 5af60c505c22d6c490d71b54b2
 MD5 01dabdf7f9fedde81f74922a0f83c8e3 spamassassin-fuzzyocr-3.5.1.ebuild 5315
 RMD160 5af60c505c22d6c490d71b54b2cc82f0e7f425e5 spamassassin-fuzzyocr-3.5.1.ebuild 5315
 SHA256 1a5b87d023845d15fe07207ed0687a9772b1968e5e173d5b02f35234b98b62ec spamassassin-fuzzyocr-3.5.1.ebuild 5315
-MISC ChangeLog 1047 RMD160 9fe7aaf0ba880266a749f4f12cdb80b1ef24b65e SHA1 59034af3e11a6ea08a7db27843686cb8d7650546 SHA256 4868da6d71e213e0f8933cb34b6f390f1703f1c057e2204ff24294aeecc1d5ca
-MD5 5edbadfcaa2ba1acaae283a7a56728f6 ChangeLog 1047
-RMD160 9fe7aaf0ba880266a749f4f12cdb80b1ef24b65e ChangeLog 1047
-SHA256 4868da6d71e213e0f8933cb34b6f390f1703f1c057e2204ff24294aeecc1d5ca ChangeLog 1047
+MISC ChangeLog 1177 RMD160 fa627bb91632e9668b87bc2f242fd716e9c30739 SHA1 027a7fa41207c2bc3404f910dde8a7ef7a654694 SHA256 c9d2638008c88c5cab238bfcd2f3102963a585eea68ececf0a20b1c3a224a354
+MD5 a82fdfae71e40c4d8a29279ab890ea12 ChangeLog 1177
+RMD160 fa627bb91632e9668b87bc2f242fd716e9c30739 ChangeLog 1177
+SHA256 c9d2638008c88c5cab238bfcd2f3102963a585eea68ececf0a20b1c3a224a354 ChangeLog 1177
 MISC metadata.xml 724 RMD160 ca8bdf48e7e3f1fe34a9df8cf1df070a977d3480 SHA1 b6778bbc7c0d77b4556306d0c1c85b7b91106b22 SHA256 39e916df5be09516aed189bc9a8fcc3f16623699f33c35d364e9a49c71f4c31a
 MD5 46baf638cb6673317723526fbd95c442 metadata.xml 724
 RMD160 ca8bdf48e7e3f1fe34a9df8cf1df070a977d3480 metadata.xml 724
diff --git a/mail-filter/spamassassin-fuzzyocr/files/disableocrad.patch b/mail-filter/spamassassin-fuzzyocr/files/disableocrad.patch
index bd78cb64acad..cda344a6513e 100644
--- a/mail-filter/spamassassin-fuzzyocr/files/disableocrad.patch
+++ b/mail-filter/spamassassin-fuzzyocr/files/disableocrad.patch
@@ -49,10 +49,3 @@
  
  # Standard Gocr Scanset
  scanset gocr {
-@@ -59,4 +59,4 @@
- #    preprocessors = normalize, invert, normalize
- #    command = $gocr
- #    args = -i $input
--#}
-\ No newline at end of file
-+#}
diff --git a/mail-filter/spamassassin-fuzzyocr/files/enabletesseract.patch b/mail-filter/spamassassin-fuzzyocr/files/enabletesseract.patch
index bf2aa15453da..b95d0e7113d9 100644
--- a/mail-filter/spamassassin-fuzzyocr/files/enabletesseract.patch
+++ b/mail-filter/spamassassin-fuzzyocr/files/enabletesseract.patch
@@ -19,10 +19,3 @@
  
  # Another example, this basically does the same as the inverted Ocrad Scanset
  # Only listed here to serve as example, ocrad-invert does this already
-@@ -59,4 +59,4 @@
- #    preprocessors = normalize, invert, normalize
- #    command = $gocr
- #    args = -i $input
--#}
-\ No newline at end of file
-+#}