gentoo resync : 25.08.2018

11 files changed, 197 insertions, 344 deletions

diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 77bad3c430e9..e2367d9c8d02 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -1,9 +1,6 @@
-AUX tesseract-3.04.01-use-system-piccolo2d.patch 1158 BLAKE2B f12d99977644dfdb7078ebab18ab02c1979922b94fbff4cde568e1496e572671465dd849cc38d86d0d32c986d054092eaa6e78c3423de0bdeef7c7d501a80a24 SHA512 635276f604238c0aace8be06ee6d0e7ec5fcb61a6cbe2504721ce41407a9799289f4917e4fecbe2155072e324c3ae3246238ec12abd23700a9311532657e678b
 AUX tesseract-3.05.00-no_graphics.patch 2199 BLAKE2B 0ed987995a7686dfb6e420c1e79eb1374df5d1c2c69177f858f962c1216f54daeb4b0e10e9c6cbfeda931f44a359b75fa266266c0807321479a4275b8ab7fdb4 SHA512 136b4f298e52517a801a19847ceb85cbb77ee0de42a43dc5a82faa7039f0b9c0bde965453ac5cd6c25f4578351217319a0ceb719fa42f207a38b3efe0c210388
-AUX tesseract-4.00.00-use-system-piccolo2d.patch 1030 BLAKE2B ce4e080e7d192df3ee7f9579d40cc30dcde63cf17ad85d06beb939ef26cddc013b4be5e2a8c0a0556576c01a57ad2c8a6281709a0d902e02e096b6a5688438c5 SHA512 df203ab3933a59f1f2f689ce8dcf266200c705837b5b97dab5f7b1684903523ffa7b88c374c2e7c0b106c1726ef54fdcda47ab44bf75cf51e7dc4308dac6a810
-AUX tesseract-4.00.00_alpha-isnan.patch 1027 BLAKE2B 7123c50da551abfe12e74e2dcb5c7b63dae7c6c35fad577b123acd341ce49ebb9c844033ee33a4c3bfe0751c4443e765311393b51c59513f5002ecb2c35bf2f9 SHA512 c2fa33a385b7fa0da525abf80ac39f846bb89df89a80c71c076355e98ac1d16a01d69c9ba748462f02e8f94b0049e6706ad77406ed0cc230fcac20b00fc917d8
-AUX tesseract-4.00.00_alpha-no_graphics.patch 4485 BLAKE2B a904e8c781c46f4173dafb86a665a8f736c97d37cf23a70bff2930d73c5794e888b44a6bbb33aedb9e89f9d383fd30d4a944b72f3feffcb08f53e60ba3ada091 SHA512 d64592d0236fdadde005020e3afe3839029b2090d052c8034f1f16c401a6df99bbd11750dd9e0013367afae04e770c8166e984531be05822f8cc134c2ff9b1d4
-AUX tesseract-4.00.00_alpha-openmp.patch 3817 BLAKE2B 31d0534d8006e91f25e78d4e2ffa132f3b46a764acd32726a1c3ea3ca98466b07a53f1716dd82d4b497670a933dbc3f6d67b038cf0b3a74a0538c9d47872fc52 SHA512 6e685f0b8da173714139bf48c2406bfb365081f8723c7b58c9feeb140ad0abf6875b871fd95c521f3e26421869c84409a0b8f405ea3179847a1052899148d4ca
+AUX tesseract-3.05.00-use-system-piccolo2d.patch 1030 BLAKE2B ce4e080e7d192df3ee7f9579d40cc30dcde63cf17ad85d06beb939ef26cddc013b4be5e2a8c0a0556576c01a57ad2c8a6281709a0d902e02e096b6a5688438c5 SHA512 df203ab3933a59f1f2f689ce8dcf266200c705837b5b97dab5f7b1684903523ffa7b88c374c2e7c0b106c1726ef54fdcda47ab44bf75cf51e7dc4308dac6a810
+AUX tesseract-4.00.00-use-system-piccolo2d.patch 1046 BLAKE2B 47aed1637b153bb946ddc76cc04fa564eafe83cf06d020b24ce9247c0e78cb62d3e03ee4bf950fb53bac0030c3bb4b2cea42d922414765c07862b929ee813800 SHA512 56bf955bf1b647dd3c5f55bd9e02126217cb21943866fdb6402e2dbe1f93ce018da41dcdbb120d88e06ebbdb6d7fb4726c19013150f7b07b38d91d784a2bb963
 DIST afr.traineddata-4.00 12213914 BLAKE2B e06516788c09f6a9538ffe3c4378eef4e88eaec0c8e14a7f3ddfd6db0820839a90a27f8519dcf6872dc8c08f47229d4ee8bd6aa41e383cbf51a5584bcda6f7f8 SHA512 1c00ef71a0e846bf5d0d57c7c3a3a8b5af47dfa8f429dbc02fdb560731923c0d0ab3273b3b975a570ffe7bfed2c7b284ef28ef4f830f8d4a0f33d84692cc655b
 DIST amh.traineddata-4.00 9771502 BLAKE2B 3a905487136efd099aacd0a979bfda1edcd30c8eb14fe2b304ba1f5355f570520b864c992b63a1fd1f683baa91186de7cd7c89e6057dfebb896f2d6f905b6d6a SHA512 0b449936c350eff717aa5bba502d3df86632746de9b3a7320252cb69707d18596b0bbd4a27caa3cb5bb560add8991bfbe7b56dac6f7e0a9f91202924fcb694de
 DIST ara.traineddata-3.04.00 6315068 BLAKE2B 30af9442d0180c9288c6e8ae03e7ede7e4a1a18743733bc00b63c28f405ee1f0221a64e01c19dde3f808efe6b4547bceeee36690d9bf44288dfe57211b7acc90 SHA512 7fba780ec9061148c01dafee1227f8e338c1cf199a5c2869d58703123ea89f2279551e15159ab37038ec8ebc755076ede6ef049cc8a6e6764aa66d81c72a259b
@@ -128,7 +125,8 @@ DIST syr.traineddata-4.00 8056121 BLAKE2B bacf6ee42b8a9dac7042ca2608ec72b6db1a76
 DIST tam.traineddata-4.00 17333471 BLAKE2B 67e4b10d8e9fab5df8455b35483972d5543ccf76d7440e7b1c9c8fe89a3cc4e19359a8695b1410004e202b138b8524c000487fdf2ee26247c0a2d4190b7184ed SHA512 9ad90eb8c291712e4cd874d41ed9bcd4169427a50509a353f5549382909458b46a7e4a092dec0d475c548e681426a81597c577f2f821978405a94f965fd4d05f
 DIST tel.traineddata-4.00 54446537 BLAKE2B 0ecb044b58017e36a6d9e28927242ecb6ac8975f079c42c78a661faa87ac1ed7f9d38fd59383d3ca1b484fbf371aeb5e872765921d4b79066a938b88671a3d9f SHA512 5e5c2ca84f095ec4dd3184d6cb75702482c699b5cd04f8750ab8958f578f7b24cf3253a83d19a4a1f3716466b95a81737d473339e3593538e46372c4588febb6
 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-3.05.02.tar.gz 3571750 BLAKE2B f8c856449ab763d66a50d4bc65450f3c71132e66b4306f5a022c3df65c62646ec202256e12b5ce91888330a5ef10a3966f91eddc241cf306809ce40abc165c82 SHA512 4cb23a6981dd5ec9eefea7b9674847ae88a411a7308ee6d946a920c76eefcf5fe7a90f6cb3ff00493a0e69b5c327d052fa8514d7f3ed506bccbe4b0163065793
+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
@@ -143,7 +141,8 @@ DIST uzb.traineddata-4.00 12505562 BLAKE2B e0fb586d07d70e13c03e2ae0ce7a974952819
 DIST uzb_cyrl.traineddata-4.00 10390622 BLAKE2B 055ad7b767d5e919cf386f3a1b2902bdf21918b7e7604d83b4e002f248c3ae209326c1cc78541bbdf58a12c96e7e072f5d935c76053bd7b65090191f9b0956af SHA512 d2e82371312bdeb3e4db73bb74270553165df2f4d2b62ae7de474286c8c02e27f7c5401c3857c60d0d1de3d02b9106e396de7cfa167b82bb8a874101498be0e7
 DIST vie.traineddata-3.04.00 6096118 BLAKE2B 2314880eef055eade892e788cc1458ca1b4b3ee3a8ce7c8657ab7d36c2f57556d21045094f055961ab0ecca38300d4c986162ee79d437e706a8e54c35b552feb SHA512 51087e2141051906a1815798175ff8b9f214ae36c7d87cb60999489ccc684307ea7ef65c5ae4024f95c51b89084ab9f0e8dde0a4d480eaf78dceebfba87350cf
 DIST vie.traineddata-4.00 12209616 BLAKE2B cd1eb9de7a319240b5279f7a7190244fa0c4ce4cbd40493d9b56b13ecc42e9e2b9030fd8ad80e44e8c784f344b0eabbdec65373135bffadf36cd79b25f19bd4d SHA512 6f73647d8fc4df104eb8a8b9444bb46e0ee7560dfff3c33055a791a17a9ffb78a857dac2aa0219c628469eea636f89eb1551151fd79d7ac8c2d4a09c68765560
-EBUILD tesseract-3.05.01.ebuild 5839 BLAKE2B 601d39333d3b9f48116991182b43b9bdcd8d4e0075ca2f0615c42c3591dc1e8ca2aebc9047b658698a406784e145d42285c371155d7e2d35668827ee7fd6ab8d SHA512 bb8df48c8865a06bcc79cf8fe32744761faff9a57ccb0e304a0dd09ee386ad4d9eddbe2e1ebc2fa815f1b62369c758ded77e9b45b69573e49a95579f554ccd57
-EBUILD tesseract-4.00.00_alpha.ebuild 4167 BLAKE2B e638b8eb2a49dede24bc822a28da5d5e0671859eb707f28e8fd8de02b9f7e6db4d370d94b9a651f0072632d9f5cf4da809c128eb2a58636a7cdb6cff3eb35172 SHA512 1fbd99257210baee6791dc8fc4b3faa39b86bcbf786ed9c1a4da521c7b5b4a0c48a9c74596d589fcbe07767cd104490ef1b5c72beaa7226bdcfac373f30eed03
-EBUILD tesseract-9999.ebuild 3975 BLAKE2B 7aec6a728d49f1c50a7f12c15c17c37280c7cf38495fe375b37f5203da998c7fd1967fff4b1326d9cbc3ca8edbcb03e5ec16d63aaa2ed1129eddbffd9dd13bba SHA512 f1c5f75693a6eaff06a193113266020cde1bdbba7ba291ae7e6aad94fd7a94401fa03ac3f8ea2fdcd27417438045fac83a242027fb34ae836d6bfb0e77ad1f13
+EBUILD tesseract-3.05.01.ebuild 5839 BLAKE2B 60b51c0673443da142de10d6b2494a0e6e64351ab05b93294834c2c7f0dd7b49cabfaa7b6ac3524f2448edf27a42d3c064e6eafaebe325b12734b39ac5fb72cf SHA512 bd9aafd41fff04ee0c0b725c402613050ebfffa0113a74352b8819bffae7aa6d200d18f9058db22cff312befe213c0468affc5efc36b08e8b544570a9a4241f5
+EBUILD tesseract-3.05.02.ebuild 5844 BLAKE2B 498c5b5e633af1319b785c3ea40bfd3de48022710bd5edc8d381bf0dbc7d2ab29b11524be669a43cdbaae439677d606eae67ee334077961f0dbd952dd16a1745 SHA512 f8f9adc9e12ecaad1aafae82fed5ad3169b54275e43b225e91931044bc76822d4ac39dacbe0fdcc57a551eccce44ed4e5600deb1c100aca546a4467dfded99d2
+EBUILD tesseract-4.0.0_beta4.ebuild 3965 BLAKE2B c8d8b17f998368aca538ee664e6cdf12f6beba3ee0fb90c5439b84d16623b50cb75f0c81623d2fb777967d8531de583308127ec4e49c1f2c55d41e718479dc85 SHA512 0de2ba12cfb65644e126d2c4b635f6d3621d9cf4b6f0dc40e5ce606d27f55e9d4ddae567af7ee0b7691b6b57c951687ab623fcb6d6d1cf8f5fcab75e083f8715
+EBUILD tesseract-9999.ebuild 3842 BLAKE2B aef57e284d1268d22a48e832bb451999e05bf0a870d399f9e2d83ac53705ef8df3ea95973a42cfd40adaecd81595dd92a5cc5810c26128af15b922532604fd06 SHA512 a9e6935469b8b8dfef11ccfe86b0df0cacd2e7cc536517f0092fbc9242c29e7df3ef128b4057a09df5ebc57516457a11a231f7df554d3a55c8b85e1c34594ec3
 MISC metadata.xml 1271 BLAKE2B e2f8b18ee6fa20f2c059c5fc99e242743cc30153e783874e3b43ef7185b0f5827d611884dfa98242ec442edd8adf278fdc389731d61e9114d7549df934b6f7d9 SHA512 7ea459bc822290be824fc07b7abe26e13ad537e932b5cf71925e654f191fdee4d8681fabdd9a7fb246e87a9a365a8c0d6f933e34217aff24eb8bf3d741369656
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 a9dd00419347..000000000000
--- 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-3.05.00-use-system-piccolo2d.patch b/app-text/tesseract/files/tesseract-3.05.00-use-system-piccolo2d.patch
new file mode 100644
index 000000000000..ad1f0f3df208
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-3.05.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/files/tesseract-4.00.00-use-system-piccolo2d.patch b/app-text/tesseract/files/tesseract-4.00.00-use-system-piccolo2d.patch
index ad1f0f3df208..dc60579c6671 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 4ae4c8150a61..000000000000
--- 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 6707ff093644..000000000000
--- 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 d07fb58157fe..000000000000
--- 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 b75cd450b347..d237409e66ae 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
new file mode 100644
index 000000000000..9f1cde5cf67a
--- /dev/null
+++ b/app-text/tesseract/tesseract-3.05.02.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2018 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 ~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
+	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-4.00.00_alpha.ebuild b/app-text/tesseract/tesseract-4.0.0_beta4.ebuild
index b936e99c917f..84e9db7e0a22 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} )"
@@ -20,7 +21,7 @@ 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 ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc examples jpeg math opencl openmp osd png scrollview static-libs tiff training webp"
+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
@@ -72,16 +73,13 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	scrollview? ( >=virtual/jre-1.7 )"
 
-DOCS=( AUTHORS ChangeLog NEWS README.md )
+DOCS=( AUTHORS ChangeLog 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
@@ -135,11 +133,6 @@ src_install() {
 		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-9999.ebuild b/app-text/tesseract/tesseract-9999.ebuild
index d7b815358586..efa9df5d7095 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
@@ -20,7 +20,7 @@ EGIT_REPO_URI="https://github.com/${MY_PN}/${PN}.git"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc examples jpeg math opencl openmp osd png scrollview static-libs tiff training webp"
+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
@@ -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"
@@ -130,11 +130,6 @@ src_install() {
 		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