Fixed gcc-4 compilation problem, bug #129651.

(Portage version: 2.1_pre7-r5)

4 files changed, 42 insertions, 9 deletions

diff --git a/app-text/ocrad/ChangeLog b/app-text/ocrad/ChangeLog
index dc2d41eaebaf..61991249e381 100644
--- a/app-text/ocrad/ChangeLog
+++ b/app-text/ocrad/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/ocrad
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ocrad/ChangeLog,v 1.15 2006/04/10 11:02:58 ehmsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ocrad/ChangeLog,v 1.16 2006/04/13 14:26:42 ehmsen Exp $
+
+  13 Apr 2006; Martin Ehmsen <ehmsen@gentoo.org>
+  +files/ocrad-0.14-gcc-4-compilation.patch, ocrad-0.14.ebuild:
+  Fixed gcc-4 compilation problem, bug #129651.
 
 *ocrad-0.14 (10 Apr 2006)
 
diff --git a/app-text/ocrad/Manifest b/app-text/ocrad/Manifest
index b63a19a71cdc..e4edded83d7e 100644
--- a/app-text/ocrad/Manifest
+++ b/app-text/ocrad/Manifest
@@ -1,6 +1,6 @@
-MD5 ac5d165ea464c7312f9bd48ccba4278e ChangeLog 1730
-RMD160 bd172ce3dfcdaf50b6a424ded280f9bc1b9791fa ChangeLog 1730
-SHA256 bcca9ba8db97711445fe251bab1b7852f80f737e128883fd351c72c166f138b0 ChangeLog 1730
+MD5 9fdd20264aa5ffe5078c230e78cf7cd2 ChangeLog 1892
+RMD160 983fed17fdc4399fb354dc0bfcfcefbcd2eaef29 ChangeLog 1892
+SHA256 ad3a5a7707a18857e4c63e7e200ec18f21d0a5b079bbded100448a079396081a ChangeLog 1892
 MD5 859e2275e9be955282b13de247311494 files/digest-ocrad-0.10 62
 RMD160 ee821996d1a2863a7baf33521e6690a1e09ad611 files/digest-ocrad-0.10 62
 SHA256 bdf03b34ef5b87a7fe8ae0d6f8c7712702f9167d389302d28b9bdc86be0d2e5e files/digest-ocrad-0.10 62
@@ -16,6 +16,9 @@ SHA256 bea0875aee5ebd316eb676834789516b417c71196435cfb558f4fb3cc3917173 files/di
 MD5 4e4cdcfaa9582353a5ac2a22d1ae712a files/digest-ocrad-0.9 61
 RMD160 a88b8e33ab693e97eecf32affc69fa63ddfbc4a4 files/digest-ocrad-0.9 61
 SHA256 a27f91122e79a751b6206ec31dde97ff62ba59283b5a99fd442e3a5896f0ee34 files/digest-ocrad-0.9 61
+MD5 6e95b1f3cfe2ba3d1940596599d3b04f files/ocrad-0.14-gcc-4-compilation.patch 486
+RMD160 7aef9a80dafa576798a699340d1229624ad0e6ca files/ocrad-0.14-gcc-4-compilation.patch 486
+SHA256 b9c85c54436aedc2bbf8dbc4adf0e497efcdaebb9448b7e3dadf11727653fb85 files/ocrad-0.14-gcc-4-compilation.patch 486
 MD5 cf6fae23c926d0a529f52619cea00222 metadata.xml 415
 RMD160 47a1ee42aa1dc077b2521da334afcec9d38b60a8 metadata.xml 415
 SHA256 73266d7344b2037f518d880ce64b324a6f7f9406a3ebf3a047e67e49d81ddcaa metadata.xml 415
@@ -28,9 +31,9 @@ SHA256 bcf0daf06754b7616c53ca57286a5632043a10980d5cb1304fc780cff45864f0 ocrad-0.
 MD5 be393a71a752cdf64dd69d9539896659 ocrad-0.13.ebuild 751
 RMD160 dda0f7d3b8a5842106ce9545b1d22e35c30c22b6 ocrad-0.13.ebuild 751
 SHA256 6179eaa3409555826ff5ac5b42ed6b607cbac567aaa88fef09ffaa3e910118ca ocrad-0.13.ebuild 751
-MD5 67e0ce1d90670bf036eca006e644708e ocrad-0.14.ebuild 869
-RMD160 186678f88f57c230620633604de308d89d4e75d2 ocrad-0.14.ebuild 869
-SHA256 5048a0c0e12eef50be799a9a1e0e3e2635376150a22a9a493630cd1345a54a09 ocrad-0.14.ebuild 869
+MD5 d8e7fb038d148ab954e6bfb7581fe491 ocrad-0.14.ebuild 889
+RMD160 f1a8670899a804a98cd78b696c481c270281278e ocrad-0.14.ebuild 889
+SHA256 d2b3a2107fe79b84d90f81fbc159a88b4756ee74c65e60a3afd5726a04ebe2a2 ocrad-0.14.ebuild 889
 MD5 8639acb4f138ce92f70b5b614c0e6ad6 ocrad-0.9.ebuild 750
 RMD160 c8feddae7504c54475829a86f0bf168cbaf489bc ocrad-0.9.ebuild 750
 SHA256 03aea640b467f091c35aa308ed94817e1032c7edb899e67c5591de7708f7e400 ocrad-0.9.ebuild 750
diff --git a/app-text/ocrad/files/ocrad-0.14-gcc-4-compilation.patch b/app-text/ocrad/files/ocrad-0.14-gcc-4-compilation.patch
new file mode 100644
index 000000000000..f3905aee31ea
--- /dev/null
+++ b/app-text/ocrad/files/ocrad-0.14-gcc-4-compilation.patch
@@ -0,0 +1,21 @@
+--- ocrad-0.14-orig/page_image_layout.cc        2006-01-02 11:31:18.000000000
+-0700
++++ ocrad-0.14/page_image_layout.cc     2006-04-11 21:50:48.000000000 -0600
+@@ -31,6 +31,8 @@
+
+ void find_rows( const Rectangle & rin, bool recursive ) throw();
+
++} // end namespace
++
+ void Page_image::find_columns( const Rectangle & rin, bool recursive ) throw()
+   {
+   if( !this->includes( rin ) ) return;
+@@ -172,8 +174,6 @@
+     }
+   }
+
+-} // end namespace
+-
+
+ // Creates a reduced Page_image
+ //
diff --git a/app-text/ocrad/ocrad-0.14.ebuild b/app-text/ocrad/ocrad-0.14.ebuild
index 650596775fe1..90bdfa3b7899 100644
--- a/app-text/ocrad/ocrad-0.14.ebuild
+++ b/app-text/ocrad/ocrad-0.14.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ocrad/ocrad-0.14.ebuild,v 1.1 2006/04/10 11:02:58 ehmsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ocrad/ocrad-0.14.ebuild,v 1.2 2006/04/13 14:26:42 ehmsen Exp $
 
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
 
 IUSE=""
 
@@ -17,6 +17,11 @@ KEYWORDS="~x86 ~ppc ~amd64"
 
 DEPEND="virtual/libc"
 
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${P}-gcc-4-compilation.patch" || die "Patching failed"
+}
+
 src_compile() {
 	# econf doesn't work (unrecognized option --host)
 	./configure --prefix=/usr || die