Clean up patch

(Portage version: 2.2.10/cvs/Linux i686, signed Manifest commit with key A792A613)

2 files changed, 22 insertions, 28 deletions

diff --git a/app-text/ocrad/ChangeLog b/app-text/ocrad/ChangeLog
index c6112d909805..767073c40206 100644
--- a/app-text/ocrad/ChangeLog
+++ b/app-text/ocrad/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/ocrad
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ocrad/ChangeLog,v 1.39 2014/04/05 05:11:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ocrad/ChangeLog,v 1.40 2014/04/06 23:53:23 jer Exp $
+
+  06 Apr 2014; Jeroen Roovers <jer@gentoo.org> files/ocrad-0.17-gcc43.patch:
+  Clean up patch
 
 *ocrad-0.23 (05 Apr 2014)
 
diff --git a/app-text/ocrad/files/ocrad-0.17-gcc43.patch b/app-text/ocrad/files/ocrad-0.17-gcc43.patch
index f5c8de3f095d..40119aed8643 100644
--- a/app-text/ocrad/files/ocrad-0.17-gcc43.patch
+++ b/app-text/ocrad/files/ocrad-0.17-gcc43.patch
@@ -1,6 +1,5 @@
-diff -up ocrad-0.17/textblock.cc.gcc43 ocrad-0.17/textblock.cc
---- ocrad-0.17/textblock.cc.gcc43	2007-06-29 14:29:13.000000000 +0200
-+++ ocrad-0.17/textblock.cc	2008-02-19 19:36:25.000000000 +0100
+--- a/textblock.cc
++++ b/textblock.cc
 @@ -18,6 +18,7 @@
  #include <algorithm>
  #include <cstdio>
@@ -9,9 +8,8 @@ diff -up ocrad-0.17/textblock.cc.gcc43 ocrad-0.17/textblock.cc
  
  #include "common.h"
  #include "rational.h"
-diff -up ocrad-0.17/page_image_layout.cc.gcc43 ocrad-0.17/page_image_layout.cc
---- ocrad-0.17/page_image_layout.cc.gcc43	2007-06-29 14:29:13.000000000 +0200
-+++ ocrad-0.17/page_image_layout.cc	2008-02-19 19:36:25.000000000 +0100
+--- a/page_image_layout.cc
++++ b/page_image_layout.cc
 @@ -18,6 +18,8 @@
  #include <algorithm>
  #include <cstdio>
@@ -21,9 +19,8 @@ diff -up ocrad-0.17/page_image_layout.cc.gcc43 ocrad-0.17/page_image_layout.cc
  
  #include "common.h"
  #include "rational.h"
-diff -up ocrad-0.17/track.cc.gcc43 ocrad-0.17/track.cc
---- ocrad-0.17/track.cc.gcc43	2008-02-19 19:37:08.000000000 +0100
-+++ ocrad-0.17/track.cc	2008-02-19 19:37:30.000000000 +0100
+--- a/track.cc
++++ b/track.cc
 @@ -17,6 +17,7 @@
  
  #include <algorithm>
@@ -32,9 +29,8 @@ diff -up ocrad-0.17/track.cc.gcc43 ocrad-0.17/track.cc
  
  #include "common.h"
  #include "rectangle.h"
-diff -up ocrad-0.17/textline.cc.gcc43 ocrad-0.17/textline.cc
---- ocrad-0.17/textline.cc.gcc43	2007-06-29 14:29:13.000000000 +0200
-+++ ocrad-0.17/textline.cc	2008-02-19 19:36:25.000000000 +0100
+--- a/textline.cc
++++ b/textline.cc
 @@ -19,6 +19,7 @@
  #include <cctype>
  #include <cstdio>
@@ -43,9 +39,8 @@ diff -up ocrad-0.17/textline.cc.gcc43 ocrad-0.17/textline.cc
  
  #include "common.h"
  #include "rational.h"
-diff -up ocrad-0.17/common.cc.gcc43 ocrad-0.17/common.cc
---- ocrad-0.17/common.cc.gcc43	2007-06-29 14:29:13.000000000 +0200
-+++ ocrad-0.17/common.cc	2008-02-19 19:36:25.000000000 +0100
+--- a/common.cc
++++ b/common.cc
 @@ -17,6 +17,7 @@
  
  #include <algorithm>
@@ -54,9 +49,8 @@ diff -up ocrad-0.17/common.cc.gcc43 ocrad-0.17/common.cc
  #include <cstdlib>
  #include "common.h"
  
-diff -up ocrad-0.17/textpage.cc.gcc43 ocrad-0.17/textpage.cc
---- ocrad-0.17/textpage.cc.gcc43	2007-06-29 14:29:13.000000000 +0200
-+++ ocrad-0.17/textpage.cc	2008-02-19 19:36:25.000000000 +0100
+--- a/textpage.cc
++++ b/textpage.cc
 @@ -18,6 +18,7 @@
  #include <cstdio>
  #include <string>
@@ -65,9 +59,8 @@ diff -up ocrad-0.17/textpage.cc.gcc43 ocrad-0.17/textpage.cc
  
  #include "common.h"
  #include "rectangle.h"
-diff -up ocrad-0.17/textline_r2.cc.gcc43 ocrad-0.17/textline_r2.cc
---- ocrad-0.17/textline_r2.cc.gcc43	2007-06-29 14:29:13.000000000 +0200
-+++ ocrad-0.17/textline_r2.cc	2008-02-19 19:36:25.000000000 +0100
+--- a/textline_r2.cc
++++ b/textline_r2.cc
 @@ -18,6 +18,7 @@
  #include <cctype>
  #include <cstdio>
@@ -76,9 +69,8 @@ diff -up ocrad-0.17/textline_r2.cc.gcc43 ocrad-0.17/textline_r2.cc
  
  #include "common.h"
  #include "rectangle.h"
-diff -up ocrad-0.17/page_image.cc.gcc43 ocrad-0.17/page_image.cc
---- ocrad-0.17/page_image.cc.gcc43	2007-06-29 14:29:13.000000000 +0200
-+++ ocrad-0.17/page_image.cc	2008-02-19 19:36:25.000000000 +0100
+--- a/page_image.cc
++++ b/page_image.cc
 @@ -19,6 +19,8 @@
  #include <cctype>
  #include <cstdio>
@@ -88,9 +80,8 @@ diff -up ocrad-0.17/page_image.cc.gcc43 ocrad-0.17/page_image.cc
  
  #include "common.h"
  #include "rational.h"
-diff -up ocrad-0.17/character_r12.cc.gcc43 ocrad-0.17/character_r12.cc
---- ocrad-0.17/character_r12.cc.gcc43	2007-06-29 14:29:13.000000000 +0200
-+++ ocrad-0.17/character_r12.cc	2008-02-19 19:36:25.000000000 +0100
+--- a/character_r12.cc
++++ b/character_r12.cc
 @@ -17,6 +17,7 @@
  
  #include <cstdio>