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

Package-Manager: portage-2.1.5_rc6

5 files changed, 150 insertions, 35 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/Manifest b/app-text/ocrad/Manifest
index 9ecb1ebb1d9d..902a97d6487b 100644
--- a/app-text/ocrad/Manifest
+++ b/app-text/ocrad/Manifest
@@ -1,6 +1,7 @@
-DIST ocrad-0.10.tar.bz2 58565 RMD160 3e519c346754f1977d7c16d0b0dea51529a14350 SHA1 5c4095645da01a763efe7df431ed4fc3e56be6b3 SHA256 98b2e0fb8fb1d4952de0c356fb640a38c8afa9574679c46a56946871cc7dcea0
+AUX ocrad-0.17-gcc43.patch 3081 RMD160 c94dc90d009e31bd02146937ac69a877f2548fea SHA1 3b6b5338f0f374dcc8d133248b4e43ad1cc00ad2 SHA256 ca879a7ff7ca2251e4fbc2afa4aa8833163da10bae495af54c6a6ad24ca115da
 DIST ocrad-0.15.tar.bz2 73631 RMD160 15387c4e116c6643cad9aa8687dc946792b91b32 SHA1 f5b62d21b1efc863d46e42221cf0a6a48e078801 SHA256 0d4b3e5720bcc2eefd70f99281dddc72dfd242b04dcb3f6908217f88abc2251c
-EBUILD ocrad-0.10.ebuild 746 RMD160 74573284ba678a71ad750d6fca61d4976effa54a SHA1 004e1705726fc89b6ab8bd3fde3bb5761ccd5651 SHA256 33204428801050a90ac09bf0ef3e703b32fe33abf3c46b1a9723505c05e87d2d
+DIST ocrad-0.17.tar.bz2 81287 RMD160 8e0da4477552dcc493f90c13d1570bd4a0ade95b SHA1 985de977ef765a97e87fe8fe8483f77a3ec68e00 SHA256 eba6cf9bae61dfe7b2633ecb05c282682c2ac998edaa57a13bcb04c0542070ae
 EBUILD ocrad-0.15.ebuild 855 RMD160 9b577aef32c7e27e302dbf51875ee629aece8692 SHA1 e2078e3c9cb0561075d8658eacc8f41b21a4f3a0 SHA256 f025d0470cfc1ce7785a77f8536ee8b89da773a814b53c8ff91bfafd405d0204
-MISC ChangeLog 2916 RMD160 354a88e65da050acfce0ea47697337b2539cc406 SHA1 c0d74829ef4fde0ba0773e031c2f12f879ab0657 SHA256 28c48416fbf22695ea5fbcd36148fd5f53bcc3cfc2d1d4c4d4cf163135810fa1
+EBUILD ocrad-0.17.ebuild 949 RMD160 1d8751872ef7763fc2ea48bc8763828eb67f8ac2 SHA1 3146e27dd8c0afd69556ba5a3f467ab97c76817f SHA256 e2d2c0005c3255e715b139425e0107eeab25c15c2fe6c34ac7e725119fec3046
+MISC ChangeLog 3155 RMD160 847c198e92e5558f900527b676c3edffacb40a06 SHA1 13ee00b66665bbba24cd7b3881afe6d850efca40 SHA256 457c928526201f90393c2480266dada3820c3afb0d2be40791f8718905649540
 MISC metadata.xml 407 RMD160 1f251ddbac4cc958d8b78f1a775e1a72e391e5de SHA1 dacf5199d609f8c7512e5c5346a8034bd79c5fc9 SHA256 c48d3c0a043726262f346e29b9cdaa6ab847e6801b2862a9c9fd75bfbe9de668
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
+}