Version bump for bug 218929, thanks to Peter Alfredsen for reporting and GCC 4.3 patch.

(Portage version: 2.1.5_rc6)

4 files changed, 146 insertions, 32 deletions

diff --git a/app-text/ocrad/ChangeLog b/app-text/ocrad/ChangeLog
index 019cdc568bfd..d217eff01e89 100644
--- a/app-text/ocrad/ChangeLog
+++ b/app-text/ocrad/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/ocrad
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ocrad/ChangeLog,v 1.24 2007/06/03 16:17:27 armin76 Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ocrad/ChangeLog,v 1.25 2008/04/22 19:33:52 drac Exp $
+
+*ocrad-0.17 (22 Apr 2008)
+
+  22 Apr 2008; Samuli Suominen <drac@gentoo.org>
+  +files/ocrad-0.17-gcc43.patch, -ocrad-0.10.ebuild, +ocrad-0.17.ebuild:
+  Version bump for bug 218929, thanks to Peter Alfredsen for reporting and
+  GCC 4.3 patch.
 
   03 Jun 2007; Raúl Porcel <armin76@gentoo.org> ocrad-0.15.ebuild:
   Add ~alpha wrt #173114
diff --git a/app-text/ocrad/files/ocrad-0.17-gcc43.patch b/app-text/ocrad/files/ocrad-0.17-gcc43.patch
new file mode 100644
index 000000000000..f5c8de3f095d
--- /dev/null
+++ b/app-text/ocrad/files/ocrad-0.17-gcc43.patch
@@ -0,0 +1,101 @@
+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
+@@ -18,6 +18,7 @@
+ #include <algorithm>
+ #include <cstdio>
+ #include <vector>
++#include <string>
+ 
+ #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
+@@ -18,6 +18,8 @@
+ #include <algorithm>
+ #include <cstdio>
+ #include <vector>
++#include <cstdlib>
++#include <string>
+ 
+ #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
+@@ -17,6 +17,7 @@
+ 
+ #include <algorithm>
+ #include <vector>
++#include <cstdio>
+ 
+ #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
+@@ -19,6 +19,7 @@
+ #include <cctype>
+ #include <cstdio>
+ #include <vector>
++#include <string>
+ 
+ #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
+@@ -17,6 +17,7 @@
+ 
+ #include <algorithm>
+ #include <cstdio>
++#include <cstring>
+ #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
+@@ -18,6 +18,7 @@
+ #include <cstdio>
+ #include <string>
+ #include <vector>
++#include <algorithm>
+ 
+ #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
+@@ -18,6 +18,7 @@
+ #include <cctype>
+ #include <cstdio>
+ #include <vector>
++#include <cstdlib>
+ 
+ #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
+@@ -19,6 +19,8 @@
+ #include <cctype>
+ #include <cstdio>
+ #include <vector>
++#include <climits>
++#include <string>
+ 
+ #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
+@@ -17,6 +17,7 @@
+ 
+ #include <cstdio>
+ #include <vector>
++#include <cstdlib>
+ #include "common.h"
+ #include "rectangle.h"
+ #include "ucs.h"
diff --git a/app-text/ocrad/ocrad-0.10.ebuild b/app-text/ocrad/ocrad-0.10.ebuild
deleted file mode 100644
index fa849f390869..000000000000
--- a/app-text/ocrad/ocrad-0.10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ocrad/ocrad-0.10.ebuild,v 1.3 2005/02/10 10:14:59 usata Exp $
-
-inherit toolchain-funcs
-
-IUSE=""
-
-DESCRIPTION="GNU Ocrad is an OCR (Optical Character Recognition) program"
-
-SRC_URI="http://savannah.nongnu.org/download/ocrad/${P}.tar.bz2"
-HOMEPAGE="http://www.gnu.org/software/ocrad/ocrad.html"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	# econf doesn't work (unrecognized option --host)
-	./configure --prefix=/usr || die
-	emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" || die
-}
-
-src_install() {
-	dobin ocrad
-	doinfo doc/ocrad.info
-	doman doc/ocrad.1
-}
diff --git a/app-text/ocrad/ocrad-0.17.ebuild b/app-text/ocrad/ocrad-0.17.ebuild
new file mode 100644
index 000000000000..ef6e17bdcbb6
--- /dev/null
+++ b/app-text/ocrad/ocrad-0.17.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ocrad/ocrad-0.17.ebuild,v 1.1 2008/04/22 19:33:52 drac Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="GNU Ocrad is an OCR (Optical Character Recognition) program"
+HOMEPAGE="http://www.gnu.org/software/ocrad/ocrad.html"
+SRC_URI="http://savannah.nongnu.org/download/ocrad/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
+src_compile() {
+	econf CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	doman doc/ocrad.1
+	doinfo doc/ocrad.info
+	dodoc AUTHORS NEWS README TODO
+	insinto /usr/share/doc/${PF}
+	doins -r examples
+}