Version bump, change the default data directory to /usr/share/tessdata, closes bug #180781. Drop older versions.

(Portage version: 2.1.3_rc7)

8 files changed, 77 insertions, 108 deletions

diff --git a/app-text/tesseract/ChangeLog b/app-text/tesseract/ChangeLog
index 65ad1af80f61..e098807f86e6 100644
--- a/app-text/tesseract/ChangeLog
+++ b/app-text/tesseract/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/tesseract
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/ChangeLog,v 1.10 2007/06/03 16:24:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/ChangeLog,v 1.11 2007/07/10 18:28:56 chutzpah Exp $
+
+*tesseract-1.04b (10 Jul 2007)
+
+  10 Jul 2007; Patrick McLean <chutzpah@gentoo.org>
+  +files/tesseract-1.04b-globals.patch, -tesseract-1.02.02022007.ebuild,
+  -tesseract-1.03.ebuild, +tesseract-1.04b.ebuild:
+  Version bump, change the default data directory to /usr/share/tessdata, closes
+  bug #180781. Drop older versions.
 
   03 Jun 2007; Raúl Porcel <armin76@gentoo.org> tesseract-1.03-r1.ebuild:
   Add ~alpha wrt #173114
diff --git a/app-text/tesseract/files/digest-tesseract-1.02.02022007 b/app-text/tesseract/files/digest-tesseract-1.02.02022007
deleted file mode 100644
index 12ce4e3dc33f..000000000000
--- a/app-text/tesseract/files/digest-tesseract-1.02.02022007
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b8c2fb868ec7259ab6ec29cb267e565d tesseract-1.02.02022007.tar.gz 2785659
-RMD160 7fcbac6a32f838b243bd72daee46a17f53c47f93 tesseract-1.02.02022007.tar.gz 2785659
-SHA256 b175f4d341a9189a1109b02defd0be4c7a27a1ccde4c6abad1d83b1fa4cccf80 tesseract-1.02.02022007.tar.gz 2785659
diff --git a/app-text/tesseract/files/digest-tesseract-1.03 b/app-text/tesseract/files/digest-tesseract-1.03
deleted file mode 100644
index a05f08caba1d..000000000000
--- a/app-text/tesseract/files/digest-tesseract-1.03
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8a191bff04b6f6bc908b3838bfc7f937 tesseract-1.03.tar.gz 2828351
-RMD160 21a3fa31ed3c2232e33c5ebf43321c4feba735d1 tesseract-1.03.tar.gz 2828351
-SHA256 75033707378f01e5f6e67b90e050ac385ad5bf29ab81d9063acfc791a163d971 tesseract-1.03.tar.gz 2828351
diff --git a/app-text/tesseract/files/digest-tesseract-1.04b b/app-text/tesseract/files/digest-tesseract-1.04b
new file mode 100644
index 000000000000..25533655d4ee
--- /dev/null
+++ b/app-text/tesseract/files/digest-tesseract-1.04b
@@ -0,0 +1,3 @@
+MD5 c6f015f2f2c37b3e7e31b64eb295f798 tesseract-1.04b.tar.gz 2899276
+RMD160 5e9c70d4435a59157f0af6503a57b02a4a74350e tesseract-1.04b.tar.gz 2899276
+SHA256 4dcbddbed71b1b27f7260413dd5d1498b835954128192acb0ab93c0d835c1c0c tesseract-1.04b.tar.gz 2899276
diff --git a/app-text/tesseract/files/tesseract-1.04b-globals.patch b/app-text/tesseract/files/tesseract-1.04b-globals.patch
new file mode 100644
index 000000000000..2eba744262bd
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-1.04b-globals.patch
@@ -0,0 +1,32 @@
+--- ./tesseract-1.04/cutil/globals.h.orig	2007-06-04 00:06:00.000000000 +0300
++++ ./tesseract-1.04/cutil/globals.h	2007-06-04 00:06:25.000000000 +0300
+@@ -45,8 +45,6 @@
+ extern int debugs[MAXPROC];      /*debug flags */
+ extern int plots[MAXPROC];       /*plot flags */
+ extern int corners[4];           /*corners of scan window */
+-extern int optind;               /*option index */
+-extern char *optarg;             /*option argument */
+                                  /*image file name */
+ extern char imagefile[FILENAMESIZE];
+                                  /* main directory */
+--- ./tesseract-1.04/ccmain/tfacep.h.orig	2007-06-04 00:16:19.000000000 +0300
++++ ./tesseract-1.04/ccmain/tfacep.h	2007-06-04 00:16:24.000000000 +0300
+@@ -103,7 +103,6 @@
+   //extern int                                    enable_assoc;
+   //extern int                                    chop_enable;
+   //extern int                                    permute_only_top;
+-  extern int display_ratings;
+ 
+ };
+ 
+--- ./tesseract-1.04/cutil/tordvars.h.orig	2007-06-04 00:24:15.000000000 +0300
++++ ./tesseract-1.04/cutil/tordvars.h	2007-06-04 00:24:21.000000000 +0300
+@@ -45,7 +45,7 @@
+ extern int similarity_debug;                /* Level of debug output */
+ extern int write_raw_output;                /* Text before context */
+ extern int write_output;                    /* Text file output */
+-//extern "C" { extern int display_ratings; }  /* Show the ratings */
++extern "C" { extern int display_ratings; }  /* Show the ratings */
+ extern int display_ratings;                 /* Show the ratings */
+ extern int show_bold;                       /* Use bold text */
+ extern int display_text;                    /* Show word text */
diff --git a/app-text/tesseract/tesseract-1.02.02022007.ebuild b/app-text/tesseract/tesseract-1.02.02022007.ebuild
deleted file mode 100644
index 11da20d95698..000000000000
--- a/app-text/tesseract/tesseract-1.02.02022007.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-1.02.02022007.ebuild,v 1.1 2007/02/02 21:34:24 chutzpah Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="A commercial quality OCR engine developed at HP in the 80's and early 90's."
-HOMEPAGE="http://sourceforge.net/projects/tesseract-ocr/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-#SRC_URI="mirror://sourceforge/tesseract-ocr/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="media-libs/tiff"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch "${FILESDIR}"/tesseract-1.0.xterm-path.patch
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}"
-
-	dodir "${dest}"
-
-	exeinto "${dest}"
-	doexe ccmain/tesseract
-
-	dodir "${dest}/tessdata/configs"
-	dodir "${dest}/tessdata/tessconfigs"
-
-	insinto "${dest}/tessdata"
-	doins tessdata/*
-
-	insinto "${dest}/tessdata/configs"
-	doins tessdata/configs/*
-
-	insinto "${dest}/tessdata/tessconfigs"
-	doins tessdata/tessconfigs/*
-
-	dodoc README AUTHORS phototest.tif
-
-	echo -e "#!/bin/sh\n${dest}/${PN} \"\${@}\"" > ${PN}.sh
-	newbin ${PN}.sh ${PN}
-}
diff --git a/app-text/tesseract/tesseract-1.03.ebuild b/app-text/tesseract/tesseract-1.03.ebuild
deleted file mode 100644
index 057b56eb5420..000000000000
--- a/app-text/tesseract/tesseract-1.03.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-1.03.ebuild,v 1.1 2007/02/05 16:50:56 chutzpah Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="A commercial quality OCR engine developed at HP in the 80's and early 90's."
-HOMEPAGE="http://sourceforge.net/projects/tesseract-ocr/"
-SRC_URI="mirror://sourceforge/tesseract-ocr/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="media-libs/tiff"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch "${FILESDIR}"/tesseract-1.0.xterm-path.patch
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}"
-
-	dodir "${dest}"
-
-	exeinto "${dest}"
-	doexe ccmain/tesseract
-
-	dodir "${dest}/tessdata/configs"
-	dodir "${dest}/tessdata/tessconfigs"
-
-	insinto "${dest}/tessdata"
-	doins tessdata/*
-
-	insinto "${dest}/tessdata/configs"
-	doins tessdata/configs/*
-
-	insinto "${dest}/tessdata/tessconfigs"
-	doins tessdata/tessconfigs/*
-
-	dodoc README AUTHORS phototest.tif
-
-	echo -e "#!/bin/sh\n${dest}/${PN} \"\${@}\"" > ${PN}.sh
-	newbin ${PN}.sh ${PN}
-}
diff --git a/app-text/tesseract/tesseract-1.04b.ebuild b/app-text/tesseract/tesseract-1.04b.ebuild
new file mode 100644
index 000000000000..e382d25a5a97
--- /dev/null
+++ b/app-text/tesseract/tesseract-1.04b.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-1.04b.ebuild,v 1.1 2007/07/10 18:28:56 chutzpah Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="A commercial quality OCR engine developed at HP in the 80's and early 90's."
+HOMEPAGE="http://code.google.com/p/tesseract-ocr/"
+SRC_URI="http://tesseract-ocr.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="media-libs/tiff"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P%b}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-globals.patch
+	sed -i -e "s:/usr/bin/X11/xterm:/usr/bin/xterm:" ccutil/debugwin.cpp
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc README AUTHORS phototest.tif
+}