public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/
@ 2015-12-06 20:25 Thomas Kahle
  0 siblings, 0 replies; 15+ messages in thread
From: Thomas Kahle @ 2015-12-06 20:25 UTC (permalink / raw
  To: gentoo-commits

commit:     882c9a1a8cde041a0bcde4babdcccd7d13cfe469
Author:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 20:24:55 2015 +0000
Commit:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 20:25:08 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=882c9a1a

app-text/tesseract: Remove old ebuilds.

Package-Manager: portage-2.2.24

 app-text/tesseract/Manifest                        |  12 ---
 .../tesseract/files/tesseract-2.04-gcc44.patch     |  15 ---
 app-text/tesseract/tesseract-2.04-r1.ebuild        |  71 -------------
 app-text/tesseract/tesseract-3.03_rc1-r1.ebuild    | 108 --------------------
 app-text/tesseract/tesseract-3.04.00-r1.ebuild     | 110 ---------------------
 app-text/tesseract/tesseract-3.04.00.ebuild        | 107 --------------------
 6 files changed, 423 deletions(-)

diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 67f1bc7..6ec6df6 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -1,4 +1,3 @@
-DIST 3.04.00.tar.gz 2264427 SHA256 7e6e48b625e1fba9bc825a4ef8c39f12c60aae1084939133b3c6a00f8f8dc38c SHA512 60c31bad40b4c01395782fb98b3326407e75ebdbda962de4fb0e878824efb05140bdcb139dcf7d4f699ae5350e81a00320ebe7fbec083a0d374952488cc59e25 WHIRLPOOL 81b685e4d50d94056a4f99ce6beb4c73983e9449e1eed07a69d4649b0a8231b17fede430a8c181b37216a55e9f6102a578c85d84b2bbe6e9643ca98f16ae3260
 DIST ara.traineddata-3.04.00 6315068 SHA256 21c98aaf7aeba2271ac0cc4a363d364d806649d7cb0bcab85d4b9a385f49645a SHA512 7fba780ec9061148c01dafee1227f8e338c1cf199a5c2869d58703123ea89f2279551e15159ab37038ec8ebc755076ede6ef049cc8a6e6764aa66d81c72a259b WHIRLPOOL d258d6eecb01feca9f0de5c973ab4a3c952db764b624ba98732e58af18a88332daa746e19194bcee8ed6fe1abe2a8d42b0b8976f0c9bde66e9831482b389f038
 DIST bul.traineddata-3.04.00 6026234 SHA256 ca0bd253b4ab6202db5e8b2cecbc4219b4f725e51468cabf5bc99338e2c3de33 SHA512 5115b4f92359344a17ee43b298c5c012569d77325e440bbe079ce7734ed087cbbe7ffb2b2dcb831e522fde2cde556e5de630f9ca85c141e9282e951e008e156c WHIRLPOOL 1bc19032224a6d4f94aae67fd8f5caabbcc00c00b0329513bf23c7a978f01269edec965e6090564b345862dc8810c2bc9c6fd04c736b7f4180998dd0cb8cb8fa
 DIST bul.traineddata.gz 848731 SHA256 fc3c650568d014f2337052658e9ddd8efaff6ac74c9a90952d740eafdf400e2d SHA512 69dca9b285da3985142fc3e8d2a75d7fb217308c077114004c274972491c8cd8aebd60e27ffb26c9906a6ae78e05e19bbc5fd24ab97b961df5882cbd295f747a WHIRLPOOL a331336952140946bae38c59f9005d131dc9f7976358ff06a4458311ac0e5e10102868d0c37a41eae3f73a27d6a9a253c599e53167dbdf6c7c086ba8418f0624
@@ -69,17 +68,6 @@ DIST srp.traineddata.gz 977674 SHA256 542b83f62389ff8cc34746dd765345566ab368b63d
 DIST swe-frak.traineddata.gz 1503568 SHA256 2cf1a0e1eb8a0e3f8477ebcde44d99a9229f2c20b2d96ecb1ca6c25db5c6fdec SHA512 ad23fb3b4088a6e3c706ac54c940399b502d1e5e0a822f671e7e0682709323380eba6ae2e6a138702393450fea9ec3473c977d5bd9aa7550081a8c0aaeb3ae58 WHIRLPOOL b8e217a419cab817424f977a5a3650587afc91d9ddc5a929f89568c60930f61bd219305b36d7f84a9b07aae489e1f896f8e300fa474c098de03f03df92b8b2f7
 DIST swe.traineddata-3.04.00 9460295 SHA256 2a6407bbf187eb1fcfd1633fae9abffcd6220e7ab74e05e65bf16426ac8f2050 SHA512 d69c916daa5946d11129e5401f0b8d9b8965df7fa2223e78c8e607e2bcc102a91c875a86e6a737612b61823ebd7f331c3d4c5db28ee35d1fb830beb9414bd167 WHIRLPOOL c95f12b64b1563d195b38cd8ad169f91e7608ba72c2e93fb49aebd7ec6bd065431b8ee892621cdd7d01922b99e71f52d1f1e5023b3af682eb2125419f0d529cd
 DIST swe.traineddata.gz 959911 SHA256 25331ca1f41378a86336604476049810a0c5350417205e300cb2d11048cec2c1 SHA512 e38fe9fd7d26420ee1aab3db7f700d58210dbfaef45d03114679d2671bc1942d7b031499e763204e15ebeadafa2f8f063f78941f2299b2c74f635425ddce856a WHIRLPOOL db1225d47e2e3b26372689f96164d8286701dbb2e0f1a82368c784c8d127a0d11248924936abd05d0092ba8ad5ce222b6d113ceb0f440b85faaca37396781480
-DIST tesseract-2.00.deu.tar.gz 1373777 SHA256 6083f16373689ef55651f4dd7773426ab4c32a12ebf7f398af982ac2971fe404 SHA512 e1792055d666c6090c4094b032d0143fd6bd5545c2d2e926f71bb360c6628ae5550f158df8efe47b69c987ac9cef8bd914fedcad2bd5b79901a41506ad8a60f2 WHIRLPOOL 77322db4454bddffa9f7b08bf8336ecddb0a71be9b7463427a7aa87e49716dc1aea4c8bb85ad836716bba03519827c051229a5cc37149d96558cdfe83ffc3445
-DIST tesseract-2.00.eng.tar.gz 1013090 SHA256 2fbd50a6cb352f847ebf3deadc914bbc12592539d4c368f7f7cff0a71f7d48e7 SHA512 f2aa2e1aa8f20c59faa664675f85ca8c1dcc922803f17cc00519f84a01c0c98ba431915ba5765d5de75200d828687507846af7e9e0096f3a4fdf1163e54cb83d WHIRLPOOL 178baaa6c73169a8b3e9276927bcf67bdd80fe114c8c3635aacd765cf9198dce2599c4f5493577b2ba9b1538ca8da69e6b2117fc7c9bb6451c129ee2efb71efe
-DIST tesseract-2.00.fra.tar.gz 1007776 SHA256 1201229bb8b377ab3d92255e0b0642a36304b99415091fb059f423c814cecd25 SHA512 46686d6296446c59d020731e2d36e015717a750f6a41401c38794e7e8067dbd0299b838260a9ea9d5da3ddc289e0320ed71437f67ea99f93e79895e4aaf9cdc8 WHIRLPOOL 9cb290cf260c40272223c75f1b575361cea2d51f462a10f4f82e20518531cbe1b908473b4d6a11f08c7461c4fbc8bd31256555964d39502676b035dc753da97a
-DIST tesseract-2.00.ita.tar.gz 977683 SHA256 3a1b9323ddfcda327780aba94ef724f35690d3cfdf8ef832c5709721b7e2999a SHA512 75cb670c1fe202878c220029d113e0795844f94901a6a0e31201c43d5694e1995c11760229ef6dc5222ff1fe49ee87ee1cdf073e80347e2862e71f045ce4a2db WHIRLPOOL c57ad7d994abc0c030ba68efff6c27eca8af9c78878f166d0fdad6564f916b6c30c1882c7447ce38752817489054bbed71ec49b07de70d1cf5e96080646fba2e
-DIST tesseract-2.00.nld.tar.gz 1408071 SHA256 26b9f7d80c4cfe19074c3c5dc55a37b489d89b6f7b13c026f9c2dc265120d859 SHA512 0a2b7f13d784d210f5284de1a02c9b3849c4b36a27cf6276b5d9d444607bf52b909f8edfa07b5b1e0ee6bf59504bb9c92a47297ce31efa351aaa6b81c038b0ef WHIRLPOOL 5c60260832af157cf4f07b79105187be6a1f9d5bd2bf4d8d0a0c8f43c36da3271225114e6d5d1e1b83e53e47bf67e0e8ec89ed0f22ba6c48c620c0c22da854d2
-DIST tesseract-2.00.spa.tar.gz 1365863 SHA256 b4b83e46be4602a361279c131da2c7f3ba8c51ac26c0e108f958406db6ae320e SHA512 a7efb46c5cc3812789f3dacf151e547007c3de1eed3d4a6a5c55cc18d4e1794377f34b55fd9e6a416f91a0ff62a66c0825a1993029ce4656ea64fcc18b9fa3fe WHIRLPOOL b6d474cf1bb9015cfe42214b3ca87e8f4c2ff193443a71fd0c1fd973a5a7683e4501e975354929f91c446a2bfb449f2cb535ca70f26ec35b527458450f0a8ee9
-DIST tesseract-2.01.deu-f.tar.gz 1312785 SHA256 410143cf5029b10d274909439de2c407706e4d601cd5e1bb1309dbd46288757e SHA512 76cc7da4f3a21581705bbae1975ae9a458ca61fa2691645f5b9f64d61ff0222e2c721ecd0c069c3540a65974129f58ae1a08b0d38c3f4d1f45f31d5969d63fb8 WHIRLPOOL 456e7d7f446c1cfca9e483dd85f5bf62c1b24c44535a0dd8600a6188096a1692484a60502bc6537262222cd94c8caae378a2bb698d3628a4223d15e559ad8cfd
-DIST tesseract-2.01.por.tar.gz 2107696 SHA256 0dc30b76814a7694246ca347ccb402bcd40e5e6f3bf70cca31e6d3ca06210baa SHA512 a7d2b3eb206f0cb9e8eee18f55476f8778a8839b3daaa9e10a8d77fec07ce3e37de58017b8fb09b90a4aef026f94df4a15ce77b4db9d6a12815353ee60fcadc7 WHIRLPOOL f15cf92aae31a28ae4c56a9730d6a8af6d87675b5a4eba5dbeadbd65fa609213fb919bb8334c7c430fe0907bbce3107a7d0efed3733487e00ae6b1282d6001d6
-DIST tesseract-2.01.vie.tar.gz 964277 SHA256 8026240029341d45a6142cfccf6f0f98e5b1f35cae5725f8379ac4a8de34283f SHA512 568b91ffa79ca57b613d6548504adf37677fa04a7226d366bc7d4548d1480dc00b397b76f42ef96a2ca0d78b6ffc635fa5586b0cd251d54cf22eb960ab3c920e WHIRLPOOL c32c5e8a5b62f688df43a94a69f0d1326179866e6a9674b625d984ceed26b085764c9b7cd3980507546e23c567f350f9a0ccb3d2d4b2c8d2efe1a1a9ef98d430
-DIST tesseract-2.04.eus.tar.gz 1207994 SHA256 19aa30dda8049fb03e125e3b17d05ae402544e9ec81adcb18964d4a7b125a2fe SHA512 613fedb033f3c678a15d71a7346ad7d2da7d0908f18b0450bc4c198b19e3671fdab025e44a4f6f73257848f626af58c144464ce349a3e5c4b91eebc8b4018c1f WHIRLPOOL 7c0f5556ff2acbc4aac3b60885dc15db22385135c43ea57ad8d4b4226b603e6aad6a346d57099429d3c92bffeda9c9604e621c8d9bc2c98c4b770634250d17e1
-DIST tesseract-2.04.tar.gz 1118386 SHA256 62866f283916553e02cebdeb1b485856c6a790f5f8bf86c30b87c6304374bef8 SHA512 c095407910235f7f914aa6a51feedade3f0b33108c7801b88c5ade26f2b75d1756b034d9ac32ad362a326ee468f97b69476978102ef0cefcc1b5c93be2342d42 WHIRLPOOL 2ce585c295477d17de265bac563d50c249b036301058b98e552b79f040829facea778cfc7692ae06299fc6b55bf2d890e511300c9746be525f9439d0d93d1280
 DIST tesseract-3.03-rc1.tar.gz 12812907 SHA256 d244956236f7491d74d7f342895f611a6c46c45fa9900173d5b7625d8461d2ea SHA512 4acd6a3c0db5568bd6cb199776a52fbf1643692cf2d9da7449644662461c0c3ef7e5941bb49be94135433a90de400413df062edd612ce9ec9c06e9206a57113f WHIRLPOOL 93f33f62aeb5a9f65a7642bc282138622076989618f787a044ad79463ab9cd9a9ebaeb5e34e52cf5c95c569b01fc552a44d2eda24e697d0c9a045fb626b9aa77
 DIST tesseract-3.04.00.tar.gz 2264427 SHA256 7e6e48b625e1fba9bc825a4ef8c39f12c60aae1084939133b3c6a00f8f8dc38c SHA512 60c31bad40b4c01395782fb98b3326407e75ebdbda962de4fb0e878824efb05140bdcb139dcf7d4f699ae5350e81a00320ebe7fbec083a0d374952488cc59e25 WHIRLPOOL 81b685e4d50d94056a4f99ce6beb4c73983e9449e1eed07a69d4649b0a8231b17fede430a8c181b37216a55e9f6102a578c85d84b2bbe6e9643ca98f16ae3260
 DIST tesseract-ocr-3.01.heb-com.tar.gz 270977 SHA256 20a9d53172a8dbf1a4bbd7f7e9e3a523a9435c47c751533642e8a9becc8584ff SHA512 378dc49da535f70c860c29b9a43cae478f6d8403c93a623b1781194c02aad3ea12345f9ea6ebbac4fb2033179964d23fb075e6aa206ec79530b41947d5d44411 WHIRLPOOL cc6463928c05d5904af71ea6170e946e601639761eaab317f0570275e0eaee81cba2c0636dc5dec40f8ba6d16ad498e7177a0c2bf5a886f2598c99568f151fd6

diff --git a/app-text/tesseract/files/tesseract-2.04-gcc44.patch b/app-text/tesseract/files/tesseract-2.04-gcc44.patch
deleted file mode 100644
index 7d1f61c..0000000
--- a/app-text/tesseract/files/tesseract-2.04-gcc44.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -NrU5 tesseract-2.04.original/viewer/svutil.cpp tesseract-2.04/viewer/svutil.cpp
---- tesseract-2.04.original/viewer/svutil.cpp	2009-07-25 21:03:18.000000000 +0000
-+++ tesseract-2.04/viewer/svutil.cpp	2009-07-25 21:05:54.000000000 +0000
-@@ -41,10 +41,11 @@
- #include <sys/prctl.h>
- #endif
- #endif
- 
- #include <iostream>
-+#include <cstdio>
- 
- const int kBufferSize = 65536;
- const int kMaxMsgSize = 4096;
- 
- // Signals a thread to exit.

diff --git a/app-text/tesseract/tesseract-2.04-r1.ebuild b/app-text/tesseract/tesseract-2.04-r1.ebuild
deleted file mode 100644
index adcaca9..0000000
--- a/app-text/tesseract/tesseract-2.04-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="An OCR Engine that was developed at HP and now at Google"
-HOMEPAGE="https://code.google.com/p/tesseract-ocr/"
-SRC_URI="https://tesseract-ocr.googlecode.com/files/${P}.tar.gz
-	https://tesseract-ocr.googlecode.com/files/${PN}-2.00.eng.tar.gz
-	linguas_de? (
-		https://tesseract-ocr.googlecode.com/files/${PN}-2.00.deu.tar.gz
-		https://tesseract-ocr.googlecode.com/files/${PN}-2.01.deu-f.tar.gz
-	)
-	linguas_eu? ( https://tesseract-ocr.googlecode.com/files/${PN}-2.04.eus.tar.gz )
-	linguas_es? ( https://tesseract-ocr.googlecode.com/files/${PN}-2.00.spa.tar.gz )
-	linguas_fr? ( https://tesseract-ocr.googlecode.com/files/${PN}-2.00.fra.tar.gz )
-	linguas_it? ( https://tesseract-ocr.googlecode.com/files/${PN}-2.00.ita.tar.gz )
-	linguas_nl? ( https://tesseract-ocr.googlecode.com/files/${PN}-2.00.nld.tar.gz )
-	linguas_pt_BR? ( https://tesseract-ocr.googlecode.com/files/${PN}-2.01.por.tar.gz )
-	linguas_vi? ( https://tesseract-ocr.googlecode.com/files/${PN}-2.01.vie.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~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
-	# fix gcc-4.7 compilation, bug 413937
-	epatch \
-		"${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-gcc47.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
-}

diff --git a/app-text/tesseract/tesseract-3.03_rc1-r1.ebuild b/app-text/tesseract/tesseract-3.03_rc1-r1.ebuild
deleted file mode 100644
index f80a9c5..0000000
--- a/app-text/tesseract/tesseract-3.03_rc1-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="${PN}-ocr"
-DL_P="${MY_PN}-3.02"
-URI_PREFIX="https://${MY_PN}.googlecode.com/files"
-
-inherit eutils autotools autotools-utils versionator
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-2 )"
-
-DESCRIPTION="An OCR Engine that was developed at HP and now at Google"
-HOMEPAGE="https://code.google.com/p/tesseract-ocr/"
-SRC_URI="https://dev.gentoo.org/~tomka/files/${PN}-3.03-rc1.tar.gz
-	${URI_PREFIX}/${DL_P}.eng.tar.gz
-	doc? ( ${URI_PREFIX}/${DL_P}.02-doc-html.tar.gz )
-	linguas_ar? ( ${URI_PREFIX}/${DL_P}.ara.tar.gz )
-	linguas_bg? ( ${URI_PREFIX}/bul.traineddata.gz )
-	linguas_ca? ( ${URI_PREFIX}/cat.traineddata.gz )
-	linguas_chr? ( ${URI_PREFIX}/chr.traineddata.gz )
-	linguas_cs? ( ${URI_PREFIX}/ces.traineddata.gz )
-	linguas_de? ( ${URI_PREFIX}/deu.traineddata.gz
-				${URI_PREFIX}/deu-frak.traineddata.gz )
-	linguas_da? ( ${URI_PREFIX}/dan.traineddata.gz
-				${URI_PREFIX}/dan-frak.traineddata.gz )
-	linguas_el? ( ${URI_PREFIX}/ell.traineddata.gz )
-	linguas_es? ( ${URI_PREFIX}/spa.traineddata.gz )
-	linguas_fi? ( ${URI_PREFIX}/fin.traineddata.gz )
-	linguas_fr? ( ${URI_PREFIX}/fra.traineddata.gz )
-	linguas_he? ( ${URI_PREFIX}/${DL_P}.heb.tar.gz
-				${URI_PREFIX}/${MY_PN}-3.01.heb-com.tar.gz )
-	linguas_hi? ( ${URI_PREFIX}/${DL_P}.hin.tar.gz )
-	linguas_hu? ( ${URI_PREFIX}/hun.traineddata.gz )
-	linguas_id? ( ${URI_PREFIX}/ind.traineddata.gz )
-	linguas_it? ( ${URI_PREFIX}/ita.traineddata.gz )
-	linguas_jp? ( ${URI_PREFIX}/jpn.traineddata.gz )
-	linguas_ko? ( ${URI_PREFIX}/kor.traineddata.gz )
-	linguas_lt? ( ${URI_PREFIX}/lit.traineddata.gz )
-	linguas_lv? ( ${URI_PREFIX}/lav.traineddata.gz )
-	linguas_nl? ( ${URI_PREFIX}/nld.traineddata.gz )
-	linguas_no? ( ${URI_PREFIX}/nor.traineddata.gz )
-	linguas_pl? ( ${URI_PREFIX}/pol.traineddata.gz )
-	linguas_pt? ( ${URI_PREFIX}/por.traineddata.gz )
-	linguas_ro? ( ${URI_PREFIX}/ron.traineddata.gz )
-	linguas_ru? ( ${URI_PREFIX}/rus.traineddata.gz )
-	linguas_sk? ( ${URI_PREFIX}/slk.traineddata.gz
-				${URI_PREFIX}/${MY_PN}-3.01.slk-frak.tar.gz )
-	linguas_sl? ( ${URI_PREFIX}/slv.traineddata.gz )
-	linguas_sr? ( ${URI_PREFIX}/srp.traineddata.gz )
-	linguas_sv? ( ${URI_PREFIX}/swe.traineddata.gz
-				${URI_PREFIX}/swe-frak.traineddata.gz )
-	linguas_th? ( ${URI_PREFIX}/${DL_P}.tha.tar.gz )
-	linguas_tl? ( ${URI_PREFIX}/tgl.traineddata.gz )
-	linguas_tr? ( ${URI_PREFIX}/tur.traineddata.gz )
-	linguas_uk? ( ${URI_PREFIX}/ukr.traineddata.gz )
-	linguas_vi? ( ${URI_PREFIX}/vie.traineddata.gz )
-	linguas_zh_CN? ( ${URI_PREFIX}/chi_sim.traineddata.gz )
-	linguas_zh_TW? ( ${URI_PREFIX}/chi_tra.traineddata.gz )
-	osd? ( ${URI_PREFIX}/${MY_PN}-3.01.osd.tar.gz )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="doc examples jpeg opencl osd png +scrollview static-libs tiff -webp linguas_ar linguas_bg linguas_ca linguas_chr linguas_cs linguas_de linguas_da linguas_el linguas_es linguas_fi linguas_fr linguas_he linguas_hi linguas_hu linguas_id linguas_it linguas_jp linguas_ko linguas_lt linguas_lv linguas_nl linguas_no linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tl linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW"
-
-# With opencl tiff is necessary regardless of leptonica status
-DEPEND=">=media-libs/leptonica-1.70[zlib,tiff?,jpeg?,png?,webp?]
-		opencl? ( virtual/opencl
-				  media-libs/tiff:0 )"
-RDEPEND="${DEPEND}"
-
-DOCS=(AUTHORS ChangeLog NEWS README ReleaseNotes )
-
-PATCHES=(
-	"${FILESDIR}/tesseract-2.04-gcc47.patch"
-)
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable opencl) \
-		$(use_enable scrollview graphics) \
-		--disable-dependency-tracking
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins eurotext.tif phototest.tif
-	fi
-
-	if use doc; then
-		dohtml -r "${WORKDIR}"/"${MY_PN}"/doc/html/*
-	fi
-
-	# install language files
-	insinto /usr/share/tessdata
-	find "${WORKDIR}" -maxdepth 1 -type f -name "*.traineddata" -exec doins '{}' +
-	doins "${WORKDIR}"/"${MY_PN}"/tessdata/*
-}

diff --git a/app-text/tesseract/tesseract-3.04.00-r1.ebuild b/app-text/tesseract/tesseract-3.04.00-r1.ebuild
deleted file mode 100644
index fa1e08a..0000000
--- a/app-text/tesseract/tesseract-3.04.00-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="tesseract-ocr"
-URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${PV}/"
-
-inherit eutils autotools autotools-utils
-
-DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
-HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${URI_PREFIX}eng.traineddata -> eng.traineddata-${PV}
-	doc? ( https://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.02-doc-html.tar.gz )
-	linguas_ar? ( ${URI_PREFIX}ara.traineddata -> ara.traineddata-${PV} )
-	linguas_bg? ( ${URI_PREFIX}bul.traineddata -> bul.traineddata-${PV} )
-	linguas_ca? ( ${URI_PREFIX}cat.traineddata -> cat.traineddata-${PV} )
-	linguas_chr? ( ${URI_PREFIX}chr.traineddata -> chr.traineddata-${PV} )
-	linguas_cs? ( ${URI_PREFIX}ces.traineddata -> ces.traineddata-${PV} )
-	linguas_de? ( ${URI_PREFIX}deu.traineddata -> deu.traineddata-${PV}
-				  ${URI_PREFIX}deu_frak.traineddata -> deu_frak.traineddata-${PV} )
-	linguas_da? ( ${URI_PREFIX}dan.traineddata -> dan.traineddata-${PV}
-				  ${URI_PREFIX}dan_frak.traineddata -> dan_frak.traineddata-${PV} )
-	linguas_el? ( ${URI_PREFIX}ell.traineddata -> ell.traineddata-${PV} )
-	linguas_es? ( ${URI_PREFIX}spa.traineddata -> spa.traineddata-${PV} )
-	linguas_fi? ( ${URI_PREFIX}fin.traineddata -> fin.traineddata-${PV} )
-	linguas_fr? ( ${URI_PREFIX}fra.traineddata -> fra.traineddata-${PV} )
-	linguas_he? ( ${URI_PREFIX}heb.traineddata -> heb.traineddata-${PV} )
-	linguas_hi? ( ${URI_PREFIX}hin.traineddata -> hin.traineddata-${PV} )
-	linguas_hu? ( ${URI_PREFIX}hun.traineddata -> hun.traineddata-${PV} )
-	linguas_id? ( ${URI_PREFIX}ind.traineddata -> ind.traineddata-${PV} )
-	linguas_it? ( ${URI_PREFIX}ita.traineddata -> ita.traineddata-${PV} )
-	linguas_jp? ( ${URI_PREFIX}jpn.traineddata -> jpn.traineddata-${PV} )
-	linguas_ko? ( ${URI_PREFIX}kor.traineddata -> kor.traineddata-${PV} )
-	linguas_lt? ( ${URI_PREFIX}lit.traineddata -> lit.traineddata-${PV} )
-	linguas_lv? ( ${URI_PREFIX}lav.traineddata -> lav.traineddata-${PV} )
-	linguas_nl? ( ${URI_PREFIX}nld.traineddata -> nld.traineddata-${PV} )
-	linguas_no? ( ${URI_PREFIX}nor.traineddata -> nor.traineddata-${PV} )
-	linguas_pl? ( ${URI_PREFIX}pol.traineddata -> pol.traineddata-${PV} )
-	linguas_pt? ( ${URI_PREFIX}por.traineddata -> por.traineddata-${PV} )
-	linguas_ro? ( ${URI_PREFIX}ron.traineddata -> ron.traineddata-${PV} )
-	linguas_ru? ( ${URI_PREFIX}rus.traineddata -> rus.traineddata-${PV} )
-	linguas_sk? ( ${URI_PREFIX}slk.traineddata -> slk.traineddata-${PV}
-				  ${URI_PREFIX}slk_frak.traineddata -> slk_frak.traineddata-${PV} )
-	linguas_sl? ( ${URI_PREFIX}slv.traineddata -> slv.traineddata-${PV} )
-	linguas_sr? ( ${URI_PREFIX}srp.traineddata -> srp.traineddata-${PV} )
-	linguas_sv? ( ${URI_PREFIX}swe.traineddata -> swe.traineddata-${PV} )
-	linguas_th? ( ${URI_PREFIX}tha.traineddata -> tha.traineddata-${PV} )
-	linguas_tl? ( ${URI_PREFIX}tgl.traineddata -> tgl.traineddata-${PV} )
-	linguas_tr? ( ${URI_PREFIX}tur.traineddata -> tur.traineddata-${PV} )
-	linguas_uk? ( ${URI_PREFIX}ukr.traineddata -> ukr.traineddata-${PV} )
-	linguas_vi? ( ${URI_PREFIX}vie.traineddata -> vie.traineddata-${PV} )
-	linguas_zh_CN? ( ${URI_PREFIX}chi_sim.traineddata -> chi_sim.traineddata-${PV} )
-	linguas_zh_TW? ( ${URI_PREFIX}chi_tra.traineddata -> chi_tra.traineddata-${PV} )
-	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${PV} )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="doc examples jpeg opencl osd png +scrollview static-libs tiff -webp linguas_ar linguas_bg linguas_ca linguas_chr linguas_cs linguas_de linguas_da linguas_el linguas_es linguas_fi linguas_fr linguas_he linguas_hi linguas_hu linguas_id linguas_it linguas_jp linguas_ko linguas_lt linguas_lv linguas_nl linguas_no linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tl linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW"
-
-# With opencl tiff is necessary regardless of leptonica status   <-- Check this
-DEPEND=">=media-libs/leptonica-1.71[zlib,tiff?,jpeg?,png?,webp?]
-		opencl? ( virtual/opencl
-				  media-libs/tiff:0 )"
-RDEPEND="${DEPEND}"
-
-DOCS=(AUTHORS ChangeLog NEWS README ReleaseNotes )
-
-PATCHES=(
-	"${FILESDIR}/tesseract-2.04-gcc47.patch"
-	"${FILESDIR}/${P}-fix-scrollview-disabled.patch"
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	use doc && unpack tesseract-ocr-3.02.02-doc-html.tar.gz
-	find "${DISTDIR}/" -name "*traineddata-${PV}" \
-		 -execdir sh -c 'cp -- "$0" "${S}/tessdata/${0%-*}"' '{}' ';' || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable opencl) \
-		$(use_enable scrollview graphics) \
-		--disable-dependency-tracking
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins testing/eurotext.tif testing/phototest.tif
-	fi
-
-	if use doc; then
-		dohtml -r "${WORKDIR}"/"${MY_PN}"/doc/html/*
-	fi
-
-	# install language files
-	insinto /usr/share/tessdata
-	doins "${S}"/tessdata/*traineddata*
-}

diff --git a/app-text/tesseract/tesseract-3.04.00.ebuild b/app-text/tesseract/tesseract-3.04.00.ebuild
deleted file mode 100644
index 6303c2d..0000000
--- a/app-text/tesseract/tesseract-3.04.00.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="${PN}-ocr"
-DL_P="${MY_PN}-3.02"
-URI_PREFIX="https://${MY_PN}.googlecode.com/files"
-
-inherit eutils autotools autotools-utils
-
-DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
-HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz
-	${URI_PREFIX}/${DL_P}.eng.tar.gz
-	doc? ( ${URI_PREFIX}/${DL_P}.02-doc-html.tar.gz )
-	linguas_ar? ( ${URI_PREFIX}/${DL_P}.ara.tar.gz )
-	linguas_bg? ( ${URI_PREFIX}/bul.traineddata.gz )
-	linguas_ca? ( ${URI_PREFIX}/cat.traineddata.gz )
-	linguas_chr? ( ${URI_PREFIX}/chr.traineddata.gz )
-	linguas_cs? ( ${URI_PREFIX}/ces.traineddata.gz )
-	linguas_de? ( ${URI_PREFIX}/deu.traineddata.gz
-				${URI_PREFIX}/deu-frak.traineddata.gz )
-	linguas_da? ( ${URI_PREFIX}/dan.traineddata.gz
-				${URI_PREFIX}/dan-frak.traineddata.gz )
-	linguas_el? ( ${URI_PREFIX}/ell.traineddata.gz )
-	linguas_es? ( ${URI_PREFIX}/spa.traineddata.gz )
-	linguas_fi? ( ${URI_PREFIX}/fin.traineddata.gz )
-	linguas_fr? ( ${URI_PREFIX}/fra.traineddata.gz )
-	linguas_he? ( ${URI_PREFIX}/${DL_P}.heb.tar.gz
-				${URI_PREFIX}/${MY_PN}-3.01.heb-com.tar.gz )
-	linguas_hi? ( ${URI_PREFIX}/${DL_P}.hin.tar.gz )
-	linguas_hu? ( ${URI_PREFIX}/hun.traineddata.gz )
-	linguas_id? ( ${URI_PREFIX}/ind.traineddata.gz )
-	linguas_it? ( ${URI_PREFIX}/ita.traineddata.gz )
-	linguas_jp? ( ${URI_PREFIX}/jpn.traineddata.gz )
-	linguas_ko? ( ${URI_PREFIX}/kor.traineddata.gz )
-	linguas_lt? ( ${URI_PREFIX}/lit.traineddata.gz )
-	linguas_lv? ( ${URI_PREFIX}/lav.traineddata.gz )
-	linguas_nl? ( ${URI_PREFIX}/nld.traineddata.gz )
-	linguas_no? ( ${URI_PREFIX}/nor.traineddata.gz )
-	linguas_pl? ( ${URI_PREFIX}/pol.traineddata.gz )
-	linguas_pt? ( ${URI_PREFIX}/por.traineddata.gz )
-	linguas_ro? ( ${URI_PREFIX}/ron.traineddata.gz )
-	linguas_ru? ( ${URI_PREFIX}/rus.traineddata.gz )
-	linguas_sk? ( ${URI_PREFIX}/slk.traineddata.gz
-				${URI_PREFIX}/${MY_PN}-3.01.slk-frak.tar.gz )
-	linguas_sl? ( ${URI_PREFIX}/slv.traineddata.gz )
-	linguas_sr? ( ${URI_PREFIX}/srp.traineddata.gz )
-	linguas_sv? ( ${URI_PREFIX}/swe.traineddata.gz
-				${URI_PREFIX}/swe-frak.traineddata.gz )
-	linguas_th? ( ${URI_PREFIX}/${DL_P}.tha.tar.gz )
-	linguas_tl? ( ${URI_PREFIX}/tgl.traineddata.gz )
-	linguas_tr? ( ${URI_PREFIX}/tur.traineddata.gz )
-	linguas_uk? ( ${URI_PREFIX}/ukr.traineddata.gz )
-	linguas_vi? ( ${URI_PREFIX}/vie.traineddata.gz )
-	linguas_zh_CN? ( ${URI_PREFIX}/chi_sim.traineddata.gz )
-	linguas_zh_TW? ( ${URI_PREFIX}/chi_tra.traineddata.gz )
-	osd? ( ${URI_PREFIX}/${MY_PN}-3.01.osd.tar.gz )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="doc examples jpeg opencl osd png +scrollview static-libs tiff -webp linguas_ar linguas_bg linguas_ca linguas_chr linguas_cs linguas_de linguas_da linguas_el linguas_es linguas_fi linguas_fr linguas_he linguas_hi linguas_hu linguas_id linguas_it linguas_jp linguas_ko linguas_lt linguas_lv linguas_nl linguas_no linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tl linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW"
-
-# With opencl tiff is necessary regardless of leptonica status   <-- Check this
-DEPEND=">=media-libs/leptonica-1.71[zlib,tiff?,jpeg?,png?,webp?]
-		opencl? ( virtual/opencl
-				  media-libs/tiff:0 )"
-RDEPEND="${DEPEND}"
-
-DOCS=(AUTHORS ChangeLog NEWS README ReleaseNotes )
-
-PATCHES=(
-	"${FILESDIR}/tesseract-2.04-gcc47.patch"
-	"${FILESDIR}/${P}-fix-scrollview-disabled.patch"
-)
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable opencl) \
-		$(use_enable scrollview graphics) \
-		--disable-dependency-tracking
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins testing/eurotext.tif testing/phototest.tif
-	fi
-
-	if use doc; then
-		dohtml -r "${WORKDIR}"/"${MY_PN}"/doc/html/*
-	fi
-
-	# install language files
-	insinto /usr/share/tessdata
-	find "${WORKDIR}" -maxdepth 1 -type f -name "*.traineddata" -exec doins '{}' +
-	doins "${WORKDIR}"/"${MY_PN}"/tessdata/*
-}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/
@ 2016-02-01 17:13 James Le Cuirot
  0 siblings, 0 replies; 15+ messages in thread
From: James Le Cuirot @ 2016-02-01 17:13 UTC (permalink / raw
  To: gentoo-commits

commit:     7a46316823a825080fa731bbffe9dec801feaa6f
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 11:17:29 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Feb  1 17:12:19 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a463168

app-text/tesseract: Fix ScrollViewer

Use the system piccolo2d to build the ScrollViewer server. Stage it
manually instead of using install-jars so we don't have to sed through
the files and copy the bundled piccolo2d.

Many thanks to Olivier Diotte for the initial work on this. See
https://github.com/gentoo/gentoo/pull/719 for the details.

Package-Manager: portage-2.2.27

 .../tesseract-3.04.00-use-system-piccolo2d.patch   | 39 ++++++++++++++++++++++
 app-text/tesseract/tesseract-3.04.00-r4.ebuild     | 23 ++++++++++---
 2 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/app-text/tesseract/files/tesseract-3.04.00-use-system-piccolo2d.patch b/app-text/tesseract/files/tesseract-3.04.00-use-system-piccolo2d.patch
new file mode 100644
index 0000000..decee3a
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-3.04.00-use-system-piccolo2d.patch
@@ -0,0 +1,39 @@
+--- a/java/Makefile.am	2015-07-11 03:53:12.000000000 -0400
++++ b/java/Makefile.am	2016-01-20 22:20:37.505713349 -0500
+@@ -36,10 +36,9 @@
+ 	com/google/scrollview/ScrollView.class
+ 
+ SCROLLVIEW_LIBS = \
+-	$(srcdir)/piccolo2d-core-3.0.jar \
+-	$(srcdir)/piccolo2d-extras-3.0.jar
++	/usr/share/piccolo2d/lib/piccolo2d.jar
+ 
+-CLASSPATH = $(srcdir)/piccolo2d-core-3.0.jar:$(srcdir)/piccolo2d-extras-3.0.jar
++CLASSPATH = /usr/share/piccolo2d/lib/piccolo2d.jar
+ 
+ ScrollView.jar : $(SCROLLVIEW_CLASSES)
+ 	$(JAR) cf $@ com/google/scrollview/*.class \
+--- a/viewer/svutil.cpp	2015-07-11 03:53:12.000000000 -0400
++++ b/viewer/svutil.cpp	2016-01-21 01:46:30.203461826 -0500
+@@ -302,7 +302,7 @@
+ #else
+   const char* cmd_template = "-c \"trap 'kill %%1' 0 1 2 ; java "
+       "-Xms1024m -Xmx2048m -Djava.library.path=%s -cp %s/ScrollView.jar:"
+-      "%s/piccolo2d-core-3.0.jar:%s/piccolo2d-extras-3.0.jar"
++      "/usr/share/piccolo2d/lib/piccolo2d.jar"
+       " com.google.scrollview.ScrollView"
+       " & wait\"";
+ #endif
+--- a/viewer/Makefile.am	2015-07-11 03:53:12.000000000 -0400
++++ b/viewer/Makefile.am	2016-01-21 03:37:04.355789682 -0500
+@@ -5,6 +5,10 @@
+     -fvisibility=hidden -fvisibility-inlines-hidden
+ endif
+ 
++if !GRAPHICS_DISABLED
++AM_CPPFLAGS += -DSCROLLVIEW_PATH=/usr/share/tessdata/
++endif
++
+ noinst_HEADERS = \
+     scrollview.h svmnode.h svutil.h
+ 

diff --git a/app-text/tesseract/tesseract-3.04.00-r4.ebuild b/app-text/tesseract/tesseract-3.04.00-r4.ebuild
index 42e7f1b..8fce6ae 100644
--- a/app-text/tesseract/tesseract-3.04.00-r4.ebuild
+++ b/app-text/tesseract/tesseract-3.04.00-r4.ebuild
@@ -6,8 +6,9 @@ EAPI=5
 
 MY_PN="tesseract-ocr"
 URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${PV}/"
+JAVA_PKG_OPT_USE="scrollview"
 
-inherit eutils autotools
+inherit eutils autotools java-pkg-opt-2
 
 DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
 HOMEPAGE="https://github.com/tesseract-ocr"
@@ -65,25 +66,34 @@ KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc examples jpeg math opencl osd png +scrollview static-libs tiff training -webp linguas_ar linguas_bg linguas_ca linguas_chr linguas_cs linguas_de linguas_da linguas_el linguas_es linguas_fi linguas_fr linguas_he linguas_hi linguas_hu linguas_id linguas_it linguas_jp linguas_ko linguas_lt linguas_lv linguas_nl linguas_no linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tl linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW"
 
 # With opencl USE=tiff is necessary in leptonica
-DEPEND=">=media-libs/leptonica-1.71:=[zlib,tiff?,jpeg?,png?,webp?]
+CDEPEND=">=media-libs/leptonica-1.71:=[zlib,tiff?,jpeg?,png?,webp?]
 	opencl? (
 		virtual/opencl
 		media-libs/tiff:0=
 		media-libs/leptonica:=[tiff]
 	)
+	scrollview? (
+		>=dev-java/piccolo2d-3.0:0
+	)
 	training? (
 		dev-libs/icu:=
 		x11-libs/pango:=
 		x11-libs/cairo:=
 	)
 "
-RDEPEND="${DEPEND}"
+
+DEPEND="${CDEPEND}
+	scrollview? ( >=virtual/jdk-1.7 )"
+
+RDEPEND="${CDEPEND}
+	scrollview? ( >=virtual/jre-1.7 )"
 
 DOCS=(AUTHORS ChangeLog NEWS README ReleaseNotes )
 
 PATCHES=(
 	"${FILESDIR}/tesseract-2.04-gcc47.patch"
 	"${FILESDIR}/${P}-fix-scrollview-disabled.patch"
+	"${FILESDIR}/${P}-use-system-piccolo2d.patch"
 )
 
 src_unpack() {
@@ -96,6 +106,8 @@ src_unpack() {
 src_prepare() {
 	epatch "${PATCHES[@]}"
 	eautoreconf
+
+	java-pkg-opt-2_src_prepare
 }
 
 src_configure() {
@@ -111,6 +123,7 @@ src_configure() {
 
 src_compile() {
 	default
+	use scrollview && emake ScrollView.jar JAVAC="javac $(java-pkg_javac-args)"
 	use training && emake training
 }
 
@@ -131,7 +144,7 @@ src_install() {
 		dohtml -r "${WORKDIR}/${MY_PN}"/doc/html/*
 	fi
 
-	# install language files
 	insinto /usr/share/tessdata
-	doins tessdata/*traineddata*
+	doins tessdata/*traineddata* # language files
+	use scrollview && doins java/ScrollView.jar # scrollview
 }


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/
@ 2016-08-09 11:36 Thomas Kahle
  0 siblings, 0 replies; 15+ messages in thread
From: Thomas Kahle @ 2016-08-09 11:36 UTC (permalink / raw
  To: gentoo-commits

commit:     c049a5c2ecd9a07a7aacd34c192b5824b9ccad74
Author:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  9 11:35:28 2016 +0000
Commit:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
CommitDate: Tue Aug  9 11:35:56 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c049a5c2

app-text/tesseract: Bump to 3.04.01 (bug 590788)

Package-Manager: portage-2.3.0

 app-text/tesseract/Manifest                        |   1 +
 .../tesseract-3.04.01-use-system-piccolo2d.patch   |  27 ++++
 app-text/tesseract/tesseract-3.04.01.ebuild        | 150 +++++++++++++++++++++
 3 files changed, 178 insertions(+)

diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 6ec6df6..d4b3c5d 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -70,6 +70,7 @@ DIST swe.traineddata-3.04.00 9460295 SHA256 2a6407bbf187eb1fcfd1633fae9abffcd622
 DIST swe.traineddata.gz 959911 SHA256 25331ca1f41378a86336604476049810a0c5350417205e300cb2d11048cec2c1 SHA512 e38fe9fd7d26420ee1aab3db7f700d58210dbfaef45d03114679d2671bc1942d7b031499e763204e15ebeadafa2f8f063f78941f2299b2c74f635425ddce856a WHIRLPOOL db1225d47e2e3b26372689f96164d8286701dbb2e0f1a82368c784c8d127a0d11248924936abd05d0092ba8ad5ce222b6d113ceb0f440b85faaca37396781480
 DIST tesseract-3.03-rc1.tar.gz 12812907 SHA256 d244956236f7491d74d7f342895f611a6c46c45fa9900173d5b7625d8461d2ea SHA512 4acd6a3c0db5568bd6cb199776a52fbf1643692cf2d9da7449644662461c0c3ef7e5941bb49be94135433a90de400413df062edd612ce9ec9c06e9206a57113f WHIRLPOOL 93f33f62aeb5a9f65a7642bc282138622076989618f787a044ad79463ab9cd9a9ebaeb5e34e52cf5c95c569b01fc552a44d2eda24e697d0c9a045fb626b9aa77
 DIST tesseract-3.04.00.tar.gz 2264427 SHA256 7e6e48b625e1fba9bc825a4ef8c39f12c60aae1084939133b3c6a00f8f8dc38c SHA512 60c31bad40b4c01395782fb98b3326407e75ebdbda962de4fb0e878824efb05140bdcb139dcf7d4f699ae5350e81a00320ebe7fbec083a0d374952488cc59e25 WHIRLPOOL 81b685e4d50d94056a4f99ce6beb4c73983e9449e1eed07a69d4649b0a8231b17fede430a8c181b37216a55e9f6102a578c85d84b2bbe6e9643ca98f16ae3260
+DIST tesseract-3.04.01.tar.gz 2269105 SHA256 57f63e1b14ae04c3932a2683e4be4954a2849e17edd638ffe91bc5a2156adc6a SHA512 816f6c29f8efeaf157891ddb022bd0daf8eb27c0cb8b6df5542e745d209f0ce617245e4583c59a561ed3216044d3afb38f8620ee94cdea656364923dcb140b5b WHIRLPOOL 995502084484d172becdfdaa38888cd21f0fe2b8845fe4a64726f9fbcd35310d64153be6325016dd50ca37b95069112b63d4f0528bd989a58c3b88dc6c6a6813
 DIST tesseract-ocr-3.01.heb-com.tar.gz 270977 SHA256 20a9d53172a8dbf1a4bbd7f7e9e3a523a9435c47c751533642e8a9becc8584ff SHA512 378dc49da535f70c860c29b9a43cae478f6d8403c93a623b1781194c02aad3ea12345f9ea6ebbac4fb2033179964d23fb075e6aa206ec79530b41947d5d44411 WHIRLPOOL cc6463928c05d5904af71ea6170e946e601639761eaab317f0570275e0eaee81cba2c0636dc5dec40f8ba6d16ad498e7177a0c2bf5a886f2598c99568f151fd6
 DIST tesseract-ocr-3.01.osd.tar.gz 4320544 SHA256 7861210fd0970ad30503e8c70d7841de6716bd293d8512fd8787a1a07219b7aa SHA512 ad0d6246574db10dbe5a439ba4266765114b1343228608c5ad35bea125c5e308e286a133ecf2fc9407287af56ea57bb48c32f445fef98256a119a2f432f6e2b6 WHIRLPOOL ffa5a9f209e54a36860e2a2cdee955a83df768fbb814717a2d1e0efe05b3aa2283bc14a33cfa72d7179ddeb684587fe04c0d37cefa944ba2182c9c7e6c9affd4
 DIST tesseract-ocr-3.01.slk-frak.tar.gz 292809 SHA256 f35b8a858d509c540a5829d94e8f8800ed25db4c904661000f4c4fa528d5c156 SHA512 a015719fe72b5463b6e9849de0ba5cdb9ed996ac60a47a7fab360c1028cc52b3ad41872b8b35e988f4430f991791ae0837c6823e479cb1549b65d5f530f62fe6 WHIRLPOOL 79419ea93b9d69d4be3ef8399656a5adb6dc383b9496434c99db8f5f0d6fca70314d68e96f59940674a51b79448e43b5ed59389e382528bf050134e6a6edb00d

diff --git a/app-text/tesseract/files/tesseract-3.04.01-use-system-piccolo2d.patch b/app-text/tesseract/files/tesseract-3.04.01-use-system-piccolo2d.patch
new file mode 100644
index 0000000..a9dd004
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-3.04.01-use-system-piccolo2d.patch
@@ -0,0 +1,27 @@
+diff -U 3 -dHrN tesseract-3.04.01/java/Makefile.am tesseract-3.04.01-scrollview/java/Makefile.am
+--- tesseract-3.04.01/java/Makefile.am	2016-02-16 22:27:01.000000000 +0100
++++ tesseract-3.04.01-scrollview/java/Makefile.am	2016-08-09 13:18:12.810503862 +0200
+@@ -36,10 +36,9 @@
+ 	com/google/scrollview/ScrollView.class
+ 
+ SCROLLVIEW_LIBS = \
+-	$(srcdir)/piccolo2d-core-3.0.jar \
+-	$(srcdir)/piccolo2d-extras-3.0.jar
++	/usr/share/piccolo2d/lib/piccolo2d.jar
+ 
+-CLASSPATH = $(srcdir)/piccolo2d-core-3.0.jar:$(srcdir)/piccolo2d-extras-3.0.jar
++CLASSPATH = /usr/share/piccolo2d/lib/piccolo2d.jar
+ 
+ ScrollView.jar : $(SCROLLVIEW_CLASSES)
+ 	$(JAR) cfm $@ Manifest.txt com/google/scrollview/*.class \
+diff -U 3 -dHrN tesseract-3.04.01/viewer/Makefile.am tesseract-3.04.01-scrollview/viewer/Makefile.am
+--- tesseract-3.04.01/viewer/Makefile.am	2016-02-16 22:27:01.000000000 +0100
++++ tesseract-3.04.01-scrollview/viewer/Makefile.am	2016-08-09 13:20:57.788318147 +0200
+@@ -17,3 +17,7 @@
+ 
+ libtesseract_viewer_la_SOURCES = \
+     scrollview.cpp svmnode.cpp svutil.cpp svpaint.cpp
++
++if !GRAPHICS_DISABLED
++AM_CPPFLAGS += -DSCROLLVIEW_PATH=/usr/share/tessdata/
++endif

diff --git a/app-text/tesseract/tesseract-3.04.01.ebuild b/app-text/tesseract/tesseract-3.04.01.ebuild
new file mode 100644
index 0000000..ee55a25
--- /dev/null
+++ b/app-text/tesseract/tesseract-3.04.01.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="tesseract-ocr"
+LANGPACKV="3.04.00"
+URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
+JAVA_PKG_OPT_USE="scrollview"
+
+inherit eutils autotools java-pkg-opt-2
+
+DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
+HOMEPAGE="https://github.com/tesseract-ocr"
+SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
+	doc? ( https://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.02-doc-html.tar.gz )
+	math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
+	linguas_ar? ( ${URI_PREFIX}ara.traineddata -> ara.traineddata-${LANGPACKV} )
+	linguas_bg? ( ${URI_PREFIX}bul.traineddata -> bul.traineddata-${LANGPACKV} )
+	linguas_ca? ( ${URI_PREFIX}cat.traineddata -> cat.traineddata-${LANGPACKV} )
+	linguas_chr? ( ${URI_PREFIX}chr.traineddata -> chr.traineddata-${LANGPACKV} )
+	linguas_cs? ( ${URI_PREFIX}ces.traineddata -> ces.traineddata-${LANGPACKV} )
+	linguas_de? ( ${URI_PREFIX}deu.traineddata -> deu.traineddata-${LANGPACKV}
+				  ${URI_PREFIX}deu_frak.traineddata -> deu_frak.traineddata-${LANGPACKV} )
+	linguas_da? ( ${URI_PREFIX}dan.traineddata -> dan.traineddata-${LANGPACKV}
+				  ${URI_PREFIX}dan_frak.traineddata -> dan_frak.traineddata-${LANGPACKV} )
+	linguas_el? ( ${URI_PREFIX}ell.traineddata -> ell.traineddata-${LANGPACKV} )
+	linguas_es? ( ${URI_PREFIX}spa.traineddata -> spa.traineddata-${LANGPACKV} )
+	linguas_fi? ( ${URI_PREFIX}fin.traineddata -> fin.traineddata-${LANGPACKV} )
+	linguas_fr? ( ${URI_PREFIX}fra.traineddata -> fra.traineddata-${LANGPACKV} )
+	linguas_he? ( ${URI_PREFIX}heb.traineddata -> heb.traineddata-${LANGPACKV} )
+	linguas_hi? ( ${URI_PREFIX}hin.traineddata -> hin.traineddata-${LANGPACKV} )
+	linguas_hu? ( ${URI_PREFIX}hun.traineddata -> hun.traineddata-${LANGPACKV} )
+	linguas_id? ( ${URI_PREFIX}ind.traineddata -> ind.traineddata-${LANGPACKV} )
+	linguas_it? ( ${URI_PREFIX}ita.traineddata -> ita.traineddata-${LANGPACKV} )
+	linguas_ja? ( ${URI_PREFIX}jpn.traineddata -> jpn.traineddata-${LANGPACKV} )
+	linguas_ko? ( ${URI_PREFIX}kor.traineddata -> kor.traineddata-${LANGPACKV} )
+	linguas_lt? ( ${URI_PREFIX}lit.traineddata -> lit.traineddata-${LANGPACKV} )
+	linguas_lv? ( ${URI_PREFIX}lav.traineddata -> lav.traineddata-${LANGPACKV} )
+	linguas_nl? ( ${URI_PREFIX}nld.traineddata -> nld.traineddata-${LANGPACKV} )
+	linguas_no? ( ${URI_PREFIX}nor.traineddata -> nor.traineddata-${LANGPACKV} )
+	linguas_pl? ( ${URI_PREFIX}pol.traineddata -> pol.traineddata-${LANGPACKV} )
+	linguas_pt? ( ${URI_PREFIX}por.traineddata -> por.traineddata-${LANGPACKV} )
+	linguas_ro? ( ${URI_PREFIX}ron.traineddata -> ron.traineddata-${LANGPACKV} )
+	linguas_ru? ( ${URI_PREFIX}rus.traineddata -> rus.traineddata-${LANGPACKV} )
+	linguas_sk? ( ${URI_PREFIX}slk.traineddata -> slk.traineddata-${LANGPACKV}
+				  ${URI_PREFIX}slk_frak.traineddata -> slk_frak.traineddata-${LANGPACKV} )
+	linguas_sl? ( ${URI_PREFIX}slv.traineddata -> slv.traineddata-${LANGPACKV} )
+	linguas_sr? ( ${URI_PREFIX}srp.traineddata -> srp.traineddata-${LANGPACKV} )
+	linguas_sv? ( ${URI_PREFIX}swe.traineddata -> swe.traineddata-${LANGPACKV} )
+	linguas_th? ( ${URI_PREFIX}tha.traineddata -> tha.traineddata-${LANGPACKV} )
+	linguas_tl? ( ${URI_PREFIX}tgl.traineddata -> tgl.traineddata-${LANGPACKV} )
+	linguas_tr? ( ${URI_PREFIX}tur.traineddata -> tur.traineddata-${LANGPACKV} )
+	linguas_uk? ( ${URI_PREFIX}ukr.traineddata -> ukr.traineddata-${LANGPACKV} )
+	linguas_vi? ( ${URI_PREFIX}vie.traineddata -> vie.traineddata-${LANGPACKV} )
+	linguas_zh_CN? ( ${URI_PREFIX}chi_sim.traineddata -> chi_sim.traineddata-${LANGPACKV} )
+	linguas_zh_TW? ( ${URI_PREFIX}chi_tra.traineddata -> chi_tra.traineddata-${LANGPACKV} )
+	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="doc examples jpeg math opencl osd png +scrollview static-libs tiff training -webp linguas_ar linguas_bg linguas_ca linguas_chr linguas_cs linguas_de linguas_da linguas_el linguas_es linguas_fi linguas_fr linguas_he linguas_hi linguas_hu linguas_id linguas_it linguas_ja linguas_ko linguas_lt linguas_lv linguas_nl linguas_no linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tl linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW"
+
+# With opencl USE=tiff is necessary in leptonica
+CDEPEND=">=media-libs/leptonica-1.71:=[zlib,tiff?,jpeg?,png?,webp?]
+	opencl? (
+		virtual/opencl
+		media-libs/tiff:0=
+		media-libs/leptonica:=[tiff]
+	)
+	scrollview? (
+		>=dev-java/piccolo2d-3.0:0
+	)
+	training? (
+		dev-libs/icu:=
+		x11-libs/pango:=
+		x11-libs/cairo:=
+	)
+"
+
+DEPEND="${CDEPEND}
+	scrollview? ( >=virtual/jdk-1.7 )"
+
+RDEPEND="${CDEPEND}
+	scrollview? ( >=virtual/jre-1.7 )"
+
+DOCS=(AUTHORS ChangeLog NEWS README.md ReleaseNotes )
+
+PATCHES=(
+	"${FILESDIR}/tesseract-2.04-gcc47.patch"
+	"${FILESDIR}/${P}-use-system-piccolo2d.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	use doc && unpack tesseract-ocr-3.02.02-doc-html.tar.gz
+	find "${DISTDIR}/" -name "*traineddata-${LANGPACKV}" \
+		 -execdir sh -c 'cp -- "$0" "${S}/tessdata/${0%-*}"' '{}' ';' || die
+}
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+	eautoreconf
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable opencl)
+		$(use_enable scrollview graphics)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+	use scrollview && emake ScrollView.jar JAVAC="javac $(java-pkg_javac-args)"
+	use training && emake training
+}
+
+src_install() {
+	default
+	prune_libtool_files
+
+	if use training; then
+		emake DESTDIR="${D}" training-install
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins testing/eurotext.tif testing/phototest.tif
+	fi
+
+	if use doc; then
+		dohtml -r "${WORKDIR}/${MY_PN}"/doc/html/*
+	fi
+
+	insinto /usr/share/tessdata
+	doins tessdata/*traineddata* # language files
+	use scrollview && doins java/ScrollView.jar # scrollview
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/
@ 2016-08-14 21:19 Thomas Kahle
  0 siblings, 0 replies; 15+ messages in thread
From: Thomas Kahle @ 2016-08-14 21:19 UTC (permalink / raw
  To: gentoo-commits

commit:     209745ded1e1572a32e1ab160fffac92eb268da8
Author:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 14 21:19:04 2016 +0000
Commit:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
CommitDate: Sun Aug 14 21:19:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=209745de

app-text/tesseract: Fix opencl ldflags

Bug: 591070
Thanks Dennis Schridde

Package-Manager: portage-2.3.0

 .../files/tesseract-3.04.01-fix-opencl-ldflags.patch          | 11 +++++++++++
 app-text/tesseract/tesseract-3.04.01.ebuild                   |  1 +
 2 files changed, 12 insertions(+)

diff --git a/app-text/tesseract/files/tesseract-3.04.01-fix-opencl-ldflags.patch b/app-text/tesseract/files/tesseract-3.04.01-fix-opencl-ldflags.patch
new file mode 100644
index 0000000..b1b2b63
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-3.04.01-fix-opencl-ldflags.patch
@@ -0,0 +1,11 @@
+--- tesseract-3.04.01/configure.ac.orig	2016-08-11 10:50:28.853292674 +0200
++++ tesseract-3.04.01/configure.ac	2016-08-11 11:06:32.919076995 +0200
+@@ -248,7 +248,7 @@
+         fi
+         AC_SUBST([AM_CPPFLAGS], [-DUSE_OPENCL])
+         OPENCL_CPPFLAGS="-I${OPENCL_INC}"
+-        OPENCL_LDFLAGS="-l${OPENCL_LIBS}"
++        OPENCL_LDFLAGS="${OPENCL_LIBS}"
+     fi
+     ;;
+ esac

diff --git a/app-text/tesseract/tesseract-3.04.01.ebuild b/app-text/tesseract/tesseract-3.04.01.ebuild
index 9acfdc1..fe782e8 100644
--- a/app-text/tesseract/tesseract-3.04.01.ebuild
+++ b/app-text/tesseract/tesseract-3.04.01.ebuild
@@ -94,6 +94,7 @@ DOCS=(AUTHORS ChangeLog NEWS README.md ReleaseNotes )
 PATCHES=(
 	"${FILESDIR}/tesseract-2.04-gcc47.patch"
 	"${FILESDIR}/${P}-use-system-piccolo2d.patch"
+	"${FILESDIR}/${P}-fix-opencl-ldflags.patch"
 )
 
 src_unpack() {


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/
@ 2017-01-30 10:00 Bernard Cafarelli
  0 siblings, 0 replies; 15+ messages in thread
From: Bernard Cafarelli @ 2017-01-30 10:00 UTC (permalink / raw
  To: gentoo-commits

commit:     3f60fe685eef5109c0ffe79e0de0e45ce6378d6d
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 09:53:13 2017 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 09:53:50 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f60fe68

app-text/tesseract: 4.0 alpha version bump

This release adds a new OCR engine based on LSTM neural networks

Reworked languages handling
Added openmp support

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-text/tesseract/Manifest                        |  95 +++++++++++++
 .../files/tesseract-4.00.00_alpha-isnan.patch      |  28 ++++
 .../tesseract-4.00.00_alpha-no_graphics.patch      | 143 ++++++++++++++++++++
 .../files/tesseract-4.00.00_alpha-openmp.patch     | 111 ++++++++++++++++
 app-text/tesseract/tesseract-4.00.00_alpha.ebuild  | 148 +++++++++++++++++++++
 5 files changed, 525 insertions(+)

diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 878b4d0..b57b7e4 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -1,46 +1,141 @@
+DIST afr.traineddata-4.00 12213914 SHA256 6f4d631e4dd824091f1581c8594fbcc67633b55dabdaebcec5434e89ab4355a7 SHA512 1c00ef71a0e846bf5d0d57c7c3a3a8b5af47dfa8f429dbc02fdb560731923c0d0ab3273b3b975a570ffe7bfed2c7b284ef28ef4f830f8d4a0f33d84692cc655b WHIRLPOOL dce6effae838bc4df76a95d4041034add07020c35d63ff6cc0a66f18769b069014ed96a4c3ec3807342a5bab675c0c642e3b738feb166d427a244ad4fa1e00c9
+DIST amh.traineddata-4.00 9771502 SHA256 1b5d9634cbb9f39daca68601f6d719963b6e5923e1f5bb8b4710123a47043cbd SHA512 0b449936c350eff717aa5bba502d3df86632746de9b3a7320252cb69707d18596b0bbd4a27caa3cb5bb560add8991bfbe7b56dac6f7e0a9f91202924fcb694de WHIRLPOOL 14eea7c8415e86a32396d7fd29df43d83942eb370a9e4423ae16490d5f4045abfb7bafc08a2d59b843a11c1a4720996f428b80c7560aa1f1f9975e1a816b5499
 DIST ara.traineddata-3.04.00 6315068 SHA256 21c98aaf7aeba2271ac0cc4a363d364d806649d7cb0bcab85d4b9a385f49645a SHA512 7fba780ec9061148c01dafee1227f8e338c1cf199a5c2869d58703123ea89f2279551e15159ab37038ec8ebc755076ede6ef049cc8a6e6764aa66d81c72a259b WHIRLPOOL d258d6eecb01feca9f0de5c973ab4a3c952db764b624ba98732e58af18a88332daa746e19194bcee8ed6fe1abe2a8d42b0b8976f0c9bde66e9831482b389f038
+DIST ara.traineddata-4.00 12537236 SHA256 a1b229d72f12cc626a8c2dde6f77ccfbd09b28ff09c87f26d77a55be910091cb SHA512 a3dfc8604aba6efccb0cdd39488ea978d324ec953c5e74892cbfb7506f1b4276e5e335cba56301272779d7a0ec69c55187db01bcd01de06a524ecb92820b7348 WHIRLPOOL 5de0109bbace36be9ed59abd256fbe437954e779233f8c67ccfee67a3472d2b798710c5c2464a8650fe3ecae626a1453b86c1939dd6831c63ba83890a8c67aa9
+DIST asm.traineddata-4.00 23520270 SHA256 1cac90fa32cd89073c70cff5a91b622b8c522a02ce684c462578a97d7508d70f SHA512 9413806ba55d101cf2c88c0c0cf408a8b4010c4a4b4ecfb315f98527865a1ddd052f1590326500f4c583628171d203a2a5530ef406b583a8b9f5451da91bb42a WHIRLPOOL 833e5b58a7829f3ca0abe380b910fa122e81aa01a657f336c0dffb9155b98b6d921b57498a699c1c5908e64b542fa7a91abbbef2e936f5a94d4a2ab4088c369c
+DIST aze.traineddata-4.00 15168011 SHA256 83762cbc4064944fbcb35ab41ae35ea093dce82bbc9f0f2f0cf1e3aa8b4cf960 SHA512 372241fa9f1d060d47a1ffd4830cbca4c9a319a014631545ca8f2c043609afe4427d4342e522d383778f0448ad853fccb632ef3eaa6dc09192ba06f1693102cf WHIRLPOOL bd55aff2b7da00d5667380f2b590eac3fec361e44513cce2dad873c3764f30a20ea4f4ff3b09dc6ac226a5988c71db9578078c59fd3ff463e715c86f8bd69cb1
+DIST aze_cyrl.traineddata-4.00 10530787 SHA256 827a302f906bbafafeef1b881c06719991e86177d03ea9122b010c84529dd08e SHA512 8cba80fd1201ad89eaaf31bf256924257fb45e192b139abcd9a7cefe43e4e30fd35dd4e08588d593a062b2668f0715804f66566479dd0a0beb688bb2c1ce7291 WHIRLPOOL 489a948912eb97cd35f71a68a925133788b896e003285a77a987870da28733689a2e954849606fdb63f8445ca529173e8abf6b1025e9ad6d74d6902b8ad48c28
+DIST bel.traineddata-4.00 16325127 SHA256 109e0adb6958f055f1f8cb47aec24b30100c3a42a20e4ed72e2214d5ee0a62bf SHA512 b6c7eccda420fc6c9cb30d3cd2e38b8f2d09766a77f701f3daae38fde198e2314a9a050841f2fec2fe49551e8334d9d5b820303b2d19285a942b423c66a71538 WHIRLPOOL f98ef5ef30c92dc7ce6dac8a42955cb4d3ccf4357d19f78fccf6ff12e38af580427d61c04f0008a369d2cbea7b00f8a19082c7d111dd9c827db6b4267e91f932
+DIST ben.traineddata-4.00 23447857 SHA256 f55f8ee76cd328a440fe2aa6b2d7d382534b21f7442c551634710f2ab0923a90 SHA512 6e59864bb499e048d8f8ce575f280f897b14bc626cad1970bb70d267f982be96ce2dacde847d060520288389bcbf2bd4a39d6abd9269a51d3d7970ffa19f4a17 WHIRLPOOL 255b114d9c990fe327b1fb4aad6a8fab22c3d83b0f1a1da90a8a6d27cc114d69dadebc51351c65c9e8404bbbcfee7bc594f72df49f47c6fe24a545e603da89db
+DIST bod.traineddata-4.00 35497681 SHA256 9d49b3736d13819e6548f8f8ebe29055381d1506f42f1596a048fe8ecceb252f SHA512 3b57c9d71b0914f274a6dc34e3d60fdb94f487e67e2fbddc92dafdb3bdc6e90766aa5b780449d367a6ac4d02b2c6634ee43efe74cbe52f71b11358e4d1c74339 WHIRLPOOL 675ec41d75c3c124eea423e962a70f4b6fd667c030fdd696f46c67c6e47467e74043b4bb7b8b08defd88ded53ad75a115cde2418a3c4f73ff061b263f181de0c
+DIST bos.traineddata-4.00 13859186 SHA256 07d192090364016c21845788b882087b2de6ad8f98dac1d19019958ba166dcb7 SHA512 21d9c6c4bbc042b1ee473d2f67fbd875cfa6f7fd9652abf914f8a0c526b5833ebb9602ee942f72642b00db4d632647beb531da37db712f0acdb86410024ebb01 WHIRLPOOL eb72dffee3335ae5da3306377853a45e1ac40c8e4fe16306718ec406545d27abe44aacddb4f9f3d96ed8db1c9acdd3737c73c7f9ed6cad0ac2290238ad3ff695
 DIST bul.traineddata-3.04.00 6026234 SHA256 ca0bd253b4ab6202db5e8b2cecbc4219b4f725e51468cabf5bc99338e2c3de33 SHA512 5115b4f92359344a17ee43b298c5c012569d77325e440bbe079ce7734ed087cbbe7ffb2b2dcb831e522fde2cde556e5de630f9ca85c141e9282e951e008e156c WHIRLPOOL 1bc19032224a6d4f94aae67fd8f5caabbcc00c00b0329513bf23c7a978f01269edec965e6090564b345862dc8810c2bc9c6fd04c736b7f4180998dd0cb8cb8fa
+DIST bul.traineddata-4.00 13677970 SHA256 aea17ad60107f4dad3533c5e4688d2b5f67ef4d0f22b0d2975f112f493e47a24 SHA512 26a010581fc65673d48b30fdd69308cee47c12531bb260c93a0b22429b2c342e78ee3d7ccae1590e71ea2fb1c9f33110a3bbbaebf8e7c4fbaab207a4bf9cea48 WHIRLPOOL d8a7a66969a1fd586f01026ee9e90f81afb8e4c2774d332109c47c295e28e3c45da0f44326dcdafa86a7f79c4ecf9362c345ec12c265e1975c5b380e728490d3
 DIST cat.traineddata-3.04.00 5356190 SHA256 29af67467ec1b1ffd4d2d9748f0219f2220974b0e53a66ec7234f1768b43fc4d SHA512 d3b1f2ff0d7d57fdbddbf9a2cd44fd1fcec08d13b82c6fd77a21fe45ef8e33dd809332b59d8bec0600f2596e0bf163605811539aca154eb11f7d8238e6df9630 WHIRLPOOL 94b50ede6a958d9c0c8128296a1dc9d2d3a7ce148f6a42603e8c95c4e968e69f0007a457744ca539854e6470f8eab9faa009f1ddd8b9bd266215a44307fad0b6
+DIST cat.traineddata-4.00 12704811 SHA256 8e4e3b56191ea751d1af402ef6e911d544a5a013feb9e89b14da1c9c4183b5f0 SHA512 d743b2515081d2121f294ba179c81a96f632b9ffec539777a3f1f1f54516a02d068377fed05ee7008fd6268e754645aec7d338043fda1340a4da432358248db1 WHIRLPOOL 101841659e4315479d0b5361e62ecd084cd3cdbbcb3b49afa72a67b0a5717da48f2481fba3994296c6df5c7b15b8ac9c055f5f527b47d9ddb1963fb3f035d5a5
 DIST ces.traineddata-3.04.00 11896327 SHA256 60c58ecd97875a41eccae4846a2e4bf74cb0e4bc066d1bc430919c76a19fb37f SHA512 de65b88d76fd50115099dfaac8ac80b7c6581eb0aa6186fa0c91c9cf12e90632a96de341b2faf94a8de1c5ed7b71c196571c914792b6aa7de42a3b7542ed625d WHIRLPOOL 2d906496e63304ee7e094ed69dcd1d97253e9802f16e338652c1550c4ae7812be4cc7bef6ac75fe1efb182f59bafafe61d3fd5ee54f37c0e1c65c85bf96614cf
+DIST ces.traineddata-4.00 22727966 SHA256 cf4270e56547a07ab342e78bacc3bb7fa72bac390520d6a91e8ea759b9f32f2e SHA512 48513c3c653aee6c6d7b22cd364331ee4ce5daeae6291b0f3eeac7cbfec8603ada5c64ae10f084ac12151d659ccc8957d040df36e68e605b34c56293491f0d6a WHIRLPOOL 6c7df1c1eede3c8ba7b88368cdb566d61ecd582ddb26c59657c8068d3fbc2ed90e1b8382c45bcf09f9af0d4618cf64446d381b3d670aca8597828a3a284581a7
 DIST chi_sim.traineddata-3.04.00 42089623 SHA256 323ae74d4a2ff49e932dbb4d6282fe0e67ddfafda075ec85803ecd077207454c SHA512 e3427c17988e777447262bd3f5704f84d1296a8c02d10f343fc6f698ed23b8577670bdc76f3e0ea53284a233de1e6d0f25224d984bed75bfd52f73e6a6945673 WHIRLPOOL 40b202dce49c25bac2f684189581567ac97ab5dbf00eeb6a06a00272856f5f0f0de22c2025e1b57e122af58af7edeba83cad28ef10a698e53c5ff5e598357526
+DIST chi_sim.traineddata-4.00 52662579 SHA256 c0b1f7a21638e2ae4e2fabdeec0433eed152ed4849a5e724f585437da5092e2e SHA512 18c6307c2f1d7f498df58a198b4bd61fb434651a1cdaf2abfea259f01d0064edaad69421c744ef3485134b49868ff3a5c75cb53db87d68bb1b746e29f9356440 WHIRLPOOL e4de16698b90ebe7c3aaf5ddd2171dc66ff572ccc05d92c2b60905adeebda1809f169c76277fb4ed9c7dd49781264aca40504d63607d2aef967d9e9618ba7e59
 DIST chi_tra.traineddata-3.04.00 56692327 SHA256 774d566bd0b36e4b6c07415dfa5b6b57feb2575b1f5f231d7fe01a52dac5dd0e SHA512 149795758dd51beeea3b9739395b599c9b6fac35862ef50fd663273709f00bab72840a6983d09289d05269f808a6af25b588d9740f54736beaf2452da1c735d1 WHIRLPOOL 3c8dfd8658a6b81d594a73c6da4d8e8223a38d15328938d92a8ee5e1afc50671476daa4f525b403f727ec8773b895f783ed3c1c68bb8c068fd1c7d2715708ed2
+DIST chi_tra.traineddata-4.00 67377986 SHA256 34fec4c96cf006a0810186d5ac3fc9a7584fc7ebe6cfa3991d663ed38eeb9d4d SHA512 a8300b785ae367b94059ea8519512474088c2202410aa74d9621fc5aaeb552125f257daccad1294456f8dd7ae07071e73151847b296b971c8c18d48ae519201f WHIRLPOOL 89baf4bccb54a80a4c91fc7b17758a95fa84d515846acba7640ba1f07005449d9ca114ec9af16cfe49165b440ce90ff37448c38a18be10572eb23a8507c8a358
 DIST chr.traineddata-3.04.00 1083194 SHA256 8bb20f8a78e31a4802fa9f1e075cb7de8d7c2eac5b7b33942a6d82abe0783acc SHA512 e0982f5069a9cab4ad274babcd00a7199e2e76ae02167101a24c0074a91db5faf55f921159da724391860c9187423b14b5aab096f90eccc604a32b2d30376455 WHIRLPOOL e5cf1c4156589eb9d1d5e290e03b5b87d9165608da3df2587621f5b876c65e1dbd2c290c7b6f2400853e8d46e54e2805248d9363172363d52000c4ce11fabf14
+DIST cym.traineddata-4.00 10333739 SHA256 adb749ca5879f9e5bb18af074c7bb7a0b5ce20f4ce84a00e05993957c2206451 SHA512 8f845d557be62195689ecf17b43c229bd33e85cac4cadf90b176e9a6d9f184411465be5b3534344b562bfa14b10cad6b0f47cb7dcece3f3d7192b13db7fd2e23 WHIRLPOOL de3ddebbdfc547bfa011dee04ed1a0e8cb723ace487de0de0141a44021a5085e513815563feae2cf79eea96752abe423ae0d29f9f0dbb62362f1dd62b2ce6e37
 DIST dan.traineddata-3.04.00 7340575 SHA256 f9521a8381ab1823be0808f933a9bb8f1172968a44e391e370b1fe9b4d913ee8 SHA512 ed320c5a3b93b5416ad1941a3e8a331a2f60570ba74b4bc2285e687472e7222556379c0ef261ae06970e3b9710c5fa89a26da5d509be325c2e627ed6e9f48bff WHIRLPOOL 3aed0bdc2613b5b2b98b2860a629e49a186a8eb28ae3ec958f212bbb939d263aac0a326ab4c870ba01ee6564e83faf9fc0e7849955d596954b1e761d9d76805d
+DIST dan.traineddata-4.00 16011554 SHA256 88accaa0831412b9ab18ccb72f60ed973d64ff634c9a796aee9d77347ba132cd SHA512 3b678b28d4d5c67c4781251974dc36fb8d430440a1409b67e5c7124ee3c04fb39fe545af8a7e8fd0e14a24ccde55a9dc32bae127eb48ad7c8eab16cc374fde48 WHIRLPOOL 7be1e3c751accff2e6e3e7fe86b78d2eb8c38b23ee599081df1b8d35a9707dc34aaaa6f4a10738d0bf84a34d8b5fadc6594c0ca0023992883bc9bd6667f2d6be
 DIST dan_frak.traineddata-3.04.00 1622710 SHA256 7183617a7ba763f59c1ed87ebc8b4885da03a9bba2b99d4600afac58fd28b1af SHA512 8bb21f7ee21f99e0eb8fb55bdcd60b006bb1dbb42946f1f7dce1c53bcbef46f5f6cca7aaf069b1b3c43b13eee2c7dee752fea8c38003ee266999752a9b466b01 WHIRLPOOL 629500189e28509d17fb6bad33a443c5f9a79126403e2132d63ad9a28516b8364462b5e7ee346eb95b3af357fe805a739f3e28d2e84b3f787d419156d3b9234f
 DIST deu.traineddata-3.04.00 13367187 SHA256 cb7eb42a7e972cec7ef904fe81825d7b547c46df684c814fdb11a930b13bca3a SHA512 fd4eab9e9203ea3a2f009c5feb337449b4ec2acb67b42c5420ccf69b342ca9afa655093d7e9b07d3ad435a80e9f59eeaf3ca578608a9136ca13ee234444d6995 WHIRLPOOL 554ebb795842f3086750ad55e826e57d0725e60c831ed7be213d73e80efce734983f53c1ace9d91776b865b7cfeb745554f5eb6f9bcaf3138be4fdca6c27898c
+DIST deu.traineddata-4.00 20193615 SHA256 59d92b49a22ff96964ba7be053a9e7198cd14c88f76788e7ce2555f5acb9a40c SHA512 23326861284f096e40834bac31ef4e9344507b9332c8bbdc10dced0c60743bb2fbeae79d888c80c56e796661a2232998f1f7ba64ff1e0c9bc79ff13bd0a2663c WHIRLPOOL a2a5d53f2242bf158baaa8429448c7d298634689127dc9d2389dc58856fb925c9ebdf62a463fc517f39fbc993a05cce416ed71e72dc330d46239c0219f51773b
 DIST deu_frak.traineddata-3.04.00 1978593 SHA256 cbb200e394485c5b515de203963c2a76c14bdef2cf258219ecf2bcacf6cc93f8 SHA512 6d458b657c5b88671e0932da24fe91051b7191105b710b18331620347407c5f91338ae951ee9e0464af2d93dca552d77b1e40d372dda1aed12bc209baf00d4b7 WHIRLPOOL 87e9d1645d01f5f6418516649b96274ad587b7d584eec72501d2435398038e5f57f5e910086636b51eb80bd666598a3af61a447a8bdf5a1cedcf7a8a0304a390
+DIST dzo.traineddata-4.00 8771208 SHA256 3fa23360be6e114296901c33c4c5dece0049b7ef0665a16cc8dd0cf94cb8e615 SHA512 b9801388c1e2e6355846be86ec61b8eb0bdec0c2907b787c5ee5cfd042a3889b8b4a9baea27775088a1e18597c024012263830ee238b4d8f7c58d31c607f47e6 WHIRLPOOL 6bc9c018465cdd3671cff9c9f3ff7db892509318dfe85c86a6233e69f156c115794cd59fbeef5dea84ea0068c3670648c2220a3d91921722f3778f39d7f162d5
 DIST ell.traineddata-3.04.00 5422512 SHA256 bbe0ed0758c69043114b13fc8f00a42342c647f27be352c05b4978e265380e64 SHA512 b542f4cad465332b7d9742ce64951289a22f31c2196335b09037e047c9fe2966689426d9e973173147aa7c0ca73cddb337c9ec7b485b13b80eea3e44ad31bb48 WHIRLPOOL 16d89cb546883bf75a8b75e55c0eb88d915d07cad0f4c5b3e0640385f4b7cb2a6aeeedce13cf48538f5a78ec39776ccdecef9c3264cd749e1d224cdcff5e310a
+DIST ell.traineddata-4.00 12594922 SHA256 797c80b46587c18b020a0231006b4ff6463ba923969eaeb3ecbc4ffa2f7608b9 SHA512 ba49067c8eed46992615013a09f58c457bf333afa4f152f3b1f837e934c71d04564bf1e9a1a8d80cd4aeac95639c19124aa586f3043737c556d28e2bc478fbae WHIRLPOOL ee877b8ff4bdc6cb17934583b8b6cff424e375b2dafbddf07db7a0a9f99d45d488c31250f87168da9518d528232aea10cc7e31b61934d5c9b71345ee43ad911b
 DIST eng.traineddata-3.04.00 21876550 SHA256 c0515c9f1e0c79e1069fcc05c2b2f6a6841fb5e1082d695db160333c1154f06d SHA512 e03d205900e3f6b866b2342eb8f32fb35dad28c7f58b7bdc3c0bec0de570f87578168d8d64b1f0bedac7bbcf462dd949b00701943a55ba3f42842ad1629e230a WHIRLPOOL e71cec7e7e8b9b8183f459741ce2eb1a33923e73802ab35dae81ab7939b980b028e4d4a3325205a52f67b8502323e9cd8dee6efd69ca40c0eb42b0961d5d8786
+DIST eng.traineddata-4.00 31873501 SHA256 1cb1468826191cc7d4158fe0a3014d3f5e3bbac618d754586afc86ddae8bcdae SHA512 dec017b60c7ee7c8dfe1c4cef562a02c8699c2856d6562641a7077c1a0b5493a26085fa81e7dfff97323054276f24eb51f64833bc2fe7bbe91b1955c6f719618 WHIRLPOOL f6e2b5b4dff3eed23ac807078af70e07e18989f3ed040c883a4556173c627556816783156e9134fedeebe1e62bcf60c97f3bec3fbad2ac2a6c50540ac5d29d03
+DIST enm.traineddata-4.00 10479188 SHA256 4f91bd9ddb757508ac0d65f36afef37545fe4d2b557451c1ec91d58ed55aaf65 SHA512 fe78e53eaaedee66e688291d684c221673b787dd3f020736f60ecdf4dd1257f3d2ccfcc10408a6ef50c711b538a4a3933c84d1ebfded82c2adc1685e7a9712ed WHIRLPOOL 2d150f66ad8747d4d42a718b64196adb8238346ed20c3e312e16f49b0e545ec51693a8015b267f5e3f46d0f5aecb0942465b3dad7faf9ad4233faa799df23f12
+DIST epo.traineddata-4.00 15408492 SHA256 7837df9717900031f54e28882f33e5d1676f062ed6aec6c38902dc6c0bd4931e SHA512 44230babdbe3ff366c0141f49ee524cc7eb1226be767e865b4ddd5afc1c1f99b67ccdc68ddc1ad0c8b3a368937508d9edbeeef099cb23815b506f1e08910427f WHIRLPOOL 7499e8fcba07c399ef1c864b2733996c359cf0dadca08412f1b265259e5fc55c6e4936bd223b94f9b0f97e54ce7db8c8912a3e3b9ec5be714eeb8ac5ee59bbf1
 DIST equ.traineddata-3.04.00 2251826 SHA256 3af43a2420ce927dbce68474d644625947189a82ce6ae4fd32106399146819db SHA512 2c5e5f9f85e956e0ebdbb25aa4e92bc163808ba9944c8d1ec9a76e4c70727c3657c6e56c86266a2e769e48c6f6d9aea72bf2080f723f3d90c089f775c3dae9d8 WHIRLPOOL 074d613cdb990703731deb228fbf4bec660e8e4be053bc8196ab639d14f84cb51e11a2ac285e4cbc4c362a90e2117d90a19b843cdf11f5ab3263d604ddd252b8
+DIST equ.traineddata-4.00 2251826 SHA256 3af43a2420ce927dbce68474d644625947189a82ce6ae4fd32106399146819db SHA512 2c5e5f9f85e956e0ebdbb25aa4e92bc163808ba9944c8d1ec9a76e4c70727c3657c6e56c86266a2e769e48c6f6d9aea72bf2080f723f3d90c089f775c3dae9d8 WHIRLPOOL 074d613cdb990703731deb228fbf4bec660e8e4be053bc8196ab639d14f84cb51e11a2ac285e4cbc4c362a90e2117d90a19b843cdf11f5ab3263d604ddd252b8
+DIST est.traineddata-4.00 21175883 SHA256 d4843e1615d8d01260d1b7b3d3beda182b7226f3becedaaa67889c6cdc5cf30e SHA512 733200cfb2e963e93d12666b28f7993af4a84737cf4c9a4c68946fa70076d4fc649bde93e68d701d1970fb7ac3adb2c1fcf89f54b0a35dfa56c257f8a30ab6f8 WHIRLPOOL b4dcccbb53b2e5f7811ec437e3565b0206be6892898bf8c5281485a25e2063843ab8b7c8ca942d7c055e54a24c34817632fb4c207f533c93c75a1aa2e03a0452
+DIST eus.traineddata-4.00 12542297 SHA256 ab62a90b031886f7769bb52bf30be7d82f09284585d777fc0e2cca3ad309230a SHA512 bbdab8f049a42cbe9e84d9695c6d209613ac35549147f000301954f8275b2683bbb2787df772f084e2f7887b2de9c0567fb424e80f0e82f95a14bbdac66c266e WHIRLPOOL 2a824adf3a860f756aa7a845727acef72c046a468a2af6dcf361dad7d65666f730afb39b394b3e29746388286fc7be72fc64058c17a962b7aab0877dd26746b7
+DIST fas.traineddata-4.00 10579225 SHA256 897d37f61416ec360f62745e05422c1a2f2087ce07f234d254d2d2e007c90944 SHA512 8423479acc7ed52156a0a4f3c574de4555e51979a98f60a760c86b5726a767bdab7a787069574cbe2f9dd11f9ad9a723b9b9f03b656e2b0e0192cccaeef0c3b8 WHIRLPOOL b731b58cfe26a99b32f572e7c5c1106d0fa83cb63ee49081b9f0f4f2a3e47e8c9aad5e4c80557aeeefdf35701a5e89dde78731c3e9ef89737308fa05e0a31eab
 DIST fin.traineddata-3.04.00 13274908 SHA256 f830c625f635a637cb11a6a565126b1ae105c24ae9fd7cb92c8d5130c7184cf1 SHA512 036e5e383ec4ffc0e06fb5a93d288f21360660d10c6daf8459edd3fb94f611ed49ffcfb9bc1fdd1d8476690f53950ca31963ccdb36a35d3330fe2ffef0a81789 WHIRLPOOL 9068bd4b23ac62d8b4cc846b10abb7bf536b786a8eefc32745ca99370eb6739b4ee9bd912b78cb0922e6111a0e8be2dc58285c0726dd2ebd92bb3349bf8344db
+DIST fin.traineddata-4.00 28467692 SHA256 650eb990e434349647e686f5578294678f4a3cac4a5381e43f7958dadbe99547 SHA512 a077a853ab89d2d03d5bd7ccb60af51544c7ef3afd230ab0e12dc616f28130c860701af314f6e73f24ccdca4fd8d4c611126df525fbded4b7f023a135ab3a094 WHIRLPOOL 5efbd39c9ff29097fb380c2f946c5a50227236d4dc847d662305277560586a23796d1ccd24caa61b6b1e984971d743162698ce8f897449d481a9ed969fd8aa4b
 DIST fra.traineddata-3.04.00 14044118 SHA256 86afb23ad146467f263e8ade56fd3951b1cc28f8c4eebc34f993d3c02d88a7ab SHA512 c41223608625491fdbf2d4fbe526da472bb5c269958e776b2058d4a782ebeffff9749e30c7db34adcdbd30669d82be97ee58d303027d5a67ae61b87b65c2e561 WHIRLPOOL edd6121dbfb52ca11ce86fcf54ec5f026d6b4341f824fbe1eab45af2e830bf1cf80615626b260c79343337fb61181e69b42281da78e6784dc28d244afd09a1fb
+DIST fra.traineddata-4.00 20908386 SHA256 a9eccaf325f39d7db2d5ee14f07818e517bf11f04d1de475e89ec707ac3a7824 SHA512 ecf1ded66b3e5c903161377903b5a693ea8221b155ac61fa88b0e2ba1fdb34cce8d8e6d0270a45ed822baa012d7d24ee15c6032a31b62d9b773106e39bd18603 WHIRLPOOL a2d3f6601b3903288ab9f076c1acc3d36908e532944718b3925bacf578c0a2dc9db9da123021c23e7160fd2ac9a42042495f3552acff4f47f7884dbfca253fc4
+DIST frk.traineddata-4.00 29861799 SHA256 210c3f6a42309481b6bafa06a492c02dc7ed58224bbc0a6687cf8884d6f327c1 SHA512 1d70263862960fd55e51bf906dfc2092cb9acbab94e46f57c9dc83180585604a12072c977f820b2bbbe2b7a26bc63ca4e24900ac95d4f8a0e6d45f0a485dc186 WHIRLPOOL cdf0562f2a0edfd644dd6f9cf443f3e446bd6f7932e0ea971b3d5db6a27d72f32f17474ef8febea6555796475e398560970f83f915ca7169c5ad4b779ce4c3b1
+DIST frm.traineddata-4.00 24482384 SHA256 a5a6e0a9f996d8330a0bd4ebfa22035cce55b677d327bd426019cd462e603f3e SHA512 946587cbbde6d4fa537312bb9cbb1952f5c30cd404b2cec4f2bc6282e3b190bddc4f2450e0f1904a1b5e8523c5651a5592fa892aaed2d2da7b0f1cc6f35f3e2d WHIRLPOOL e5078edcf3036a47a99fa9c4a55d0d81c7d6020277ab3fdc4d65228072605ce185c9dae817a59b4f675e25da3ab3d098268724fd70042d0884a3d432f5da206c
+DIST gle.traineddata-4.00 10190010 SHA256 7d2ef97cefa831545d2aa1ec88e9de449e87498f8f29b6fbcef33b0cf175ab9d SHA512 b8ac110cd62185aaf4336080e9e08df83f9bca2418aacb440345c5a00b2b938613ef1b13788dd4484791b3728e9b88fd739ed1cd042b82ca61341f541b4403d3 WHIRLPOOL b2869e089dfbe0e92a4fb97f3a47872db996dfc2fc08556028d58f97b787808a3de7eb8b6472f4357cb7d7ed145f908c6c87146f6a62cf1130b313949df299c9
+DIST glg.traineddata-4.00 12746027 SHA256 9ad4d863c98d0be7bbcc214c97fccc2b36638481d70706aa257a8540d392c9ac SHA512 3c0e34d0b2fc50e21bd1d08ec2862fe3839f84206669127b5a902cf9d61ffb38faa25d68154619053677ca2682cc70260d2ca443bc3ea4d319ce0ee4b21e649b WHIRLPOOL 3ebe8da307aaabe2922317979e659d0fb851e9df28b5177b21b830535635414e816d035d16ffef921725d9c779db5120c49f34508875ff14039767f42279d7bb
+DIST grc.traineddata-4.00 12838816 SHA256 ea737fac889cbcbf6f9507b1c0c409374f1b04870d66f4c6f3108c21296be545 SHA512 121aa44fd9f6b1841bcc50407c483aa7c94dc63217cedf655c393907e32d24e5dadc34f9c40c044153329f01010128c58a3ae8b6e30b8fa1419c1b66617b9202 WHIRLPOOL 2e29dd519dd991b589379265eb7f1820fb6c9b506db7a016629f3b95e0fc1f18e4e6c57efb3a2422a9d3b94b7ba4aa246c5fa46c01553b71b6658eccd45c00fd
+DIST guj.traineddata-4.00 22879598 SHA256 60efe00e38e19bee7885bd28462ef056c3ec2110555be9123cfe0636c8622b05 SHA512 47cd56dbd2cce5bc1dd1947440f03ca3879df8526256bd4f8973fc670046f68eb4b5529f13402af9e1580c4af272f976a1a95efae1126d09208f18c7aa9d7b6f WHIRLPOOL 91c3330959758cf850037340cca3a3cae4a7493fd813c16a0a1025f1e81708551bcc14457554df0b578a71ff3fb4d5849670d4cfd7bf689555295f0f34006aac
 DIST heb.traineddata-3.04.00 4339016 SHA256 4f79288afde9162ee27841f0de999e690022cf1e3bd1723e34ca8f189c4bea9b SHA512 9528f3b0d63bb2bc4f90c33808208846df2e9806085f134d4d6d6cd4ff96fe30ba3ae58db222245a7320646319526185ddc29cfb728d6db5038988bcf14a7727 WHIRLPOOL d9fc11c9fb6a87fa4f0f1e03b63fa3e8a33dfb8f32b66b127172bc1acf835943505985f856c49d183a028b5fab66d7c691ac66f6ed3f10199bae3d7f669058b9
+DIST heb.traineddata-4.00 10992421 SHA256 5f793cfb994e586356114a92239bb7965702c6c58bfb5b1aafcd5d63745faad1 SHA512 b86ae5cc2ba7a1d9b3e178e9eb9153f2de38906de5054f494f0e4d35fb22af0c479ad9400ed8d1e625e648a7769778966eeae8a4064b1c9c85c3b78a7235155c WHIRLPOOL c200b8ab25d95679591e589c53e1437e8dc6b44f7825d455351fae4b1460e2415337a92a43b674126d4e32f6242d908bae77db8b2015ca54d6c828e3848345f6
 DIST hin.traineddata-3.04.00 14152165 SHA256 6e99459dbdcc40bfec132747bc233054916bed9da02f89567c9388c32e2fd6ee SHA512 3ac300090fc39564079aa3ba70dc09841d0fcf3181ff2f25e50fc5687c17ec9e8a5f5343879a87f7362235bafe074025de5eb02391fc68f0637f8bef1c16c3ed WHIRLPOOL ceee2a21820c0d77a788e2f303e6d128a8cca71443887ad7b922b0079a120e2b0bada1d4cc6d54030ab4105093d11042be9597219a4ccf31ce2860bb58a31b48
+DIST hin.traineddata-4.00 25757980 SHA256 ccca65fe8a649f2391c36a00b70d94725f90bef45775a38baa82a1294f564890 SHA512 53c55f22b3d52a852e7b1a699eddf4567e1b72897c4f5ca2cb13e0968c1e40d0a9d80ca84986c35e9b478868e1dc2d86b65873960d21f8d3671980a796dae2fc WHIRLPOOL 5bfe6e7620347ba393d8be3a53bb8bd39418a11559be5a67ca049d7124be7f5013b86e4395c5a718240d6c3951c41f683ce1a334c1e2321e4427592cb0afdf52
+DIST hrv.traineddata-4.00 19582927 SHA256 c084acdd2943d0315547c7f5af68814c2954a05cb8bc5695557aa679108762f2 SHA512 35bbe4c202993d421a29f63390b2b5e774d348e15c9bfbe88b8e910f949fc84e3c9edee13fe47a3e8629a55384ee880f815d74eabe85fcb775c9d4bdb16e4321 WHIRLPOOL b59222b999c377f5818492fcbd380120adfcf2a358cfd89dae42ef77feef81807ce3c7d3a8ec47a08c3c7ac3f2ffd767e9a4023d2a4522fec5b8cf2e51656aa9
 DIST hun.traineddata-3.04.00 12213770 SHA256 a6704d2e8dae62240597342c33736cd7bd836a88e188fc74db038ec87be3ffa7 SHA512 cdd6957f83a50850b30d66de5063db83d0612bbbf3a582aacf35f011b8b595ba5dd03f4ffea784c337ce568bdd1cc3cdbdf96f5fc80783bad634a785f12f147e WHIRLPOOL f475ff06bc43215b9f9817da4a7958167e273bc25259655682bcffa81ce96e2944efe8909502b47ff73eead791af65356179685f4d38e7c8671f03a5883dc054
+DIST hun.traineddata-4.00 21667149 SHA256 2c1f9144e3e4a272c6f063f75b9dc963aeadac78b57c3145b7d4976b0f444e99 SHA512 f59a5b2291fd5588b4107936bd813209df174e5a6494af6b3101f7f426501c00d78c3c2e02a9e3277f2b802ebd6e1c1b95825f8e08a9bf7eac12bd149d9fa4e5 WHIRLPOOL 234395fa396a3514feafa0cc51d8d8245f02150f5c811f18541df9fad5dd4d7bad67e2cde19efd7eae3067d06e5f026977b2eba1e00a7acf5433de684836c538
 DIST ind.traineddata-3.04.00 6503178 SHA256 3738deb007baf9f01b3a601835003f71c314d1b955f8a743634f6f1ec8220d88 SHA512 997b0acbfac262d8889b47e8ad3c9ddea7893b89fe5edcbdb9a7fafe68ab4ac9e93e67cc1806bc6f4b1e1fa669da034687fae982318f9e05ad4716da0f276c77 WHIRLPOOL a564f9fb7b481f95466e5d65d8e02326df629932a52125b277ed11479d1145f911cf5941666b18cc8ce7325806a902c4ed0b5cb613cbc41859088c21b4142867
+DIST ind.traineddata-4.00 14281790 SHA256 e2d6adc8842b4d5b2e65953af736b2c77f434a59ab90eed26ed61271de574769 SHA512 1835d1992975214c3a85a436e78cf732c8f8a1464e8c24109f6d1dab65764f4a1b0757e32166620637074ef02d0749eb494e66f4932d1e0af11ecf00fa7bb28d WHIRLPOOL 8e3cbd8b77b1afafccbf5bc9bfd042854c1cff8e7764b9f6f1d71c41d23d83635eeff38208dceee98b5ae733e100c255b9e975a333ab1427a099319cbd866778
+DIST isl.traineddata-4.00 14374305 SHA256 af4989b7141d17da728fe118aa49abbeed40aaa22eae862137e5839dea54a9b6 SHA512 598e827226edeb843d03848edcf95cf41a8adec2aacb79c2be47411876a2fd5650bffc1e6a252f3eae4b148667dc0a7e02b4130bcea898c6ade9ed99af8e9299 WHIRLPOOL b22bb508cfc12d89703bf7a3b9e8d25dd17e02e1552cf23e8417925b1020d7ebe0eebdac4137f095db0a8dd152f9380100ee7bffdb32dbfbcbf96bbd1df47734
 DIST ita.traineddata-3.04.00 14210569 SHA256 5a4e6e826e021d04f3494c2bd74ed1af5977b67fdedceb3c9aa30ff6c7a4b3d3 SHA512 97566bb89803656cca14d3559a46734b74f7859fa651399705de8a22259828e76aca2ef8d27f486e3ae7779005772966155ef190ba666ea31b7bf8c1d2fe53ef WHIRLPOOL 3e2714679db204426e1997bce5ad8616fc0413523768f9e962ea73b1272041a2c7c88210600627d079be2ce41f09f16f67c0d431e899042181199bf924b08a26
+DIST ita.traineddata-4.00 23586689 SHA256 e9ef89885616eb98774a4258ac0609484448c0e2d4dd19a3b2956ac2fc2b7a6a SHA512 0e32802292edb6bde1300a28af43e720e8cd6ea28e236865b01f8f5ff7b2e04b88d5d1ff2c32bf4fe20691c01aee4e524411c4cabb612e881e7573dc836ed0e6 WHIRLPOOL 27b8d6137d8791d045278b66e0a30fe8067169647feffb8f9bb0dd8eb0ce9cb6980ae145fd84efa69ea174c046e3d5aa788b892ad66f243d9a8ca9fc2dc68c32
+DIST ita_old.traineddata-4.00 23437150 SHA256 f6fe55e7d34a750355306dc990556cf02fd6efc2182a75adae5c4477ddd747be SHA512 d0e98445f637422dc24350c7d29c8e3a3403a75b8a28322706b5dc7c8588e9a74796edbc39036ee44bfe68964e7aa60f430682ac2385501a4fd8653c54d01c5f WHIRLPOOL 1daa562306ef6cc1dff9fa88d19e9e0214497ce66da474ba7a472cd8f8423baca414134a0e7ed1cdc6bfce109be6387426907c2fb99d26209308fadc090c3a32
 DIST jpn.traineddata-3.04.00 33072615 SHA256 3c3c957cbbfb6fe66b38b46bc17f86158dfdb1688a2a28ede7ee0ec891f4aaf2 SHA512 23d2880f19e53739bff456a2e656924ea811872f16aa6bd52c87afdf2d7f639896d9b732ad0eea1966acb3ac76e2ed17dd6786cbbfabd9602f4af229580bf567 WHIRLPOOL 67bcc22f05f19f196b8349e73659d2f5c3b41fa1a4a73dcf824d058675037b96ae23873aba99d084a8409abba6d75548b4f1dc0f83ff38fdf29d1826fe2a9978
+DIST jpn.traineddata-4.00 44380238 SHA256 5ab3a7ced22f3f8056ecd1281075f487c628d275827a50a295e14093e6acf225 SHA512 ff49dd391d718152232b1db45ddd909441c9b6e753d56ce66ff637421db0e3876d7f2e66901bb67f8ca42c34d009d519e6814cb38fbc4403f63791754fe2aaf2 WHIRLPOOL 4b5a87fa00064c11f11a5a58423f90f921201ed88abd8b83dd84c7e582fb253585fcb0b8a6d3feb6e86b550e0f9eaecc4b84835d6cdb9640f01476f297a800d2
+DIST kan.traineddata-4.00 49079291 SHA256 e90a77f81ec43d1ed0b4e032825b6ccfd2972ad23c10d70c0ebf5ab3284d10e5 SHA512 b407ac1d48f7d60d1e2ad67dffc0a7d0756466bf4f687089f62bbac44d787804048c95ddf83565726fcf5638f9986e11fce163c008bce92b51d42b4016444a9f WHIRLPOOL 35f61715f296c0e86990c4999d167cd7fab7c0323d48c659801ebf328208af56baf889b4b93ab395a4b8634b201ccef19ce9431e6bd893ef581a72bb1199397f
+DIST kat.traineddata-4.00 15490959 SHA256 0069a55127ac156188ac05aa01aa3233887c9f2dfee264f81221788b10aa3ef9 SHA512 9af3cdfcc0be350a9a2952a478bd5f12cae0a688486dfb391b5eae9a44c28b24a05209b08feb36fd7b27dde86a300bde32b569596854370ec5e08bedcb39efa9 WHIRLPOOL 55e3768590e449e857d86ad4c10a10f6a3f212130f2b2032513a57965c3e14eaccc35f86958256a65f1401d16c10c8f13fd9a6aeeeb35ae4aee80018f90ca95d
+DIST kat_old.traineddata-4.00 5981988 SHA256 ec5c6ce0a2f3e1f2dcbce60878c236df7451c587f599761303620fd4205c1dfe SHA512 d98c6ad4a345726b20178eb018fe521c5e811eaeb79f7eb3c6c2abe4e984bc9bd03cb4644942ea24aa88e01a5972c8e1e3df9374b4f0e5e6464c8f5eb131b74b WHIRLPOOL c010524a98e49e4df6978dfd703286a662be33a41323936ecced2e47fbfda6e9201d9e96ad6ed2273db13359d3aeafb5906db1796c229e56d8f1c462a25204a7
+DIST kaz.traineddata-4.00 12616561 SHA256 5b1f7169c076f1b7574b75816a2edb36cf24d3e7426d877535ba2d1f466d0437 SHA512 742bfd1ecd6cc06b1f4c89aecd64439b981d5194933fae7a8fc428b3b761b99f9cf54151c3ab2950a9e3630ffd28ce973e82c4cf3fa6b035a1fb60562c038912 WHIRLPOOL 90ef4be1d4358594fb1940d6be5d39e6032ede76d3f682afa854f192a0c8ca79671b1cd8cfd4c09ba0d50cefb8f8366c24d4c18f262beae27e63e79470fdc5da
+DIST khm.traineddata-4.00 54152200 SHA256 d3773943b7a93272d8b333abdb9c3ea2f8ac4de453c60224cc1bcafc363370ec SHA512 3d9d096880e75ca6df0fc47548fd31f1035b2527edcfcfc6df926f358fdffc9ef8b8347cf7d58bfe76ed1b0bc8906ec02a0e493bdcdca14a78c251aadca56b42 WHIRLPOOL 81b837e0653db7622843274c75838a76a7dbef5c7ffb75f6472a4e1f43049923781c5aa45a4a3480dc4d1b840b83401767543dcc19ea3105d23d2e35232c673d
+DIST kir.traineddata-4.00 13994013 SHA256 f2eae5116348c61d925a62223b761809ea073ea8a42988f259bd3699b08a70c8 SHA512 399c4f53a1a6ac8c3895231d15fdd2e564e2fc81b900dacbc1d39fde019f2f881be83ed79c2a7637b5ad7a11be0139275929f4cccaab388583ad107666776582 WHIRLPOOL 64fc4a909987cd45889b53a7f7ef987a0c07d159c391d3d33a51b989cda90a6e0e3b1cad2dd26041fed4a2a0156e569d216da2efc1c3e59da4ce7a93fcc29263
 DIST kor.traineddata-3.04.00 13309831 SHA256 fb312ebe119a7673ca68c0a9f7b9ddd13a704f64609dd22f2fd606889c918de6 SHA512 83d44cc7a870aa3efa6858f09ed1ee50d810e29711b706d6417d2aa79125da13bcd8f50e107dceef93849446a0506d122bfb8ce649f7e1e7181cdf75a6e0e4ee WHIRLPOOL b8adca986f62de6149f7b9710ea71f29de61af5aab7010b1de2621e4b5b546289a11a176192cb86d4ab3b2fc55df76837fd70c37fa2c3659da527bdc10d7d7a5
+DIST kor.traineddata-4.00 19342144 SHA256 97aae68095e6fd71943e91bb3f32706e43ff31eee165e06783d078adbca930d4 SHA512 1f932f25b60ec8a1f375bf03b9e51f3457d0259340bb4bed21bcaae44768c5dbfeb3b2dca98b88de89d8b52cc6e38dddee61315d4a286833186e5fdea1e7f773 WHIRLPOOL c13d771a48ddc296daa345dc1ae8d0decc6b3eab63606af5d3d87391982b2cd0e3b2f36cfadd3b2557e92693b80dac9400490218fe4edf428b8caf0c33a2340d
+DIST kur.traineddata-4.00 2020502 SHA256 2c865e0519fe5b8fde0b6e2184745c9c06ec96eb93fb13fb7ec298679abbe2b2 SHA512 49e0661a2517632543eaeebd8c6468231f811bfca513731c7e5b1b0f6c0f1f1c86e3e8d757bb0cea1af077db46517cbce72cd8d9d71cb006c1ed6a51c9b8d24d WHIRLPOOL da7b7add6a51901b6484cff3eacf44fae96ccbc59ce30b7888a7f81f2167c1c0e1ca8701dd0be77270350a63c91205d52bd92d408e67d934f266955565690db0
+DIST lao.traineddata-4.00 28962138 SHA256 560f041738ec66fb8564fd1166da731989938ed19edc17dde6182e8e57aaf09a SHA512 75e56e234e544de5c683801be0e0c5b41cec7553f441c302c4ca1936c73afe2a0f467118e5b773d574495d925f54d5607675056674c0908362735c6a1b777a9f WHIRLPOOL c3ecfff4c11b840aec56b7d4285680da0812113da5c8c2bc7b9f9080c34f531f92c6dcd76c81202f14f5c96aa925e9ec457b40b1a7ee3cd4ec3d41d7cf2e7145
+DIST lat.traineddata-4.00 15241172 SHA256 04ab8334a20feb8e73e5b0da5b5c1c32d1e47cadfcfa44c90f953415ecdcd08e SHA512 fef165eaada48f0c423177674061e05f569a3973e10423a78c2ce8fda21848e421150a9ce47f4185d70a72a344239715b2199d82dc5f609a29681cd85ac53234 WHIRLPOOL e3b976d679d669aa04ad6d0d34abc2cfd8c8aa5fcd9f28b2debec0a58b7c5ce2d7f9bb62eb31ca7a59ea8281b6a96630a3c47509ca10f44ac5a9343189ee1c78
 DIST lav.traineddata-3.04.00 7802105 SHA256 4f1f06376f498d0dae11fb03200ee124c615dc848fee1c05aff9187bf8f6bf3b SHA512 f45f3c722994c627a681bc38b66f64eb7d33563654f35ad838acdc11f66d7290eba3af3cb41aed633af981316f71fe44cc6fc20a0229b6ae20f3a96a1744a16b WHIRLPOOL c1f2c9a22f98d5c44f8da541baa48f02b7137eddecabd04a81ad889b1a0088f1d97e4115376824b780e8bb5dd15ffbe9302339112d93919703e65d139975923f
+DIST lav.traineddata-4.00 16963807 SHA256 336311ab7ba29d9de3a5929ea7a3baf3460f43aabbcb54afd0449d577e5c900e SHA512 c8ab21a9de64b13fd2e96c8300e77d81bbbc8037ee8cf38cc5ab98f3b81b2cdf969dd4a0b893cb3d545eaa24dd3fface55b3da3cc8350e6e3c8ed71134ae7018 WHIRLPOOL e3cd23a5bb79d781ffdd5614595c7398c365baaa4ac338f7fc890807a03b82cead0cfd7ac38114c2816a05a9c3439c58246c944f0c9fcc6adf894efdfa44bac9
 DIST lit.traineddata-3.04.00 8916163 SHA256 158a5277572f04bb9fb070a3bc00ad3a5fe7a5e25856c9f92489662ce57b0038 SHA512 cebd5fdd1387b919c6327fb8a6337c44787bfcde283e56dd71bd96b22ac4435c2a55418f57c4dbcf11f7174eb4feb736370d2b8f5ed2184a3c8503e13fc404d0 WHIRLPOOL 969355747616e5b7d5657db26b2c1efec3ac8b06c2c63d00e9dcbd876a7fc8da207d6c579e0179f0083aae134e23f24be5ba64ca7a54e0015c9f130bd3b20bed
+DIST lit.traineddata-4.00 19560399 SHA256 20a1b5460d6dcad1c2d69fde51709a7550ab5fff7625b4940695fe4d71b0fb69 SHA512 e8c7f23bfa87b23a80c15929e0697f6a9a2fee62b298555bcae61aed80f9cb4528e54c92733c844a69f656e98e302a2415cbc4ee54f3c5f2743ffd653fa78e37 WHIRLPOOL 6b7e6300f7a9f776e84fcf5d0edd9f56c9f25fdeb0d14b2484d374a7a230ebbb79fe8a888f98a5500dcbff538148b8fcdbb3b7ea2e8f7847e67784c210f4cbda
+DIST mal.traineddata-4.00 21778761 SHA256 2c34c9c7440af81a7aa62cb7d5bed1a53f97ea9cbd82e7c352440570e8063190 SHA512 2b0cb5ea506a91206f3e33c5c7db7e48369cca240aad57e78c9a8b642826a3fdde5b0b1f5d83f8745db4d9ee66f96e6ae8d321cd41ae93f6759c83927c235bea WHIRLPOOL 01f0494848ab22b908a4cfa2bdc56b1c561fcce1254bfe4ba88d511d117b552716d0dee928d92a66808c9b8b561cdbdca2be5563c907c671860b591a362ef127
+DIST mar.traineddata-4.00 26199347 SHA256 f3a9398f8ac7b664c81bcc5ff1c0dd9b6f97da614eb4480f23c7f911c9555fb0 SHA512 60fb8db91831476a7bdb70d64f16811a1d244286fd92c2db65b7d53e177aa0141149325d8eb87c29a1935a7942d74ecca36e7153c656c47366a2eba4f35c815d WHIRLPOOL deae3034f7df6156524f470b6f73079c324b31c1535245bb0cad904294818c79b79ddcec2b35e02d262a88ea35278f3eb1c2bcc542a2228f396cb0dea822f29a
+DIST mkd.traineddata-4.00 10485081 SHA256 957b8d55af5efe12bf36d2600fb0497f7cfce99a613aea8a284ddbe4e054566a SHA512 2bd8220e6133c7e60980da687fd8fa25ef227de76326bff70f7e285ffa7d30c05bbc0ae57af346fc17dd37f5c1cf408b976d8983be264687517c292056daf75e WHIRLPOOL a903a525e707051a25377001252db209e18db7315ab95c17deb1634585e6ea262bc751b7bfaef410de0fd9bfed4f2908c56f74976ed75d4ad0cf3e13dd5ac918
+DIST msa.traineddata-4.00 14604064 SHA256 0e46cb2898e566372dca9a2343fba839025a77c00cbea465cbf8abca5d4af9ce SHA512 deb9fba173fd967ea6e92b68f79417c126c3b2d25b67eeb4390a6d27d04e585e27761c1c81ae8c03119a223570bb1bddfe31b13cb5450666253cc1a8fe83b9f8 WHIRLPOOL 8663b01b928e202b24c665ca467416b131fe07c55c758bbaa8da179633c3b4384df99db4a0cb8ca1ca0e4f2f7a21a5679f4a8e051b4ec7b69be45f648007d64f
+DIST mya.traineddata-4.00 75085274 SHA256 cdbc5a22978fac4a3cf0fce793aecadd341d6d0a4bc30daefd06bf47fc7c6391 SHA512 681d641eefb389636e59ddd9c3bf23153d0bc0aaf4a6bebeb15af4cda6a9069c78f64e1eea75abcb06aa563ff074ba7b3688d54025c71a073c0e88133bc1d7ca WHIRLPOOL a39ec612dbc411368f674535411309650834561869ef16191e9674725ede7570d0855601449d70cbe195dca43fad9c3b372758607f345cb66e8ee2a08b24b823
+DIST nep.traineddata-4.00 24248362 SHA256 69c7814418482736247d5ce24bad470b6a1c420aaa829e56e12c28d70c6dbf10 SHA512 f289a240f2d9c442b8c4cb678d849547dd3c8c187ad4d4e5829c98c925fe07e0763679e04c8a2360a4a0a77644dd191ac31728398a807731ead879896e4f5509 WHIRLPOOL 31c88602500f9405891761b8dc5212706a810ada6e0d61bf1c86acb850cf42f0267635fb08100340ad2514dfa69846a71e603c03598cafae36c6449f3b152b20
 DIST nld.traineddata-3.04.00 17098919 SHA256 bd849345e8476f47b40c17204fef5cf64287244c19b9d17e297ffe70fc5c9cb2 SHA512 adffd81fe6fdbc94f790a102940dcbf913d51ab1a75b7ced9818f88df5c9444f2f3eb6363523084f1dd474c98a558e02ccfc32d83ae73af2af180334c1c39a1c WHIRLPOOL 508f0107b19862e50606c86240a48c13336ca28816acde8a697b2ed28ceb621e72f629a97fc4d551d4dc6e9a9c69e3f2269f629ceb687063405c61894565e3b3
+DIST nld.traineddata-4.00 33075399 SHA256 070817e07ab27c1f715fdf2cb49b8c748a75ec2f9a312eb299f2db554606b30a SHA512 248ac4048b8909e325bd3ca4edbe48f9853eb8fdd8ad9d1950a557706fe45832ada8dac9dbbf033d33fe676101fa81f96de1c691465b77ad84e29f1307eb2846 WHIRLPOOL ab8860f4c14de9399b843634e875bc62d2a000481ea1fdf51ec104921aa44ec7425de6bf6398287fafa25e23ab44f4c299a3cf4f9ac3b7aab3d97ca32075fcd2
 DIST nor.traineddata-3.04.00 8262167 SHA256 a990269f3d815ad206ea0f27b14d07e7a0be0c171335397bc0b46ea0cdcfdbfa SHA512 4e943a2e19b10b3c8c862e23e78c70f6a02d3c2ebcd01a90b7f25a677f92b19bde052a6fa48f640c0d8b7d74769fc7fc45ab1c412339cb0e9e108926be439ce2 WHIRLPOOL 3d609ed7c818f0c2329ee2521c5bf75165f9be317ad7d50d12aa77333f3e069f4ffdda904b3c632b01b921c3aa6778b08d8e955935e12e28815ed0f666adcc17
+DIST nor.traineddata-4.00 17444731 SHA256 d3e94ea7e6f79e03a4f395e1db70fccdfb705d881e5c698ed8a37b5c09564d34 SHA512 9f439a99e7316796c9d1fe3a562ea056459897d1cb195fe20ede546fe09b46dff9ffcff497b6db1ba1d9e82a914724f7645ef33263fdf9d7a86e5102802ff1f4 WHIRLPOOL 3ce55885e9dac14031fc11b514b456af3c83eedefb5fe719fb0e4d8209917c69f7035438134788286529548f8d8d8577a794b558ae7142f8b902152a5dc67992
+DIST ori.traineddata-4.00 14655225 SHA256 c788902125b7f02cc71a29dbbd4481422ecf2e80d218a8a3fabdf18a523a385c SHA512 532f3b0466675fb15f22888323bdb4bef983204169333b46387820add7f7d9e2d79bda3b65cb7a0825d20da13ca721c1233066592de0145555ccce2da7e0ec6a WHIRLPOOL 456664d5af44cbdf3a29c95147d14db884d84f3f0e5f1bd34a5a311d03af581cda0ed48ac7aa4d4281f8733c892cc4dbbb144549cc7c15c5da9ff750fdf687a6
 DIST osd.traineddata-3.04.00 10562727 SHA256 9cf5d576fcc47564f11265841e5ca839001e7e6f38ff7f7aacf46d15a96b00ff SHA512 c54f481903187bed19cf14c69b24c44044b540f50814de66dff8d35e6987eea71ef4464492a8fae9242fcb22cccbe59e009f3a4dab6c36ad63f78c52ebe9628f WHIRLPOOL 909efcb63ee6eebb9b5b28eb05548aed669e21081f708e51e705da42f06e8694a7fa5338a1e5af27269f8145cac7031ad730238472747234062b2f18ef2fc1be
+DIST osd.traineddata-4.00 10562727 SHA256 9cf5d576fcc47564f11265841e5ca839001e7e6f38ff7f7aacf46d15a96b00ff SHA512 c54f481903187bed19cf14c69b24c44044b540f50814de66dff8d35e6987eea71ef4464492a8fae9242fcb22cccbe59e009f3a4dab6c36ad63f78c52ebe9628f WHIRLPOOL 909efcb63ee6eebb9b5b28eb05548aed669e21081f708e51e705da42f06e8694a7fa5338a1e5af27269f8145cac7031ad730238472747234062b2f18ef2fc1be
+DIST pan.traineddata-4.00 20032828 SHA256 ae91e968970f8ca27ec3321399e499a7ecfe7fa03644c65b4b26b1a9f2e5bbe6 SHA512 c86547b2ae1dedd259237acd59417cc1a181dcb2960791974dea2dc7cfeaf1d7604988c892ae40b5d51b63573d3fcbfc24aa87e2e068f532ecca730cd3395872 WHIRLPOOL 282be74e324e51643712fd398298083a93706d9323205522856d825f1116fe2c3e1fb70617f09b9d122d147d10587a63732ace70746015cf204ea34628be84cf
 DIST pol.traineddata-3.04.00 13918058 SHA256 1d2292319d2e3c65e15f19f55b961c9b492651fc179f3bcd219affe7c141bf94 SHA512 e1730d8bdbb296d223000747aea0dfd9561401e17f37518f4f7ae6c1b13cf500f5f359df465013112e126fc426e3e940b5dc98f84bdfc6517a73a1f8e8fc4c10 WHIRLPOOL 2feae8c53b76358a4c51b4760e86015f313cef22fcfe137863ee7d0ba2baf802d1de929e763e22297d6c3b5328f2eac5bc42aa65b39f558bcc9ba8b51422fbb6
+DIST pol.traineddata-4.00 25941386 SHA256 10b5a77c4e865ccaa79984879457df8aea7b6b0caabd9a5860733d485c913634 SHA512 42442d52aa1afa52274b307994a1470bd643b017ab3effde0a61e44a22463fd17cbc516cfe2bcd3bb9964782315b08a95d1dd7b40d3f31c04fec8109fad224ba WHIRLPOOL fff6e2d39c728370abfeb95926e121a1c1e4b2b64608b61259dd01d388ac9a1b4ddaa69d563e86e887a6ac15cde9c89238ec4399e2c83653cda910981fb16cba
 DIST por.traineddata-3.04.00 12914622 SHA256 089fb419cd7bd135236244dd9a4b8a42dfe2ee97d97b481efdd7b92c9c6324a0 SHA512 cf771fb86aad468d73c879049382b4c88b978eb9ac450472b1729f2cc86e713e5ffe5bdd3f226e3f6e6340e38e115d201046849428b05c2a3bd406eed240ea03 WHIRLPOOL f7142c9e86cbbeefa10ed8375518f3adb61ecf6dcd0c8ca55c6b54d57ac279bf9efa56ea92ef05c38a14168f4344ae82058556b948bf516bbac2a0886e01453b
+DIST por.traineddata-4.00 21457953 SHA256 c63e1b06a52ff00ede0faee27a024cc37ed9c350cc671b827fb7a173d99f3293 SHA512 5bc95002bda1fd0cf15d3be6d417fcda952417c5a9e08c46f3bcce859e89be2359ec4bb15199bee0cc72b407251b7b4ee655d67d46f8738bf29bf2b12bf3b29d WHIRLPOOL 012a644fd177060043c7707b27b3b6e613e790b0115dce31bb16d3a895d4796d5720a8feb378f2f6fb20703341aec441ef6815f2e35be68855873986e8e276e6
 DIST ron.traineddata-3.04.00 7957608 SHA256 f4f3614d4b009eeb0ab5815ebef080ebba7c470b3f80c9f97ed6da0d3f409986 SHA512 921aec7e0e91d7bcb3b85e2b0c5544b105cb01516c100eac21caedfcf27da678c392574c3dfedc81ff52571a8702c91ee76529ecea2b6bc3e155f6e2c56b951a WHIRLPOOL 3257cad73ef2f12b91518942669463728a31bfdfe9db4e604411ec02edba4933c047ba6df9eac65f46436e5f5242fd58ee3070d59b9b140f3b8c3fe19a74bd43
+DIST ron.traineddata-4.00 16545516 SHA256 d174190ea050c537d69b988ae75d4e5d8eb718358b6ef0b55bf60b00ccb680ef SHA512 045eb12025bb4e85edd7f82407287e451432411303a17bfe2ae13327a99f568903fa6b105d3fdd6ab066161821106485dbd8d44931b2eb357cd6145adbcd3d65 WHIRLPOOL 854e7392ad61062e62b95f7802de321b2becc6f4ff69c707cd1bf16ac889621b04ba974d795808a3e0deb2a0921eb2fd427b96d64c070f0be6211193e726b237
 DIST rus.traineddata-3.04.00 16152507 SHA256 1800dcaf043e95007269f07168a12258cd8b87bf413769c2b5a3d5451e45cab4 SHA512 e5053d8b53a676d800f490276172f16f2754e009408164958ad2f61071906042c299b23fdd3dde4a10026e42b19d03f8a8ab7de2fc29d8b9843d30de5c36a335 WHIRLPOOL a2d14ba6ab87b681bb95d60527677268ec7ffeaac59fd6a240fdce023fc5e2f2377f3250a7a393c14221f43f8c3ea7e7a93dc83b9fec3e7bd37d1fcb0a53f658
+DIST rus.traineddata-4.00 28115168 SHA256 fdb9b7abbc417661b54ee7c4b5ee01a7a95e828aec3bd8bd912de4433fe18c40 SHA512 4a4524a4759b52e7936518c37aa3e60032537a5a2e11fc8ad5e48bf92a2f8efc54cab3962db5e980b9d894dcbf791ad796c55b875eb95b7f03444eb75c1cedee WHIRLPOOL ada91f2d6700b39f993a84751f10bf336bfb359c88897ea83d86481f4acd203ad21e9ffcd6bb2def86f94e8f08704cf0cd392fa563ebcbf046feacbb0050a037
+DIST san.traineddata-4.00 44276691 SHA256 8d112844481d48ee3252cc053b959e81592670ffaa3333efb8b7ebda403845a5 SHA512 97c266b3dd7b557575004d432ed7ea09ee44cf168d8f00a0dc544ebcc4df736c175a88f9c0b45a600d99eb7b3616bd2ceb96ebd2eae67b43f9d38bc35736d006 WHIRLPOOL 7793fa1b6d3c856d37380daa2e9413f30f8d23da7bdf9be0a2dba1425f7126f9fa7764142d20ba441ec75066d11f329659c450239b177f730ea485af96ce69a4
+DIST sin.traineddata-4.00 13528944 SHA256 a18aeec83bed7f88f4ef38cddef2220c946f217ce0ac6229b38387d997b05b2e SHA512 1dc149d2c9e1c394d2945a6c41a9885ba05a82b6b629f87157d8439932066fa54b5316aba0430c4f861703a8aabc3cacc1577992d68869a988b11d4b93c71140 WHIRLPOOL ce7a2a2b8e6a5ebfdbb3cf06f96d8b8ba955cc6231ffb575adf1cc98984ccfaefb7a112aa3613087a161df08894977262aeb9a220f17975c6e8ce7ac3d13a905
 DIST slk.traineddata-3.04.00 9126966 SHA256 ba5d2aba09f59e1952583825dd7b0eb9ba706283d1c0f93be8d7381b5e5eae2f SHA512 33fbb9ee9881eb68b1e75cf9c7cacc31f306bb4371139894271e34e201740325ea26fb9622e4cf980a6c3a162568927a4085c5f63d483146fa2b2fe3d4b85a96 WHIRLPOOL 133a028dbea660377922a7df3690b3218b1e68735c6b9a19b2eb5d6e142a5d50e1a24d245f81a593c7baf14e7ac76536dd0c218033ef2e4e72f620a5f67b9a6f
+DIST slk.traineddata-4.00 19335882 SHA256 46536c109d17dd93839b77f0c0031e784956c96d2ef5b0765bcd0a431df1d9a0 SHA512 f72db1f57ffab113424d872ad97f8b1381c2be1ad2b8f09f6b4a5a75eb59d5f53e3319160b451fd6313ee8cb0606afd089f4051580d4af4dfa7706814d89bf7b WHIRLPOOL 4853be3476697b94a1e5d4ea6ca900a3d381023a5ca92a29c9b2cea8c65b9ea78bd509baf125ad2c1896114ddc4cc79df15a79ae92fb709cb0e968424a74da2b
 DIST slk_frak.traineddata-3.04.00 845250 SHA256 1e7f1e59ead24a136dc0626e98019594a042e62087bfcf8f0fddb3e283b5d87f SHA512 89b794f06772982ec63e317e95ba1c6b611881b8363b645ebfbb4e7c29f914545162401d4766d1b3247ada6df1fa1d7cc02ea539a746fd6839c45124e9e68ae5 WHIRLPOOL bbd770dd93a15f016ab7ae1db3e82f50ef376705097a3b5c6b2dc09c0c2514b2c44eb550f41605c27f6a1b6a226d6e20f5eb1f3922c0a6f6bcb53ee3a5b6d278
 DIST slv.traineddata-3.04.00 6824064 SHA256 305884e151a01421e847a4a30f05e9c899fcefd483a12d2ea8e0f205534d56ce SHA512 26634af8d9585f293d4af38c0bd6bd7c552edeaa59e3f2ab1e170431f40ba172ca455ede49df90a0b97b4da253b3a96394f4729f6a349361c3e954f2f59e2bbe WHIRLPOOL c765b5922c8d415f2281e9d6f6a5aee1e1717dbf779171ebd6f4dbeedbdf813361de80cf2531bc84f032c07b39b6d6098d9a5a37ec24bca8d86303955691fbab
+DIST slv.traineddata-4.00 15472904 SHA256 15fa29517d0e7696196a80c35001d20fbcef39e15100cf236ad4d2a0e6c0dc6a SHA512 975542196c706e98430e5e8fd9673d03ada91a829c0b0744bacb6fbbbe93d22f3fd36de4993766fdbb76f3902e4e7bdcf59a4b51a0c452130b3a368d0e645208 WHIRLPOOL 7fd9bce9559c74dfee93e0ed02cd91e01069e39b7c4ca87232f086923a93aa0f49e120c62ef30ca34b074e4c125168cf151f544f8503c9af3c1eee9d12b30a40
 DIST spa.traineddata-3.04.00 15953087 SHA256 f23985996bbcfe2b57864ccb082783c1c74c87429f04411a04a6ba4d3da2efda SHA512 e1356c0948c9245fecd335b1b7dd3c84c56b09210e84c5d211d9ddfb2bd3aa232c97f8e8d03f2a6639120c5196aa4222a8385da64528261c7cf137cd64b214a8 WHIRLPOOL 3be9607b1041aac3e744165e7767b32acd91e9746c7b35bb052dfb94f5a4391d19fa8da9122164c01d3f2d39224960a6ce83c431acfeb5e9c391ff1d4b816ba1
+DIST spa.traineddata-4.00 25107848 SHA256 687793a658359a9fefa78b809dc9233caa4c5f941f3fb27dc07bb5c04aef86f7 SHA512 5d009401faa71d3a8e9c4ff32dd1efc5e38c02b8c4170653ebb33874e6c489f7556c67ce6ca7cee27500496f657cf4361314563576176ff5e545b8079722bb8f WHIRLPOOL 6c2efe99d1c221f98145ceab32368f037cd67dc60eeaafdb08ad9ccfa5f02062cfcea525afe82beaafc305e5c044ec2bf883b34b9cc3b5d113997c3ee0fbb5a5
+DIST spa_old.traineddata-4.00 26019934 SHA256 6f574e9e4fe4746fefa54e058f1566fa24fbdcc7c933b4f7051b091473b25e9f SHA512 b50c9785e6962defd3c9373272581eefd476405e8b0f20d4f692a99137af01319ec92af0c51207d724d4f83852c789c2f5109cc6f47a1a79080d5024926ffc7c WHIRLPOOL 96f87b3a4e1318711d2101f2e9a2233ab6ef1925deae7ba1d97e9dcd7164d394e3ad8e79a4b0ef30d8b3eb33cfb2367d48c409a102045cf75a2b963b90bead53
+DIST sqi.traineddata-4.00 14827880 SHA256 f3c48a78c94a1d6bd860be96dacded344719f118be5e301c13f55f15aa2be838 SHA512 56a2e2486f05498f6fd136f27406eafc218e2c9328274c60c4bacc5f51289d3b99810c305da76e5ab3ded05ac1c33bc822b367394bb030dc7f2f6bda3092a4fa WHIRLPOOL c5973031b484585e4c40554086ebdc85824d6f0af5de4a59abaa287835fa6bbca8a8b031e32f705f157c7d3c3143bc3cf76504d7416496fd98e83aec60c9f496
 DIST srp.traineddata-3.04.00 4611681 SHA256 35bfeb3ce14f5afeb82c9be2490db34178c0e13f7de8061013a083b163c67415 SHA512 41925f957f9b30617746072216dbfb642d55caebdf95f8c322fbc78cf6040b85ed3bb91e81c3114830504189fb8e9f33a3150878a571ce714345e9d87263ac2a WHIRLPOOL 5a10a60970f8bfd5dd5245b2da20861d4b1107d31f1c81531cd7f77030015e75dfa820c3fd4e824865a2f89e8f5254137ff533b7c80e00a27cc3d90a94aecc44
+DIST srp.traineddata-4.00 12189572 SHA256 b06de5ae5cb8745b0e00d363ecd36f8857da82f1e33cfa6f23d22815b53fea97 SHA512 69f7703d48cc3e6cd1d2d40d1012ead58a3905beba6787cf0276c0268d142f64bc7116ab43c6339eb8704ebb293ec25c2041093b4eca8cc76d64cf432a95f26d WHIRLPOOL 3195cb4c361701fa66fc1780c5714a5dd62458c51e96b645e367e2574f9a3f60192800c9f3e1ee364d4340ae5d487d6b99bc0886b0e1318cd6709c130933dbc3
+DIST srp_latn.traineddata-4.00 14395288 SHA256 79df402b9b6d51b5f4bc88f9a5744a52d0a6b63ff2d56f9cc9e0ec761de944bf SHA512 65644d3f7e01cc77038a438d438707f48f5dda1827f729e793fc478a997afe84388d51993e18b31833f5b1a3f37b183112ec1459bdc3184ccce3f6dd361c232b WHIRLPOOL 807d8cd84af888272d49d93f80e5af7938ba41163ef9a70dc86e80382c734ab3c599eaad0680ab0d69c23e0ad071de42a031c2885ed164fba74b7a7fd7b4c6f0
+DIST swa.traineddata-4.00 10931654 SHA256 c944c1def83e56d24704f87eac50720735e83c444aef0ea6edfa90640bacb75e SHA512 bb865197fe1558ea8b63a83d68906a7f2a12aadcdba2904f1f01f15db4576e96d942b8a2c684ee3a049f2cdc3997b9e6ca49faf531b1d885abe7228a50af2d2b WHIRLPOOL cd195ff88f0ab72049d0da9361fe072c0b9f99a3fbc88ab045aa19f15444536d9d285155cf1e464872a3aec218281e3e2dfcb0765408b1b5b92e9019d5d0c090
 DIST swe.traineddata-3.04.00 9460295 SHA256 2a6407bbf187eb1fcfd1633fae9abffcd6220e7ab74e05e65bf16426ac8f2050 SHA512 d69c916daa5946d11129e5401f0b8d9b8965df7fa2223e78c8e607e2bcc102a91c875a86e6a737612b61823ebd7f331c3d4c5db28ee35d1fb830beb9414bd167 WHIRLPOOL c95f12b64b1563d195b38cd8ad169f91e7608ba72c2e93fb49aebd7ec6bd065431b8ee892621cdd7d01922b99e71f52d1f1e5023b3af682eb2125419f0d529cd
+DIST swe.traineddata-4.00 19062525 SHA256 f292c86c4388c08a0ec862f81e5b08619164cc765821008b530cfaa357aff4fb SHA512 634c75641d27026afa84e4179889673bcc1dd6eb56459894612e0148a3e70862c82e5e92832ea83e066c128cb5646eec90a0b36f3cb4c789128b43cc27117450 WHIRLPOOL 3bb944fa51e0504ddcdf70fb7cec120eee71f48180d586e350a605a0cfffeb2bb255cc266de04d133f61bea61cd488a381537ea21328771541d798bf745e49de
+DIST syr.traineddata-4.00 8056121 SHA256 d7be312ddbf720ea29380d5dbaa0427ae027de507e178e671f7232cc7ae8a0bf SHA512 c79acc0bde79d7f38b5ddd34683615886d7c284040273849e4b31dd988c4c0ac1617c0f6ef9d246b47eaade5ad5fdfdc4bf99dbb29e2d33c3827927135ea6f06 WHIRLPOOL adc125d0323fc99a51be568eb75d77891a7e84b377091dabdec816642b1fc7a5c2e14f256a1ccb81994c633824adf3ee3a258a17747472f8ae30993e37e2ce65
+DIST tam.traineddata-4.00 17333471 SHA256 ba8dc53bd987e4bdfacc37f46e6b0c8f7aea9c000d142ebda40f9f27c3aa2a48 SHA512 9ad90eb8c291712e4cd874d41ed9bcd4169427a50509a353f5549382909458b46a7e4a092dec0d475c548e681426a81597c577f2f821978405a94f965fd4d05f WHIRLPOOL dd3b1489d6c8758b7a36cc4d5d85f61f10643f2b3ffef63a3ae380a1b9314de9490304a27a04c92780ea90eac9f6fbb9845f3a0760df0c715864372dc1f958f0
+DIST tel.traineddata-4.00 54446537 SHA256 9db74228a36fcdbcde54e6e6118c0998b2fb73ed84c9e42b52062009c5becd66 SHA512 5e5c2ca84f095ec4dd3184d6cb75702482c699b5cd04f8750ab8958f578f7b24cf3253a83d19a4a1f3716466b95a81737d473339e3593538e46372c4588febb6 WHIRLPOOL 1eb738325fd5610ae3a71791a998aed4f901e03eac629547a5d627f7173dbf3b268732e08a7a64fd4147773bbfc56f560b5f02f32bd3adb16166e6cd8d85e794
 DIST tesseract-3.04.00.tar.gz 2264427 SHA256 7e6e48b625e1fba9bc825a4ef8c39f12c60aae1084939133b3c6a00f8f8dc38c SHA512 60c31bad40b4c01395782fb98b3326407e75ebdbda962de4fb0e878824efb05140bdcb139dcf7d4f699ae5350e81a00320ebe7fbec083a0d374952488cc59e25 WHIRLPOOL 81b685e4d50d94056a4f99ce6beb4c73983e9449e1eed07a69d4649b0a8231b17fede430a8c181b37216a55e9f6102a578c85d84b2bbe6e9643ca98f16ae3260
 DIST tesseract-3.04.01.tar.gz 2269105 SHA256 57f63e1b14ae04c3932a2683e4be4954a2849e17edd638ffe91bc5a2156adc6a SHA512 816f6c29f8efeaf157891ddb022bd0daf8eb27c0cb8b6df5542e745d209f0ce617245e4583c59a561ed3216044d3afb38f8620ee94cdea656364923dcb140b5b WHIRLPOOL 995502084484d172becdfdaa38888cd21f0fe2b8845fe4a64726f9fbcd35310d64153be6325016dd50ca37b95069112b63d4f0528bd989a58c3b88dc6c6a6813
+DIST tesseract-4.00.00_alpha.tar.gz 3706567 SHA256 ada7db147970317eed8223bb72702359ac53ad570e135f7f6824f40c41ea6791 SHA512 282ec941233ceb80fe1008e585a6069fe8ecd6bf2dd1d0f56e2e79b772a0b83bca918d5da892a6cab194a7828607e41a7fd873acec33181b8b86c3c37e434103 WHIRLPOOL ae27cd45ce680c71785c36bd4d5414efc5b07baa483094fd33ee7bd886b55e21a4034ddaa5d55a265cf23983ba21dc98c5e2e2148178e4fabd2c69e1a9326c9e
 DIST tesseract-ocr-3.02.02-doc-html.tar.gz 10635901 SHA256 e7ffd3082005345a682268740140bfdde73461528d6f2da019fef29539477a7b SHA512 4cca5974635ed9c1656a00735bf682ed1eca5cb9a3641a0d063f66ffbdf9dcbc0476628a5b5c48684bd23f5616412e71e9cec608ac979760010c1ee91764290f WHIRLPOOL e84ceb57cbc7065b37424a2d53ce7ecea39f45856efe76610840296f20869742674b8b248b205ba293b7c729f85ff7938defce930409efa907af2d4309ca0a6b
+DIST tgk.traineddata-4.00 6555909 SHA256 70a4f0e2b81591fb37687e7a33ee94a8f8591b788c2903267fc43f90662e843a SHA512 abc5f2c4ac91b17a250f2f4847c9528a7673d51230415b7a069dc7243e2c210564400d34d5c38da6b727c8c24af26cbde3e7ef8a9674fa1605da001b4b1b60bb WHIRLPOOL 4d53fa690f81ff1115d0d2aaf3c906d21d4f30b5b2b37932f25e3f6e6c7a5a9920098d66019f5ad70b6bd11e9ed33ce9599de22bb7f7545cf5f5909f516847d9
 DIST tgl.traineddata-3.04.00 4114554 SHA256 e794af607426269bb32eedb2f20706e278fbb00e4a75c43dc4a7b8c8e2033938 SHA512 8c205fd0d4b2fc774e5b6a19cb56dcdb91b7d001acd881e34363e437d5eeae8615b853ae09f93c4957328d3a423300b9a20a443ca971a14ede1867de6194a2bb WHIRLPOOL 767dfce0bb3937d2c7beee8ad454296386383644532de1886df34aa33b3bcc3a70de06dd2d2b336b5efa6fda940970ae091478bad8d64a422a925ee1711ffa91
+DIST tgl.traineddata-4.00 11991699 SHA256 1902088273eabff7ee97f48ee57f2c5e4400ddf4d0b1986ed53b4c2b081ee25d SHA512 fda51303a8963432fa541510287aec32ea9ee7342e0ca7dfba4f40c5d352aec74bf7982bc469e12196d51a8906dd224df01aead0d14859102267e7ffd19f0380 WHIRLPOOL 2487e5c1e446c9d630ea8127491a8e5b122bac96a1d865f4c2916ff5aec57d4493bdc51738139135a566afcd467287ef761643d5c5d0826abc0d94a33dafe686
 DIST tha.traineddata-3.04.00 13565168 SHA256 ca4a42d4481bd0377cd02731b5149c228bf73e8b7a61e44b9a2d5e274be150f8 SHA512 1f8750ee148a6dc5677441bdf8b41d09594b591c34c7fc0af1923a89acf9db76f12ab3ed136819b6900b70ff393fd586054fd383a427ca70b4cf9aecb6db029a WHIRLPOOL 07f937618a058313b90a6e1640c37731fbcc9167afba33d9926d57064b9748c4dfec467a240cf74a92a69a1bdb0694c93dc6d18fab8ca99ea3a9228ca184f658
+DIST tha.traineddata-4.00 22477903 SHA256 8497a3bc45289dc5fa0d5d2578ded745b71864e196deb8d5ac9a3dada259c120 SHA512 b4349650ca1f2a5317cd2691a9fa97afde1c22872147829a71b0c49cdffe7b8a732c9aafcb87fe12431e0bc897a82e48204e5d2369e8441a654aa3baa4d41096 WHIRLPOOL 8b756fcf40ba03e53a92c4ca19433ce45c6c0f27c1ff2f2f7560ffb8be608a0121b493bb577b85215255c21fb9136f2a35aa1d15779231a505cd5d5239730576
 DIST tur.traineddata-3.04.00 14069931 SHA256 5cbcce5efb66b3da10a14397fbc3a88d8457b9f1b724b9c8d96449b152c21677 SHA512 822b51bf9836f0d2b5923fc8ea14690a16d6e1831dc8828d0aad7cb4bda2bcec06ba7cdc79187d48b93e3541dfd46f1f50dc44dae504af9dd7a788052a05b51e WHIRLPOOL 6fd2d777c4ca4a5a89db44fb663b80e8540eb3fd4b26e75825b35f49f24f389f7bf2ff91e88f8b2d35cf0969ff7437e37cbf813384d16c94da2b59088a4a364f
+DIST tur.traineddata-4.00 26503738 SHA256 34e3b573b8a0bfef2ca7a0a14216e33f05dadd5078848d37a1e50a7a896acc6a SHA512 03b58b9757a975a2b6101ce62cf12a13ae1b167bb3f8c8fb9384802ae6427af5f2182600972412c942d706a37b624ea49cd7ef3bab7244e7dd7bd765e011a558 WHIRLPOOL 733b4a0960ee7d87aa2029fef3df2119938f6ac450b3668ff8d9df2a3f6a123e1b4daf21abe0efdbedaa9af69355f736b7b9145fb0d5b46152a388e78ab78849
+DIST uig.traineddata-4.00 7657636 SHA256 5844a53300a20ef3000ac3c7a933d398c2b20563c07e80309a1d62f63a89926d SHA512 fc53338b875bd8d104f196e59b66e070fd789d8a58c54f04cf5b788bb83b4b83c5c9b6f1b1f468619358e833e436e1bd64c2b6b52e8499f5cd6189ebbdee3ddd WHIRLPOOL 4e8ca0dfa96b0d00c7529cb6e7bf8ee0ee3aea23a644e1f2ba54af7e514969b6cddb2cd6e8b57d8af5bb7a9b39e2ae552e5a99d34eb98a8e2905b16ca4cdba79
 DIST ukr.traineddata-3.04.00 8043189 SHA256 2f8b2cd0f0b5b8612a4b80abcebaa3ac46f5f0368926629b3cff576b9d95bc31 SHA512 16117151debf90d79eb9f84c0b215b1d9d72d5b61bbf0004330b34b1502388f7d81051ce5ce296720dd10f53ba08f1e15cebaf4030330b5a071810612f78e0ef WHIRLPOOL 763229993a81d379d6a9d0384ddde95feac95c9e3442a27b94bc3e574235df88dfcd50638c39cba49f966de5f7605aaf884dcc5199715755a4e858be490948e5
+DIST ukr.traineddata-4.00 17775376 SHA256 5ac765c0f9c7c8eccc04acdd0dad76db8b554d5d1f127d8cb8786381a256900f SHA512 26f02bd7d4c392beb3ec174041685d6eed0b6a2f0d7102d6dea271e94bfc8bbbbcb4d74bb34e72357cb3de7bd72f7e5da2d7fa576b98374f9a0938b2b52c9c81 WHIRLPOOL 0f62c92091c056447ad1c2c87d3cc3f8f0b4788dc4868b1b0068333a5b03121a8fcebe8fdcd78141c2818757a1dba1fb7284e16776764c77619b464132f5f8e4
+DIST uzb.traineddata-4.00 12505562 SHA256 5a597c227033a9f33ecb08b4b7763a72e0adee5a1323e08de3f04ec4e5aa3b85 SHA512 dd7579e62d5564d22945447d471bc288abceab99b21e224ec9adafc20899cf708e7fecc5c2c0133171f6a6841d56c04743a0b7762ee021e6b5d5f678e4cdc05c WHIRLPOOL a36bee1c4c92d2a38e7f6637b44c42a1c1a5884738c73fe228416071340e267cf40d17cf00cf8910cdd909cf087daba4345be0e6d9012a5402b96651bc75b473
+DIST uzb_cyrl.traineddata-4.00 10390622 SHA256 7531d9642da84766def415263017476eebfef9ec35de9da3c60f5e1142576876 SHA512 d2e82371312bdeb3e4db73bb74270553165df2f4d2b62ae7de474286c8c02e27f7c5401c3857c60d0d1de3d02b9106e396de7cfa167b82bb8a874101498be0e7 WHIRLPOOL bcfa633ea30c10fff8e3a3fbdb5c2c64612024e20ad55bc03ecf37b4f2e7153b358d0a5724eedc166b9d661a2bc3f295f536490b75146d6458fc81f3b261789a
 DIST vie.traineddata-3.04.00 6096118 SHA256 cef5e63747c86e21bcbbd30bb683a1b104f98293b74b2a89174870d5bb4441c9 SHA512 51087e2141051906a1815798175ff8b9f214ae36c7d87cb60999489ccc684307ea7ef65c5ae4024f95c51b89084ab9f0e8dde0a4d480eaf78dceebfba87350cf WHIRLPOOL abe4f4633dcc9f98c2f0e6da01a4ed419dcf0a8b1261fe528bd147e2f52498cb424e3effea68dfe826d52b55c50ae35350a861138269012232ef83caf234ad89
+DIST vie.traineddata-4.00 12209616 SHA256 3a1b8db4487c1c8c49db7733a569d0cadff3aa7ada20984870e23aedc865d391 SHA512 6f73647d8fc4df104eb8a8b9444bb46e0ee7560dfff3c33055a791a17a9ffb78a857dac2aa0219c628469eea636f89eb1551151fd79d7ac8c2d4a09c68765560 WHIRLPOOL 642db83b34e74de086064222a9c8871ccbc501a6ed616df2942de90895c15b007c76ba2c6ba74125b042a897c5c875393d4da1772900f8d9fdada0152a7eca76

diff --git a/app-text/tesseract/files/tesseract-4.00.00_alpha-isnan.patch b/app-text/tesseract/files/tesseract-4.00.00_alpha-isnan.patch
new file mode 100644
index 00000000..4ae4c81
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-4.00.00_alpha-isnan.patch
@@ -0,0 +1,28 @@
+From beb564df82204078563bcbde4e569caac2f7a2ac Mon Sep 17 00:00:00 2001
+From: Stefan Weil <sw@weilnetz.de>
+Date: Tue, 22 Nov 2016 11:31:01 +0100
+Subject: [PATCH] lstm: Fix compilation (undeclared 'isnan')
+
+gcc report:
+
+lstm/lstmrecognizer.cpp:608:47: error: 'isnan' was not declared in this scope
+     ASSERT_HOST(!isnan(output.f(t)[null_char_]));
+
+Signed-off-by: Stefan Weil <sw@weilnetz.de>
+---
+ lstm/lstmrecognizer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lstm/lstmrecognizer.cpp b/lstm/lstmrecognizer.cpp
+index f648e16..babfe50 100644
+--- a/lstm/lstmrecognizer.cpp
++++ b/lstm/lstmrecognizer.cpp
+@@ -600,7 +600,7 @@ void LSTMRecognizer::LabelsViaThreshold(const NetworkIO& output,
+     ++t;
+   }
+   while (t < width) {
+-    ASSERT_HOST(!isnan(output.f(t)[null_char_]));
++    ASSERT_HOST(!std::isnan(output.f(t)[null_char_]));
+     int label = output.BestLabel(t, null_char_, null_char_, NULL);
+     int char_start = t++;
+     while (t < width && !NullIsBest(output, null_thr, null_char_, t) &&

diff --git a/app-text/tesseract/files/tesseract-4.00.00_alpha-no_graphics.patch b/app-text/tesseract/files/tesseract-4.00.00_alpha-no_graphics.patch
new file mode 100644
index 00000000..6707ff0
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-4.00.00_alpha-no_graphics.patch
@@ -0,0 +1,143 @@
+diff --git a/lstm/lstmrecognizer.cpp b/lstm/lstmrecognizer.cpp
+index 1d4f0f3..7192ba7 100644
+--- a/lstm/lstmrecognizer.cpp
++++ b/lstm/lstmrecognizer.cpp
+@@ -16,6 +16,11 @@
+ // limitations under the License.
+ ///////////////////////////////////////////////////////////////////////
+ 
++// Include automatically generated configuration file if running autoconf.
++#ifdef HAVE_CONFIG_H
++#include "config_auto.h"
++#endif
++
+ #include "lstmrecognizer.h"
+ 
+ #include "allheaders.h"
+diff --git a/lstm/lstmtrainer.cpp b/lstm/lstmtrainer.cpp
+index ab66702..fd3f247 100644
+--- a/lstm/lstmtrainer.cpp
++++ b/lstm/lstmtrainer.cpp
+@@ -16,6 +16,11 @@
+ // limitations under the License.
+ ///////////////////////////////////////////////////////////////////////
+ 
++// Include automatically generated configuration file if running autoconf.
++#ifdef HAVE_CONFIG_H
++#include "config_auto.h"
++#endif
++
+ #include "lstmtrainer.h"
+ #include <string>
+ 
+diff --git a/lstm/network.cpp b/lstm/network.cpp
+index 795d4a5..791848a 100644
+--- a/lstm/network.cpp
++++ b/lstm/network.cpp
+@@ -16,6 +16,11 @@
+ // limitations under the License.
+ ///////////////////////////////////////////////////////////////////////
+ 
++// Include automatically generated configuration file if running autoconf.
++#ifdef HAVE_CONFIG_H
++#include "config_auto.h"
++#endif
++
+ #include "network.h"
+ 
+ #include <stdlib.h>
+@@ -277,27 +282,31 @@ double Network::Random(double range) {
+   return randomizer_->SignedRand(range);
+ }
+ 
+-#ifndef GRAPHICS_DISABLED
+ // === Debug image display methods. ===
+ // Displays the image of the matrix to the forward window.
+ void Network::DisplayForward(const NetworkIO& matrix) {
++#ifndef GRAPHICS_DISABLED  // do nothing if there's no graphics
+   Pix* image = matrix.ToPix();
+   ClearWindow(false, name_.string(), pixGetWidth(image),
+               pixGetHeight(image), &forward_win_);
+   DisplayImage(image, forward_win_);
+   forward_win_->Update();
++#endif  // GRAPHICS_DISABLED
+ }
+ 
+ // Displays the image of the matrix to the backward window.
+ void Network::DisplayBackward(const NetworkIO& matrix) {
++#ifndef GRAPHICS_DISABLED  // do nothing if there's no graphics
+   Pix* image = matrix.ToPix();
+   STRING window_name = name_ + "-back";
+   ClearWindow(false, window_name.string(), pixGetWidth(image),
+               pixGetHeight(image), &backward_win_);
+   DisplayImage(image, backward_win_);
+   backward_win_->Update();
++#endif  // GRAPHICS_DISABLED
+ }
+ 
++#ifndef GRAPHICS_DISABLED
+ // Creates the window if needed, otherwise clears it.
+ void Network::ClearWindow(bool tess_coords, const char* window_name,
+                           int width, int height, ScrollView** window) {
+diff --git a/viewer/svutil.cpp b/viewer/svutil.cpp
+index 34a2286..84a4b94 100644
+--- a/viewer/svutil.cpp
++++ b/viewer/svutil.cpp
+@@ -83,6 +83,27 @@ void SVMutex::Unlock() {
+ #endif
+ }
+ 
++// Create new thread.
++void SVSync::StartThread(void *(*func)(void*), void* arg) {
++#ifdef _WIN32
++  LPTHREAD_START_ROUTINE f = (LPTHREAD_START_ROUTINE) func;
++  DWORD threadid;
++  HANDLE newthread = CreateThread(
++  NULL,          // default security attributes
++  0,             // use default stack size
++  f,             // thread function
++  arg,           // argument to thread function
++  0,             // use default creation flags
++  &threadid);    // returns the thread identifier
++#else
++  pthread_t helper;
++  pthread_attr_t attr;
++  pthread_attr_init(&attr);
++  pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
++  pthread_create(&helper, &attr, func, arg);
++#endif
++}
++
+ #ifndef GRAPHICS_DISABLED
+ 
+ const int kMaxMsgSize = 4096;
+@@ -186,29 +207,6 @@ void SVSemaphore::Wait() {
+ #endif
+ }
+ 
+-
+-// Create new thread.
+-
+-void SVSync::StartThread(void *(*func)(void*), void* arg) {
+-#ifdef _WIN32
+-  LPTHREAD_START_ROUTINE f = (LPTHREAD_START_ROUTINE) func;
+-  DWORD threadid;
+-  HANDLE newthread = CreateThread(
+-  NULL,          // default security attributes
+-  0,             // use default stack size
+-  f,             // thread function
+-  arg,           // argument to thread function
+-  0,             // use default creation flags
+-  &threadid);    // returns the thread identifier
+-#else
+-  pthread_t helper;
+-  pthread_attr_t attr;
+-  pthread_attr_init(&attr);
+-  pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+-  pthread_create(&helper, &attr, func, arg);
+-#endif
+-}
+-
+ // Place a message in the message buffer (and flush it).
+ void SVNetwork::Send(const char* msg) {
+   mutex_send_->Lock();

diff --git a/app-text/tesseract/files/tesseract-4.00.00_alpha-openmp.patch b/app-text/tesseract/files/tesseract-4.00.00_alpha-openmp.patch
new file mode 100644
index 00000000..d07fb58
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-4.00.00_alpha-openmp.patch
@@ -0,0 +1,111 @@
+Backport from upstream 6140be6a5575e9159e3678adf4ee9e673b3ff2cc
+
+diff -Naur tesseract-4.00.00alpha.orig/api/Makefile.am tesseract-4.00.00alpha/api/Makefile.am
+--- tesseract-4.00.00alpha.orig/api/Makefile.am	2016-11-08 00:38:07.000000000 +0100
++++ tesseract-4.00.00alpha/api/Makefile.am	2017-01-26 10:27:59.269712914 +0100
+@@ -88,9 +88,7 @@
+ 
+ tesseract_LDFLAGS = $(OPENCL_LDFLAGS)
+ 
+-if OPENMP
+ tesseract_LDADD += $(OPENMP_CFLAGS)
+-endif
+ 
+ if T_WIN
+ tesseract_LDADD += -lws2_32
+@@ -99,4 +97,3 @@
+ if ADD_RT
+ tesseract_LDADD += -lrt
+ endif
+-
+diff -Naur tesseract-4.00.00alpha.orig/ccmain/Makefile.am tesseract-4.00.00alpha/ccmain/Makefile.am
+--- tesseract-4.00.00alpha.orig/ccmain/Makefile.am	2016-11-08 00:38:07.000000000 +0100
++++ tesseract-4.00.00alpha/ccmain/Makefile.am	2017-01-26 10:27:59.269712914 +0100
+@@ -8,6 +8,7 @@
+     -I$(top_srcdir)/textord -I$(top_srcdir)/opencl
+ 
+ AM_CPPFLAGS += $(OPENCL_CPPFLAGS)
++AM_CPPFLAGS += $(OPENMP_CXXFLAGS)
+ 
+ if VISIBILITY
+ AM_CPPFLAGS += -DTESS_EXPORTS \
+diff -Naur tesseract-4.00.00alpha.orig/ccmain/par_control.cpp tesseract-4.00.00alpha/ccmain/par_control.cpp
+--- tesseract-4.00.00alpha.orig/ccmain/par_control.cpp	2016-11-08 00:38:07.000000000 +0100
++++ tesseract-4.00.00alpha/ccmain/par_control.cpp	2017-01-26 10:27:59.269712914 +0100
+@@ -18,9 +18,9 @@
+ ///////////////////////////////////////////////////////////////////////
+ 
+ #include "tesseractclass.h"
+-#ifdef OPENMP
++#ifdef _OPENMP
+ #include <omp.h>
+-#endif  // OPENMP
++#endif // _OPENMP
+ 
+ namespace tesseract {
+ 
+@@ -53,7 +53,9 @@
+   }
+   // Pre-classify all the blobs.
+   if (tessedit_parallelize > 1) {
++#ifdef _OPENMP
+     #pragma omp parallel for num_threads(10)
++#endif // _OPENMP
+     for (int b = 0; b < blobs.size(); ++b) {
+       *blobs[b].choices =
+           blobs[b].tesseract->classify_blob(blobs[b].blob, "par", White, NULL);
+diff -Naur tesseract-4.00.00alpha.orig/configure.ac tesseract-4.00.00alpha/configure.ac
+--- tesseract-4.00.00alpha.orig/configure.ac	2016-11-08 00:38:07.000000000 +0100
++++ tesseract-4.00.00alpha/configure.ac	2017-01-26 10:28:45.636688839 +0100
+@@ -170,14 +170,7 @@
+ fi
+ 
+ # check whether to build OpenMP support
+-AM_CONDITIONAL([OPENMP], false)
+ AC_OPENMP
+-AS_IF([test "x$OPENMP_CFLAGS" != "x"],
+-  [AM_CONDITIONAL([OPENMP], true)
+-   AC_SUBST([AM_CPPFLAGS], ["$OPENMP_CXXFLAGS"])
+-   AC_DEFINE([OPENMP], [], [Defined when compiled with OpenMP support])]
+-)
+-
+ 
+ # check whether to build opencl version
+ AC_MSG_CHECKING([--enable-opencl argument])
+diff -Naur tesseract-4.00.00alpha.orig/lstm/lstm.cpp tesseract-4.00.00alpha/lstm/lstm.cpp
+--- tesseract-4.00.00alpha.orig/lstm/lstm.cpp	2016-11-08 00:38:07.000000000 +0100
++++ tesseract-4.00.00alpha/lstm/lstm.cpp	2017-01-26 10:27:59.269712914 +0100
+@@ -18,7 +18,7 @@
+ 
+ #include "lstm.h"
+ 
+-#ifndef ANDROID_BUILD
++#ifdef _OPENMP
+ #include <omp.h>
+ #endif
+ #include <stdio.h>
+diff -Naur tesseract-4.00.00alpha.orig/lstm/Makefile.am tesseract-4.00.00alpha/lstm/Makefile.am
+--- tesseract-4.00.00alpha.orig/lstm/Makefile.am	2016-11-08 00:38:07.000000000 +0100
++++ tesseract-4.00.00alpha/lstm/Makefile.am	2017-01-26 10:27:59.269712914 +0100
+@@ -4,7 +4,7 @@
+     -I$(top_srcdir)/dict -I$(top_srcdir)/lstm
+ AUTOMAKE_OPTIONS = subdir-objects
+ SUBDIRS =
+-AM_CXXFLAGS = -fopenmp
++AM_CXXFLAGS = $(OPENMP_CXXFLAGS)
+ 
+ if !NO_TESSDATA_PREFIX
+ AM_CXXFLAGS += -DTESSDATA_PREFIX=@datadir@/
+diff -Naur tesseract-4.00.00alpha.orig/lstm/parallel.cpp tesseract-4.00.00alpha/lstm/parallel.cpp
+--- tesseract-4.00.00alpha.orig/lstm/parallel.cpp	2016-11-08 00:38:07.000000000 +0100
++++ tesseract-4.00.00alpha/lstm/parallel.cpp	2017-01-26 10:27:59.269712914 +0100
+@@ -18,7 +18,9 @@
+ 
+ #include "parallel.h"
+ 
++#ifdef _OPENMP
+ #include <omp.h>
++#endif
+ 
+ #include "functions.h"  // For conditional undef of _OPENMP.
+ #include "networkscratch.h"

diff --git a/app-text/tesseract/tesseract-4.00.00_alpha.ebuild b/app-text/tesseract/tesseract-4.00.00_alpha.ebuild
new file mode 100644
index 00000000..d5d4de1
--- /dev/null
+++ b/app-text/tesseract/tesseract-4.00.00_alpha.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_PN="tesseract-ocr"
+LANGPACKV="4.00"
+URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
+JAVA_PKG_OPT_USE="scrollview"
+
+inherit autotools java-pkg-opt-2 toolchain-funcs
+
+DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
+HOMEPAGE="https://github.com/tesseract-ocr"
+SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz
+	${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
+	math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
+	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+# Next release will include SSE4.1/AVX
+IUSE="doc examples jpeg math opencl openmp osd png scrollview static-libs tiff training webp"
+
+# List of supported Gentoo linguas and their upstream mapping
+# https://github.com/tesseract-ocr/tesseract/wiki/Data-Files
+# "old" variants were regrouped in the matching modern locale
+LANGUAGES="af:afr am:amh ar:ara as:asm az:aze,aze_cyrl be:bel bn:ben bo:bod bs:bos bg:bul ca:cat cs:ces zh:chi_sim,chi_tra cy:cym da:dan de:deu,frk dz:dzo el:ell,grc en:enm eo:epo et:est eu:eus fa:fas fi:fin fr:fra,frm ga:gle gl:glg gu:guj he:heb hi:hin hr:hrv hu:hun id:ind is:isl it:ita,ita_old ja:jpn kn:kan ka:kat,kat_old kk:kaz km:khm ky:kir ko:kor ku:kur lo:lao la:lat lv:lav lt:lit ml:mal mr:mar mk:mkd ms:msa my:mya ne:nep nl:nld no:nor or:ori pa:pan pl:pol pt:por ro:ron ru:rus sa:san si:sin sk:slk sl:slv es:spa,spa_old sq:sqi sr:srp,srp_latn sw:swa sv:swe syc:syr ta:tam te:tel tg:tgk tl:tgl th:tha tr:tur ug:uig uk:ukr uz:uzb,uzb_cyrl vi:vie"
+# Missing matches:
+#	ceb 	Cebuano
+#	chr 	Cherokee
+#	hat 	Haitian; Haitian Creole
+#	iku 	Inuktitut
+#	jav 	Javanese
+#	mlt 	Maltese
+#	pus 	Pushto; Pashto
+#	tir 	Tigrinya
+#	urd 	Urdu
+#	yid 	Yiddish
+# l10n_en provides the additional data:
+#	enm 	English, Middle (1100-1500)
+
+for lang in ${LANGUAGES}; do
+	gentoo_lang=${lang%:*}
+	tess_langs=${lang#*:}
+	for tess_lang in ${tess_langs//,/ }; do
+		SRC_URI+=" l10n_${gentoo_lang}? ( ${URI_PREFIX}${tess_lang}.traineddata -> ${tess_lang}.traineddata-${LANGPACKV} )"
+	done
+	IUSE+=" l10n_${gentoo_lang}"
+done
+
+# With opencl USE=tiff is necessary in leptonica
+CDEPEND=">=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?]
+	opencl? (
+		virtual/opencl
+		media-libs/tiff:0=
+		media-libs/leptonica:=[tiff]
+	)
+	scrollview? (
+		>=dev-java/piccolo2d-3.0:0
+	)
+	training? (
+		dev-libs/icu:=
+		x11-libs/pango:=
+		x11-libs/cairo:=
+	)"
+
+DEPEND="${CDEPEND}
+	doc? ( app-doc/doxygen )
+	scrollview? ( >=virtual/jdk-1.7 )"
+
+RDEPEND="${CDEPEND}
+	scrollview? ( >=virtual/jre-1.7 )"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.04.01-use-system-piccolo2d.patch"
+	"${FILESDIR}/${P}-isnan.patch"
+	"${FILESDIR}/${P}-openmp.patch"
+	"${FILESDIR}/${P}-no_graphics.patch"
+)
+
+S=${WORKDIR}/${P/_}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	for file in ${A}; do
+		if [[ "${file}" == *traineddata* ]]; then
+			cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || die
+		fi
+	done
+}
+
+src_prepare() {
+	default
+	eautoreconf
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable opencl)
+		$(use_enable openmp)
+		$(use_enable scrollview graphics)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+	use doc && emake doc
+	use scrollview && emake ScrollView.jar JAVAC="javac $(java-pkg_javac-args)"
+	use training && emake training
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/html/. )
+	default
+	prune_libtool_files
+
+	if use training; then
+		emake DESTDIR="${D}" training-install
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins testing/eurotext.tif testing/phototest.tif
+	fi
+
+	insinto /usr/share/tessdata
+	doins tessdata/*traineddata* # language files
+	use scrollview && doins java/ScrollView.jar # scrollview
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/
@ 2017-01-30 16:56 Bernard Cafarelli
  0 siblings, 0 replies; 15+ messages in thread
From: Bernard Cafarelli @ 2017-01-30 16:56 UTC (permalink / raw
  To: gentoo-commits

commit:     7032d231288986d9cfa191830e4f79789c589d0b
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 16:43:44 2017 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 16:56:20 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7032d231

app-text/tesseract: add live ebuild

AVX/SSE4.1 are detected at runtime, so no need for CPU USE flags

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../tesseract-4.00.00-use-system-piccolo2d.patch   | 27 ++++++++++++++++++++++
 app-text/tesseract/tesseract-4.00.00_alpha.ebuild  |  1 -
 ...-4.00.00_alpha.ebuild => tesseract-9999.ebuild} | 18 +++++----------
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/app-text/tesseract/files/tesseract-4.00.00-use-system-piccolo2d.patch b/app-text/tesseract/files/tesseract-4.00.00-use-system-piccolo2d.patch
new file mode 100644
index 00000000..ad1f0f3
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-4.00.00-use-system-piccolo2d.patch
@@ -0,0 +1,27 @@
+diff -Naur tesseract.orig/java/Makefile.am tesseract/java/Makefile.am
+--- tesseract.orig/java/Makefile.am	2017-01-30 17:20:23.135458366 +0100
++++ tesseract/java/Makefile.am	2017-01-30 17:21:29.834462557 +0100
+@@ -36,10 +36,9 @@
+ 	com/google/scrollview/ScrollView.class
+ 
+ SCROLLVIEW_LIBS = \
+-	piccolo2d-core-3.0.jar \
+-	piccolo2d-extras-3.0.jar
++	/usr/share/piccolo2d/lib/piccolo2d.jar
+ 
+-CLASSPATH = piccolo2d-core-3.0.jar:piccolo2d-extras-3.0.jar
++CLASSPATH = /usr/share/piccolo2d/lib/piccolo2d.jar
+ 
+ ScrollView.jar : $(SCROLLVIEW_CLASSES)
+ 	$(JAR) cfm $@ $(srcdir)/Manifest.txt com/google/scrollview/*.class \
+diff -Naur tesseract.orig/viewer/Makefile.am tesseract/viewer/Makefile.am
+--- tesseract.orig/viewer/Makefile.am	2017-01-30 17:20:23.176458368 +0100
++++ tesseract/viewer/Makefile.am	2017-01-30 17:22:39.281467163 +0100
+@@ -17,3 +17,7 @@
+ 
+ libtesseract_viewer_la_SOURCES = \
+     scrollview.cpp svmnode.cpp svutil.cpp svpaint.cpp
++
++if !GRAPHICS_DISABLED
++AM_CPPFLAGS += -DSCROLLVIEW_PATH=/usr/share/tessdata/
++endif

diff --git a/app-text/tesseract/tesseract-4.00.00_alpha.ebuild b/app-text/tesseract/tesseract-4.00.00_alpha.ebuild
index d5d4de1..029aee6 100644
--- a/app-text/tesseract/tesseract-4.00.00_alpha.ebuild
+++ b/app-text/tesseract/tesseract-4.00.00_alpha.ebuild
@@ -21,7 +21,6 @@ SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
-# Next release will include SSE4.1/AVX
 IUSE="doc examples jpeg math opencl openmp osd png scrollview static-libs tiff training webp"
 
 # List of supported Gentoo linguas and their upstream mapping

diff --git a/app-text/tesseract/tesseract-4.00.00_alpha.ebuild b/app-text/tesseract/tesseract-9999.ebuild
similarity index 88%
copy from app-text/tesseract/tesseract-4.00.00_alpha.ebuild
copy to app-text/tesseract/tesseract-9999.ebuild
index d5d4de1..883c5c3 100644
--- a/app-text/tesseract/tesseract-4.00.00_alpha.ebuild
+++ b/app-text/tesseract/tesseract-9999.ebuild
@@ -9,19 +9,18 @@ LANGPACKV="4.00"
 URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
 JAVA_PKG_OPT_USE="scrollview"
 
-inherit autotools java-pkg-opt-2 toolchain-funcs
+inherit autotools git-r3 java-pkg-opt-2 toolchain-funcs
 
 DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
 HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz
-	${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
+SRC_URI="${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
 	math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
 	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )"
+EGIT_REPO_URI="https://github.com/${MY_PN}/${PN}.git"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
-# Next release will include SSE4.1/AVX
+KEYWORDS=""
 IUSE="doc examples jpeg math opencl openmp osd png scrollview static-libs tiff training webp"
 
 # List of supported Gentoo linguas and their upstream mapping
@@ -77,14 +76,9 @@ RDEPEND="${CDEPEND}
 DOCS=( AUTHORS ChangeLog NEWS README.md )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.04.01-use-system-piccolo2d.patch"
-	"${FILESDIR}/${P}-isnan.patch"
-	"${FILESDIR}/${P}-openmp.patch"
-	"${FILESDIR}/${P}-no_graphics.patch"
+	"${FILESDIR}/${PN}-4.00.00-use-system-piccolo2d.patch"
 )
 
-S=${WORKDIR}/${P/_}
-
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
@@ -94,7 +88,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack ${P}.tar.gz
+	git-r3_src_unpack
 	for file in ${A}; do
 		if [[ "${file}" == *traineddata* ]]; then
 			cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || die


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/
@ 2017-03-14  0:14 Bernard Cafarelli
  0 siblings, 0 replies; 15+ messages in thread
From: Bernard Cafarelli @ 2017-03-14  0:14 UTC (permalink / raw
  To: gentoo-commits

commit:     8504e55c31cfa890c4e1a238d3d7767bf72e9fe7
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 14 00:13:55 2017 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Mar 14 00:14:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8504e55c

app-text/tesseract: 3.05.00 bump

Backport fix for build without scrollview
Backport libtiff underlinking fix, bug #611136 by marecki

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 app-text/tesseract/Manifest                        |   1 +
 .../files/tesseract-3.05.00-libtiff.patch          |  25 ++++
 .../files/tesseract-3.05.00-no_graphics.patch      |  74 +++++++++++
 app-text/tesseract/tesseract-3.05.00.ebuild        | 147 +++++++++++++++++++++
 4 files changed, 247 insertions(+)

diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index b57b7e44871..7b5f3022771 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -123,6 +123,7 @@ DIST tam.traineddata-4.00 17333471 SHA256 ba8dc53bd987e4bdfacc37f46e6b0c8f7aea9c
 DIST tel.traineddata-4.00 54446537 SHA256 9db74228a36fcdbcde54e6e6118c0998b2fb73ed84c9e42b52062009c5becd66 SHA512 5e5c2ca84f095ec4dd3184d6cb75702482c699b5cd04f8750ab8958f578f7b24cf3253a83d19a4a1f3716466b95a81737d473339e3593538e46372c4588febb6 WHIRLPOOL 1eb738325fd5610ae3a71791a998aed4f901e03eac629547a5d627f7173dbf3b268732e08a7a64fd4147773bbfc56f560b5f02f32bd3adb16166e6cd8d85e794
 DIST tesseract-3.04.00.tar.gz 2264427 SHA256 7e6e48b625e1fba9bc825a4ef8c39f12c60aae1084939133b3c6a00f8f8dc38c SHA512 60c31bad40b4c01395782fb98b3326407e75ebdbda962de4fb0e878824efb05140bdcb139dcf7d4f699ae5350e81a00320ebe7fbec083a0d374952488cc59e25 WHIRLPOOL 81b685e4d50d94056a4f99ce6beb4c73983e9449e1eed07a69d4649b0a8231b17fede430a8c181b37216a55e9f6102a578c85d84b2bbe6e9643ca98f16ae3260
 DIST tesseract-3.04.01.tar.gz 2269105 SHA256 57f63e1b14ae04c3932a2683e4be4954a2849e17edd638ffe91bc5a2156adc6a SHA512 816f6c29f8efeaf157891ddb022bd0daf8eb27c0cb8b6df5542e745d209f0ce617245e4583c59a561ed3216044d3afb38f8620ee94cdea656364923dcb140b5b WHIRLPOOL 995502084484d172becdfdaa38888cd21f0fe2b8845fe4a64726f9fbcd35310d64153be6325016dd50ca37b95069112b63d4f0528bd989a58c3b88dc6c6a6813
+DIST tesseract-3.05.00.tar.gz 3581853 SHA256 3fe83e06d0f73b39f6e92ed9fc7ccba3ef734877b76aa5ddaaa778fac095d996 SHA512 54ba96bd1b0d19883e8a0f717ecfddd459945f9dda0fd340e29e2dab3af94d0eceb7f3d207f34685ee97d1ec763efac5d94dec7e0498a7ca85fec35da4ed76b1 WHIRLPOOL 33622256479395eb12c72e4d3187eecf23fe4557f4fcaecf9b5f1ba3aeab67e333b0d979812525f3a1504102764bc572a79f8e64c794be805004e5fec5cdef5b
 DIST tesseract-4.00.00_alpha.tar.gz 3706567 SHA256 ada7db147970317eed8223bb72702359ac53ad570e135f7f6824f40c41ea6791 SHA512 282ec941233ceb80fe1008e585a6069fe8ecd6bf2dd1d0f56e2e79b772a0b83bca918d5da892a6cab194a7828607e41a7fd873acec33181b8b86c3c37e434103 WHIRLPOOL ae27cd45ce680c71785c36bd4d5414efc5b07baa483094fd33ee7bd886b55e21a4034ddaa5d55a265cf23983ba21dc98c5e2e2148178e4fabd2c69e1a9326c9e
 DIST tesseract-ocr-3.02.02-doc-html.tar.gz 10635901 SHA256 e7ffd3082005345a682268740140bfdde73461528d6f2da019fef29539477a7b SHA512 4cca5974635ed9c1656a00735bf682ed1eca5cb9a3641a0d063f66ffbdf9dcbc0476628a5b5c48684bd23f5616412e71e9cec608ac979760010c1ee91764290f WHIRLPOOL e84ceb57cbc7065b37424a2d53ce7ecea39f45856efe76610840296f20869742674b8b248b205ba293b7c729f85ff7938defce930409efa907af2d4309ca0a6b
 DIST tgk.traineddata-4.00 6555909 SHA256 70a4f0e2b81591fb37687e7a33ee94a8f8591b788c2903267fc43f90662e843a SHA512 abc5f2c4ac91b17a250f2f4847c9528a7673d51230415b7a069dc7243e2c210564400d34d5c38da6b727c8c24af26cbde3e7ef8a9674fa1605da001b4b1b60bb WHIRLPOOL 4d53fa690f81ff1115d0d2aaf3c906d21d4f30b5b2b37932f25e3f6e6c7a5a9920098d66019f5ad70b6bd11e9ed33ce9599de22bb7f7545cf5f5909f516847d9

diff --git a/app-text/tesseract/files/tesseract-3.05.00-libtiff.patch b/app-text/tesseract/files/tesseract-3.05.00-libtiff.patch
new file mode 100644
index 00000000000..5771739c344
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-3.05.00-libtiff.patch
@@ -0,0 +1,25 @@
+From 9ec0c4fa9c9836d414c02662a6f94f48815d61b2 Mon Sep 17 00:00:00 2001
+From: Stefan Weil <sw@weilnetz.de>
+Date: Tue, 13 Dec 2016 13:28:29 +0100
+Subject: [PATCH] api: Add missing dependency on libtiff
+
+It is needed because of a direct call to TIFFSetWarningHandler.
+
+Signed-off-by: Stefan Weil <sw@weilnetz.de>
+---
+ api/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/api/Makefile.am b/api/Makefile.am
+index 76a8ed4..25e7f21 100644
+--- a/api/Makefile.am
++++ b/api/Makefile.am
+@@ -90,6 +90,8 @@ tesseract_LDFLAGS = $(OPENCL_LDFLAGS)
+ 
+ tesseract_LDADD += $(OPENMP_CXXFLAGS)
+ 
++tesseract_LDADD += -ltiff
++
+ if T_WIN
+ tesseract_LDADD += -lws2_32
+ libtesseract_la_LDFLAGS += -no-undefined -Wl,--as-needed -lws2_32

diff --git a/app-text/tesseract/files/tesseract-3.05.00-no_graphics.patch b/app-text/tesseract/files/tesseract-3.05.00-no_graphics.patch
new file mode 100644
index 00000000000..d6250d66c05
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-3.05.00-no_graphics.patch
@@ -0,0 +1,74 @@
+From 4141de7f8ddb5ac3c39fd9c1fc77ed911c768c3d Mon Sep 17 00:00:00 2001
+From: Bernard Cafarelli <bernard.cafarelli@gmail.com>
+Date: Fri, 27 Jan 2017 12:02:54 +0100
+Subject: [PATCH] Provide SVSync::StartThread() with GRAPHICS_DISABLED
+
+---
+ viewer/svutil.cpp | 44 +++++++++++++++++++++-----------------------
+ 1 file changed, 21 insertions(+), 23 deletions(-)
+
+diff --git a/viewer/svutil.cpp b/viewer/svutil.cpp
+index 34a2286..84a4b94 100644
+--- a/viewer/svutil.cpp
++++ b/viewer/svutil.cpp
+@@ -83,6 +83,27 @@ void SVMutex::Unlock() {
+ #endif
+ }
+ 
++// Create new thread.
++void SVSync::StartThread(void *(*func)(void*), void* arg) {
++#ifdef _WIN32
++  LPTHREAD_START_ROUTINE f = (LPTHREAD_START_ROUTINE) func;
++  DWORD threadid;
++  HANDLE newthread = CreateThread(
++  NULL,          // default security attributes
++  0,             // use default stack size
++  f,             // thread function
++  arg,           // argument to thread function
++  0,             // use default creation flags
++  &threadid);    // returns the thread identifier
++#else
++  pthread_t helper;
++  pthread_attr_t attr;
++  pthread_attr_init(&attr);
++  pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
++  pthread_create(&helper, &attr, func, arg);
++#endif
++}
++
+ #ifndef GRAPHICS_DISABLED
+ 
+ const int kMaxMsgSize = 4096;
+@@ -186,29 +207,6 @@ void SVSemaphore::Wait() {
+ #endif
+ }
+ 
+-
+-// Create new thread.
+-
+-void SVSync::StartThread(void *(*func)(void*), void* arg) {
+-#ifdef _WIN32
+-  LPTHREAD_START_ROUTINE f = (LPTHREAD_START_ROUTINE) func;
+-  DWORD threadid;
+-  HANDLE newthread = CreateThread(
+-  NULL,          // default security attributes
+-  0,             // use default stack size
+-  f,             // thread function
+-  arg,           // argument to thread function
+-  0,             // use default creation flags
+-  &threadid);    // returns the thread identifier
+-#else
+-  pthread_t helper;
+-  pthread_attr_t attr;
+-  pthread_attr_init(&attr);
+-  pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+-  pthread_create(&helper, &attr, func, arg);
+-#endif
+-}
+-
+ // Place a message in the message buffer (and flush it).
+ void SVNetwork::Send(const char* msg) {
+   mutex_send_->Lock();
+-- 
+2.12.0
+

diff --git a/app-text/tesseract/tesseract-3.05.00.ebuild b/app-text/tesseract/tesseract-3.05.00.ebuild
new file mode 100644
index 00000000000..e3d7c887342
--- /dev/null
+++ b/app-text/tesseract/tesseract-3.05.00.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="tesseract-ocr"
+LANGPACKV="3.04.00"
+URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
+JAVA_PKG_OPT_USE="scrollview"
+
+inherit autotools java-pkg-opt-2 toolchain-funcs
+
+DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
+HOMEPAGE="https://github.com/tesseract-ocr"
+SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
+	math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
+	l10n_ar? ( ${URI_PREFIX}ara.traineddata -> ara.traineddata-${LANGPACKV} )
+	l10n_bg? ( ${URI_PREFIX}bul.traineddata -> bul.traineddata-${LANGPACKV} )
+	l10n_ca? ( ${URI_PREFIX}cat.traineddata -> cat.traineddata-${LANGPACKV} )
+	l10n_chr? ( ${URI_PREFIX}chr.traineddata -> chr.traineddata-${LANGPACKV} )
+	l10n_cs? ( ${URI_PREFIX}ces.traineddata -> ces.traineddata-${LANGPACKV} )
+	l10n_de? ( ${URI_PREFIX}deu.traineddata -> deu.traineddata-${LANGPACKV}
+				  ${URI_PREFIX}deu_frak.traineddata -> deu_frak.traineddata-${LANGPACKV} )
+	l10n_da? ( ${URI_PREFIX}dan.traineddata -> dan.traineddata-${LANGPACKV}
+				  ${URI_PREFIX}dan_frak.traineddata -> dan_frak.traineddata-${LANGPACKV} )
+	l10n_el? ( ${URI_PREFIX}ell.traineddata -> ell.traineddata-${LANGPACKV} )
+	l10n_es? ( ${URI_PREFIX}spa.traineddata -> spa.traineddata-${LANGPACKV} )
+	l10n_fi? ( ${URI_PREFIX}fin.traineddata -> fin.traineddata-${LANGPACKV} )
+	l10n_fr? ( ${URI_PREFIX}fra.traineddata -> fra.traineddata-${LANGPACKV} )
+	l10n_he? ( ${URI_PREFIX}heb.traineddata -> heb.traineddata-${LANGPACKV} )
+	l10n_hi? ( ${URI_PREFIX}hin.traineddata -> hin.traineddata-${LANGPACKV} )
+	l10n_hu? ( ${URI_PREFIX}hun.traineddata -> hun.traineddata-${LANGPACKV} )
+	l10n_id? ( ${URI_PREFIX}ind.traineddata -> ind.traineddata-${LANGPACKV} )
+	l10n_it? ( ${URI_PREFIX}ita.traineddata -> ita.traineddata-${LANGPACKV} )
+	l10n_ja? ( ${URI_PREFIX}jpn.traineddata -> jpn.traineddata-${LANGPACKV} )
+	l10n_ko? ( ${URI_PREFIX}kor.traineddata -> kor.traineddata-${LANGPACKV} )
+	l10n_lt? ( ${URI_PREFIX}lit.traineddata -> lit.traineddata-${LANGPACKV} )
+	l10n_lv? ( ${URI_PREFIX}lav.traineddata -> lav.traineddata-${LANGPACKV} )
+	l10n_nl? ( ${URI_PREFIX}nld.traineddata -> nld.traineddata-${LANGPACKV} )
+	l10n_no? ( ${URI_PREFIX}nor.traineddata -> nor.traineddata-${LANGPACKV} )
+	l10n_pl? ( ${URI_PREFIX}pol.traineddata -> pol.traineddata-${LANGPACKV} )
+	l10n_pt? ( ${URI_PREFIX}por.traineddata -> por.traineddata-${LANGPACKV} )
+	l10n_ro? ( ${URI_PREFIX}ron.traineddata -> ron.traineddata-${LANGPACKV} )
+	l10n_ru? ( ${URI_PREFIX}rus.traineddata -> rus.traineddata-${LANGPACKV} )
+	l10n_sk? ( ${URI_PREFIX}slk.traineddata -> slk.traineddata-${LANGPACKV}
+				  ${URI_PREFIX}slk_frak.traineddata -> slk_frak.traineddata-${LANGPACKV} )
+	l10n_sl? ( ${URI_PREFIX}slv.traineddata -> slv.traineddata-${LANGPACKV} )
+	l10n_sr? ( ${URI_PREFIX}srp.traineddata -> srp.traineddata-${LANGPACKV} )
+	l10n_sv? ( ${URI_PREFIX}swe.traineddata -> swe.traineddata-${LANGPACKV} )
+	l10n_th? ( ${URI_PREFIX}tha.traineddata -> tha.traineddata-${LANGPACKV} )
+	l10n_tl? ( ${URI_PREFIX}tgl.traineddata -> tgl.traineddata-${LANGPACKV} )
+	l10n_tr? ( ${URI_PREFIX}tur.traineddata -> tur.traineddata-${LANGPACKV} )
+	l10n_uk? ( ${URI_PREFIX}ukr.traineddata -> ukr.traineddata-${LANGPACKV} )
+	l10n_vi? ( ${URI_PREFIX}vie.traineddata -> vie.traineddata-${LANGPACKV} )
+	l10n_zh-CN? ( ${URI_PREFIX}chi_sim.traineddata -> chi_sim.traineddata-${LANGPACKV} )
+	l10n_zh-TW? ( ${URI_PREFIX}chi_tra.traineddata -> chi_tra.traineddata-${LANGPACKV} )
+	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="doc examples jpeg math opencl osd png scrollview static-libs tiff training webp l10n_ar l10n_bg l10n_ca l10n_chr l10n_cs l10n_de l10n_da l10n_el l10n_es l10n_fi l10n_fr l10n_he l10n_hi l10n_hu l10n_id l10n_it l10n_ja l10n_ko l10n_lt l10n_lv l10n_nl l10n_no l10n_pl l10n_pt l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_th l10n_tl l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW"
+
+# With opencl USE=tiff is necessary in leptonica
+CDEPEND=">=media-libs/leptonica-1.71:=[zlib,tiff?,jpeg?,png?,webp?]
+	opencl? (
+		virtual/opencl
+		media-libs/tiff:0=
+		media-libs/leptonica:=[tiff]
+	)
+	scrollview? (
+		>=dev-java/piccolo2d-3.0:0
+	)
+	training? (
+		dev-libs/icu:=
+		x11-libs/pango:=
+		x11-libs/cairo:=
+	)
+"
+
+DEPEND="${CDEPEND}
+	doc? ( app-doc/doxygen )
+	scrollview? ( >=virtual/jdk-1.7 )"
+
+RDEPEND="${CDEPEND}
+	scrollview? ( >=virtual/jre-1.7 )"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md )
+
+PATCHES=(
+	"${FILESDIR}/${P}-libtiff.patch"
+	"${FILESDIR}/${P}-no_graphics.patch"
+	"${FILESDIR}/${PN}-4.00.00-use-system-piccolo2d.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	find "${DISTDIR}/" -name "*traineddata-${LANGPACKV}" \
+		 -execdir sh -c 'cp -- "$0" "${S}/tessdata/${0%-*}"' '{}' ';' || die
+}
+
+src_prepare() {
+	default
+	eautoreconf
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable opencl)
+		$(use_enable scrollview graphics)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+	use doc && emake doc
+	use scrollview && emake ScrollView.jar JAVAC="javac $(java-pkg_javac-args)"
+	use training && emake training
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/html/. )
+	default
+	prune_libtool_files
+
+	if use training; then
+		emake DESTDIR="${D}" training-install
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins testing/eurotext.tif testing/phototest.tif
+	fi
+
+	insinto /usr/share/tessdata
+	doins tessdata/*traineddata* # language files
+	use scrollview && doins java/ScrollView.jar # scrollview
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/
@ 2017-03-22 16:28 Bernard Cafarelli
  0 siblings, 0 replies; 15+ messages in thread
From: Bernard Cafarelli @ 2017-03-22 16:28 UTC (permalink / raw
  To: gentoo-commits

commit:     5ee2ef42d5998dd66c24768e245e1bcfcd224b16
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 22 14:53:41 2017 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Wed Mar 22 16:27:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ee2ef42

app-text/tesseract: drop old

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-text/tesseract/Manifest                        |   1 -
 ...tesseract-3.04.00-fix-scrollview-disabled.patch |  41 -------
 app-text/tesseract/tesseract-3.04.00-r2.ebuild     | 129 ---------------------
 3 files changed, 171 deletions(-)

diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 7b5f3022771..c72774bbc36 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -121,7 +121,6 @@ DIST swe.traineddata-4.00 19062525 SHA256 f292c86c4388c08a0ec862f81e5b08619164cc
 DIST syr.traineddata-4.00 8056121 SHA256 d7be312ddbf720ea29380d5dbaa0427ae027de507e178e671f7232cc7ae8a0bf SHA512 c79acc0bde79d7f38b5ddd34683615886d7c284040273849e4b31dd988c4c0ac1617c0f6ef9d246b47eaade5ad5fdfdc4bf99dbb29e2d33c3827927135ea6f06 WHIRLPOOL adc125d0323fc99a51be568eb75d77891a7e84b377091dabdec816642b1fc7a5c2e14f256a1ccb81994c633824adf3ee3a258a17747472f8ae30993e37e2ce65
 DIST tam.traineddata-4.00 17333471 SHA256 ba8dc53bd987e4bdfacc37f46e6b0c8f7aea9c000d142ebda40f9f27c3aa2a48 SHA512 9ad90eb8c291712e4cd874d41ed9bcd4169427a50509a353f5549382909458b46a7e4a092dec0d475c548e681426a81597c577f2f821978405a94f965fd4d05f WHIRLPOOL dd3b1489d6c8758b7a36cc4d5d85f61f10643f2b3ffef63a3ae380a1b9314de9490304a27a04c92780ea90eac9f6fbb9845f3a0760df0c715864372dc1f958f0
 DIST tel.traineddata-4.00 54446537 SHA256 9db74228a36fcdbcde54e6e6118c0998b2fb73ed84c9e42b52062009c5becd66 SHA512 5e5c2ca84f095ec4dd3184d6cb75702482c699b5cd04f8750ab8958f578f7b24cf3253a83d19a4a1f3716466b95a81737d473339e3593538e46372c4588febb6 WHIRLPOOL 1eb738325fd5610ae3a71791a998aed4f901e03eac629547a5d627f7173dbf3b268732e08a7a64fd4147773bbfc56f560b5f02f32bd3adb16166e6cd8d85e794
-DIST tesseract-3.04.00.tar.gz 2264427 SHA256 7e6e48b625e1fba9bc825a4ef8c39f12c60aae1084939133b3c6a00f8f8dc38c SHA512 60c31bad40b4c01395782fb98b3326407e75ebdbda962de4fb0e878824efb05140bdcb139dcf7d4f699ae5350e81a00320ebe7fbec083a0d374952488cc59e25 WHIRLPOOL 81b685e4d50d94056a4f99ce6beb4c73983e9449e1eed07a69d4649b0a8231b17fede430a8c181b37216a55e9f6102a578c85d84b2bbe6e9643ca98f16ae3260
 DIST tesseract-3.04.01.tar.gz 2269105 SHA256 57f63e1b14ae04c3932a2683e4be4954a2849e17edd638ffe91bc5a2156adc6a SHA512 816f6c29f8efeaf157891ddb022bd0daf8eb27c0cb8b6df5542e745d209f0ce617245e4583c59a561ed3216044d3afb38f8620ee94cdea656364923dcb140b5b WHIRLPOOL 995502084484d172becdfdaa38888cd21f0fe2b8845fe4a64726f9fbcd35310d64153be6325016dd50ca37b95069112b63d4f0528bd989a58c3b88dc6c6a6813
 DIST tesseract-3.05.00.tar.gz 3581853 SHA256 3fe83e06d0f73b39f6e92ed9fc7ccba3ef734877b76aa5ddaaa778fac095d996 SHA512 54ba96bd1b0d19883e8a0f717ecfddd459945f9dda0fd340e29e2dab3af94d0eceb7f3d207f34685ee97d1ec763efac5d94dec7e0498a7ca85fec35da4ed76b1 WHIRLPOOL 33622256479395eb12c72e4d3187eecf23fe4557f4fcaecf9b5f1ba3aeab67e333b0d979812525f3a1504102764bc572a79f8e64c794be805004e5fec5cdef5b
 DIST tesseract-4.00.00_alpha.tar.gz 3706567 SHA256 ada7db147970317eed8223bb72702359ac53ad570e135f7f6824f40c41ea6791 SHA512 282ec941233ceb80fe1008e585a6069fe8ecd6bf2dd1d0f56e2e79b772a0b83bca918d5da892a6cab194a7828607e41a7fd873acec33181b8b86c3c37e434103 WHIRLPOOL ae27cd45ce680c71785c36bd4d5414efc5b07baa483094fd33ee7bd886b55e21a4034ddaa5d55a265cf23983ba21dc98c5e2e2148178e4fabd2c69e1a9326c9e

diff --git a/app-text/tesseract/files/tesseract-3.04.00-fix-scrollview-disabled.patch b/app-text/tesseract/files/tesseract-3.04.00-fix-scrollview-disabled.patch
deleted file mode 100644
index 7523e3b4496..00000000000
--- a/app-text/tesseract/files/tesseract-3.04.00-fix-scrollview-disabled.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 27b8a5cc89898c3f12dae57a58b15efddee9fe18 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zdenko=20Podobn=C3=BD?= <zdenop@gmail.com>
-Date: Thu, 23 Jul 2015 23:14:53 +0200
-Subject: [PATCH] fix GRAPHICS_DISABLED build
-
----
- ccstruct/imagedata.cpp | 4 ++++
- ccstruct/split.cpp     | 5 +++++
- 2 files changed, 9 insertions(+)
-
-diff --git a/ccstruct/imagedata.cpp b/ccstruct/imagedata.cpp
-index 4016a92..3c244c7 100644
---- a/ccstruct/imagedata.cpp
-+++ b/ccstruct/imagedata.cpp
-@@ -17,6 +17,10 @@
- // limitations under the License.
- ///////////////////////////////////////////////////////////////////////
- 
-+// Include automatically generated configuration file if running autoconf.
-+#ifdef HAVE_CONFIG_H
-+#include "config_auto.h"
-+#endif
- 
- #include "imagedata.h"
- 
-diff --git a/ccstruct/split.cpp b/ccstruct/split.cpp
-index 24650d4..6e6ea44 100644
---- a/ccstruct/split.cpp
-+++ b/ccstruct/split.cpp
-@@ -25,6 +25,11 @@
- /*----------------------------------------------------------------------
-               I n c l u d e s
- ----------------------------------------------------------------------*/
-+// Include automatically generated configuration file if running autoconf.
-+#ifdef HAVE_CONFIG_H
-+#include "config_auto.h"
-+#endif
-+
- #include "split.h"
- #include "coutln.h"
- #include "tprintf.h"

diff --git a/app-text/tesseract/tesseract-3.04.00-r2.ebuild b/app-text/tesseract/tesseract-3.04.00-r2.ebuild
deleted file mode 100644
index fe3a9e25170..00000000000
--- a/app-text/tesseract/tesseract-3.04.00-r2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="tesseract-ocr"
-URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${PV}/"
-
-inherit eutils autotools autotools-utils
-
-DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
-HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${URI_PREFIX}eng.traineddata -> eng.traineddata-${PV}
-	doc? ( https://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.02-doc-html.tar.gz )
-	l10n_ar? ( ${URI_PREFIX}ara.traineddata -> ara.traineddata-${PV} )
-	l10n_bg? ( ${URI_PREFIX}bul.traineddata -> bul.traineddata-${PV} )
-	l10n_ca? ( ${URI_PREFIX}cat.traineddata -> cat.traineddata-${PV} )
-	l10n_chr? ( ${URI_PREFIX}chr.traineddata -> chr.traineddata-${PV} )
-	l10n_cs? ( ${URI_PREFIX}ces.traineddata -> ces.traineddata-${PV} )
-	l10n_de? ( ${URI_PREFIX}deu.traineddata -> deu.traineddata-${PV}
-			   ${URI_PREFIX}deu_frak.traineddata -> deu_frak.traineddata-${PV} )
-	l10n_da? ( ${URI_PREFIX}dan.traineddata -> dan.traineddata-${PV}
-			   ${URI_PREFIX}dan_frak.traineddata -> dan_frak.traineddata-${PV} )
-	l10n_el? ( ${URI_PREFIX}ell.traineddata -> ell.traineddata-${PV} )
-	l10n_es? ( ${URI_PREFIX}spa.traineddata -> spa.traineddata-${PV} )
-	l10n_fi? ( ${URI_PREFIX}fin.traineddata -> fin.traineddata-${PV} )
-	l10n_fr? ( ${URI_PREFIX}fra.traineddata -> fra.traineddata-${PV} )
-	l10n_he? ( ${URI_PREFIX}heb.traineddata -> heb.traineddata-${PV} )
-	l10n_hi? ( ${URI_PREFIX}hin.traineddata -> hin.traineddata-${PV} )
-	l10n_hu? ( ${URI_PREFIX}hun.traineddata -> hun.traineddata-${PV} )
-	l10n_id? ( ${URI_PREFIX}ind.traineddata -> ind.traineddata-${PV} )
-	l10n_it? ( ${URI_PREFIX}ita.traineddata -> ita.traineddata-${PV} )
-	l10n_ja? ( ${URI_PREFIX}jpn.traineddata -> jpn.traineddata-${PV} )
-	l10n_ko? ( ${URI_PREFIX}kor.traineddata -> kor.traineddata-${PV} )
-	l10n_lt? ( ${URI_PREFIX}lit.traineddata -> lit.traineddata-${PV} )
-	l10n_lv? ( ${URI_PREFIX}lav.traineddata -> lav.traineddata-${PV} )
-	l10n_nl? ( ${URI_PREFIX}nld.traineddata -> nld.traineddata-${PV} )
-	l10n_no? ( ${URI_PREFIX}nor.traineddata -> nor.traineddata-${PV} )
-	l10n_pl? ( ${URI_PREFIX}pol.traineddata -> pol.traineddata-${PV} )
-	l10n_pt? ( ${URI_PREFIX}por.traineddata -> por.traineddata-${PV} )
-	l10n_ro? ( ${URI_PREFIX}ron.traineddata -> ron.traineddata-${PV} )
-	l10n_ru? ( ${URI_PREFIX}rus.traineddata -> rus.traineddata-${PV} )
-	l10n_sk? ( ${URI_PREFIX}slk.traineddata -> slk.traineddata-${PV}
-			   ${URI_PREFIX}slk_frak.traineddata -> slk_frak.traineddata-${PV} )
-	l10n_sl? ( ${URI_PREFIX}slv.traineddata -> slv.traineddata-${PV} )
-	l10n_sr? ( ${URI_PREFIX}srp.traineddata -> srp.traineddata-${PV} )
-	l10n_sv? ( ${URI_PREFIX}swe.traineddata -> swe.traineddata-${PV} )
-	l10n_th? ( ${URI_PREFIX}tha.traineddata -> tha.traineddata-${PV} )
-	l10n_tl? ( ${URI_PREFIX}tgl.traineddata -> tgl.traineddata-${PV} )
-	l10n_tr? ( ${URI_PREFIX}tur.traineddata -> tur.traineddata-${PV} )
-	l10n_uk? ( ${URI_PREFIX}ukr.traineddata -> ukr.traineddata-${PV} )
-	l10n_vi? ( ${URI_PREFIX}vie.traineddata -> vie.traineddata-${PV} )
-	l10n_zh-CN? ( ${URI_PREFIX}chi_sim.traineddata -> chi_sim.traineddata-${PV} )
-	l10n_zh-TW? ( ${URI_PREFIX}chi_tra.traineddata -> chi_tra.traineddata-${PV} )
-	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${PV} )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~mips ppc ppc64 sparc x86"
-
-IUSE="doc examples jpeg opencl osd png +scrollview static-libs tiff training -webp l10n_ar l10n_bg l10n_ca l10n_chr l10n_cs l10n_de l10n_da l10n_el l10n_es l10n_fi l10n_fr l10n_he l10n_hi l10n_hu l10n_id l10n_it l10n_ja l10n_ko l10n_lt l10n_lv l10n_nl l10n_no l10n_pl l10n_pt l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_th l10n_tl l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW"
-
-# With opencl USE=tiff is necessary in leptonica
-DEPEND=">=media-libs/leptonica-1.71[zlib,tiff?,jpeg?,png?,webp?]
-		opencl? ( virtual/opencl
-				  media-libs/tiff:0
-				  >=media-libs/leptonica-1.71[zlib,tiff,jpeg?,png?,webp?]
-				)
-	training? (
-	  dev-libs/icu
-	  x11-libs/pango
-	  x11-libs/cairo
-	)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README ReleaseNotes )
-
-PATCHES=(
-	"${FILESDIR}/tesseract-2.04-gcc47.patch"
-	"${FILESDIR}/${P}-fix-scrollview-disabled.patch"
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	use doc && unpack tesseract-ocr-3.02.02-doc-html.tar.gz
-	find "${DISTDIR}/" -name "*traineddata-${PV}" \
-		 -execdir sh -c 'cp -- "$0" "${S}/tessdata/${0%-*}"' '{}' ';' || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable opencl) \
-		$(use_enable scrollview graphics)
-		)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	default
-	if use training; then
-		emake training
-	fi
-	}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use training; then
-		pushd "${BUILD_DIR}"
-		emake DESTDIR="${D}" training-install
-		popd
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins testing/eurotext.tif testing/phototest.tif
-	fi
-
-	if use doc; then
-		dohtml -r "${WORKDIR}"/"${MY_PN}"/doc/html/*
-	fi
-
-	# install language files
-	insinto /usr/share/tessdata
-	doins "${S}"/tessdata/*traineddata*
-}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/
@ 2018-02-07 10:31 Bernard Cafarelli
  0 siblings, 0 replies; 15+ messages in thread
From: Bernard Cafarelli @ 2018-02-07 10:31 UTC (permalink / raw
  To: gentoo-commits

commit:     a6e24a2f2fcef48c6127f9812d71201399aead77
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  7 09:56:18 2018 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Wed Feb  7 10:31:27 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6e24a2f

app-text/tesseract: drop old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-text/tesseract/Manifest                        |   3 -
 .../tesseract/files/tesseract-2.04-gcc47.patch     |  10 --
 .../tesseract-3.04.01-fix-opencl-ldflags.patch     |  11 --
 .../files/tesseract-3.05.00-libtiff.patch          |  25 ----
 app-text/tesseract/tesseract-3.04.01-r1.ebuild     | 149 --------------------
 app-text/tesseract/tesseract-3.04.01.ebuild        | 153 ---------------------
 app-text/tesseract/tesseract-3.05.00.ebuild        | 149 --------------------
 7 files changed, 500 deletions(-)

diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index fd4879a3d72..514151081a2 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -121,11 +121,8 @@ DIST swe.traineddata-4.00 19062525 BLAKE2B bcdd4b24e671c47d7c4e2bc88c19c92576512
 DIST syr.traineddata-4.00 8056121 BLAKE2B bacf6ee42b8a9dac7042ca2608ec72b6db1a760f505e3325105141a24395d7e4e35fed3fe737785e92232bf89584822b46af05e97308f76edad0c7bd28a048e7 SHA512 c79acc0bde79d7f38b5ddd34683615886d7c284040273849e4b31dd988c4c0ac1617c0f6ef9d246b47eaade5ad5fdfdc4bf99dbb29e2d33c3827927135ea6f06
 DIST tam.traineddata-4.00 17333471 BLAKE2B 67e4b10d8e9fab5df8455b35483972d5543ccf76d7440e7b1c9c8fe89a3cc4e19359a8695b1410004e202b138b8524c000487fdf2ee26247c0a2d4190b7184ed SHA512 9ad90eb8c291712e4cd874d41ed9bcd4169427a50509a353f5549382909458b46a7e4a092dec0d475c548e681426a81597c577f2f821978405a94f965fd4d05f
 DIST tel.traineddata-4.00 54446537 BLAKE2B 0ecb044b58017e36a6d9e28927242ecb6ac8975f079c42c78a661faa87ac1ed7f9d38fd59383d3ca1b484fbf371aeb5e872765921d4b79066a938b88671a3d9f SHA512 5e5c2ca84f095ec4dd3184d6cb75702482c699b5cd04f8750ab8958f578f7b24cf3253a83d19a4a1f3716466b95a81737d473339e3593538e46372c4588febb6
-DIST tesseract-3.04.01.tar.gz 2269105 BLAKE2B 298b388619b3dfa1d2aac331f50dcf8f840fb44826df568aa4c831903b8a4b511cd05cb7c54a27502bcfb457630ed6561f314934cadc0e1f5be7479096606307 SHA512 816f6c29f8efeaf157891ddb022bd0daf8eb27c0cb8b6df5542e745d209f0ce617245e4583c59a561ed3216044d3afb38f8620ee94cdea656364923dcb140b5b
-DIST tesseract-3.05.00.tar.gz 3581853 BLAKE2B 1053ccec6a85601757a0b64a952b522b70b618ff78f3b8f33756298676151359891fb5b89d09f0d7c93db0109587745398d1dc5854806242308cd275caed06d4 SHA512 54ba96bd1b0d19883e8a0f717ecfddd459945f9dda0fd340e29e2dab3af94d0eceb7f3d207f34685ee97d1ec763efac5d94dec7e0498a7ca85fec35da4ed76b1
 DIST tesseract-3.05.01.tar.gz 3574810 BLAKE2B 0af97d0a58c05ce4d6f8fb3f76302344f75b5894b036adc327ecc79f90f2b41da58c8145509dc131706e806e291355e221482980294e2c9caff4be93d9b448b6 SHA512 a49c20c98386684cd89582e57b772811204fad8e5ff18214fb0da109f73629c70845054985e31e8deeb49107fbcf56e546aff661f08eb5dd60fbf83dbe976e81
 DIST tesseract-4.00.00_alpha.tar.gz 3706567 BLAKE2B e3790c95ca7f219a3e1a90de09b9464bc54210d6f553132d4fa9e39f0afe56e458e16424a10a1a6e6461e8e98a84fbea826542a32d3432533165a9d400a416c4 SHA512 282ec941233ceb80fe1008e585a6069fe8ecd6bf2dd1d0f56e2e79b772a0b83bca918d5da892a6cab194a7828607e41a7fd873acec33181b8b86c3c37e434103
-DIST tesseract-ocr-3.02.02-doc-html.tar.gz 10635901 BLAKE2B 2c54d12d796c760acfac88bfa4307843776262b2637376d7aa356e0da5e8426a1ef1dea8bd544ffcf87125827061713455d42b4c0037f4a40f91263f47f61f58 SHA512 4cca5974635ed9c1656a00735bf682ed1eca5cb9a3641a0d063f66ffbdf9dcbc0476628a5b5c48684bd23f5616412e71e9cec608ac979760010c1ee91764290f
 DIST tgk.traineddata-4.00 6555909 BLAKE2B a3023ec0fa10e3f52e5059b20da48a81eaa90b6665b55b50ac74d7f1f4acea3d7b6eae9f00f2a0a1f58798eb15d976367145d72976db1dd019fe249cae36a1b2 SHA512 abc5f2c4ac91b17a250f2f4847c9528a7673d51230415b7a069dc7243e2c210564400d34d5c38da6b727c8c24af26cbde3e7ef8a9674fa1605da001b4b1b60bb
 DIST tgl.traineddata-3.04.00 4114554 BLAKE2B 1cbd5e20fcf5fa7ea183daa76e1d09d7bd4427ce2456de49f23e374af8ae48219a32f71a25d0a98c26c79ac87dc4f8f68621c76fad85b6105561f5285d635c8d SHA512 8c205fd0d4b2fc774e5b6a19cb56dcdb91b7d001acd881e34363e437d5eeae8615b853ae09f93c4957328d3a423300b9a20a443ca971a14ede1867de6194a2bb
 DIST tgl.traineddata-4.00 11991699 BLAKE2B d888013c0416c1e057522ec828e2c2b4470d50b55b6de580ecf20090771cd6726167ca1dc66f02afab1f7c369035db1ea84cb0c7ddcc36d37820c0c065648986 SHA512 fda51303a8963432fa541510287aec32ea9ee7342e0ca7dfba4f40c5d352aec74bf7982bc469e12196d51a8906dd224df01aead0d14859102267e7ffd19f0380

diff --git a/app-text/tesseract/files/tesseract-2.04-gcc47.patch b/app-text/tesseract/files/tesseract-2.04-gcc47.patch
deleted file mode 100644
index afc560a8dc4..00000000000
--- a/app-text/tesseract/files/tesseract-2.04-gcc47.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./viewer/svutil.cpp.ori	2012-04-28 01:59:58.441072997 +0200
-+++ ./viewer/svutil.cpp	2012-04-28 02:00:35.085467955 +0200
-@@ -37,6 +37,7 @@
- #include <signal.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <unistd.h>
- #include <netdb.h>
- #include <sys/socket.h>
- #ifdef __linux__

diff --git a/app-text/tesseract/files/tesseract-3.04.01-fix-opencl-ldflags.patch b/app-text/tesseract/files/tesseract-3.04.01-fix-opencl-ldflags.patch
deleted file mode 100644
index b1b2b63fb53..00000000000
--- a/app-text/tesseract/files/tesseract-3.04.01-fix-opencl-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tesseract-3.04.01/configure.ac.orig	2016-08-11 10:50:28.853292674 +0200
-+++ tesseract-3.04.01/configure.ac	2016-08-11 11:06:32.919076995 +0200
-@@ -248,7 +248,7 @@
-         fi
-         AC_SUBST([AM_CPPFLAGS], [-DUSE_OPENCL])
-         OPENCL_CPPFLAGS="-I${OPENCL_INC}"
--        OPENCL_LDFLAGS="-l${OPENCL_LIBS}"
-+        OPENCL_LDFLAGS="${OPENCL_LIBS}"
-     fi
-     ;;
- esac

diff --git a/app-text/tesseract/files/tesseract-3.05.00-libtiff.patch b/app-text/tesseract/files/tesseract-3.05.00-libtiff.patch
deleted file mode 100644
index 5771739c344..00000000000
--- a/app-text/tesseract/files/tesseract-3.05.00-libtiff.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9ec0c4fa9c9836d414c02662a6f94f48815d61b2 Mon Sep 17 00:00:00 2001
-From: Stefan Weil <sw@weilnetz.de>
-Date: Tue, 13 Dec 2016 13:28:29 +0100
-Subject: [PATCH] api: Add missing dependency on libtiff
-
-It is needed because of a direct call to TIFFSetWarningHandler.
-
-Signed-off-by: Stefan Weil <sw@weilnetz.de>
----
- api/Makefile.am | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/api/Makefile.am b/api/Makefile.am
-index 76a8ed4..25e7f21 100644
---- a/api/Makefile.am
-+++ b/api/Makefile.am
-@@ -90,6 +90,8 @@ tesseract_LDFLAGS = $(OPENCL_LDFLAGS)
- 
- tesseract_LDADD += $(OPENMP_CXXFLAGS)
- 
-+tesseract_LDADD += -ltiff
-+
- if T_WIN
- tesseract_LDADD += -lws2_32
- libtesseract_la_LDFLAGS += -no-undefined -Wl,--as-needed -lws2_32

diff --git a/app-text/tesseract/tesseract-3.04.01-r1.ebuild b/app-text/tesseract/tesseract-3.04.01-r1.ebuild
deleted file mode 100644
index d7d23a447a0..00000000000
--- a/app-text/tesseract/tesseract-3.04.01-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="tesseract-ocr"
-LANGPACKV="3.04.00"
-URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
-JAVA_PKG_OPT_USE="scrollview"
-
-inherit autotools java-pkg-opt-2 toolchain-funcs
-
-DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
-HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
-	math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
-	l10n_ar? ( ${URI_PREFIX}ara.traineddata -> ara.traineddata-${LANGPACKV} )
-	l10n_bg? ( ${URI_PREFIX}bul.traineddata -> bul.traineddata-${LANGPACKV} )
-	l10n_ca? ( ${URI_PREFIX}cat.traineddata -> cat.traineddata-${LANGPACKV} )
-	l10n_chr? ( ${URI_PREFIX}chr.traineddata -> chr.traineddata-${LANGPACKV} )
-	l10n_cs? ( ${URI_PREFIX}ces.traineddata -> ces.traineddata-${LANGPACKV} )
-	l10n_de? ( ${URI_PREFIX}deu.traineddata -> deu.traineddata-${LANGPACKV}
-				  ${URI_PREFIX}deu_frak.traineddata -> deu_frak.traineddata-${LANGPACKV} )
-	l10n_da? ( ${URI_PREFIX}dan.traineddata -> dan.traineddata-${LANGPACKV}
-				  ${URI_PREFIX}dan_frak.traineddata -> dan_frak.traineddata-${LANGPACKV} )
-	l10n_el? ( ${URI_PREFIX}ell.traineddata -> ell.traineddata-${LANGPACKV} )
-	l10n_es? ( ${URI_PREFIX}spa.traineddata -> spa.traineddata-${LANGPACKV} )
-	l10n_fi? ( ${URI_PREFIX}fin.traineddata -> fin.traineddata-${LANGPACKV} )
-	l10n_fr? ( ${URI_PREFIX}fra.traineddata -> fra.traineddata-${LANGPACKV} )
-	l10n_he? ( ${URI_PREFIX}heb.traineddata -> heb.traineddata-${LANGPACKV} )
-	l10n_hi? ( ${URI_PREFIX}hin.traineddata -> hin.traineddata-${LANGPACKV} )
-	l10n_hu? ( ${URI_PREFIX}hun.traineddata -> hun.traineddata-${LANGPACKV} )
-	l10n_id? ( ${URI_PREFIX}ind.traineddata -> ind.traineddata-${LANGPACKV} )
-	l10n_it? ( ${URI_PREFIX}ita.traineddata -> ita.traineddata-${LANGPACKV} )
-	l10n_ja? ( ${URI_PREFIX}jpn.traineddata -> jpn.traineddata-${LANGPACKV} )
-	l10n_ko? ( ${URI_PREFIX}kor.traineddata -> kor.traineddata-${LANGPACKV} )
-	l10n_lt? ( ${URI_PREFIX}lit.traineddata -> lit.traineddata-${LANGPACKV} )
-	l10n_lv? ( ${URI_PREFIX}lav.traineddata -> lav.traineddata-${LANGPACKV} )
-	l10n_nl? ( ${URI_PREFIX}nld.traineddata -> nld.traineddata-${LANGPACKV} )
-	l10n_no? ( ${URI_PREFIX}nor.traineddata -> nor.traineddata-${LANGPACKV} )
-	l10n_pl? ( ${URI_PREFIX}pol.traineddata -> pol.traineddata-${LANGPACKV} )
-	l10n_pt? ( ${URI_PREFIX}por.traineddata -> por.traineddata-${LANGPACKV} )
-	l10n_ro? ( ${URI_PREFIX}ron.traineddata -> ron.traineddata-${LANGPACKV} )
-	l10n_ru? ( ${URI_PREFIX}rus.traineddata -> rus.traineddata-${LANGPACKV} )
-	l10n_sk? ( ${URI_PREFIX}slk.traineddata -> slk.traineddata-${LANGPACKV}
-				  ${URI_PREFIX}slk_frak.traineddata -> slk_frak.traineddata-${LANGPACKV} )
-	l10n_sl? ( ${URI_PREFIX}slv.traineddata -> slv.traineddata-${LANGPACKV} )
-	l10n_sr? ( ${URI_PREFIX}srp.traineddata -> srp.traineddata-${LANGPACKV} )
-	l10n_sv? ( ${URI_PREFIX}swe.traineddata -> swe.traineddata-${LANGPACKV} )
-	l10n_th? ( ${URI_PREFIX}tha.traineddata -> tha.traineddata-${LANGPACKV} )
-	l10n_tl? ( ${URI_PREFIX}tgl.traineddata -> tgl.traineddata-${LANGPACKV} )
-	l10n_tr? ( ${URI_PREFIX}tur.traineddata -> tur.traineddata-${LANGPACKV} )
-	l10n_uk? ( ${URI_PREFIX}ukr.traineddata -> ukr.traineddata-${LANGPACKV} )
-	l10n_vi? ( ${URI_PREFIX}vie.traineddata -> vie.traineddata-${LANGPACKV} )
-	l10n_zh-CN? ( ${URI_PREFIX}chi_sim.traineddata -> chi_sim.traineddata-${LANGPACKV} )
-	l10n_zh-TW? ( ${URI_PREFIX}chi_tra.traineddata -> chi_tra.traineddata-${LANGPACKV} )
-	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="doc examples jpeg math opencl osd png scrollview static-libs tiff training webp l10n_ar l10n_bg l10n_ca l10n_chr l10n_cs l10n_de l10n_da l10n_el l10n_es l10n_fi l10n_fr l10n_he l10n_hi l10n_hu l10n_id l10n_it l10n_ja l10n_ko l10n_lt l10n_lv l10n_nl l10n_no l10n_pl l10n_pt l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_th l10n_tl l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW"
-
-# With opencl USE=tiff is necessary in leptonica
-CDEPEND=">=media-libs/leptonica-1.71:=[zlib,tiff?,jpeg?,png?,webp?]
-	opencl? (
-		virtual/opencl
-		media-libs/tiff:0=
-		media-libs/leptonica:=[tiff]
-	)
-	scrollview? (
-		>=dev-java/piccolo2d-3.0:0
-	)
-	training? (
-		dev-libs/icu:=
-		x11-libs/pango:=
-		x11-libs/cairo:=
-	)
-"
-
-DEPEND="${CDEPEND}
-	doc? ( app-doc/doxygen )
-	scrollview? ( >=virtual/jdk-1.7 )"
-
-RDEPEND="${CDEPEND}
-	scrollview? ( >=virtual/jre-1.7 )"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md ReleaseNotes )
-
-PATCHES=(
-	"${FILESDIR}/${P}-use-system-piccolo2d.patch"
-	"${FILESDIR}/${P}-fix-opencl-ldflags.patch"
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	for file in ${A}; do
-		if [[ "${file}" == *traineddata* ]]; then
-			cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || die
-		fi
-	done
-}
-
-src_prepare() {
-	default
-	eautoreconf
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		$(use_enable opencl)
-		$(use_enable scrollview graphics)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-	use doc && emake doc
-	use scrollview && emake ScrollView.jar JAVAC="javac $(java-pkg_javac-args)"
-	use training && emake training
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/html/. )
-	default
-	prune_libtool_files
-
-	if use training; then
-		emake DESTDIR="${D}" training-install
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins testing/eurotext.tif testing/phototest.tif
-	fi
-
-	insinto /usr/share/tessdata
-	doins tessdata/*traineddata* # language files
-	use scrollview && doins java/ScrollView.jar # scrollview
-}

diff --git a/app-text/tesseract/tesseract-3.04.01.ebuild b/app-text/tesseract/tesseract-3.04.01.ebuild
deleted file mode 100644
index 6852fc486ef..00000000000
--- a/app-text/tesseract/tesseract-3.04.01.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="tesseract-ocr"
-LANGPACKV="3.04.00"
-URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
-JAVA_PKG_OPT_USE="scrollview"
-
-inherit eutils autotools java-pkg-opt-2
-
-DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
-HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
-	doc? ( https://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.02-doc-html.tar.gz )
-	math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
-	l10n_ar? ( ${URI_PREFIX}ara.traineddata -> ara.traineddata-${LANGPACKV} )
-	l10n_bg? ( ${URI_PREFIX}bul.traineddata -> bul.traineddata-${LANGPACKV} )
-	l10n_ca? ( ${URI_PREFIX}cat.traineddata -> cat.traineddata-${LANGPACKV} )
-	l10n_chr? ( ${URI_PREFIX}chr.traineddata -> chr.traineddata-${LANGPACKV} )
-	l10n_cs? ( ${URI_PREFIX}ces.traineddata -> ces.traineddata-${LANGPACKV} )
-	l10n_de? ( ${URI_PREFIX}deu.traineddata -> deu.traineddata-${LANGPACKV}
-				  ${URI_PREFIX}deu_frak.traineddata -> deu_frak.traineddata-${LANGPACKV} )
-	l10n_da? ( ${URI_PREFIX}dan.traineddata -> dan.traineddata-${LANGPACKV}
-				  ${URI_PREFIX}dan_frak.traineddata -> dan_frak.traineddata-${LANGPACKV} )
-	l10n_el? ( ${URI_PREFIX}ell.traineddata -> ell.traineddata-${LANGPACKV} )
-	l10n_es? ( ${URI_PREFIX}spa.traineddata -> spa.traineddata-${LANGPACKV} )
-	l10n_fi? ( ${URI_PREFIX}fin.traineddata -> fin.traineddata-${LANGPACKV} )
-	l10n_fr? ( ${URI_PREFIX}fra.traineddata -> fra.traineddata-${LANGPACKV} )
-	l10n_he? ( ${URI_PREFIX}heb.traineddata -> heb.traineddata-${LANGPACKV} )
-	l10n_hi? ( ${URI_PREFIX}hin.traineddata -> hin.traineddata-${LANGPACKV} )
-	l10n_hu? ( ${URI_PREFIX}hun.traineddata -> hun.traineddata-${LANGPACKV} )
-	l10n_id? ( ${URI_PREFIX}ind.traineddata -> ind.traineddata-${LANGPACKV} )
-	l10n_it? ( ${URI_PREFIX}ita.traineddata -> ita.traineddata-${LANGPACKV} )
-	l10n_ja? ( ${URI_PREFIX}jpn.traineddata -> jpn.traineddata-${LANGPACKV} )
-	l10n_ko? ( ${URI_PREFIX}kor.traineddata -> kor.traineddata-${LANGPACKV} )
-	l10n_lt? ( ${URI_PREFIX}lit.traineddata -> lit.traineddata-${LANGPACKV} )
-	l10n_lv? ( ${URI_PREFIX}lav.traineddata -> lav.traineddata-${LANGPACKV} )
-	l10n_nl? ( ${URI_PREFIX}nld.traineddata -> nld.traineddata-${LANGPACKV} )
-	l10n_no? ( ${URI_PREFIX}nor.traineddata -> nor.traineddata-${LANGPACKV} )
-	l10n_pl? ( ${URI_PREFIX}pol.traineddata -> pol.traineddata-${LANGPACKV} )
-	l10n_pt? ( ${URI_PREFIX}por.traineddata -> por.traineddata-${LANGPACKV} )
-	l10n_ro? ( ${URI_PREFIX}ron.traineddata -> ron.traineddata-${LANGPACKV} )
-	l10n_ru? ( ${URI_PREFIX}rus.traineddata -> rus.traineddata-${LANGPACKV} )
-	l10n_sk? ( ${URI_PREFIX}slk.traineddata -> slk.traineddata-${LANGPACKV}
-				  ${URI_PREFIX}slk_frak.traineddata -> slk_frak.traineddata-${LANGPACKV} )
-	l10n_sl? ( ${URI_PREFIX}slv.traineddata -> slv.traineddata-${LANGPACKV} )
-	l10n_sr? ( ${URI_PREFIX}srp.traineddata -> srp.traineddata-${LANGPACKV} )
-	l10n_sv? ( ${URI_PREFIX}swe.traineddata -> swe.traineddata-${LANGPACKV} )
-	l10n_th? ( ${URI_PREFIX}tha.traineddata -> tha.traineddata-${LANGPACKV} )
-	l10n_tl? ( ${URI_PREFIX}tgl.traineddata -> tgl.traineddata-${LANGPACKV} )
-	l10n_tr? ( ${URI_PREFIX}tur.traineddata -> tur.traineddata-${LANGPACKV} )
-	l10n_uk? ( ${URI_PREFIX}ukr.traineddata -> ukr.traineddata-${LANGPACKV} )
-	l10n_vi? ( ${URI_PREFIX}vie.traineddata -> vie.traineddata-${LANGPACKV} )
-	l10n_zh-CN? ( ${URI_PREFIX}chi_sim.traineddata -> chi_sim.traineddata-${LANGPACKV} )
-	l10n_zh-TW? ( ${URI_PREFIX}chi_tra.traineddata -> chi_tra.traineddata-${LANGPACKV} )
-	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~mips ppc ppc64 sparc x86"
-
-IUSE="doc examples jpeg math opencl osd png +scrollview static-libs tiff training -webp l10n_ar l10n_bg l10n_ca l10n_chr l10n_cs l10n_de l10n_da l10n_el l10n_es l10n_fi l10n_fr l10n_he l10n_hi l10n_hu l10n_id l10n_it l10n_ja l10n_ko l10n_lt l10n_lv l10n_nl l10n_no l10n_pl l10n_pt l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_th l10n_tl l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW"
-
-# With opencl USE=tiff is necessary in leptonica
-CDEPEND=">=media-libs/leptonica-1.71:=[zlib,tiff?,jpeg?,png?,webp?]
-	opencl? (
-		virtual/opencl
-		media-libs/tiff:0=
-		media-libs/leptonica:=[tiff]
-	)
-	scrollview? (
-		>=dev-java/piccolo2d-3.0:0
-	)
-	training? (
-		dev-libs/icu:=
-		x11-libs/pango:=
-		x11-libs/cairo:=
-	)
-"
-
-DEPEND="${CDEPEND}
-	scrollview? ( >=virtual/jdk-1.7 )"
-
-RDEPEND="${CDEPEND}
-	scrollview? ( >=virtual/jre-1.7 )"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md ReleaseNotes )
-
-PATCHES=(
-	"${FILESDIR}/tesseract-2.04-gcc47.patch"
-	"${FILESDIR}/${P}-use-system-piccolo2d.patch"
-	"${FILESDIR}/${P}-fix-opencl-ldflags.patch"
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	use doc && unpack tesseract-ocr-3.02.02-doc-html.tar.gz
-	for file in ${A}; do
-		if [[ "${file}" == *traineddata* ]]; then
-			cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || die
-		fi
-	done
-}
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	eautoreconf
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		$(use_enable opencl)
-		$(use_enable scrollview graphics)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-	use scrollview && emake ScrollView.jar JAVAC="javac $(java-pkg_javac-args)"
-	use training && emake training
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	if use training; then
-		emake DESTDIR="${D}" training-install
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins testing/eurotext.tif testing/phototest.tif
-	fi
-
-	if use doc; then
-		dohtml -r "${WORKDIR}/${MY_PN}"/doc/html/*
-	fi
-
-	insinto /usr/share/tessdata
-	doins tessdata/*traineddata* # language files
-	use scrollview && doins java/ScrollView.jar # scrollview
-}

diff --git a/app-text/tesseract/tesseract-3.05.00.ebuild b/app-text/tesseract/tesseract-3.05.00.ebuild
deleted file mode 100644
index 7b1c14b4f5b..00000000000
--- a/app-text/tesseract/tesseract-3.05.00.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="tesseract-ocr"
-LANGPACKV="3.04.00"
-URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
-JAVA_PKG_OPT_USE="scrollview"
-
-inherit autotools java-pkg-opt-2 toolchain-funcs
-
-DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
-HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
-	math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
-	l10n_ar? ( ${URI_PREFIX}ara.traineddata -> ara.traineddata-${LANGPACKV} )
-	l10n_bg? ( ${URI_PREFIX}bul.traineddata -> bul.traineddata-${LANGPACKV} )
-	l10n_ca? ( ${URI_PREFIX}cat.traineddata -> cat.traineddata-${LANGPACKV} )
-	l10n_chr? ( ${URI_PREFIX}chr.traineddata -> chr.traineddata-${LANGPACKV} )
-	l10n_cs? ( ${URI_PREFIX}ces.traineddata -> ces.traineddata-${LANGPACKV} )
-	l10n_de? ( ${URI_PREFIX}deu.traineddata -> deu.traineddata-${LANGPACKV}
-				  ${URI_PREFIX}deu_frak.traineddata -> deu_frak.traineddata-${LANGPACKV} )
-	l10n_da? ( ${URI_PREFIX}dan.traineddata -> dan.traineddata-${LANGPACKV}
-				  ${URI_PREFIX}dan_frak.traineddata -> dan_frak.traineddata-${LANGPACKV} )
-	l10n_el? ( ${URI_PREFIX}ell.traineddata -> ell.traineddata-${LANGPACKV} )
-	l10n_es? ( ${URI_PREFIX}spa.traineddata -> spa.traineddata-${LANGPACKV} )
-	l10n_fi? ( ${URI_PREFIX}fin.traineddata -> fin.traineddata-${LANGPACKV} )
-	l10n_fr? ( ${URI_PREFIX}fra.traineddata -> fra.traineddata-${LANGPACKV} )
-	l10n_he? ( ${URI_PREFIX}heb.traineddata -> heb.traineddata-${LANGPACKV} )
-	l10n_hi? ( ${URI_PREFIX}hin.traineddata -> hin.traineddata-${LANGPACKV} )
-	l10n_hu? ( ${URI_PREFIX}hun.traineddata -> hun.traineddata-${LANGPACKV} )
-	l10n_id? ( ${URI_PREFIX}ind.traineddata -> ind.traineddata-${LANGPACKV} )
-	l10n_it? ( ${URI_PREFIX}ita.traineddata -> ita.traineddata-${LANGPACKV} )
-	l10n_ja? ( ${URI_PREFIX}jpn.traineddata -> jpn.traineddata-${LANGPACKV} )
-	l10n_ko? ( ${URI_PREFIX}kor.traineddata -> kor.traineddata-${LANGPACKV} )
-	l10n_lt? ( ${URI_PREFIX}lit.traineddata -> lit.traineddata-${LANGPACKV} )
-	l10n_lv? ( ${URI_PREFIX}lav.traineddata -> lav.traineddata-${LANGPACKV} )
-	l10n_nl? ( ${URI_PREFIX}nld.traineddata -> nld.traineddata-${LANGPACKV} )
-	l10n_no? ( ${URI_PREFIX}nor.traineddata -> nor.traineddata-${LANGPACKV} )
-	l10n_pl? ( ${URI_PREFIX}pol.traineddata -> pol.traineddata-${LANGPACKV} )
-	l10n_pt? ( ${URI_PREFIX}por.traineddata -> por.traineddata-${LANGPACKV} )
-	l10n_ro? ( ${URI_PREFIX}ron.traineddata -> ron.traineddata-${LANGPACKV} )
-	l10n_ru? ( ${URI_PREFIX}rus.traineddata -> rus.traineddata-${LANGPACKV} )
-	l10n_sk? ( ${URI_PREFIX}slk.traineddata -> slk.traineddata-${LANGPACKV}
-				  ${URI_PREFIX}slk_frak.traineddata -> slk_frak.traineddata-${LANGPACKV} )
-	l10n_sl? ( ${URI_PREFIX}slv.traineddata -> slv.traineddata-${LANGPACKV} )
-	l10n_sr? ( ${URI_PREFIX}srp.traineddata -> srp.traineddata-${LANGPACKV} )
-	l10n_sv? ( ${URI_PREFIX}swe.traineddata -> swe.traineddata-${LANGPACKV} )
-	l10n_th? ( ${URI_PREFIX}tha.traineddata -> tha.traineddata-${LANGPACKV} )
-	l10n_tl? ( ${URI_PREFIX}tgl.traineddata -> tgl.traineddata-${LANGPACKV} )
-	l10n_tr? ( ${URI_PREFIX}tur.traineddata -> tur.traineddata-${LANGPACKV} )
-	l10n_uk? ( ${URI_PREFIX}ukr.traineddata -> ukr.traineddata-${LANGPACKV} )
-	l10n_vi? ( ${URI_PREFIX}vie.traineddata -> vie.traineddata-${LANGPACKV} )
-	l10n_zh-CN? ( ${URI_PREFIX}chi_sim.traineddata -> chi_sim.traineddata-${LANGPACKV} )
-	l10n_zh-TW? ( ${URI_PREFIX}chi_tra.traineddata -> chi_tra.traineddata-${LANGPACKV} )
-	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="doc examples jpeg math opencl osd png scrollview static-libs tiff training webp l10n_ar l10n_bg l10n_ca l10n_chr l10n_cs l10n_de l10n_da l10n_el l10n_es l10n_fi l10n_fr l10n_he l10n_hi l10n_hu l10n_id l10n_it l10n_ja l10n_ko l10n_lt l10n_lv l10n_nl l10n_no l10n_pl l10n_pt l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_th l10n_tl l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW"
-
-# With opencl USE=tiff is necessary in leptonica
-CDEPEND=">=media-libs/leptonica-1.71:=[zlib,tiff?,jpeg?,png?,webp?]
-	opencl? (
-		virtual/opencl
-		media-libs/tiff:0=
-		media-libs/leptonica:=[tiff]
-	)
-	scrollview? (
-		>=dev-java/piccolo2d-3.0:0
-	)
-	training? (
-		dev-libs/icu:=
-		x11-libs/pango:=
-		x11-libs/cairo:=
-	)"
-
-DEPEND="${CDEPEND}
-	doc? ( app-doc/doxygen )
-	scrollview? ( >=virtual/jdk-1.7 )"
-
-RDEPEND="${CDEPEND}
-	scrollview? ( >=virtual/jre-1.7 )"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md )
-
-PATCHES=(
-	"${FILESDIR}/${P}-libtiff.patch"
-	"${FILESDIR}/${P}-no_graphics.patch"
-	"${FILESDIR}/${PN}-4.00.00-use-system-piccolo2d.patch"
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	for file in ${A}; do
-		if [[ "${file}" == *traineddata* ]]; then
-			cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || die
-		fi
-	done
-}
-
-src_prepare() {
-	default
-	eautoreconf
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		$(use_enable opencl)
-		$(use_enable scrollview graphics)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-	use doc && emake doc
-	use scrollview && emake ScrollView.jar JAVAC="javac $(java-pkg_javac-args)"
-	use training && emake training
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/html/. )
-	default
-	prune_libtool_files
-
-	if use training; then
-		emake DESTDIR="${D}" training-install
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins testing/eurotext.tif testing/phototest.tif
-	fi
-
-	insinto /usr/share/tessdata
-	doins tessdata/*traineddata* # language files
-	use scrollview && doins java/ScrollView.jar # scrollview
-}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/
@ 2018-08-13 20:56 Bernard Cafarelli
  0 siblings, 0 replies; 15+ messages in thread
From: Bernard Cafarelli @ 2018-08-13 20:56 UTC (permalink / raw
  To: gentoo-commits

commit:     cafbb198137c2a4787acace9efc41410145d1d3c
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 13 20:51:11 2018 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Aug 13 20:53:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cafbb198

app-text/tesseract: 4.0.0-beta.4 bump, fix live ebuild

Rename 3.05 patch as it does not apply anymore to 4.0

Upstream still recommends 3.05 as stable version

Closes: https://bugs.gentoo.org/663482
Package-Manager: Portage-2.3.46, Repoman-2.3.10

 app-text/tesseract/Manifest                        |   2 +-
 .../tesseract-3.04.01-use-system-piccolo2d.patch   |  27 ----
 ...> tesseract-3.05.00-use-system-piccolo2d.patch} |   0
 .../tesseract-4.00.00-use-system-piccolo2d.patch   |   6 +-
 .../files/tesseract-4.00.00_alpha-isnan.patch      |  28 ----
 .../tesseract-4.00.00_alpha-no_graphics.patch      | 143 ---------------------
 .../files/tesseract-4.00.00_alpha-openmp.patch     | 111 ----------------
 app-text/tesseract/tesseract-3.05.01.ebuild        |   2 +-
 app-text/tesseract/tesseract-3.05.02.ebuild        |   2 +-
 ...0_alpha.ebuild => tesseract-4.0.0_beta4.ebuild} |  12 +-
 app-text/tesseract/tesseract-9999.ebuild           |   4 +-
 11 files changed, 13 insertions(+), 324 deletions(-)

diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 5e7b04fc8ce..039ffa60657 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -123,7 +123,7 @@ DIST tam.traineddata-4.00 17333471 BLAKE2B 67e4b10d8e9fab5df8455b35483972d5543cc
 DIST tel.traineddata-4.00 54446537 BLAKE2B 0ecb044b58017e36a6d9e28927242ecb6ac8975f079c42c78a661faa87ac1ed7f9d38fd59383d3ca1b484fbf371aeb5e872765921d4b79066a938b88671a3d9f SHA512 5e5c2ca84f095ec4dd3184d6cb75702482c699b5cd04f8750ab8958f578f7b24cf3253a83d19a4a1f3716466b95a81737d473339e3593538e46372c4588febb6
 DIST tesseract-3.05.01.tar.gz 3574810 BLAKE2B 0af97d0a58c05ce4d6f8fb3f76302344f75b5894b036adc327ecc79f90f2b41da58c8145509dc131706e806e291355e221482980294e2c9caff4be93d9b448b6 SHA512 a49c20c98386684cd89582e57b772811204fad8e5ff18214fb0da109f73629c70845054985e31e8deeb49107fbcf56e546aff661f08eb5dd60fbf83dbe976e81
 DIST tesseract-3.05.02.tar.gz 3571750 BLAKE2B f8c856449ab763d66a50d4bc65450f3c71132e66b4306f5a022c3df65c62646ec202256e12b5ce91888330a5ef10a3966f91eddc241cf306809ce40abc165c82 SHA512 4cb23a6981dd5ec9eefea7b9674847ae88a411a7308ee6d946a920c76eefcf5fe7a90f6cb3ff00493a0e69b5c327d052fa8514d7f3ed506bccbe4b0163065793
-DIST tesseract-4.00.00_alpha.tar.gz 3706567 BLAKE2B e3790c95ca7f219a3e1a90de09b9464bc54210d6f553132d4fa9e39f0afe56e458e16424a10a1a6e6461e8e98a84fbea826542a32d3432533165a9d400a416c4 SHA512 282ec941233ceb80fe1008e585a6069fe8ecd6bf2dd1d0f56e2e79b772a0b83bca918d5da892a6cab194a7828607e41a7fd873acec33181b8b86c3c37e434103
+DIST tesseract-4.0.0_beta4.tar.gz 1855821 BLAKE2B 8273fefc5c07526c87adcbe1d9d81204f622f42396564d8e5fae5ed5275c47bcefab1bc5df1560dee722a1236fbd2211f622e61b3f279219a877b3bb3bad822e SHA512 37347c461c288cbaf839b65ac1283ab5b60e6723726442a5d067e6a4e2f48d6847d7393206f1ddd4de3c5dbd8a8d9febcc42d68567a46a4665fbf678bab232d4
 DIST tgk.traineddata-4.00 6555909 BLAKE2B a3023ec0fa10e3f52e5059b20da48a81eaa90b6665b55b50ac74d7f1f4acea3d7b6eae9f00f2a0a1f58798eb15d976367145d72976db1dd019fe249cae36a1b2 SHA512 abc5f2c4ac91b17a250f2f4847c9528a7673d51230415b7a069dc7243e2c210564400d34d5c38da6b727c8c24af26cbde3e7ef8a9674fa1605da001b4b1b60bb
 DIST tgl.traineddata-3.04.00 4114554 BLAKE2B 1cbd5e20fcf5fa7ea183daa76e1d09d7bd4427ce2456de49f23e374af8ae48219a32f71a25d0a98c26c79ac87dc4f8f68621c76fad85b6105561f5285d635c8d SHA512 8c205fd0d4b2fc774e5b6a19cb56dcdb91b7d001acd881e34363e437d5eeae8615b853ae09f93c4957328d3a423300b9a20a443ca971a14ede1867de6194a2bb
 DIST tgl.traineddata-4.00 11991699 BLAKE2B d888013c0416c1e057522ec828e2c2b4470d50b55b6de580ecf20090771cd6726167ca1dc66f02afab1f7c369035db1ea84cb0c7ddcc36d37820c0c065648986 SHA512 fda51303a8963432fa541510287aec32ea9ee7342e0ca7dfba4f40c5d352aec74bf7982bc469e12196d51a8906dd224df01aead0d14859102267e7ffd19f0380

diff --git a/app-text/tesseract/files/tesseract-3.04.01-use-system-piccolo2d.patch b/app-text/tesseract/files/tesseract-3.04.01-use-system-piccolo2d.patch
deleted file mode 100644
index a9dd0041934..00000000000
--- a/app-text/tesseract/files/tesseract-3.04.01-use-system-piccolo2d.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -U 3 -dHrN tesseract-3.04.01/java/Makefile.am tesseract-3.04.01-scrollview/java/Makefile.am
---- tesseract-3.04.01/java/Makefile.am	2016-02-16 22:27:01.000000000 +0100
-+++ tesseract-3.04.01-scrollview/java/Makefile.am	2016-08-09 13:18:12.810503862 +0200
-@@ -36,10 +36,9 @@
- 	com/google/scrollview/ScrollView.class
- 
- SCROLLVIEW_LIBS = \
--	$(srcdir)/piccolo2d-core-3.0.jar \
--	$(srcdir)/piccolo2d-extras-3.0.jar
-+	/usr/share/piccolo2d/lib/piccolo2d.jar
- 
--CLASSPATH = $(srcdir)/piccolo2d-core-3.0.jar:$(srcdir)/piccolo2d-extras-3.0.jar
-+CLASSPATH = /usr/share/piccolo2d/lib/piccolo2d.jar
- 
- ScrollView.jar : $(SCROLLVIEW_CLASSES)
- 	$(JAR) cfm $@ Manifest.txt com/google/scrollview/*.class \
-diff -U 3 -dHrN tesseract-3.04.01/viewer/Makefile.am tesseract-3.04.01-scrollview/viewer/Makefile.am
---- tesseract-3.04.01/viewer/Makefile.am	2016-02-16 22:27:01.000000000 +0100
-+++ tesseract-3.04.01-scrollview/viewer/Makefile.am	2016-08-09 13:20:57.788318147 +0200
-@@ -17,3 +17,7 @@
- 
- libtesseract_viewer_la_SOURCES = \
-     scrollview.cpp svmnode.cpp svutil.cpp svpaint.cpp
-+
-+if !GRAPHICS_DISABLED
-+AM_CPPFLAGS += -DSCROLLVIEW_PATH=/usr/share/tessdata/
-+endif

diff --git a/app-text/tesseract/files/tesseract-4.00.00-use-system-piccolo2d.patch b/app-text/tesseract/files/tesseract-3.05.00-use-system-piccolo2d.patch
similarity index 100%
copy from app-text/tesseract/files/tesseract-4.00.00-use-system-piccolo2d.patch
copy to app-text/tesseract/files/tesseract-3.05.00-use-system-piccolo2d.patch

diff --git a/app-text/tesseract/files/tesseract-4.00.00-use-system-piccolo2d.patch b/app-text/tesseract/files/tesseract-4.00.00-use-system-piccolo2d.patch
index ad1f0f3df20..dc60579c667 100644
--- a/app-text/tesseract/files/tesseract-4.00.00-use-system-piccolo2d.patch
+++ b/app-text/tesseract/files/tesseract-4.00.00-use-system-piccolo2d.patch
@@ -14,9 +14,9 @@ diff -Naur tesseract.orig/java/Makefile.am tesseract/java/Makefile.am
  
  ScrollView.jar : $(SCROLLVIEW_CLASSES)
  	$(JAR) cfm $@ $(srcdir)/Manifest.txt com/google/scrollview/*.class \
-diff -Naur tesseract.orig/viewer/Makefile.am tesseract/viewer/Makefile.am
---- tesseract.orig/viewer/Makefile.am	2017-01-30 17:20:23.176458368 +0100
-+++ tesseract/viewer/Makefile.am	2017-01-30 17:22:39.281467163 +0100
+diff -Naur tesseract.orig/src/viewer/Makefile.am tesseract/src/viewer/Makefile.am
+--- tesseract.orig/src/viewer/Makefile.am	2017-01-30 17:20:23.176458368 +0100
++++ tesseract/src/viewer/Makefile.am	2017-01-30 17:22:39.281467163 +0100
 @@ -17,3 +17,7 @@
  
  libtesseract_viewer_la_SOURCES = \

diff --git a/app-text/tesseract/files/tesseract-4.00.00_alpha-isnan.patch b/app-text/tesseract/files/tesseract-4.00.00_alpha-isnan.patch
deleted file mode 100644
index 4ae4c8150a6..00000000000
--- a/app-text/tesseract/files/tesseract-4.00.00_alpha-isnan.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From beb564df82204078563bcbde4e569caac2f7a2ac Mon Sep 17 00:00:00 2001
-From: Stefan Weil <sw@weilnetz.de>
-Date: Tue, 22 Nov 2016 11:31:01 +0100
-Subject: [PATCH] lstm: Fix compilation (undeclared 'isnan')
-
-gcc report:
-
-lstm/lstmrecognizer.cpp:608:47: error: 'isnan' was not declared in this scope
-     ASSERT_HOST(!isnan(output.f(t)[null_char_]));
-
-Signed-off-by: Stefan Weil <sw@weilnetz.de>
----
- lstm/lstmrecognizer.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lstm/lstmrecognizer.cpp b/lstm/lstmrecognizer.cpp
-index f648e16..babfe50 100644
---- a/lstm/lstmrecognizer.cpp
-+++ b/lstm/lstmrecognizer.cpp
-@@ -600,7 +600,7 @@ void LSTMRecognizer::LabelsViaThreshold(const NetworkIO& output,
-     ++t;
-   }
-   while (t < width) {
--    ASSERT_HOST(!isnan(output.f(t)[null_char_]));
-+    ASSERT_HOST(!std::isnan(output.f(t)[null_char_]));
-     int label = output.BestLabel(t, null_char_, null_char_, NULL);
-     int char_start = t++;
-     while (t < width && !NullIsBest(output, null_thr, null_char_, t) &&

diff --git a/app-text/tesseract/files/tesseract-4.00.00_alpha-no_graphics.patch b/app-text/tesseract/files/tesseract-4.00.00_alpha-no_graphics.patch
deleted file mode 100644
index 6707ff09364..00000000000
--- a/app-text/tesseract/files/tesseract-4.00.00_alpha-no_graphics.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-diff --git a/lstm/lstmrecognizer.cpp b/lstm/lstmrecognizer.cpp
-index 1d4f0f3..7192ba7 100644
---- a/lstm/lstmrecognizer.cpp
-+++ b/lstm/lstmrecognizer.cpp
-@@ -16,6 +16,11 @@
- // limitations under the License.
- ///////////////////////////////////////////////////////////////////////
- 
-+// Include automatically generated configuration file if running autoconf.
-+#ifdef HAVE_CONFIG_H
-+#include "config_auto.h"
-+#endif
-+
- #include "lstmrecognizer.h"
- 
- #include "allheaders.h"
-diff --git a/lstm/lstmtrainer.cpp b/lstm/lstmtrainer.cpp
-index ab66702..fd3f247 100644
---- a/lstm/lstmtrainer.cpp
-+++ b/lstm/lstmtrainer.cpp
-@@ -16,6 +16,11 @@
- // limitations under the License.
- ///////////////////////////////////////////////////////////////////////
- 
-+// Include automatically generated configuration file if running autoconf.
-+#ifdef HAVE_CONFIG_H
-+#include "config_auto.h"
-+#endif
-+
- #include "lstmtrainer.h"
- #include <string>
- 
-diff --git a/lstm/network.cpp b/lstm/network.cpp
-index 795d4a5..791848a 100644
---- a/lstm/network.cpp
-+++ b/lstm/network.cpp
-@@ -16,6 +16,11 @@
- // limitations under the License.
- ///////////////////////////////////////////////////////////////////////
- 
-+// Include automatically generated configuration file if running autoconf.
-+#ifdef HAVE_CONFIG_H
-+#include "config_auto.h"
-+#endif
-+
- #include "network.h"
- 
- #include <stdlib.h>
-@@ -277,27 +282,31 @@ double Network::Random(double range) {
-   return randomizer_->SignedRand(range);
- }
- 
--#ifndef GRAPHICS_DISABLED
- // === Debug image display methods. ===
- // Displays the image of the matrix to the forward window.
- void Network::DisplayForward(const NetworkIO& matrix) {
-+#ifndef GRAPHICS_DISABLED  // do nothing if there's no graphics
-   Pix* image = matrix.ToPix();
-   ClearWindow(false, name_.string(), pixGetWidth(image),
-               pixGetHeight(image), &forward_win_);
-   DisplayImage(image, forward_win_);
-   forward_win_->Update();
-+#endif  // GRAPHICS_DISABLED
- }
- 
- // Displays the image of the matrix to the backward window.
- void Network::DisplayBackward(const NetworkIO& matrix) {
-+#ifndef GRAPHICS_DISABLED  // do nothing if there's no graphics
-   Pix* image = matrix.ToPix();
-   STRING window_name = name_ + "-back";
-   ClearWindow(false, window_name.string(), pixGetWidth(image),
-               pixGetHeight(image), &backward_win_);
-   DisplayImage(image, backward_win_);
-   backward_win_->Update();
-+#endif  // GRAPHICS_DISABLED
- }
- 
-+#ifndef GRAPHICS_DISABLED
- // Creates the window if needed, otherwise clears it.
- void Network::ClearWindow(bool tess_coords, const char* window_name,
-                           int width, int height, ScrollView** window) {
-diff --git a/viewer/svutil.cpp b/viewer/svutil.cpp
-index 34a2286..84a4b94 100644
---- a/viewer/svutil.cpp
-+++ b/viewer/svutil.cpp
-@@ -83,6 +83,27 @@ void SVMutex::Unlock() {
- #endif
- }
- 
-+// Create new thread.
-+void SVSync::StartThread(void *(*func)(void*), void* arg) {
-+#ifdef _WIN32
-+  LPTHREAD_START_ROUTINE f = (LPTHREAD_START_ROUTINE) func;
-+  DWORD threadid;
-+  HANDLE newthread = CreateThread(
-+  NULL,          // default security attributes
-+  0,             // use default stack size
-+  f,             // thread function
-+  arg,           // argument to thread function
-+  0,             // use default creation flags
-+  &threadid);    // returns the thread identifier
-+#else
-+  pthread_t helper;
-+  pthread_attr_t attr;
-+  pthread_attr_init(&attr);
-+  pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-+  pthread_create(&helper, &attr, func, arg);
-+#endif
-+}
-+
- #ifndef GRAPHICS_DISABLED
- 
- const int kMaxMsgSize = 4096;
-@@ -186,29 +207,6 @@ void SVSemaphore::Wait() {
- #endif
- }
- 
--
--// Create new thread.
--
--void SVSync::StartThread(void *(*func)(void*), void* arg) {
--#ifdef _WIN32
--  LPTHREAD_START_ROUTINE f = (LPTHREAD_START_ROUTINE) func;
--  DWORD threadid;
--  HANDLE newthread = CreateThread(
--  NULL,          // default security attributes
--  0,             // use default stack size
--  f,             // thread function
--  arg,           // argument to thread function
--  0,             // use default creation flags
--  &threadid);    // returns the thread identifier
--#else
--  pthread_t helper;
--  pthread_attr_t attr;
--  pthread_attr_init(&attr);
--  pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
--  pthread_create(&helper, &attr, func, arg);
--#endif
--}
--
- // Place a message in the message buffer (and flush it).
- void SVNetwork::Send(const char* msg) {
-   mutex_send_->Lock();

diff --git a/app-text/tesseract/files/tesseract-4.00.00_alpha-openmp.patch b/app-text/tesseract/files/tesseract-4.00.00_alpha-openmp.patch
deleted file mode 100644
index d07fb58157f..00000000000
--- a/app-text/tesseract/files/tesseract-4.00.00_alpha-openmp.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-Backport from upstream 6140be6a5575e9159e3678adf4ee9e673b3ff2cc
-
-diff -Naur tesseract-4.00.00alpha.orig/api/Makefile.am tesseract-4.00.00alpha/api/Makefile.am
---- tesseract-4.00.00alpha.orig/api/Makefile.am	2016-11-08 00:38:07.000000000 +0100
-+++ tesseract-4.00.00alpha/api/Makefile.am	2017-01-26 10:27:59.269712914 +0100
-@@ -88,9 +88,7 @@
- 
- tesseract_LDFLAGS = $(OPENCL_LDFLAGS)
- 
--if OPENMP
- tesseract_LDADD += $(OPENMP_CFLAGS)
--endif
- 
- if T_WIN
- tesseract_LDADD += -lws2_32
-@@ -99,4 +97,3 @@
- if ADD_RT
- tesseract_LDADD += -lrt
- endif
--
-diff -Naur tesseract-4.00.00alpha.orig/ccmain/Makefile.am tesseract-4.00.00alpha/ccmain/Makefile.am
---- tesseract-4.00.00alpha.orig/ccmain/Makefile.am	2016-11-08 00:38:07.000000000 +0100
-+++ tesseract-4.00.00alpha/ccmain/Makefile.am	2017-01-26 10:27:59.269712914 +0100
-@@ -8,6 +8,7 @@
-     -I$(top_srcdir)/textord -I$(top_srcdir)/opencl
- 
- AM_CPPFLAGS += $(OPENCL_CPPFLAGS)
-+AM_CPPFLAGS += $(OPENMP_CXXFLAGS)
- 
- if VISIBILITY
- AM_CPPFLAGS += -DTESS_EXPORTS \
-diff -Naur tesseract-4.00.00alpha.orig/ccmain/par_control.cpp tesseract-4.00.00alpha/ccmain/par_control.cpp
---- tesseract-4.00.00alpha.orig/ccmain/par_control.cpp	2016-11-08 00:38:07.000000000 +0100
-+++ tesseract-4.00.00alpha/ccmain/par_control.cpp	2017-01-26 10:27:59.269712914 +0100
-@@ -18,9 +18,9 @@
- ///////////////////////////////////////////////////////////////////////
- 
- #include "tesseractclass.h"
--#ifdef OPENMP
-+#ifdef _OPENMP
- #include <omp.h>
--#endif  // OPENMP
-+#endif // _OPENMP
- 
- namespace tesseract {
- 
-@@ -53,7 +53,9 @@
-   }
-   // Pre-classify all the blobs.
-   if (tessedit_parallelize > 1) {
-+#ifdef _OPENMP
-     #pragma omp parallel for num_threads(10)
-+#endif // _OPENMP
-     for (int b = 0; b < blobs.size(); ++b) {
-       *blobs[b].choices =
-           blobs[b].tesseract->classify_blob(blobs[b].blob, "par", White, NULL);
-diff -Naur tesseract-4.00.00alpha.orig/configure.ac tesseract-4.00.00alpha/configure.ac
---- tesseract-4.00.00alpha.orig/configure.ac	2016-11-08 00:38:07.000000000 +0100
-+++ tesseract-4.00.00alpha/configure.ac	2017-01-26 10:28:45.636688839 +0100
-@@ -170,14 +170,7 @@
- fi
- 
- # check whether to build OpenMP support
--AM_CONDITIONAL([OPENMP], false)
- AC_OPENMP
--AS_IF([test "x$OPENMP_CFLAGS" != "x"],
--  [AM_CONDITIONAL([OPENMP], true)
--   AC_SUBST([AM_CPPFLAGS], ["$OPENMP_CXXFLAGS"])
--   AC_DEFINE([OPENMP], [], [Defined when compiled with OpenMP support])]
--)
--
- 
- # check whether to build opencl version
- AC_MSG_CHECKING([--enable-opencl argument])
-diff -Naur tesseract-4.00.00alpha.orig/lstm/lstm.cpp tesseract-4.00.00alpha/lstm/lstm.cpp
---- tesseract-4.00.00alpha.orig/lstm/lstm.cpp	2016-11-08 00:38:07.000000000 +0100
-+++ tesseract-4.00.00alpha/lstm/lstm.cpp	2017-01-26 10:27:59.269712914 +0100
-@@ -18,7 +18,7 @@
- 
- #include "lstm.h"
- 
--#ifndef ANDROID_BUILD
-+#ifdef _OPENMP
- #include <omp.h>
- #endif
- #include <stdio.h>
-diff -Naur tesseract-4.00.00alpha.orig/lstm/Makefile.am tesseract-4.00.00alpha/lstm/Makefile.am
---- tesseract-4.00.00alpha.orig/lstm/Makefile.am	2016-11-08 00:38:07.000000000 +0100
-+++ tesseract-4.00.00alpha/lstm/Makefile.am	2017-01-26 10:27:59.269712914 +0100
-@@ -4,7 +4,7 @@
-     -I$(top_srcdir)/dict -I$(top_srcdir)/lstm
- AUTOMAKE_OPTIONS = subdir-objects
- SUBDIRS =
--AM_CXXFLAGS = -fopenmp
-+AM_CXXFLAGS = $(OPENMP_CXXFLAGS)
- 
- if !NO_TESSDATA_PREFIX
- AM_CXXFLAGS += -DTESSDATA_PREFIX=@datadir@/
-diff -Naur tesseract-4.00.00alpha.orig/lstm/parallel.cpp tesseract-4.00.00alpha/lstm/parallel.cpp
---- tesseract-4.00.00alpha.orig/lstm/parallel.cpp	2016-11-08 00:38:07.000000000 +0100
-+++ tesseract-4.00.00alpha/lstm/parallel.cpp	2017-01-26 10:27:59.269712914 +0100
-@@ -18,7 +18,9 @@
- 
- #include "parallel.h"
- 
-+#ifdef _OPENMP
- #include <omp.h>
-+#endif
- 
- #include "functions.h"  // For conditional undef of _OPENMP.
- #include "networkscratch.h"

diff --git a/app-text/tesseract/tesseract-3.05.01.ebuild b/app-text/tesseract/tesseract-3.05.01.ebuild
index b75cd450b34..d237409e66a 100644
--- a/app-text/tesseract/tesseract-3.05.01.ebuild
+++ b/app-text/tesseract/tesseract-3.05.01.ebuild
@@ -91,7 +91,7 @@ DOCS=( AUTHORS ChangeLog NEWS README.md )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.05.00-no_graphics.patch"
-	"${FILESDIR}/${PN}-4.00.00-use-system-piccolo2d.patch"
+	"${FILESDIR}/${PN}-3.05.00-use-system-piccolo2d.patch"
 )
 
 src_unpack() {

diff --git a/app-text/tesseract/tesseract-3.05.02.ebuild b/app-text/tesseract/tesseract-3.05.02.ebuild
index 160fe206b34..9f1cde5cf67 100644
--- a/app-text/tesseract/tesseract-3.05.02.ebuild
+++ b/app-text/tesseract/tesseract-3.05.02.ebuild
@@ -91,7 +91,7 @@ DOCS=( AUTHORS ChangeLog NEWS README.md )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.05.00-no_graphics.patch"
-	"${FILESDIR}/${PN}-4.00.00-use-system-piccolo2d.patch"
+	"${FILESDIR}/${PN}-3.05.00-use-system-piccolo2d.patch"
 )
 
 src_unpack() {

diff --git a/app-text/tesseract/tesseract-4.00.00_alpha.ebuild b/app-text/tesseract/tesseract-4.0.0_beta4.ebuild
similarity index 92%
rename from app-text/tesseract/tesseract-4.00.00_alpha.ebuild
rename to app-text/tesseract/tesseract-4.0.0_beta4.ebuild
index b936e99c917..a7ca7d38095 100644
--- a/app-text/tesseract/tesseract-4.00.00_alpha.ebuild
+++ b/app-text/tesseract/tesseract-4.0.0_beta4.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 MY_PN="tesseract-ocr"
+MY_PV=${PV/_beta/-beta.}
 LANGPACKV="4.00"
 URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
 JAVA_PKG_OPT_USE="scrollview"
@@ -12,7 +13,7 @@ inherit autotools java-pkg-opt-2 toolchain-funcs
 
 DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
 HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz
+SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
 	${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
 	math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
 	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )"
@@ -75,13 +76,10 @@ RDEPEND="${CDEPEND}
 DOCS=( AUTHORS ChangeLog NEWS README.md )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.04.01-use-system-piccolo2d.patch"
-	"${FILESDIR}/${P}-isnan.patch"
-	"${FILESDIR}/${P}-openmp.patch"
-	"${FILESDIR}/${P}-no_graphics.patch"
+	"${FILESDIR}/${PN}-4.00.00-use-system-piccolo2d.patch"
 )
 
-S=${WORKDIR}/${P/_}
+S=${WORKDIR}/${PN}-${MY_PV}
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp

diff --git a/app-text/tesseract/tesseract-9999.ebuild b/app-text/tesseract/tesseract-9999.ebuild
index d7b81535858..567315f9d5a 100644
--- a/app-text/tesseract/tesseract-9999.ebuild
+++ b/app-text/tesseract/tesseract-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -72,7 +72,7 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	scrollview? ( >=virtual/jre-1.7 )"
 
-DOCS=( AUTHORS ChangeLog NEWS README.md )
+DOCS=( AUTHORS ChangeLog README.md )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.00.00-use-system-piccolo2d.patch"


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/
@ 2019-06-04 14:42 Bernard Cafarelli
  0 siblings, 0 replies; 15+ messages in thread
From: Bernard Cafarelli @ 2019-06-04 14:42 UTC (permalink / raw
  To: gentoo-commits

commit:     98f4080a82c54d39d0a6c646649ca47fe9c7d649
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  4 14:35:30 2019 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Jun  4 14:39:53 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98f4080a

app-text/tesseract: 4.0.0 bump

Thanks marecki and Chris Mayo for the help
This version does not provide scrollview anymore, see bug for details

Closes: https://bugs.gentoo.org/686944
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 app-text/tesseract/Manifest                        |   1 +
 .../tesseract/files/tesseract-4.0.0-manpages.patch |  49 ++++++++
 app-text/tesseract/tesseract-4.0.0.ebuild          | 129 +++++++++++++++++++++
 3 files changed, 179 insertions(+)

diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 039ffa60657..c36c7265429 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -123,6 +123,7 @@ DIST tam.traineddata-4.00 17333471 BLAKE2B 67e4b10d8e9fab5df8455b35483972d5543cc
 DIST tel.traineddata-4.00 54446537 BLAKE2B 0ecb044b58017e36a6d9e28927242ecb6ac8975f079c42c78a661faa87ac1ed7f9d38fd59383d3ca1b484fbf371aeb5e872765921d4b79066a938b88671a3d9f SHA512 5e5c2ca84f095ec4dd3184d6cb75702482c699b5cd04f8750ab8958f578f7b24cf3253a83d19a4a1f3716466b95a81737d473339e3593538e46372c4588febb6
 DIST tesseract-3.05.01.tar.gz 3574810 BLAKE2B 0af97d0a58c05ce4d6f8fb3f76302344f75b5894b036adc327ecc79f90f2b41da58c8145509dc131706e806e291355e221482980294e2c9caff4be93d9b448b6 SHA512 a49c20c98386684cd89582e57b772811204fad8e5ff18214fb0da109f73629c70845054985e31e8deeb49107fbcf56e546aff661f08eb5dd60fbf83dbe976e81
 DIST tesseract-3.05.02.tar.gz 3571750 BLAKE2B f8c856449ab763d66a50d4bc65450f3c71132e66b4306f5a022c3df65c62646ec202256e12b5ce91888330a5ef10a3966f91eddc241cf306809ce40abc165c82 SHA512 4cb23a6981dd5ec9eefea7b9674847ae88a411a7308ee6d946a920c76eefcf5fe7a90f6cb3ff00493a0e69b5c327d052fa8514d7f3ed506bccbe4b0163065793
+DIST tesseract-4.0.0.tar.gz 1961372 BLAKE2B 5d684ec58deddc2cad6d61f5a3e22e9bccc1fa96b57d5bcad5239d5ba6d0805978b94b4b44a871c0796a756173b8072327f8a44a6a84da5604a3b50d9e425d21 SHA512 69e57d4ba1fc43d212fd0fff69a2b5d48a3b37cfee7054fdc083cbb7e04d92317609a32e457229661d70ce8d9b16c9d25e81bfc3861db660dd2c8f292202d447
 DIST tesseract-4.0.0_beta4.tar.gz 1855821 BLAKE2B 8273fefc5c07526c87adcbe1d9d81204f622f42396564d8e5fae5ed5275c47bcefab1bc5df1560dee722a1236fbd2211f622e61b3f279219a877b3bb3bad822e SHA512 37347c461c288cbaf839b65ac1283ab5b60e6723726442a5d067e6a4e2f48d6847d7393206f1ddd4de3c5dbd8a8d9febcc42d68567a46a4665fbf678bab232d4
 DIST tgk.traineddata-4.00 6555909 BLAKE2B a3023ec0fa10e3f52e5059b20da48a81eaa90b6665b55b50ac74d7f1f4acea3d7b6eae9f00f2a0a1f58798eb15d976367145d72976db1dd019fe249cae36a1b2 SHA512 abc5f2c4ac91b17a250f2f4847c9528a7673d51230415b7a069dc7243e2c210564400d34d5c38da6b727c8c24af26cbde3e7ef8a9674fa1605da001b4b1b60bb
 DIST tgl.traineddata-3.04.00 4114554 BLAKE2B 1cbd5e20fcf5fa7ea183daa76e1d09d7bd4427ce2456de49f23e374af8ae48219a32f71a25d0a98c26c79ac87dc4f8f68621c76fad85b6105561f5285d635c8d SHA512 8c205fd0d4b2fc774e5b6a19cb56dcdb91b7d001acd881e34363e437d5eeae8615b853ae09f93c4957328d3a423300b9a20a443ca971a14ede1867de6194a2bb

diff --git a/app-text/tesseract/files/tesseract-4.0.0-manpages.patch b/app-text/tesseract/files/tesseract-4.0.0-manpages.patch
new file mode 100644
index 00000000000..dfa8e9fde34
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-4.0.0-manpages.patch
@@ -0,0 +1,49 @@
+From 39ed30ad834a43cf403f88158c6db7a96f1bed29 Mon Sep 17 00:00:00 2001
+From: Stefan Weil <sw@weilnetz.de>
+Date: Fri, 1 Feb 2019 19:47:46 +0100
+Subject: Fix build rule for manpages
+
+This is similar to commit 2106cba0a98a90451df835f3ab7b2aaf54826442
+which fixed doc/generate_manpages.sh.
+
+Signed-off-by: Stefan Weil <sw@weilnetz.de>
+---
+ doc/Makefile.am | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index a218aca3..c0eeda84 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -2,9 +2,6 @@
+ 
+ if ASCIIDOC
+ 
+-asciidoc=asciidoc -d manpage
+-
+-
+ man_MANS = \
+   combine_lang_model.1 \
+   combine_tessdata.1  \
+@@ -29,6 +26,8 @@ man_MANS += \
+   unicharset.5
+ endif
+ 
++man_xslt = http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
++
+ EXTRA_DIST = $(man_MANS) Doxyfile
+ 
+ .PHONY: html
+@@ -36,7 +35,8 @@ EXTRA_DIST = $(man_MANS) Doxyfile
+ html: $(patsubst %,%.html,$(man_MANS))
+ 
+ %: %.asc
+-	$(asciidoc) -o $@ $<
++	asciidoc -b docbook -d manpage -o - $< | \
++	xsltproc --nonet $(man_xslt) -
+ 
+ %.html: %.asc
+ 	asciidoc -b html5 -o $@ $<
+-- 
+cgit v1.2.1
+

diff --git a/app-text/tesseract/tesseract-4.0.0.ebuild b/app-text/tesseract/tesseract-4.0.0.ebuild
new file mode 100644
index 00000000000..d4ba59d9b35
--- /dev/null
+++ b/app-text/tesseract/tesseract-4.0.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="tesseract-ocr"
+LANGPACKV="4.00"
+URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
+HOMEPAGE="https://github.com/tesseract-ocr"
+SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
+	math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
+	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc jpeg math opencl openmp osd png static-libs tiff training webp"
+
+# List of supported Gentoo linguas and their upstream mapping
+# https://github.com/tesseract-ocr/tesseract/wiki/Data-Files
+# "old" variants were regrouped in the matching modern locale
+LANGUAGES="af:afr am:amh ar:ara as:asm az:aze,aze_cyrl be:bel bn:ben bo:bod bs:bos bg:bul ca:cat cs:ces zh:chi_sim,chi_tra cy:cym da:dan de:deu,frk dz:dzo el:ell,grc en:enm eo:epo et:est eu:eus fa:fas fi:fin fr:fra,frm ga:gle gl:glg gu:guj he:heb hi:hin hr:hrv hu:hun id:ind is:isl it:ita,ita_old ja:jpn kn:kan ka:kat,kat_old kk:kaz km:khm ky:kir ko:kor ku:kur lo:lao la:lat lv:lav lt:lit ml:mal mr:mar mk:mkd ms:msa my:mya ne:nep nl:nld no:nor or:ori pa:pan pl:pol pt:por ro:ron ru:rus sa:san si:sin sk:slk sl:slv es:spa,spa_old sq:sqi sr:srp,srp_latn sw:swa sv:swe syc:syr ta:tam te:tel tg:tgk tl:tgl th:tha tr:tur ug:uig uk:ukr uz:uzb,uzb_cyrl vi:vie"
+# Missing matches:
+#	ceb 	Cebuano
+#	chr 	Cherokee
+#	hat 	Haitian; Haitian Creole
+#	iku 	Inuktitut
+#	jav 	Javanese
+#	mlt 	Maltese
+#	pus 	Pushto; Pashto
+#	tir 	Tigrinya
+#	urd 	Urdu
+#	yid 	Yiddish
+# l10n_en provides the additional data:
+#	enm 	English, Middle (1100-1500)
+
+for lang in ${LANGUAGES}; do
+	gentoo_lang=${lang%:*}
+	tess_langs=${lang#*:}
+	for tess_lang in ${tess_langs//,/ }; do
+		SRC_URI+=" l10n_${gentoo_lang}? ( ${URI_PREFIX}${tess_lang}.traineddata -> ${tess_lang}.traineddata-${LANGPACKV} )"
+	done
+	IUSE+=" l10n_${gentoo_lang}"
+done
+
+# With opencl USE=tiff is necessary in leptonica
+RDEPEND=">=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?]
+	opencl? (
+		virtual/opencl
+		media-libs/tiff:0=
+		media-libs/leptonica:=[tiff]
+	)
+	training? (
+		dev-libs/icu:=
+		x11-libs/pango:=
+		x11-libs/cairo:=
+	)"
+
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-manpages.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	for file in ${A}; do
+		if [[ "${file}" == *traineddata* ]]; then
+			cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || die
+		fi
+	done
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# scrollview disabled for now, see bug #686944
+	local myeconfargs=(
+		--enable-shared
+		--disable-graphics
+		$(use_enable opencl)
+		$(use_enable openmp)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+	use doc && emake doc
+	use training && emake training
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/html/. )
+	default
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	if use training; then
+		emake DESTDIR="${D}" training-install
+	fi
+
+	insinto /usr/share/tessdata
+	doins tessdata/*traineddata* # language files
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/
@ 2019-06-04 14:42 Bernard Cafarelli
  0 siblings, 0 replies; 15+ messages in thread
From: Bernard Cafarelli @ 2019-06-04 14:42 UTC (permalink / raw
  To: gentoo-commits

commit:     35ec40276689d665635de45e8fa65f47d52b2aa5
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  4 14:38:25 2019 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Jun  4 14:39:53 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35ec4027

app-text/tesseract: drop beta ebuild, sync live ebuild with 4.0

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 app-text/tesseract/Manifest                        |   1 -
 .../tesseract-4.00.00-use-system-piccolo2d.patch   |  27 ----
 app-text/tesseract/tesseract-4.0.0_beta4.ebuild    | 139 ---------------------
 app-text/tesseract/tesseract-9999.ebuild           |  39 +++---
 4 files changed, 14 insertions(+), 192 deletions(-)

diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index c36c7265429..48fb2313882 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -124,7 +124,6 @@ DIST tel.traineddata-4.00 54446537 BLAKE2B 0ecb044b58017e36a6d9e28927242ecb6ac89
 DIST tesseract-3.05.01.tar.gz 3574810 BLAKE2B 0af97d0a58c05ce4d6f8fb3f76302344f75b5894b036adc327ecc79f90f2b41da58c8145509dc131706e806e291355e221482980294e2c9caff4be93d9b448b6 SHA512 a49c20c98386684cd89582e57b772811204fad8e5ff18214fb0da109f73629c70845054985e31e8deeb49107fbcf56e546aff661f08eb5dd60fbf83dbe976e81
 DIST tesseract-3.05.02.tar.gz 3571750 BLAKE2B f8c856449ab763d66a50d4bc65450f3c71132e66b4306f5a022c3df65c62646ec202256e12b5ce91888330a5ef10a3966f91eddc241cf306809ce40abc165c82 SHA512 4cb23a6981dd5ec9eefea7b9674847ae88a411a7308ee6d946a920c76eefcf5fe7a90f6cb3ff00493a0e69b5c327d052fa8514d7f3ed506bccbe4b0163065793
 DIST tesseract-4.0.0.tar.gz 1961372 BLAKE2B 5d684ec58deddc2cad6d61f5a3e22e9bccc1fa96b57d5bcad5239d5ba6d0805978b94b4b44a871c0796a756173b8072327f8a44a6a84da5604a3b50d9e425d21 SHA512 69e57d4ba1fc43d212fd0fff69a2b5d48a3b37cfee7054fdc083cbb7e04d92317609a32e457229661d70ce8d9b16c9d25e81bfc3861db660dd2c8f292202d447
-DIST tesseract-4.0.0_beta4.tar.gz 1855821 BLAKE2B 8273fefc5c07526c87adcbe1d9d81204f622f42396564d8e5fae5ed5275c47bcefab1bc5df1560dee722a1236fbd2211f622e61b3f279219a877b3bb3bad822e SHA512 37347c461c288cbaf839b65ac1283ab5b60e6723726442a5d067e6a4e2f48d6847d7393206f1ddd4de3c5dbd8a8d9febcc42d68567a46a4665fbf678bab232d4
 DIST tgk.traineddata-4.00 6555909 BLAKE2B a3023ec0fa10e3f52e5059b20da48a81eaa90b6665b55b50ac74d7f1f4acea3d7b6eae9f00f2a0a1f58798eb15d976367145d72976db1dd019fe249cae36a1b2 SHA512 abc5f2c4ac91b17a250f2f4847c9528a7673d51230415b7a069dc7243e2c210564400d34d5c38da6b727c8c24af26cbde3e7ef8a9674fa1605da001b4b1b60bb
 DIST tgl.traineddata-3.04.00 4114554 BLAKE2B 1cbd5e20fcf5fa7ea183daa76e1d09d7bd4427ce2456de49f23e374af8ae48219a32f71a25d0a98c26c79ac87dc4f8f68621c76fad85b6105561f5285d635c8d SHA512 8c205fd0d4b2fc774e5b6a19cb56dcdb91b7d001acd881e34363e437d5eeae8615b853ae09f93c4957328d3a423300b9a20a443ca971a14ede1867de6194a2bb
 DIST tgl.traineddata-4.00 11991699 BLAKE2B d888013c0416c1e057522ec828e2c2b4470d50b55b6de580ecf20090771cd6726167ca1dc66f02afab1f7c369035db1ea84cb0c7ddcc36d37820c0c065648986 SHA512 fda51303a8963432fa541510287aec32ea9ee7342e0ca7dfba4f40c5d352aec74bf7982bc469e12196d51a8906dd224df01aead0d14859102267e7ffd19f0380

diff --git a/app-text/tesseract/files/tesseract-4.00.00-use-system-piccolo2d.patch b/app-text/tesseract/files/tesseract-4.00.00-use-system-piccolo2d.patch
deleted file mode 100644
index dc60579c667..00000000000
--- a/app-text/tesseract/files/tesseract-4.00.00-use-system-piccolo2d.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur tesseract.orig/java/Makefile.am tesseract/java/Makefile.am
---- tesseract.orig/java/Makefile.am	2017-01-30 17:20:23.135458366 +0100
-+++ tesseract/java/Makefile.am	2017-01-30 17:21:29.834462557 +0100
-@@ -36,10 +36,9 @@
- 	com/google/scrollview/ScrollView.class
- 
- SCROLLVIEW_LIBS = \
--	piccolo2d-core-3.0.jar \
--	piccolo2d-extras-3.0.jar
-+	/usr/share/piccolo2d/lib/piccolo2d.jar
- 
--CLASSPATH = piccolo2d-core-3.0.jar:piccolo2d-extras-3.0.jar
-+CLASSPATH = /usr/share/piccolo2d/lib/piccolo2d.jar
- 
- ScrollView.jar : $(SCROLLVIEW_CLASSES)
- 	$(JAR) cfm $@ $(srcdir)/Manifest.txt com/google/scrollview/*.class \
-diff -Naur tesseract.orig/src/viewer/Makefile.am tesseract/src/viewer/Makefile.am
---- tesseract.orig/src/viewer/Makefile.am	2017-01-30 17:20:23.176458368 +0100
-+++ tesseract/src/viewer/Makefile.am	2017-01-30 17:22:39.281467163 +0100
-@@ -17,3 +17,7 @@
- 
- libtesseract_viewer_la_SOURCES = \
-     scrollview.cpp svmnode.cpp svutil.cpp svpaint.cpp
-+
-+if !GRAPHICS_DISABLED
-+AM_CPPFLAGS += -DSCROLLVIEW_PATH=/usr/share/tessdata/
-+endif

diff --git a/app-text/tesseract/tesseract-4.0.0_beta4.ebuild b/app-text/tesseract/tesseract-4.0.0_beta4.ebuild
deleted file mode 100644
index 84e9db7e0a2..00000000000
--- a/app-text/tesseract/tesseract-4.0.0_beta4.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="tesseract-ocr"
-MY_PV=${PV/_beta/-beta.}
-LANGPACKV="4.00"
-URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
-JAVA_PKG_OPT_USE="scrollview"
-
-inherit autotools java-pkg-opt-2 toolchain-funcs
-
-DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
-HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
-	${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
-	math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
-	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc jpeg math opencl openmp osd png scrollview static-libs tiff training webp"
-
-# List of supported Gentoo linguas and their upstream mapping
-# https://github.com/tesseract-ocr/tesseract/wiki/Data-Files
-# "old" variants were regrouped in the matching modern locale
-LANGUAGES="af:afr am:amh ar:ara as:asm az:aze,aze_cyrl be:bel bn:ben bo:bod bs:bos bg:bul ca:cat cs:ces zh:chi_sim,chi_tra cy:cym da:dan de:deu,frk dz:dzo el:ell,grc en:enm eo:epo et:est eu:eus fa:fas fi:fin fr:fra,frm ga:gle gl:glg gu:guj he:heb hi:hin hr:hrv hu:hun id:ind is:isl it:ita,ita_old ja:jpn kn:kan ka:kat,kat_old kk:kaz km:khm ky:kir ko:kor ku:kur lo:lao la:lat lv:lav lt:lit ml:mal mr:mar mk:mkd ms:msa my:mya ne:nep nl:nld no:nor or:ori pa:pan pl:pol pt:por ro:ron ru:rus sa:san si:sin sk:slk sl:slv es:spa,spa_old sq:sqi sr:srp,srp_latn sw:swa sv:swe syc:syr ta:tam te:tel tg:tgk tl:tgl th:tha tr:tur ug:uig uk:ukr uz:uzb,uzb_cyrl vi:vie"
-# Missing matches:
-#	ceb 	Cebuano
-#	chr 	Cherokee
-#	hat 	Haitian; Haitian Creole
-#	iku 	Inuktitut
-#	jav 	Javanese
-#	mlt 	Maltese
-#	pus 	Pushto; Pashto
-#	tir 	Tigrinya
-#	urd 	Urdu
-#	yid 	Yiddish
-# l10n_en provides the additional data:
-#	enm 	English, Middle (1100-1500)
-
-for lang in ${LANGUAGES}; do
-	gentoo_lang=${lang%:*}
-	tess_langs=${lang#*:}
-	for tess_lang in ${tess_langs//,/ }; do
-		SRC_URI+=" l10n_${gentoo_lang}? ( ${URI_PREFIX}${tess_lang}.traineddata -> ${tess_lang}.traineddata-${LANGPACKV} )"
-	done
-	IUSE+=" l10n_${gentoo_lang}"
-done
-
-# With opencl USE=tiff is necessary in leptonica
-CDEPEND=">=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?]
-	opencl? (
-		virtual/opencl
-		media-libs/tiff:0=
-		media-libs/leptonica:=[tiff]
-	)
-	scrollview? (
-		>=dev-java/piccolo2d-3.0:0
-	)
-	training? (
-		dev-libs/icu:=
-		x11-libs/pango:=
-		x11-libs/cairo:=
-	)"
-
-DEPEND="${CDEPEND}
-	doc? ( app-doc/doxygen )
-	scrollview? ( >=virtual/jdk-1.7 )"
-
-RDEPEND="${CDEPEND}
-	scrollview? ( >=virtual/jre-1.7 )"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.00.00-use-system-piccolo2d.patch"
-)
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	for file in ${A}; do
-		if [[ "${file}" == *traineddata* ]]; then
-			cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || die
-		fi
-	done
-}
-
-src_prepare() {
-	default
-	eautoreconf
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		$(use_enable opencl)
-		$(use_enable openmp)
-		$(use_enable scrollview graphics)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-	use doc && emake doc
-	use scrollview && emake ScrollView.jar JAVAC="javac $(java-pkg_javac-args)"
-	use training && emake training
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/html/. )
-	default
-	prune_libtool_files
-
-	if use training; then
-		emake DESTDIR="${D}" training-install
-	fi
-
-	insinto /usr/share/tessdata
-	doins tessdata/*traineddata* # language files
-	use scrollview && doins java/ScrollView.jar # scrollview
-}

diff --git a/app-text/tesseract/tesseract-9999.ebuild b/app-text/tesseract/tesseract-9999.ebuild
index efa9df5d709..6bba4a49da5 100644
--- a/app-text/tesseract/tesseract-9999.ebuild
+++ b/app-text/tesseract/tesseract-9999.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN="tesseract-ocr"
 LANGPACKV="4.00"
 URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
-JAVA_PKG_OPT_USE="scrollview"
 
-inherit autotools git-r3 java-pkg-opt-2 toolchain-funcs
+inherit autotools git-r3 toolchain-funcs
 
 DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
 HOMEPAGE="https://github.com/tesseract-ocr"
@@ -20,7 +19,7 @@ EGIT_REPO_URI="https://github.com/${MY_PN}/${PN}.git"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc jpeg math opencl openmp osd png scrollview static-libs tiff training webp"
+IUSE="doc jpeg math opencl openmp osd png static-libs tiff training webp"
 
 # List of supported Gentoo linguas and their upstream mapping
 # https://github.com/tesseract-ocr/tesseract/wiki/Data-Files
@@ -50,34 +49,26 @@ for lang in ${LANGUAGES}; do
 done
 
 # With opencl USE=tiff is necessary in leptonica
-CDEPEND=">=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?]
+RDEPEND=">=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?]
 	opencl? (
 		virtual/opencl
 		media-libs/tiff:0=
 		media-libs/leptonica:=[tiff]
 	)
-	scrollview? (
-		>=dev-java/piccolo2d-3.0:0
-	)
 	training? (
 		dev-libs/icu:=
 		x11-libs/pango:=
 		x11-libs/cairo:=
 	)"
 
-DEPEND="${CDEPEND}
-	doc? ( app-doc/doxygen )
-	scrollview? ( >=virtual/jdk-1.7 )"
-
-RDEPEND="${CDEPEND}
-	scrollview? ( >=virtual/jre-1.7 )"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	doc? ( app-doc/doxygen )"
 
 DOCS=( AUTHORS ChangeLog README.md )
 
-PATCHES=(
-	"${FILESDIR}/${PN}-4.00.00-use-system-piccolo2d.patch"
-)
-
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
@@ -98,16 +89,15 @@ src_unpack() {
 src_prepare() {
 	default
 	eautoreconf
-
-	java-pkg-opt-2_src_prepare
 }
 
 src_configure() {
+	# scrollview disabled for now, see bug #686944
 	local myeconfargs=(
 		--enable-shared
+		--disable-graphics
 		$(use_enable opencl)
 		$(use_enable openmp)
-		$(use_enable scrollview graphics)
 		$(use_enable static-libs static)
 	)
 
@@ -117,14 +107,14 @@ src_configure() {
 src_compile() {
 	default
 	use doc && emake doc
-	use scrollview && emake ScrollView.jar JAVAC="javac $(java-pkg_javac-args)"
 	use training && emake training
 }
 
 src_install() {
 	use doc && HTML_DOCS=( doc/html/. )
 	default
-	prune_libtool_files
+
+	find "${D}" -name '*.la' -type f -delete || die
 
 	if use training; then
 		emake DESTDIR="${D}" training-install
@@ -132,5 +122,4 @@ src_install() {
 
 	insinto /usr/share/tessdata
 	doins tessdata/*traineddata* # language files
-	use scrollview && doins java/ScrollView.jar # scrollview
 }


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/
@ 2021-08-30  6:51 Bernard Cafarelli
  0 siblings, 0 replies; 15+ messages in thread
From: Bernard Cafarelli @ 2021-08-30  6:51 UTC (permalink / raw
  To: gentoo-commits

commit:     b6cf1d04988aa3d05c161e5e1b677222f0a8996f
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 30 06:49:14 2021 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Aug 30 06:51:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6cf1d04

app-text/tesseract: drop old stable

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 app-text/tesseract/Manifest                        |  45 -------
 .../files/tesseract-3.05.00-no_graphics.patch      |  74 -----------
 .../tesseract-3.05.00-use-system-piccolo2d.patch   |  27 ----
 app-text/tesseract/metadata.xml                    |   3 -
 app-text/tesseract/tesseract-3.05.02.ebuild        | 148 ---------------------
 app-text/tesseract/tesseract-4.1.0-r1.ebuild       |  91 -------------
 6 files changed, 388 deletions(-)

diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index beb6199c964..0266650c7a4 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -1,47 +1,2 @@
-DIST ara.traineddata-3.04.00 6315068 BLAKE2B 30af9442d0180c9288c6e8ae03e7ede7e4a1a18743733bc00b63c28f405ee1f0221a64e01c19dde3f808efe6b4547bceeee36690d9bf44288dfe57211b7acc90 SHA512 7fba780ec9061148c01dafee1227f8e338c1cf199a5c2869d58703123ea89f2279551e15159ab37038ec8ebc755076ede6ef049cc8a6e6764aa66d81c72a259b
-DIST bul.traineddata-3.04.00 6026234 BLAKE2B a39a5757ec6bbb77ed6fe9a263e11b9d83eb64653f62f96dec68c102aa199348eefb8f99642f9824af9e41c537573f06af45f393271145fdcfbfff71bd07e1fd SHA512 5115b4f92359344a17ee43b298c5c012569d77325e440bbe079ce7734ed087cbbe7ffb2b2dcb831e522fde2cde556e5de630f9ca85c141e9282e951e008e156c
-DIST cat.traineddata-3.04.00 5356190 BLAKE2B 64c7677812342474a7182c4e7907e068231511e09403c7122004e7720ab023f98c2d157ba5d417582d6323d3aa3ce5eb9914ce10506663f70749a1290c553747 SHA512 d3b1f2ff0d7d57fdbddbf9a2cd44fd1fcec08d13b82c6fd77a21fe45ef8e33dd809332b59d8bec0600f2596e0bf163605811539aca154eb11f7d8238e6df9630
-DIST ces.traineddata-3.04.00 11896327 BLAKE2B 253795339231d377d3b033f348cc3413ba3bf9520bae44d318b459271608501db7958dcd216f44deabc7755008cb66c5b20625ad3a00a3ea8fca2258aef3c8af SHA512 de65b88d76fd50115099dfaac8ac80b7c6581eb0aa6186fa0c91c9cf12e90632a96de341b2faf94a8de1c5ed7b71c196571c914792b6aa7de42a3b7542ed625d
-DIST chi_sim.traineddata-3.04.00 42089623 BLAKE2B d7ac25d5a43ab36fe54035e78c34aa9b7fd4fee06fb32da6ec8173d0c0a40ea727d0c529f0d02ec949642c81c81a4d180c6c68557709d3561d169c9e7c3a29f8 SHA512 e3427c17988e777447262bd3f5704f84d1296a8c02d10f343fc6f698ed23b8577670bdc76f3e0ea53284a233de1e6d0f25224d984bed75bfd52f73e6a6945673
-DIST chi_tra.traineddata-3.04.00 56692327 BLAKE2B 83ef6e067107b14cacb208ec5885d3db6a9fc6be85eae90f27eb4c70ae723cec6fa17912068f46078d8a03541a51ee2aa7b1eea007211b5fa9f7282142fd8ffb SHA512 149795758dd51beeea3b9739395b599c9b6fac35862ef50fd663273709f00bab72840a6983d09289d05269f808a6af25b588d9740f54736beaf2452da1c735d1
-DIST chr.traineddata-3.04.00 1083194 BLAKE2B 86a4c64f3df108d92f0b1d68743fb0a7c6e6aef328751c770968d946a476b1123141beb99730d67af8a4a321220be2a82cb3d96920352fd21709bfd15507a284 SHA512 e0982f5069a9cab4ad274babcd00a7199e2e76ae02167101a24c0074a91db5faf55f921159da724391860c9187423b14b5aab096f90eccc604a32b2d30376455
-DIST dan.traineddata-3.04.00 7340575 BLAKE2B 8437979bd4a01534e7a2c1c82c88232707ba10043c3bb824f71f8c365fed1353ce438dd08205286c1e2053adbe96211f34a5199648679f7c147806083d659a26 SHA512 ed320c5a3b93b5416ad1941a3e8a331a2f60570ba74b4bc2285e687472e7222556379c0ef261ae06970e3b9710c5fa89a26da5d509be325c2e627ed6e9f48bff
-DIST dan_frak.traineddata-3.04.00 1622710 BLAKE2B 458935c2176a74ef0090574be0ead1d65a0ede29fee48215a674643bb3a38f7a4fb40c940480e1e490edab8758f49010c6c2304ad9490ea22f60d8a8602317e1 SHA512 8bb21f7ee21f99e0eb8fb55bdcd60b006bb1dbb42946f1f7dce1c53bcbef46f5f6cca7aaf069b1b3c43b13eee2c7dee752fea8c38003ee266999752a9b466b01
-DIST deu.traineddata-3.04.00 13367187 BLAKE2B 3ead7f065fc4284f1dbdb83180d5f87e717fe39971d2bcf248f22125b5ac5fa9ed0f53491b955c9e0063a419dfd23a6696841ad0d12d7f6de13411f81254c416 SHA512 fd4eab9e9203ea3a2f009c5feb337449b4ec2acb67b42c5420ccf69b342ca9afa655093d7e9b07d3ad435a80e9f59eeaf3ca578608a9136ca13ee234444d6995
-DIST deu_frak.traineddata-3.04.00 1978593 BLAKE2B 7a9bf16949baa3167d162f5075a254fac7699cd6ce2766423a1d0ef652daa0174ae6a36c6dd0d0e6f45bf961b4a0d13a7f55a0de3bfa2afe023816dff0f54ed2 SHA512 6d458b657c5b88671e0932da24fe91051b7191105b710b18331620347407c5f91338ae951ee9e0464af2d93dca552d77b1e40d372dda1aed12bc209baf00d4b7
-DIST ell.traineddata-3.04.00 5422512 BLAKE2B cec340bb25a6f60fdf17dff46c06440ee2be62bf4b8dc8055dae1d77ec4a06a43862052399a3ece1c3d860cb1d88a1511a3b58a8b9f61bde3371736b0d686c01 SHA512 b542f4cad465332b7d9742ce64951289a22f31c2196335b09037e047c9fe2966689426d9e973173147aa7c0ca73cddb337c9ec7b485b13b80eea3e44ad31bb48
-DIST eng.traineddata-3.04.00 21876550 BLAKE2B 983f91e54b334ee533d5689ac8ce768922e348ef89a284c47d93ba91fcad6de8614998c8a5b17c2406c5c30c1228530077aad84929da6d8bc983c89c1d3a2234 SHA512 e03d205900e3f6b866b2342eb8f32fb35dad28c7f58b7bdc3c0bec0de570f87578168d8d64b1f0bedac7bbcf462dd949b00701943a55ba3f42842ad1629e230a
-DIST equ.traineddata-3.04.00 2251826 BLAKE2B b7ad09d1d57dd5af088496e0f6524a7bea869f61c8f4be45eee1f84d83eab5b5f724e736055bc5226abc704f90afe2726210e5eed1fcd2936c65010457c4b8b3 SHA512 2c5e5f9f85e956e0ebdbb25aa4e92bc163808ba9944c8d1ec9a76e4c70727c3657c6e56c86266a2e769e48c6f6d9aea72bf2080f723f3d90c089f775c3dae9d8
-DIST fin.traineddata-3.04.00 13274908 BLAKE2B 7fd89de5435619600523106184aea5e7c87720b1d5796508b4953d6d8c19e2e2bee96b7a36c887ab0f456a0322c30f17e37d91e3afaa1e0733c110f3324aa784 SHA512 036e5e383ec4ffc0e06fb5a93d288f21360660d10c6daf8459edd3fb94f611ed49ffcfb9bc1fdd1d8476690f53950ca31963ccdb36a35d3330fe2ffef0a81789
-DIST fra.traineddata-3.04.00 14044118 BLAKE2B 9acb6f5d6710632178aba4b95db27390d0100d9dec6ca3648c518dbc221b2cc03ecaaf33aafa363265863b9032e2ab7a327beafb8a6e29ae1a3345ba80455aed SHA512 c41223608625491fdbf2d4fbe526da472bb5c269958e776b2058d4a782ebeffff9749e30c7db34adcdbd30669d82be97ee58d303027d5a67ae61b87b65c2e561
-DIST heb.traineddata-3.04.00 4339016 BLAKE2B cbc22428f18602f7d9af02465e5e8c1088a86db812c37e113ea6a52a914710377d480366c190c852e466b7861172b964b705e328ba9cd3de5364c992e2c6e938 SHA512 9528f3b0d63bb2bc4f90c33808208846df2e9806085f134d4d6d6cd4ff96fe30ba3ae58db222245a7320646319526185ddc29cfb728d6db5038988bcf14a7727
-DIST hin.traineddata-3.04.00 14152165 BLAKE2B 1efd29d700d9baaf2a6865caebca5b6375fe5e459cf0dc075396062233f54a1ea136787a975e3b0701956200fa79c539de5ff2e615ac83862b229c74b172c85f SHA512 3ac300090fc39564079aa3ba70dc09841d0fcf3181ff2f25e50fc5687c17ec9e8a5f5343879a87f7362235bafe074025de5eb02391fc68f0637f8bef1c16c3ed
-DIST hun.traineddata-3.04.00 12213770 BLAKE2B 70f39e1e9b370c186cdffc2532810542e4655dd46274ea8e2ba9249383b991be4d82793edbab2edf7ad400eb54e0c7be032a20fa3fe851d5c6e9b5f4be12f139 SHA512 cdd6957f83a50850b30d66de5063db83d0612bbbf3a582aacf35f011b8b595ba5dd03f4ffea784c337ce568bdd1cc3cdbdf96f5fc80783bad634a785f12f147e
-DIST ind.traineddata-3.04.00 6503178 BLAKE2B 183221318212ff8c121f07541dc0d2855f12a0f5020b71d9e91a0c03c3938b7908debbcbe55e2df6d9f4f04066d513925d000cf1662aa084691f52532a4ae6a9 SHA512 997b0acbfac262d8889b47e8ad3c9ddea7893b89fe5edcbdb9a7fafe68ab4ac9e93e67cc1806bc6f4b1e1fa669da034687fae982318f9e05ad4716da0f276c77
-DIST ita.traineddata-3.04.00 14210569 BLAKE2B 2bfe588757c1f4765d5f6323cd7a72a80ba37c2796dcfd58b8dc00d9a3ad94f1e8710690b75542758be01fbe7b966d29e19054affc27d473e43448be0b2f327c SHA512 97566bb89803656cca14d3559a46734b74f7859fa651399705de8a22259828e76aca2ef8d27f486e3ae7779005772966155ef190ba666ea31b7bf8c1d2fe53ef
-DIST jpn.traineddata-3.04.00 33072615 BLAKE2B 39fc312a431c2fa8a82a4fd81cb2ed27bc29b92daba71307db484c34ca0cb616e816ce7404214e562b822251862ba79f256108320ff8fbb1cf942e3facd571f2 SHA512 23d2880f19e53739bff456a2e656924ea811872f16aa6bd52c87afdf2d7f639896d9b732ad0eea1966acb3ac76e2ed17dd6786cbbfabd9602f4af229580bf567
-DIST kor.traineddata-3.04.00 13309831 BLAKE2B 6a2ebbe51f8c1b5dd426a62b982acaa1b1a7c32f1a9282ccdb9561846d36a77660c8911065a72f80fb353d757b34958292b76dcc25656441e30c68f648df5cf8 SHA512 83d44cc7a870aa3efa6858f09ed1ee50d810e29711b706d6417d2aa79125da13bcd8f50e107dceef93849446a0506d122bfb8ce649f7e1e7181cdf75a6e0e4ee
-DIST lav.traineddata-3.04.00 7802105 BLAKE2B 40b90aadcab68a1787c77ebc3bceeb120fd4407cad3b7a33ca176cf1741d3b32ce1c4e81b3b793872caff756ec9651bfe7fc99e9721747eca7681024eb4b4726 SHA512 f45f3c722994c627a681bc38b66f64eb7d33563654f35ad838acdc11f66d7290eba3af3cb41aed633af981316f71fe44cc6fc20a0229b6ae20f3a96a1744a16b
-DIST lit.traineddata-3.04.00 8916163 BLAKE2B 7530938920b957b5affabc2e73deeb5e1c44a1005c5fddb3e5981db3c9b4c42fae45eb5ff88b1b41a9da9fa888ea4679ac2bb36f458c5da81d0251c85874ccc0 SHA512 cebd5fdd1387b919c6327fb8a6337c44787bfcde283e56dd71bd96b22ac4435c2a55418f57c4dbcf11f7174eb4feb736370d2b8f5ed2184a3c8503e13fc404d0
-DIST nld.traineddata-3.04.00 17098919 BLAKE2B dcf0641a78f1c8c6493e504229a08e1d4838d6c808446693b354ea822c7e2afc5fd9c9a1a2b970543c92fd7d4b3e9090dd8a6cd2461d6ac91aade1e1cf150aef SHA512 adffd81fe6fdbc94f790a102940dcbf913d51ab1a75b7ced9818f88df5c9444f2f3eb6363523084f1dd474c98a558e02ccfc32d83ae73af2af180334c1c39a1c
-DIST nor.traineddata-3.04.00 8262167 BLAKE2B 5ee6362a945e0ba56da6da95fd9a7958ff90fbbb20b978975092410f9d8da7f600f8eafd8587f32065b669b8399a228ccea14db94c9e74f32b1c8b683facc36b SHA512 4e943a2e19b10b3c8c862e23e78c70f6a02d3c2ebcd01a90b7f25a677f92b19bde052a6fa48f640c0d8b7d74769fc7fc45ab1c412339cb0e9e108926be439ce2
-DIST osd.traineddata-3.04.00 10562727 BLAKE2B ddf38d17e76104216495c798827c024c9d68375f60e2ecc264a495986eac502a9f0159b87adaff96b22b562d774036f0a832d520248842ca1a6550b7ec8c9b4d SHA512 c54f481903187bed19cf14c69b24c44044b540f50814de66dff8d35e6987eea71ef4464492a8fae9242fcb22cccbe59e009f3a4dab6c36ad63f78c52ebe9628f
-DIST pol.traineddata-3.04.00 13918058 BLAKE2B 5531bcda6cbe2a27655f3448b5093fc1cbd1167e91fe3bb410a260062a7163790667d43954d880b20df23d68d73f2aa2933d425a8651b2c3ca7c8387486b876a SHA512 e1730d8bdbb296d223000747aea0dfd9561401e17f37518f4f7ae6c1b13cf500f5f359df465013112e126fc426e3e940b5dc98f84bdfc6517a73a1f8e8fc4c10
-DIST por.traineddata-3.04.00 12914622 BLAKE2B ed0edc8440ebd3f2e9df7dac9ed399df79ca803d16a1396434cb058424637b123af54b0f970120b54d21c00d8a0b1fd387a12bbd200d5a85ed1d49bfea297026 SHA512 cf771fb86aad468d73c879049382b4c88b978eb9ac450472b1729f2cc86e713e5ffe5bdd3f226e3f6e6340e38e115d201046849428b05c2a3bd406eed240ea03
-DIST ron.traineddata-3.04.00 7957608 BLAKE2B f17e0e139bb0c5b12de89b82b62fa3014ed6129c60278a751994fd107a4ee310f991ef425296e3f3e3f44387ec8fa22da4e6b29127d7a7f5b31140240b79cc9c SHA512 921aec7e0e91d7bcb3b85e2b0c5544b105cb01516c100eac21caedfcf27da678c392574c3dfedc81ff52571a8702c91ee76529ecea2b6bc3e155f6e2c56b951a
-DIST rus.traineddata-3.04.00 16152507 BLAKE2B 329619a15cfb48c04d1d4e4bf902e090aac9ffaa1998a26a8861dc24ddb8d9727d473024dae44a43b7ff29f0079cb87dd60dc1a49d2e310249eb05999daea839 SHA512 e5053d8b53a676d800f490276172f16f2754e009408164958ad2f61071906042c299b23fdd3dde4a10026e42b19d03f8a8ab7de2fc29d8b9843d30de5c36a335
-DIST slk.traineddata-3.04.00 9126966 BLAKE2B fba32bf08f14a2e354b298e01b900f7e7b0aa6082c78214a19b2a11a9b2cc73a0ab9f70453888860b3e1db5b450c1934099375c258d363b32ea497c2833335c6 SHA512 33fbb9ee9881eb68b1e75cf9c7cacc31f306bb4371139894271e34e201740325ea26fb9622e4cf980a6c3a162568927a4085c5f63d483146fa2b2fe3d4b85a96
-DIST slk_frak.traineddata-3.04.00 845250 BLAKE2B 623c43315b4fc842811d4f165d19f82b1141c22d78e1ae98ec31b5b05df31f7c05702f30a37043c7bfe6bb29b8f7648f50445e7a2f4b1de666599b211c1de6b6 SHA512 89b794f06772982ec63e317e95ba1c6b611881b8363b645ebfbb4e7c29f914545162401d4766d1b3247ada6df1fa1d7cc02ea539a746fd6839c45124e9e68ae5
-DIST slv.traineddata-3.04.00 6824064 BLAKE2B b9e804194e82b3f7358cb794ca0eea0766e9166e76d0d48f6be57b431c8ea4d88884adb4dc68dda24e07d06ced018992cb9e4690d5778ae192fa9aa533ccd8b2 SHA512 26634af8d9585f293d4af38c0bd6bd7c552edeaa59e3f2ab1e170431f40ba172ca455ede49df90a0b97b4da253b3a96394f4729f6a349361c3e954f2f59e2bbe
-DIST spa.traineddata-3.04.00 15953087 BLAKE2B 9eba61ca27a8697b4e671d8f0d1626500da4c18f046b51fdd692576e5b9068898a75663d2745cd21345a6f3df5108b358624b7b7a264e3c3d4baa34cf0631771 SHA512 e1356c0948c9245fecd335b1b7dd3c84c56b09210e84c5d211d9ddfb2bd3aa232c97f8e8d03f2a6639120c5196aa4222a8385da64528261c7cf137cd64b214a8
-DIST srp.traineddata-3.04.00 4611681 BLAKE2B 08c3814a6463a279fa4111d9c94161ec43c84e6479436734e067ae5aa9b17d09ed02a74ea814ffe389e625253599a757b2bb5b866d1ca0e8991308658f57585a SHA512 41925f957f9b30617746072216dbfb642d55caebdf95f8c322fbc78cf6040b85ed3bb91e81c3114830504189fb8e9f33a3150878a571ce714345e9d87263ac2a
-DIST swe.traineddata-3.04.00 9460295 BLAKE2B 766bcd64e506eea7014975de1ddf6cffcf8610d23e38ddee77ac00125eed6c3db9c434c9f1d111a9fbfa64543b230743e1cce141b19201c7c94c96967bc35141 SHA512 d69c916daa5946d11129e5401f0b8d9b8965df7fa2223e78c8e607e2bcc102a91c875a86e6a737612b61823ebd7f331c3d4c5db28ee35d1fb830beb9414bd167
-DIST tesseract-3.05.02.tar.gz 3571750 BLAKE2B f8c856449ab763d66a50d4bc65450f3c71132e66b4306f5a022c3df65c62646ec202256e12b5ce91888330a5ef10a3966f91eddc241cf306809ce40abc165c82 SHA512 4cb23a6981dd5ec9eefea7b9674847ae88a411a7308ee6d946a920c76eefcf5fe7a90f6cb3ff00493a0e69b5c327d052fa8514d7f3ed506bccbe4b0163065793
-DIST tesseract-4.1.0.tar.gz 1965053 BLAKE2B 172aed0b149cb1af8c8c7b53022de237c8e07086bad78063374d5e425180e4b70eca5cee4d66a1f5b0bc2d51f6b8d41bf0c564918a85977d83fdbe6ba2f5497b SHA512 d617f5c5b826640b2871dbe3d7973bcc5e66fafd837921a20e009d683806ed50f0f258aa455019d99fc54f5cb65c2fa0380e3a3c92b39ab0684b8799c730b09d
 DIST tesseract-4.1.1.tar.gz 1974988 BLAKE2B f729beb017ec81704b84f5e6539706ff0cd6a51a4d1b7b730c394af58ce2ea2a659203bf239417e8d500cfbde845a73d6e6e181ca946257c2f22525820899602 SHA512 017723a2268be789fe98978eed02fd294968cc8050dde376dee026f56f2b99df42db935049ae5e72c4519a920e263b40af1a6a40d9942e66608145b3131a71a2
 DIST tesseract-5.0.0_beta20210815.tar.gz 1914265 BLAKE2B eadefb46a84fcc73d3da7a1780d1e0669840183266176021871e57ca55c79e9b56a78334414732b9024ae911cee522069c3170bf71af877c46c1ffae37c88b3f SHA512 4b78af9119c35d783e47523b41ee8bbf63913f8c122e94b6e6538a4cbab8e751df9f00f3a50d48e8a7beb948c6b23794e2481721696bf3e0f284de8aa6e9e8e7
-DIST tgl.traineddata-3.04.00 4114554 BLAKE2B 1cbd5e20fcf5fa7ea183daa76e1d09d7bd4427ce2456de49f23e374af8ae48219a32f71a25d0a98c26c79ac87dc4f8f68621c76fad85b6105561f5285d635c8d SHA512 8c205fd0d4b2fc774e5b6a19cb56dcdb91b7d001acd881e34363e437d5eeae8615b853ae09f93c4957328d3a423300b9a20a443ca971a14ede1867de6194a2bb
-DIST tha.traineddata-3.04.00 13565168 BLAKE2B 1fe254a7ace923a88579c46111a0be81ad7cac9d60d59189e26fef6c11469da26e86ca867ff97cbf1b83fc501d6e48fee0e729f6e73e7f5a512e7b89998475c2 SHA512 1f8750ee148a6dc5677441bdf8b41d09594b591c34c7fc0af1923a89acf9db76f12ab3ed136819b6900b70ff393fd586054fd383a427ca70b4cf9aecb6db029a
-DIST tur.traineddata-3.04.00 14069931 BLAKE2B 385714a9fb0efa7a8299de7152729a7f7e12a29d4c33cc4df6c5592bd1ddca145acb056caaf93f077279489c3a12e2d95285d0790979cbb036206ecdab910080 SHA512 822b51bf9836f0d2b5923fc8ea14690a16d6e1831dc8828d0aad7cb4bda2bcec06ba7cdc79187d48b93e3541dfd46f1f50dc44dae504af9dd7a788052a05b51e
-DIST ukr.traineddata-3.04.00 8043189 BLAKE2B 3435bdbdac2e4f343479515632f54345c96b9d626db6cdd8dfc190c4b8dd0919e6955db8ccea45dba2877b4959f3146cbdc5472a1fb813093232de8ea4d97a20 SHA512 16117151debf90d79eb9f84c0b215b1d9d72d5b61bbf0004330b34b1502388f7d81051ce5ce296720dd10f53ba08f1e15cebaf4030330b5a071810612f78e0ef
-DIST vie.traineddata-3.04.00 6096118 BLAKE2B 2314880eef055eade892e788cc1458ca1b4b3ee3a8ce7c8657ab7d36c2f57556d21045094f055961ab0ecca38300d4c986162ee79d437e706a8e54c35b552feb SHA512 51087e2141051906a1815798175ff8b9f214ae36c7d87cb60999489ccc684307ea7ef65c5ae4024f95c51b89084ab9f0e8dde0a4d480eaf78dceebfba87350cf

diff --git a/app-text/tesseract/files/tesseract-3.05.00-no_graphics.patch b/app-text/tesseract/files/tesseract-3.05.00-no_graphics.patch
deleted file mode 100644
index d6250d66c05..00000000000
--- a/app-text/tesseract/files/tesseract-3.05.00-no_graphics.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 4141de7f8ddb5ac3c39fd9c1fc77ed911c768c3d Mon Sep 17 00:00:00 2001
-From: Bernard Cafarelli <bernard.cafarelli@gmail.com>
-Date: Fri, 27 Jan 2017 12:02:54 +0100
-Subject: [PATCH] Provide SVSync::StartThread() with GRAPHICS_DISABLED
-
----
- viewer/svutil.cpp | 44 +++++++++++++++++++++-----------------------
- 1 file changed, 21 insertions(+), 23 deletions(-)
-
-diff --git a/viewer/svutil.cpp b/viewer/svutil.cpp
-index 34a2286..84a4b94 100644
---- a/viewer/svutil.cpp
-+++ b/viewer/svutil.cpp
-@@ -83,6 +83,27 @@ void SVMutex::Unlock() {
- #endif
- }
- 
-+// Create new thread.
-+void SVSync::StartThread(void *(*func)(void*), void* arg) {
-+#ifdef _WIN32
-+  LPTHREAD_START_ROUTINE f = (LPTHREAD_START_ROUTINE) func;
-+  DWORD threadid;
-+  HANDLE newthread = CreateThread(
-+  NULL,          // default security attributes
-+  0,             // use default stack size
-+  f,             // thread function
-+  arg,           // argument to thread function
-+  0,             // use default creation flags
-+  &threadid);    // returns the thread identifier
-+#else
-+  pthread_t helper;
-+  pthread_attr_t attr;
-+  pthread_attr_init(&attr);
-+  pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-+  pthread_create(&helper, &attr, func, arg);
-+#endif
-+}
-+
- #ifndef GRAPHICS_DISABLED
- 
- const int kMaxMsgSize = 4096;
-@@ -186,29 +207,6 @@ void SVSemaphore::Wait() {
- #endif
- }
- 
--
--// Create new thread.
--
--void SVSync::StartThread(void *(*func)(void*), void* arg) {
--#ifdef _WIN32
--  LPTHREAD_START_ROUTINE f = (LPTHREAD_START_ROUTINE) func;
--  DWORD threadid;
--  HANDLE newthread = CreateThread(
--  NULL,          // default security attributes
--  0,             // use default stack size
--  f,             // thread function
--  arg,           // argument to thread function
--  0,             // use default creation flags
--  &threadid);    // returns the thread identifier
--#else
--  pthread_t helper;
--  pthread_attr_t attr;
--  pthread_attr_init(&attr);
--  pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
--  pthread_create(&helper, &attr, func, arg);
--#endif
--}
--
- // Place a message in the message buffer (and flush it).
- void SVNetwork::Send(const char* msg) {
-   mutex_send_->Lock();
--- 
-2.12.0
-

diff --git a/app-text/tesseract/files/tesseract-3.05.00-use-system-piccolo2d.patch b/app-text/tesseract/files/tesseract-3.05.00-use-system-piccolo2d.patch
deleted file mode 100644
index ad1f0f3df20..00000000000
--- a/app-text/tesseract/files/tesseract-3.05.00-use-system-piccolo2d.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur tesseract.orig/java/Makefile.am tesseract/java/Makefile.am
---- tesseract.orig/java/Makefile.am	2017-01-30 17:20:23.135458366 +0100
-+++ tesseract/java/Makefile.am	2017-01-30 17:21:29.834462557 +0100
-@@ -36,10 +36,9 @@
- 	com/google/scrollview/ScrollView.class
- 
- SCROLLVIEW_LIBS = \
--	piccolo2d-core-3.0.jar \
--	piccolo2d-extras-3.0.jar
-+	/usr/share/piccolo2d/lib/piccolo2d.jar
- 
--CLASSPATH = piccolo2d-core-3.0.jar:piccolo2d-extras-3.0.jar
-+CLASSPATH = /usr/share/piccolo2d/lib/piccolo2d.jar
- 
- ScrollView.jar : $(SCROLLVIEW_CLASSES)
- 	$(JAR) cfm $@ $(srcdir)/Manifest.txt com/google/scrollview/*.class \
-diff -Naur tesseract.orig/viewer/Makefile.am tesseract/viewer/Makefile.am
---- tesseract.orig/viewer/Makefile.am	2017-01-30 17:20:23.176458368 +0100
-+++ tesseract/viewer/Makefile.am	2017-01-30 17:22:39.281467163 +0100
-@@ -17,3 +17,7 @@
- 
- libtesseract_viewer_la_SOURCES = \
-     scrollview.cpp svmnode.cpp svutil.cpp svpaint.cpp
-+
-+if !GRAPHICS_DISABLED
-+AM_CPPFLAGS += -DSCROLLVIEW_PATH=/usr/share/tessdata/
-+endif

diff --git a/app-text/tesseract/metadata.xml b/app-text/tesseract/metadata.xml
index 8a74de4013f..6bc9c8ca0db 100644
--- a/app-text/tesseract/metadata.xml
+++ b/app-text/tesseract/metadata.xml
@@ -17,9 +17,6 @@
   </upstream>
   <use>
     <flag name="float32">Support float for model training and text recognition (faster, requires less RAM)</flag>
-    <flag name="math"> Enable support for recognition of equations.</flag>
-    <flag name="scrollview"> Install viewer to debug recognition (ScrollView).</flag>
-    <flag name="osd"> Enable support orientation and script detection.</flag>
     <flag name="opencl">Enable opencl support for speedup using GPU computation.</flag>
     <flag name="training">Install training applications to add support for new languages.</flag>
   </use>

diff --git a/app-text/tesseract/tesseract-3.05.02.ebuild b/app-text/tesseract/tesseract-3.05.02.ebuild
deleted file mode 100644
index d237b25cfbf..00000000000
--- a/app-text/tesseract/tesseract-3.05.02.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="tesseract-ocr"
-LANGPACKV="3.04.00"
-URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
-JAVA_PKG_OPT_USE="scrollview"
-
-inherit autotools java-pkg-opt-2 toolchain-funcs
-
-DESCRIPTION="An OCR Engine, originally developed at HP, now open source."
-HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
-	math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
-	l10n_ar? ( ${URI_PREFIX}ara.traineddata -> ara.traineddata-${LANGPACKV} )
-	l10n_bg? ( ${URI_PREFIX}bul.traineddata -> bul.traineddata-${LANGPACKV} )
-	l10n_ca? ( ${URI_PREFIX}cat.traineddata -> cat.traineddata-${LANGPACKV} )
-	l10n_chr? ( ${URI_PREFIX}chr.traineddata -> chr.traineddata-${LANGPACKV} )
-	l10n_cs? ( ${URI_PREFIX}ces.traineddata -> ces.traineddata-${LANGPACKV} )
-	l10n_de? ( ${URI_PREFIX}deu.traineddata -> deu.traineddata-${LANGPACKV}
-				  ${URI_PREFIX}deu_frak.traineddata -> deu_frak.traineddata-${LANGPACKV} )
-	l10n_da? ( ${URI_PREFIX}dan.traineddata -> dan.traineddata-${LANGPACKV}
-				  ${URI_PREFIX}dan_frak.traineddata -> dan_frak.traineddata-${LANGPACKV} )
-	l10n_el? ( ${URI_PREFIX}ell.traineddata -> ell.traineddata-${LANGPACKV} )
-	l10n_es? ( ${URI_PREFIX}spa.traineddata -> spa.traineddata-${LANGPACKV} )
-	l10n_fi? ( ${URI_PREFIX}fin.traineddata -> fin.traineddata-${LANGPACKV} )
-	l10n_fr? ( ${URI_PREFIX}fra.traineddata -> fra.traineddata-${LANGPACKV} )
-	l10n_he? ( ${URI_PREFIX}heb.traineddata -> heb.traineddata-${LANGPACKV} )
-	l10n_hi? ( ${URI_PREFIX}hin.traineddata -> hin.traineddata-${LANGPACKV} )
-	l10n_hu? ( ${URI_PREFIX}hun.traineddata -> hun.traineddata-${LANGPACKV} )
-	l10n_id? ( ${URI_PREFIX}ind.traineddata -> ind.traineddata-${LANGPACKV} )
-	l10n_it? ( ${URI_PREFIX}ita.traineddata -> ita.traineddata-${LANGPACKV} )
-	l10n_ja? ( ${URI_PREFIX}jpn.traineddata -> jpn.traineddata-${LANGPACKV} )
-	l10n_ko? ( ${URI_PREFIX}kor.traineddata -> kor.traineddata-${LANGPACKV} )
-	l10n_lt? ( ${URI_PREFIX}lit.traineddata -> lit.traineddata-${LANGPACKV} )
-	l10n_lv? ( ${URI_PREFIX}lav.traineddata -> lav.traineddata-${LANGPACKV} )
-	l10n_nl? ( ${URI_PREFIX}nld.traineddata -> nld.traineddata-${LANGPACKV} )
-	l10n_no? ( ${URI_PREFIX}nor.traineddata -> nor.traineddata-${LANGPACKV} )
-	l10n_pl? ( ${URI_PREFIX}pol.traineddata -> pol.traineddata-${LANGPACKV} )
-	l10n_pt? ( ${URI_PREFIX}por.traineddata -> por.traineddata-${LANGPACKV} )
-	l10n_ro? ( ${URI_PREFIX}ron.traineddata -> ron.traineddata-${LANGPACKV} )
-	l10n_ru? ( ${URI_PREFIX}rus.traineddata -> rus.traineddata-${LANGPACKV} )
-	l10n_sk? ( ${URI_PREFIX}slk.traineddata -> slk.traineddata-${LANGPACKV}
-				  ${URI_PREFIX}slk_frak.traineddata -> slk_frak.traineddata-${LANGPACKV} )
-	l10n_sl? ( ${URI_PREFIX}slv.traineddata -> slv.traineddata-${LANGPACKV} )
-	l10n_sr? ( ${URI_PREFIX}srp.traineddata -> srp.traineddata-${LANGPACKV} )
-	l10n_sv? ( ${URI_PREFIX}swe.traineddata -> swe.traineddata-${LANGPACKV} )
-	l10n_th? ( ${URI_PREFIX}tha.traineddata -> tha.traineddata-${LANGPACKV} )
-	l10n_tl? ( ${URI_PREFIX}tgl.traineddata -> tgl.traineddata-${LANGPACKV} )
-	l10n_tr? ( ${URI_PREFIX}tur.traineddata -> tur.traineddata-${LANGPACKV} )
-	l10n_uk? ( ${URI_PREFIX}ukr.traineddata -> ukr.traineddata-${LANGPACKV} )
-	l10n_vi? ( ${URI_PREFIX}vie.traineddata -> vie.traineddata-${LANGPACKV} )
-	l10n_zh-CN? ( ${URI_PREFIX}chi_sim.traineddata -> chi_sim.traineddata-${LANGPACKV} )
-	l10n_zh-TW? ( ${URI_PREFIX}chi_tra.traineddata -> chi_tra.traineddata-${LANGPACKV} )
-	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~mips ppc ppc64 ~sparc x86"
-
-IUSE="doc examples jpeg math opencl osd png scrollview static-libs tiff training webp l10n_ar l10n_bg l10n_ca l10n_chr l10n_cs l10n_de l10n_da l10n_el l10n_es l10n_fi l10n_fr l10n_he l10n_hi l10n_hu l10n_id l10n_it l10n_ja l10n_ko l10n_lt l10n_lv l10n_nl l10n_no l10n_pl l10n_pt l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_th l10n_tl l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW"
-
-# With opencl USE=tiff is necessary in leptonica
-CDEPEND=">=media-libs/leptonica-1.71:=[zlib,tiff?,jpeg?,png?,webp?]
-	opencl? (
-		virtual/opencl
-		media-libs/tiff:0=
-		media-libs/leptonica:=[tiff]
-	)
-	scrollview? (
-		>=dev-java/piccolo2d-3.0:0
-	)
-	training? (
-		dev-libs/icu:=
-		x11-libs/pango:=
-		x11-libs/cairo:=
-	)"
-
-DEPEND="${CDEPEND}
-	doc? ( app-doc/doxygen )
-	scrollview? ( >=virtual/jdk-1.7 )"
-
-RDEPEND="${CDEPEND}
-	scrollview? ( >=virtual/jre-1.7 )"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.05.00-no_graphics.patch"
-	"${FILESDIR}/${PN}-3.05.00-use-system-piccolo2d.patch"
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	for file in ${A}; do
-		if [[ "${file}" == *traineddata* ]]; then
-			cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || die
-		fi
-	done
-}
-
-src_prepare() {
-	default
-	eautoreconf
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		$(use_enable opencl)
-		$(use_enable scrollview graphics)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-	use doc && emake doc
-	use scrollview && emake ScrollView.jar JAVAC="javac $(java-pkg_javac-args)"
-	use training && emake training
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/html/. )
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	if use training; then
-		emake DESTDIR="${D}" training-install
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins testing/eurotext.tif testing/phototest.tif
-	fi
-
-	insinto /usr/share/tessdata
-	doins tessdata/*traineddata* # language files
-	use scrollview && doins java/ScrollView.jar # scrollview
-}

diff --git a/app-text/tesseract/tesseract-4.1.0-r1.ebuild b/app-text/tesseract/tesseract-4.1.0-r1.ebuild
deleted file mode 100644
index ac660c1f07d..00000000000
--- a/app-text/tesseract/tesseract-4.1.0-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal toolchain-funcs
-
-DESCRIPTION="An OCR Engine, originally developed at HP, now open source."
-HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc jpeg opencl openmp png static-libs tiff training webp"
-
-COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?]
-	opencl? (
-		virtual/opencl[${MULTILIB_USEDEP}]
-		media-libs/tiff:0=[${MULTILIB_USEDEP}]
-		media-libs/leptonica:=[tiff]
-	)
-	training? (
-		dev-libs/icu:=
-		x11-libs/pango:=
-		x11-libs/cairo:=
-	)"
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		>=app-text/tessdata_fast-4.0.0
-		>=app-text/tessdata_best-4.0.0
-		>=app-text/tessdata_legacy-4.0.0
-	)"
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	doc? ( app-doc/doxygen )"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# scrollview disabled for now, see bug #686944
-	local myeconfargs=(
-		--enable-shared
-		--disable-graphics
-		$(use_enable opencl)
-		$(use_enable openmp)
-		$(use_enable static-libs static)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-	if multilib_is_native_abi; then
-		use doc && emake doc
-		use training && emake training
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		DOCS=( "${S}"/AUTHORS "${S}"/ChangeLog "${S}"/README.md )
-		if use doc; then
-			HTML_DOCS=( doc/html/. )
-		fi
-		einstalldocs
-
-		if use training; then
-			emake DESTDIR="${D}" training-install
-		fi
-	fi
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -type f -delete || die
-}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/
@ 2023-02-02  7:02 Sam James
  0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2023-02-02  7:02 UTC (permalink / raw
  To: gentoo-commits

commit:     ac4738fca722ddc0e5c57ba852154c7e12b1b1c9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  2 07:01:31 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb  2 07:01:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac4738fc

app-text/tesseract: fix build w/ gcc 13

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../tesseract/files/tesseract-5.3.0-gcc-13.patch   | 25 ++++++++++++++++++++++
 app-text/tesseract/tesseract-5.3.0.ebuild          |  4 ++++
 2 files changed, 29 insertions(+)

diff --git a/app-text/tesseract/files/tesseract-5.3.0-gcc-13.patch b/app-text/tesseract/files/tesseract-5.3.0-gcc-13.patch
new file mode 100644
index 000000000000..959948aa677c
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-5.3.0-gcc-13.patch
@@ -0,0 +1,25 @@
+https://github.com/tesseract-ocr/tesseract/commit/2025b53de6b3d97285d7c5f80497493007c586c3
+
+From 2025b53de6b3d97285d7c5f80497493007c586c3 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 30 Jan 2023 11:27:07 -0800
+Subject: [PATCH] Fix build with gcc 13 by including <cstdint>
+
+gcc 13 moved some includes around and as a result <cstdint> is
+no longer transitively included [1]. Explicitly include it for
+int32_t.
+
+[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/src/ccutil/params.h
++++ b/src/ccutil/params.h
+@@ -21,6 +21,7 @@
+ 
+ #include <tesseract/export.h> // for TESS_API
+ 
++#include <cstdint>
+ #include <cstdio>
+ #include <cstring>
+ #include <string>
+

diff --git a/app-text/tesseract/tesseract-5.3.0.ebuild b/app-text/tesseract/tesseract-5.3.0.ebuild
index 7c7753b1ecf2..cb7040d39bc6 100644
--- a/app-text/tesseract/tesseract-5.3.0.ebuild
+++ b/app-text/tesseract/tesseract-5.3.0.ebuild
@@ -37,6 +37,10 @@ DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	doc? ( app-doc/doxygen )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-13.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/
@ 2024-09-01  7:33 Sam James
  0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2024-09-01  7:33 UTC (permalink / raw
  To: gentoo-commits

commit:     8db9f66124d9c5620f4f2f6db921125ba9c6fa74
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  1 07:32:49 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep  1 07:32:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8db9f661

app-text/tesseract: fix arm* build w/o neon

Bug: https://bugs.gentoo.org/926891
Closes: https://bugs.gentoo.org/924757
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../tesseract-5.4.1-arm64-neon-tesseract.patch     | 57 ++++++++++++++++++++++
 app-text/tesseract/tesseract-5.3.4.ebuild          |  4 ++
 app-text/tesseract/tesseract-5.4.1.ebuild          |  4 ++
 app-text/tesseract/tesseract-9999.ebuild           |  4 ++
 4 files changed, 69 insertions(+)

diff --git a/app-text/tesseract/files/tesseract-5.4.1-arm64-neon-tesseract.patch b/app-text/tesseract/files/tesseract-5.4.1-arm64-neon-tesseract.patch
new file mode 100644
index 000000000000..d3869cfea1dd
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-5.4.1-arm64-neon-tesseract.patch
@@ -0,0 +1,57 @@
+https://bugs.gentoo.org/924757
+https://bugs.gentoo.org/926891
+https://github.com/tesseract-ocr/tesseract/pull/4154
+
+(Note that if moving to CMake, can use the patch from ghostscript-gpl
+instead, i.e. https://src.fedoraproject.org/rpms/tesseract/blob/rawhide/f/tesseract_neon.patch).
+
+From b1e48789d61d995740762f66f505385db42410a5 Mon Sep 17 00:00:00 2001
+From: Jan Palus <jpalus@fastmail.com>
+Date: Mon, 30 Oct 2023 01:36:57 +0100
+Subject: [PATCH] Check if NEON extension are actually available
+
+User may pass own compiler flags to configure which override those
+provided by project through automake. Therefore it is possible for user
+on ARM platform to pass CXXFLAGS=-mfpu=vfp which will effectively
+disable NEON even though used compiler supports -mfpu=neon (since user
+supplied flags take precedence compiler invocation will use flags:
+-mfpu=neon -mfpu=vfp). Instead of checking whether compiler supports
+-mfpu=neon flag, check if NEON extensions are available by checking if
+__ARM_NEON is defined when compiling with -mfpu=neon and user supplied
+flags combined.
+
+Signed-off-by: Jan Palus <jpalus@fastmail.com>
+---
+ configure.ac | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0b38537229..0514b619c5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -178,10 +178,20 @@ case "${host_cpu}" in
+     ;;
+ 
+   arm*)
+-
+-    AX_CHECK_COMPILE_FLAG([-mfpu=neon], [neon=true], [neon=false], [$WERROR])
+-    AM_CONDITIONAL([HAVE_NEON], $neon)
+-    if $neon; then
++    SAVE_CXXFLAGS="$CXXFLAGS"
++    CXXFLAGS="-mfpu=neon $CXXFLAGS"
++    AC_MSG_CHECKING([for NEON support])
++    AC_COMPILE_IFELSE(
++    [AC_LANG_PROGRAM([], [[
++    #ifndef __ARM_NEON
++           #error
++    #endif
++    ]])],
++    [neon=yes], [neon=no])
++    AC_MSG_RESULT([$neon])
++    CXXFLAGS="$SAVE_CXXFLAGS"
++    AM_CONDITIONAL([HAVE_NEON], test "xyes" = "x$neon")
++    if test "xyes" = "$neon"; then
+       AC_DEFINE([HAVE_NEON], [1], [Enable NEON instructions])
+       NEON_CXXFLAGS="-mfpu=neon"
+       AC_SUBST([NEON_CXXFLAGS])
+

diff --git a/app-text/tesseract/tesseract-5.3.4.ebuild b/app-text/tesseract/tesseract-5.3.4.ebuild
index d90adb970643..af83b0284a3a 100644
--- a/app-text/tesseract/tesseract-5.3.4.ebuild
+++ b/app-text/tesseract/tesseract-5.3.4.ebuild
@@ -37,6 +37,10 @@ DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	doc? ( app-text/doxygen )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.1-arm64-neon-tesseract.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }

diff --git a/app-text/tesseract/tesseract-5.4.1.ebuild b/app-text/tesseract/tesseract-5.4.1.ebuild
index 1469566c29ed..d4438214a13d 100644
--- a/app-text/tesseract/tesseract-5.4.1.ebuild
+++ b/app-text/tesseract/tesseract-5.4.1.ebuild
@@ -32,6 +32,10 @@ DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	doc? ( app-text/doxygen )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.1-arm64-neon-tesseract.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }

diff --git a/app-text/tesseract/tesseract-9999.ebuild b/app-text/tesseract/tesseract-9999.ebuild
index 4c31653fca31..d3c34531c724 100644
--- a/app-text/tesseract/tesseract-9999.ebuild
+++ b/app-text/tesseract/tesseract-9999.ebuild
@@ -32,6 +32,10 @@ DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	doc? ( app-text/doxygen )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.1-arm64-neon-tesseract.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }


^ permalink raw reply related	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2024-09-01  7:34 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-01 17:13 [gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/ James Le Cuirot
  -- strict thread matches above, loose matches on Subject: below --
2024-09-01  7:33 Sam James
2023-02-02  7:02 Sam James
2021-08-30  6:51 Bernard Cafarelli
2019-06-04 14:42 Bernard Cafarelli
2019-06-04 14:42 Bernard Cafarelli
2018-08-13 20:56 Bernard Cafarelli
2018-02-07 10:31 Bernard Cafarelli
2017-03-22 16:28 Bernard Cafarelli
2017-03-14  0:14 Bernard Cafarelli
2017-01-30 16:56 Bernard Cafarelli
2017-01-30 10:00 Bernard Cafarelli
2016-08-14 21:19 Thomas Kahle
2016-08-09 11:36 Thomas Kahle
2015-12-06 20:25 Thomas Kahle

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox