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

Package-Manager: portage-2.1.3_rc7

9 files changed, 93 insertions, 127 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/Manifest b/app-text/tesseract/Manifest
index 21149ebc26b1..b60d48f35214 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -6,34 +6,31 @@ AUX tesseract-1.03-globals.patch 1820 RMD160 9f5863bba626d16dd15178d713ab71f6ea9
 MD5 c5ba7ee84f979a135f856378be0fa920 files/tesseract-1.03-globals.patch 1820
 RMD160 9f5863bba626d16dd15178d713ab71f6ea929a96 files/tesseract-1.03-globals.patch 1820
 SHA256 395fd24d9093223968a9e91b648771c87eb23d602b026f0cc0436909afa16424 files/tesseract-1.03-globals.patch 1820
-DIST tesseract-1.02.02022007.tar.gz 2785659 RMD160 7fcbac6a32f838b243bd72daee46a17f53c47f93 SHA1 214b9aa35c1e06c6848d07932520661ac1ba7197 SHA256 b175f4d341a9189a1109b02defd0be4c7a27a1ccde4c6abad1d83b1fa4cccf80
+AUX tesseract-1.04b-globals.patch 1715 RMD160 13cc5d76a733df65d7a659b5f60b5f9e69596433 SHA1 2cb9f4eb4dc2a1e096e9b98d246da98a786e88a0 SHA256 8aca3a7384ada2c55649bfc87f802d86e24af23a22d930a1c453f88dd3ce3b0a
+MD5 faaa4b4db281b0b38999caae2831b592 files/tesseract-1.04b-globals.patch 1715
+RMD160 13cc5d76a733df65d7a659b5f60b5f9e69596433 files/tesseract-1.04b-globals.patch 1715
+SHA256 8aca3a7384ada2c55649bfc87f802d86e24af23a22d930a1c453f88dd3ce3b0a files/tesseract-1.04b-globals.patch 1715
 DIST tesseract-1.03.tar.gz 2828351 RMD160 21a3fa31ed3c2232e33c5ebf43321c4feba735d1 SHA1 086df31165a5b467aae96f7076b2dee86dce6583 SHA256 75033707378f01e5f6e67b90e050ac385ad5bf29ab81d9063acfc791a163d971
-EBUILD tesseract-1.02.02022007.ebuild 1197 RMD160 c99475c3814dc08957c1635ea392692627c5c690 SHA1 4e6e90b220a3553ac962d088d5e9041585e59e25 SHA256 8aa2fb2d5289ab12e3dcb79d6b4e43c9f442e6f1fe350b34439ec69786f14049
-MD5 e97bc4e035176a6ca0647f6b5b5c5ec1 tesseract-1.02.02022007.ebuild 1197
-RMD160 c99475c3814dc08957c1635ea392692627c5c690 tesseract-1.02.02022007.ebuild 1197
-SHA256 8aa2fb2d5289ab12e3dcb79d6b4e43c9f442e6f1fe350b34439ec69786f14049 tesseract-1.02.02022007.ebuild 1197
+DIST tesseract-1.04b.tar.gz 2899276 RMD160 5e9c70d4435a59157f0af6503a57b02a4a74350e SHA1 263a65e462ed864c4da115cdcb3f3e78613de485 SHA256 4dcbddbed71b1b27f7260413dd5d1498b835954128192acb0ab93c0d835c1c0c
 EBUILD tesseract-1.03-r1.ebuild 1314 RMD160 62fccd623b9d1eb845c6942dd16e004af3128250 SHA1 cf9d1a4a8aa38135551cb4c9bc0dad50c8a5e616 SHA256 f93a37937aa9655a8607374d9a3db8c8811301441208b5e6f67b118d523bcb9f
 MD5 dcb2fa23bef82bc40f219eca1c60777a tesseract-1.03-r1.ebuild 1314
 RMD160 62fccd623b9d1eb845c6942dd16e004af3128250 tesseract-1.03-r1.ebuild 1314
 SHA256 f93a37937aa9655a8607374d9a3db8c8811301441208b5e6f67b118d523bcb9f tesseract-1.03-r1.ebuild 1314
-EBUILD tesseract-1.03.ebuild 1149 RMD160 edaffa5f406712cfa6b48127b73ec21fa2446139 SHA1 647ac95aa1106d6b4203dfa06c8829d84ccecba6 SHA256 7c5c1fa8cd97d9b08a6a7621428b8fe231c2afc00fc6698f32fc4acefcfbe68a
-MD5 af5a64d6c27e092d0f7042f664a274a5 tesseract-1.03.ebuild 1149
-RMD160 edaffa5f406712cfa6b48127b73ec21fa2446139 tesseract-1.03.ebuild 1149
-SHA256 7c5c1fa8cd97d9b08a6a7621428b8fe231c2afc00fc6698f32fc4acefcfbe68a tesseract-1.03.ebuild 1149
-MISC ChangeLog 1737 RMD160 d3c328102847d2c2f6eafcedd6f3135e814aacb5 SHA1 0ee9d2c88311bbb6314c74b5604551caf4372960 SHA256 9fba6046052ed72463f12adba8bb35a2f54aa2f7a2bd4946a4097debd97534b1
-MD5 f2e6d85f33ecc6c6c4e0fc7c8cc2e676 ChangeLog 1737
-RMD160 d3c328102847d2c2f6eafcedd6f3135e814aacb5 ChangeLog 1737
-SHA256 9fba6046052ed72463f12adba8bb35a2f54aa2f7a2bd4946a4097debd97534b1 ChangeLog 1737
+EBUILD tesseract-1.04b.ebuild 859 RMD160 a0a0355ca36a5c36eb62b877ee0b0bfbc4e5bd16 SHA1 9e8bc49b1a020c9ebd69ef9ea0d0e5262e2a149a SHA256 39c221b70fa25371a947faa24f9995e0f373f7290fec81f0d7f6fd4d38737d7e
+MD5 fe9055e80e90e75dd458d4425bbe00d8 tesseract-1.04b.ebuild 859
+RMD160 a0a0355ca36a5c36eb62b877ee0b0bfbc4e5bd16 tesseract-1.04b.ebuild 859
+SHA256 39c221b70fa25371a947faa24f9995e0f373f7290fec81f0d7f6fd4d38737d7e tesseract-1.04b.ebuild 859
+MISC ChangeLog 2064 RMD160 2a95529b27d0536ab562dd8df8de1d6876127d17 SHA1 731575f27d501196a3207de8fa573255d82d2ba9 SHA256 f7900e5636f0610b66913cbab1bb1750b056e151f8df863dce467e196075233d
+MD5 888c8cbf49eb831261f632210925aa1a ChangeLog 2064
+RMD160 2a95529b27d0536ab562dd8df8de1d6876127d17 ChangeLog 2064
+SHA256 f7900e5636f0610b66913cbab1bb1750b056e151f8df863dce467e196075233d ChangeLog 2064
 MISC metadata.xml 486 RMD160 a822519d57f956abde805856cb6efcf7168bb7a7 SHA1 e9d1b325f4a1e2fc4bc34211c31addde8e60ab95 SHA256 f42a3773900c016a5453b563b46aabb1cdac673dfa88f5553edf609b588ea3fa
 MD5 b9a60e5d0d72507a2f5bcde06064d1a2 metadata.xml 486
 RMD160 a822519d57f956abde805856cb6efcf7168bb7a7 metadata.xml 486
 SHA256 f42a3773900c016a5453b563b46aabb1cdac673dfa88f5553edf609b588ea3fa metadata.xml 486
-MD5 8bf3b78f7032a3ca2649ca351dd75b0c files/digest-tesseract-1.02.02022007 274
-RMD160 6dbfbdb7c3650a6f4448538dc4cf47bb1907aa3b files/digest-tesseract-1.02.02022007 274
-SHA256 33b139e38a68e0de37d8f47628dd017de7faca0d68085def904a2597e85876e5 files/digest-tesseract-1.02.02022007 274
-MD5 a83c5c92795fca976632add5e04a60fd files/digest-tesseract-1.03 247
-RMD160 a6a4065997a301c5f9705d9ab6d532ba45412310 files/digest-tesseract-1.03 247
-SHA256 47a9110af0c3375d9c3ab1a012a8d235ba8c979678e98281f49dfcd6588e7c02 files/digest-tesseract-1.03 247
 MD5 a83c5c92795fca976632add5e04a60fd files/digest-tesseract-1.03-r1 247
 RMD160 a6a4065997a301c5f9705d9ab6d532ba45412310 files/digest-tesseract-1.03-r1 247
 SHA256 47a9110af0c3375d9c3ab1a012a8d235ba8c979678e98281f49dfcd6588e7c02 files/digest-tesseract-1.03-r1 247
+MD5 8f9f1d12a631b8593269ce80366417e7 files/digest-tesseract-1.04b 250
+RMD160 d17179d32c657b76b73e6dc021fbe68f37e6e2e8 files/digest-tesseract-1.04b 250
+SHA256 bb1eeb414fe8c21dda8908c52807c44b79806eee29cd020149e8818a0685a037 files/digest-tesseract-1.04b 250
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
+}