Revision bump to clean ebuild and fix bug 287373.

Removing old ebuilds and patches.
Package-Manager: portage-15321-svn/cvs/Linux ppc

10 files changed, 88 insertions, 239 deletions

diff --git a/app-text/tesseract/ChangeLog b/app-text/tesseract/ChangeLog
index ccfea17e2053..360403c0489d 100644
--- a/app-text/tesseract/ChangeLog
+++ b/app-text/tesseract/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-text/tesseract
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/ChangeLog,v 1.21 2009/07/25 21:12:14 vostorga Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/ChangeLog,v 1.22 2010/02/08 19:57:42 volkmar Exp $
+
+*tesseract-2.04-r1 (08 Feb 2010)
+
+  08 Feb 2010; Mounir Lamouri <volkmar@gentoo.org>
+  -files/tesseract-1.0.xterm-path.patch, -tesseract-1.03-r1.ebuild,
+  -files/tesseract-1.03-globals.patch, -tesseract-1.04b.ebuild,
+  -files/tesseract-1.04b-globals.patch, -tesseract-2.00.ebuild,
+  +tesseract-2.04-r1.ebuild, metadata.xml:
+  Revision bump to clean ebuild and fix bug 287373.
+  Removing old ebuilds and patches.
 
   25 Jul 2009; Víctor Ostorga <vostorga@gentoo.org> tesseract-2.04.ebuild,
   +files/tesseract-2.04-gcc44.patch:
diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index bc20cdbf234c..e4c2eda097a2 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -1,27 +1,20 @@
 AUX includes.patch 1187 RMD160 13e56bbac2ef091c2426a19e490817810fa9156c SHA1 d076a127568bc367b117f66d44da442ad1af4e2c SHA256 a6967c435e94e1b9a3e9767099416e20ef401c07a642cf2fc3ca27bb53803e79
-AUX tesseract-1.0.xterm-path.patch 629 RMD160 bcfd96f1ee65420c9a20260f67b52d3968bed6a4 SHA1 f1e88fb8dcb275b7ada4ca89a09069efa1f12c2c SHA256 14d0ea0dbfa35f8b457da1c568af95c01a5401392f1fc92f3f30f1b1146cd88a
-AUX tesseract-1.03-globals.patch 1820 RMD160 9f5863bba626d16dd15178d713ab71f6ea929a96 SHA1 a78f1328766395da015079beec202d7ed67d4554 SHA256 395fd24d9093223968a9e91b648771c87eb23d602b026f0cc0436909afa16424
-AUX tesseract-1.04b-globals.patch 1715 RMD160 13cc5d76a733df65d7a659b5f60b5f9e69596433 SHA1 2cb9f4eb4dc2a1e096e9b98d246da98a786e88a0 SHA256 8aca3a7384ada2c55649bfc87f802d86e24af23a22d930a1c453f88dd3ce3b0a
 AUX tesseract-2.03-gcc44.patch 420 RMD160 38f09469efaabce25f4b9cbbff7eb2676fb11f9b SHA1 1671cbbba1d349f371a517622e990ee071064079 SHA256 7a5b8540c520e294f0611448996b8b5bfa7e2609c97993de2d550b69b2a32f8f
 AUX tesseract-2.04-gcc44.patch 440 RMD160 1f8943090a6f98c6dbc3ac4071214ec668367fbc SHA1 88a9a69cc62844a11b176c2e877c1fc4552be7e2 SHA256 f0e0004621a0be2ba475bafa812fbe7af13dd187fd6d55650df0569831383025
-DIST tesseract-1.03.tar.gz 2828351 RMD160 21a3fa31ed3c2232e33c5ebf43321c4feba735d1 SHA1 086df31165a5b467aae96f7076b2dee86dce6583 SHA256 75033707378f01e5f6e67b90e050ac385ad5bf29ab81d9063acfc791a163d971
-DIST tesseract-1.04b.tar.gz 2899276 RMD160 5e9c70d4435a59157f0af6503a57b02a4a74350e SHA1 263a65e462ed864c4da115cdcb3f3e78613de485 SHA256 4dcbddbed71b1b27f7260413dd5d1498b835954128192acb0ab93c0d835c1c0c
 DIST tesseract-2.00.deu.tar.gz 1373777 RMD160 c7e6755e94084114fb1a1be8e9308c8dddd2fdda SHA1 d8d89e2681421a144f3a1ec61ee0c530686f5096 SHA256 6083f16373689ef55651f4dd7773426ab4c32a12ebf7f398af982ac2971fe404
 DIST tesseract-2.00.eng.tar.gz 1013090 RMD160 4a8090729504c216b3988f189ea79a5a5e223173 SHA1 40292c8d206090c4ab342f6b7814ea41c075abce SHA256 2fbd50a6cb352f847ebf3deadc914bbc12592539d4c368f7f7cff0a71f7d48e7
 DIST tesseract-2.00.fra.tar.gz 1007776 RMD160 96bf4e6bfca6ac2b9a3ec03b545a4fd12d8f343e SHA1 24f58cab2b1418816ba09e6f28e33aee34605889 SHA256 1201229bb8b377ab3d92255e0b0642a36304b99415091fb059f423c814cecd25
 DIST tesseract-2.00.ita.tar.gz 977683 RMD160 05e739d684ab138b5bb032526e019bfa01e1a2f6 SHA1 8ac6c41708950660fd66789f5925068577fb89b1 SHA256 3a1b9323ddfcda327780aba94ef724f35690d3cfdf8ef832c5709721b7e2999a
 DIST tesseract-2.00.nld.tar.gz 1408071 RMD160 ce16fbf17d4ce544269b37f5c07d5239fad22bff SHA1 8bc0a5877c1992ab10a9e124643fd9006ff30350 SHA256 26b9f7d80c4cfe19074c3c5dc55a37b489d89b6f7b13c026f9c2dc265120d859
 DIST tesseract-2.00.spa.tar.gz 1365863 RMD160 0e1fcb5739b95d4131efeea440d353f5638bb57d SHA1 49206b79407cb23bc23b1cd95bee02544f2fcf9b SHA256 b4b83e46be4602a361279c131da2c7f3ba8c51ac26c0e108f958406db6ae320e
-DIST tesseract-2.00.tar.gz 1072362 RMD160 96deb8315861e0e0c423fc2d12c9a69b776cb456 SHA1 3051d90b74a255db791ce0d7a6dc3e12203727b9 SHA256 5e27365444da6c0d5219fc1800cafdc309b7d711b2716892fce549044ed27ddb
 DIST tesseract-2.01.deu-f.tar.gz 1312785 RMD160 a52f3050fd480beb83b6f62709246d2af835485c SHA1 f79b9f348d8d7418ebe69ffe6092c6f96b3e9ea1 SHA256 410143cf5029b10d274909439de2c407706e4d601cd5e1bb1309dbd46288757e
 DIST tesseract-2.01.por.tar.gz 2107696 RMD160 3b0217ec624f1f7f2cc8ed4f9d35346d9fc8e021 SHA1 96d8ee26781022a2eab19569dcf23597b88d6c81 SHA256 0dc30b76814a7694246ca347ccb402bcd40e5e6f3bf70cca31e6d3ca06210baa
 DIST tesseract-2.01.vie.tar.gz 964277 RMD160 d3bbb15a7e27de2f3b0f5eef5b216d1b5ebde2cc SHA1 ea2feb6a344c51a882de5f80020539fd1ad791ee SHA256 8026240029341d45a6142cfccf6f0f98e5b1f35cae5725f8379ac4a8de34283f
 DIST tesseract-2.03.tar.gz 1075509 RMD160 7519e7f4d876444bd3264d599dbf423e22443311 SHA1 b7859278ff98a8b64bf98b5a519688e1559cec57 SHA256 f39097176b0b0ac83312b5994970d15283ad0e036bc174d98b87500f572acaae
+DIST tesseract-2.04.eus.tar.gz 1207994 RMD160 0f2740f08801297eff13b969bb1e1b566a212ee7 SHA1 36d683c6a9f0d18d4a8158a7e0050d08e3316aa0 SHA256 19aa30dda8049fb03e125e3b17d05ae402544e9ec81adcb18964d4a7b125a2fe
 DIST tesseract-2.04.tar.gz 1118386 RMD160 826718ddf491c8b925b02c343d4a4992fd4631d8 SHA1 850c42c92a4471c5f41d4384c57045e812fde26a SHA256 62866f283916553e02cebdeb1b485856c6a790f5f8bf86c30b87c6304374bef8
-EBUILD tesseract-1.03-r1.ebuild 1314 RMD160 62fccd623b9d1eb845c6942dd16e004af3128250 SHA1 cf9d1a4a8aa38135551cb4c9bc0dad50c8a5e616 SHA256 f93a37937aa9655a8607374d9a3db8c8811301441208b5e6f67b118d523bcb9f
-EBUILD tesseract-1.04b.ebuild 859 RMD160 a0a0355ca36a5c36eb62b877ee0b0bfbc4e5bd16 SHA1 9e8bc49b1a020c9ebd69ef9ea0d0e5262e2a149a SHA256 39c221b70fa25371a947faa24f9995e0f373f7290fec81f0d7f6fd4d38737d7e
-EBUILD tesseract-2.00.ebuild 1564 RMD160 72edcb099c9b4fe26dbf2c7e439f3d1d0960a45e SHA1 b9d509d37e95111a0f23631fcf65267d58c6b5de SHA256 f5879732f007bfc3fb173c747148dc73ea050fc66e489d9b22e87e12d7f5d1f2
 EBUILD tesseract-2.03.ebuild 2064 RMD160 7b33ee14a13533b029e8a8487075730714061af6 SHA1 532f20f4b5b892a7a77b4f1b82a015921fe0f258 SHA256 5802ac4a41d40a94cc1c494c9013f082ce089197dd9f20ed966c08b3bd4c32cd
+EBUILD tesseract-2.04-r1.ebuild 2654 RMD160 09722376ef2400609cbecca53aba25defaf70910 SHA1 eba9f89e35c2417296652b1ee73eff64d3890739 SHA256 9c061e84af5180c339a5ecbaf1d79aeb4af1157375ea8f7facc0889f36deaa40
 EBUILD tesseract-2.04.ebuild 1945 RMD160 bc97a91bc3793b63e616650f3d5c40d712038bef SHA1 35ed7573f43f7728414d402c36016201ae773ed1 SHA256 22278beb321fd8a74b54c00cf4ec7106d9e7015e95341331ecb9cce498179bf3
-MISC ChangeLog 3467 RMD160 e8815d2ee8290763df451d15dadb8f801a95514f SHA1 cef6853a0dfbec94645d50b552e2e9c6563b01e9 SHA256 964d2072a85a819931dde866fe89493101a46fa3e1a211a70a22f41351417532
-MISC metadata.xml 486 RMD160 a822519d57f956abde805856cb6efcf7168bb7a7 SHA1 e9d1b325f4a1e2fc4bc34211c31addde8e60ab95 SHA256 f42a3773900c016a5453b563b46aabb1cdac673dfa88f5553edf609b588ea3fa
+MISC ChangeLog 3879 RMD160 3c696e6c45633dc996d42bf9b85aa2bbd61aedb2 SHA1 1c4b2f20e5816fcf7e50b53a09da56117e52147a SHA256 0d12024b3bd2d6d0a0638e420119b8ef767228b04cdf36a0da5b9785022fe5b0
+MISC metadata.xml 577 RMD160 90dc1374d4570c95ffe63b1d0e1c4e2b739f0a3d SHA1 474d6c00afff3405b1455d6799126c0e22b2e3c6 SHA256 171a9ff9b4fbdb33c455944f957cdb05f05b32f259f6d64859ca873070a30e39
diff --git a/app-text/tesseract/files/tesseract-1.0.xterm-path.patch b/app-text/tesseract/files/tesseract-1.0.xterm-path.patch
deleted file mode 100644
index 7931de3fd8dc..000000000000
--- a/app-text/tesseract/files/tesseract-1.0.xterm-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --exclude='*~' -Naur tesseract-1.0.orig/ccutil/debugwin.cpp tesseract-1.0/ccutil/debugwin.cpp
---- tesseract-1.0.orig/ccutil/debugwin.cpp      2006-06-16 18:17:04.000000000 -0400
-+++ tesseract-1.0/ccutil/debugwin.cpp   2006-09-05 11:30:24.000000000 -0400
-@@ -229,7 +229,7 @@
-   length += sprintf (command + length, "trap \"\" 1 2 3 13 15\n");
-   length +=
-     sprintf (command + length,
--    "/usr/bin/X11/xterm -sb -sl " INT32FORMAT " -geometry "
-+    "/usr/bin/xterm -sb -sl " INT32FORMAT " -geometry "
-     INT32FORMAT "x" INT32FORMAT "", buflines, xsize / 8, ysize / 16);
-   if (xpos >= 0)
-     command[length++] = '+';
diff --git a/app-text/tesseract/files/tesseract-1.03-globals.patch b/app-text/tesseract/files/tesseract-1.03-globals.patch
deleted file mode 100644
index fdbd140e6667..000000000000
--- a/app-text/tesseract/files/tesseract-1.03-globals.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -ru tesseract-1.03~/ccutil/getopt.h tesseract-1.03/ccutil/getopt.h
---- tesseract-1.03~/ccutil/getopt.h	2007-02-24 00:24:36.000000000 +0100
-+++ tesseract-1.03/ccutil/getopt.h	2007-02-24 00:24:42.000000000 +0100
-@@ -20,9 +20,6 @@
- #include          "host.h"
- #include          "notdll.h"     //must be last include
- 
--extern int optind;
--extern char *optarg;
--
- int getopt (                     //parse args
- INT32 argc,                      //arg count
- char *argv[],                    //args
-diff -ru tesseract-1.03~/ccmain/tfacep.h tesseract-1.03/ccmain/tfacep.h
---- tesseract-1.03~/ccmain/tfacep.h	2006-06-17 00:17:03.000000000 +0200
-+++ tesseract-1.03/ccmain/tfacep.h	2007-02-24 00:12:20.000000000 +0100
-@@ -103,7 +103,6 @@
-   //extern int                                    enable_assoc;
-   //extern int                                    chop_enable;
-   //extern int                                    permute_only_top;
--  extern int display_ratings;
- 
- };
- 
-diff -ru tesseract-1.03~/training/cnTraining.cpp tesseract-1.03/training/cnTraining.cpp
---- tesseract-1.03~/training/cnTraining.cpp	2006-10-20 00:25:38.000000000 +0200
-+++ tesseract-1.03/training/cnTraining.cpp	2007-02-24 00:17:46.000000000 +0100
-@@ -29,6 +29,7 @@
- #include "emalloc.h"
- #include "featdefs.h"
- #include "getopt.h"
-+#include "globals.h"
- #include "ocrfeatures.h"
- #include "general.h"
- #include "clusttool.h"
-diff -ru tesseract-1.03~/training/mfTraining.cpp tesseract-1.03/training/mfTraining.cpp
---- tesseract-1.03~/training/mfTraining.cpp	2007-02-01 04:09:21.000000000 +0100
-+++ tesseract-1.03/training/mfTraining.cpp	2007-02-24 00:18:18.000000000 +0100
-@@ -31,6 +31,7 @@
- #include "emalloc.h"
- #include "featdefs.h"
- #include "getopt.h"
-+#include "globals.h"
- #include "ocrfeatures.h"
- #include "general.h"
- #include "clusttool.h"
diff --git a/app-text/tesseract/files/tesseract-1.04b-globals.patch b/app-text/tesseract/files/tesseract-1.04b-globals.patch
deleted file mode 100644
index 2eba744262bd..000000000000
--- a/app-text/tesseract/files/tesseract-1.04b-globals.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- ./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/metadata.xml b/app-text/tesseract/metadata.xml
index a6b4331e43ac..9de05c1c5c87 100644
--- a/app-text/tesseract/metadata.xml
+++ b/app-text/tesseract/metadata.xml
@@ -6,6 +6,10 @@
 	<email>chutzpah@gentoo.org</email>
 	<name>Patrick McLean</name>
 </maintainer>
+<maintainer>
+	<email>volkmar@gentoo.org</email>
+	<name>Mounir Lamouri</name>
+</maintainer>
 <longdescription lang="en">
 A commercial quality OCR engine originally developed at HP between 1985 and
 1995. In 1995, this engine was among the top 3 evaluated by UNLV. It was
diff --git a/app-text/tesseract/tesseract-1.03-r1.ebuild b/app-text/tesseract/tesseract-1.03-r1.ebuild
deleted file mode 100644
index 951743675cd6..000000000000
--- a/app-text/tesseract/tesseract-1.03-r1.ebuild
+++ /dev/null
@@ -1,56 +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-r1.ebuild,v 1.8 2007/06/03 16:24:26 armin76 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="~alpha ~amd64 ~mips ~ppc ~ppc64 sparc ~x86"
-IUSE=""
-
-DEPEND="media-libs/tiff"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch "${FILESDIR}"/${PN}-1.0.xterm-path.patch
-	epatch "${FILESDIR}"/${P}-globals.patch
-}
-
-src_compile() {
-	econf --with-libtiff=no || die "econf failed"
-	emake || die "emake failed"
-}
-
-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
deleted file mode 100644
index e382d25a5a97..000000000000
--- a/app-text/tesseract/tesseract-1.04b.ebuild
+++ /dev/null
@@ -1,33 +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.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
-}
diff --git a/app-text/tesseract/tesseract-2.00.ebuild b/app-text/tesseract/tesseract-2.00.ebuild
deleted file mode 100644
index 2ab487031d0a..000000000000
--- a/app-text/tesseract/tesseract-2.00.ebuild
+++ /dev/null
@@ -1,47 +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-2.00.ebuild,v 1.1 2007/07/30 19:45:40 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
-	linguas_de? ( http://tesseract-ocr.googlecode.com/files/${P}.deu.tar.gz )
-	linguas_en? ( http://tesseract-ocr.googlecode.com/files/${P}.eng.tar.gz )
-	linguas_fr? ( http://tesseract-ocr.googlecode.com/files/${P}.fra.tar.gz )
-	linguas_it? ( http://tesseract-ocr.googlecode.com/files/${P}.ita.tar.gz )
-	linguas_nl? ( http://tesseract-ocr.googlecode.com/files/${P}.nld.tar.gz )
-	linguas_es? ( http://tesseract-ocr.googlecode.com/files/${P}.spa.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="tiff linguas_de linguas_en linguas_es linguas_fr linguas_it linguas_nl"
-
-DEPEND="tiff? ( media-libs/tiff )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P%b}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# data files shouldn't be executable
-	chmod a-x "${WORKDIR}"/tessdata/*
-	mv -f "${WORKDIR}"/tessdata/* tessdata/
-
-	sed -i -e "s:/usr/bin/X11/xterm:/usr/bin/xterm:" ccutil/debugwin.cpp
-}
-
-src_compile() {
-	econf $(use_with tiff libtiff) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc README AUTHORS phototest.tif
-}
diff --git a/app-text/tesseract/tesseract-2.04-r1.ebuild b/app-text/tesseract/tesseract-2.04-r1.ebuild
new file mode 100644
index 000000000000..483ddbdc3434
--- /dev/null
+++ b/app-text/tesseract/tesseract-2.04-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-2.04-r1.ebuild,v 1.1 2010/02/08 19:57:42 volkmar Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="An OCR Engine that was developed at HP and now at Google"
+HOMEPAGE="http://code.google.com/p/tesseract-ocr/"
+SRC_URI="http://tesseract-ocr.googlecode.com/files/${P}.tar.gz
+	http://tesseract-ocr.googlecode.com/files/${PN}-2.00.eng.tar.gz
+	linguas_de? (
+		http://tesseract-ocr.googlecode.com/files/${PN}-2.00.deu.tar.gz
+		http://tesseract-ocr.googlecode.com/files/${PN}-2.01.deu-f.tar.gz
+	)
+	linguas_eu? ( http://tesseract-ocr.googlecode.com/files/${PN}-2.04.eus.tar.gz )
+	linguas_es? ( http://tesseract-ocr.googlecode.com/files/${PN}-2.00.spa.tar.gz )
+	linguas_fr? ( http://tesseract-ocr.googlecode.com/files/${PN}-2.00.fra.tar.gz )
+	linguas_it? ( http://tesseract-ocr.googlecode.com/files/${PN}-2.00.ita.tar.gz )
+	linguas_nl? ( http://tesseract-ocr.googlecode.com/files/${PN}-2.00.nld.tar.gz )
+	linguas_pt_BR? ( http://tesseract-ocr.googlecode.com/files/${PN}-2.01.por.tar.gz )
+	linguas_vi? ( http://tesseract-ocr.googlecode.com/files/${PN}-2.01.vie.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples tiff linguas_de linguas_eu linguas_es linguas_fr linguas_it linguas_nl linguas_pt_BR linguas_vi"
+
+DEPEND="tiff? ( media-libs/tiff )"
+RDEPEND="${DEPEND}"
+
+# NOTES:
+# english language files are always installed because they are used by default
+#   that is a tesseract bug and if possible this workaround should be avoided
+#   see bug 287373
+# deu-f corresponds to an old german graphic style named fraktur
+#   that's the same language (german, de)
+# stuff in directory java/ seems useless...
+# in testing/, there is a way to test accuracy, not usable for src_test()
+# app-ocr/ would be a better category
+
+src_prepare() {
+	# move language files to have them installed
+	mv "${WORKDIR}"/tessdata/* tessdata/ || die "move language files failed"
+
+	# remove obsolete makefile, install target only in uppercase Makefile
+	rm "${S}/java/makefile" || die "remove obsolete java makefile failed"
+
+	# fix gcc-4.4 compilation, bug 269320
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+}
+
+src_configure() {
+	econf $(use_with tiff libtiff) \
+		--disable-dependency-tracking
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README ReleaseNotes || die "dodoc failed"
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins eurotext.tif phototest.tif || die "doins failed"
+	fi
+}