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

11 files changed, 40 insertions, 324 deletions

diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 5e7b04fc8ceb..039ffa606571 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 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
index 160fe206b348..9f1cde5cf67a 100644
--- a/app-text/tesseract/tesseract-3.05.02.ebuild
+++ b/app-text/tesseract/tesseract-3.05.02.ebuild
@@ -91,7 +91,7 @@ DOCS=( AUTHORS ChangeLog NEWS README.md )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.05.00-no_graphics.patch"
-	"${FILESDIR}/${PN}-4.00.00-use-system-piccolo2d.patch"
+	"${FILESDIR}/${PN}-3.05.00-use-system-piccolo2d.patch"
 )
 
 src_unpack() {
diff --git a/app-text/tesseract/tesseract-4.00.00_alpha.ebuild b/app-text/tesseract/tesseract-4.0.0_beta4.ebuild
index b936e99c917f..a7ca7d380957 100644
--- a/app-text/tesseract/tesseract-4.00.00_alpha.ebuild
+++ b/app-text/tesseract/tesseract-4.0.0_beta4.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 MY_PN="tesseract-ocr"
+MY_PV=${PV/_beta/-beta.}
 LANGPACKV="4.00"
 URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
 JAVA_PKG_OPT_USE="scrollview"
@@ -12,7 +13,7 @@ inherit autotools java-pkg-opt-2 toolchain-funcs
 
 DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
 HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz
+SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
 	${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
 	math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
 	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )"
@@ -75,13 +76,10 @@ RDEPEND="${CDEPEND}
 DOCS=( AUTHORS ChangeLog NEWS README.md )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.04.01-use-system-piccolo2d.patch"
-	"${FILESDIR}/${P}-isnan.patch"
-	"${FILESDIR}/${P}-openmp.patch"
-	"${FILESDIR}/${P}-no_graphics.patch"
+	"${FILESDIR}/${PN}-4.00.00-use-system-piccolo2d.patch"
 )
 
-S=${WORKDIR}/${P/_}
+S=${WORKDIR}/${PN}-${MY_PV}
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
diff --git a/app-text/tesseract/tesseract-9999.ebuild b/app-text/tesseract/tesseract-9999.ebuild
index d7b815358586..567315f9d5a0 100644
--- a/app-text/tesseract/tesseract-9999.ebuild
+++ b/app-text/tesseract/tesseract-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -72,7 +72,7 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	scrollview? ( >=virtual/jre-1.7 )"
 
-DOCS=( AUTHORS ChangeLog NEWS README.md )
+DOCS=( AUTHORS ChangeLog README.md )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.00.00-use-system-piccolo2d.patch"