[gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/

2023-02-01 Thread Sam James 
commit: ac4738fca722ddc0e5c57ba852154c7e12b1b1c9
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb  2 07:01:31 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb  2 07:01:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac4738fc

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

Signed-off-by: Sam James  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 ..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 
+Date: Mon, 30 Jan 2023 11:27:07 -0800
+Subject: [PATCH] Fix build with gcc 13 by including 
+
+gcc 13 moved some includes around and as a result  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 
+--- a/src/ccutil/params.h
 b/src/ccutil/params.h
+@@ -21,6 +21,7 @@
+ 
+ #include  // for TESS_API
+ 
++#include 
+ #include 
+ #include 
+ #include 
+

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
 }

[gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/

2021-08-30 Thread Bernard Cafarelli 
commit: b6cf1d04988aa3d05c161e5e1b677222f0a8996f
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Mon Aug 30 06:49:14 2021 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Mon Aug 30 06:51:15 2021 +
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  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 
30af9442d0180c9288c6e8ae03e7ede7e4a1a18743733bc00b63c28f405ee1f0221a64e01c19dde3f808efe6b4547bc36690d9bf44288dfe57211b7acc90
 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 
fd4eab9e9203ea3a2f009c5feb337449b4ec2acb67b42c5420ccf69b342ca9afa655093d7e9b07d3ad435a80e9f59eeaf3ca578608a9136ca13ee23d6995
-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

[gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/

2019-06-04 Thread Bernard Cafarelli 
commit: 98f4080a82c54d39d0a6c646649ca47fe9c7d649
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Tue Jun  4 14:35:30 2019 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Tue Jun  4 14:39:53 2019 +
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  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 000..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 
+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 
+---
+ 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 000..d4ba59d9b35
--- /dev/null
+++ b/app-text/tesseract/tesseract-4.0.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright

[gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/

2019-06-04 Thread Bernard Cafarelli 
commit: 35ec40276689d665635de45e8fa65f47d52b2aa5
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Tue Jun  4 14:38:25 2019 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Tue Jun  4 14:39:53 2019 +
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  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-.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..000
--- 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.am2017-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..000
--- a/app-text/tesseract/tesseract-4.0.0_beta4.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-#

[gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/

2018-08-13 Thread Bernard Cafarelli 
commit: cafbb198137c2a4787acace9efc41410145d1d3c
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Mon Aug 13 20:51:11 2018 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Mon Aug 13 20:53:13 2018 +
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-.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..000
--- 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.0 +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 =

[gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/

2018-02-07 Thread Bernard Cafarelli 
commit: a6e24a2f2fcef48c6127f9812d71201399aead77
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Wed Feb  7 09:56:18 2018 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Wed Feb  7 10:31:27 2018 +
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..000
--- a/app-text/tesseract/files/tesseract-2.04-gcc47.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 ./viewer/svutil.cpp.ori2012-04-28 01:59:58.441072997 +0200
-+++

[gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/

2017-03-22 Thread Bernard Cafarelli 
commit: 5ee2ef42d5998dd66c24768e245e1bcfcd224b16
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Wed Mar 22 14:53:41 2017 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Wed Mar 22 16:27:39 2017 +
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 
995502084484d172becdfdaa3cd21f0fe2b8845fe4a64726f9fbcd35310d64153be6325016dd50ca37b95069112b63d4f0528bd989a58c3b88dc6c6a6813
 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..000
--- 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?= 
-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

[gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/

2017-03-13 Thread Bernard Cafarelli 
commit: 8504e55c31cfa890c4e1a238d3d7767bf72e9fe7
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Tue Mar 14 00:13:55 2017 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Tue Mar 14 00:14:05 2017 +
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 
995502084484d172becdfdaa3cd21f0fe2b8845fe4a64726f9fbcd35310d64153be6325016dd50ca37b95069112b63d4f0528bd989a58c3b88dc6c6a6813
+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 000..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 
+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 
+---
+ 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

[gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/

2017-01-30 Thread Bernard Cafarelli 
commit: 7032d231288986d9cfa191830e4f79789c589d0b
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Mon Jan 30 16:43:44 2017 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Mon Jan 30 16:56:20 2017 +
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-.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 ..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.am2017-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-.ebuild
similarity index 88%
copy from app-text/tesseract/tesseract-4.00.00_alpha.ebuild
copy to app-text/tesseract/tesseract-.ebuild
index d5d4de1..883c5c3 100644
--- a/app-text/tesseract/tesseract-4.00.00_alpha.ebuild
+++ b/app-text/tesseract/tesseract-.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

[gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/

2017-01-30 Thread Bernard Cafarelli 
commit: 3f60fe685eef5109c0ffe79e0de0e45ce6378d6d
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Mon Jan 30 09:53:13 2017 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Mon Jan 30 09:53:50 2017 +
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

[gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/

2016-08-14 Thread Thomas Kahle 
commit: 209745ded1e1572a32e1ab160fffac92eb268da8
Author: Thomas Kahle  gentoo  org>
AuthorDate: Sun Aug 14 21:19:04 2016 +
Commit: Thomas Kahle  gentoo  org>
CommitDate: Sun Aug 14 21:19:04 2016 +
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 000..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.orig2016-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() {

[gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/

2016-08-09 Thread Thomas Kahle 
commit: c049a5c2ecd9a07a7aacd34c192b5824b9ccad74
Author: Thomas Kahle  gentoo  org>
AuthorDate: Tue Aug  9 11:35:28 2016 +
Commit: Thomas Kahle  gentoo  org>
CommitDate: Tue Aug  9 11:35:56 2016 +
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 
995502084484d172becdfdaa3cd21f0fe2b8845fe4a64726f9fbcd35310d64153be6325016dd50ca37b95069112b63d4f0528bd989a58c3b88dc6c6a6813
 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 000..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.0 +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.0 
+0100
 tesseract-3.04.01-scrollview/viewer/Makefile.am2016-08-09 
13:20:57.788318147 +0200
+@@ -17,3 +17,7 @@
+ 
+

[gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/

2016-02-01 Thread James Le Cuirot 
commit: 7a46316823a825080fa731bbffe9dec801feaa6f
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Jan 30 11:17:29 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Feb  1 17:12:19 2016 +
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 000..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.0 -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.cpp2015-07-11 03:53:12.0 -0400
 b/viewer/svutil.cpp2016-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.0 -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

[gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/files/, app-text/tesseract/

2015-12-06 Thread Thomas Kahle 
commit: 882c9a1a8cde041a0bcde4babdcccd7d13cfe469
Author: Thomas Kahle  gentoo  org>
AuthorDate: Sun Dec  6 20:24:55 2015 +
Commit: Thomas Kahle  gentoo  org>
CommitDate: Sun Dec  6 20:25:08 2015 +
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