gentoo resync : 02.08.2019

3 files changed, 87 insertions, 3 deletions

diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 6bbc3171390d..8d42914c2c44 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -127,6 +127,7 @@ 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.1.0.tar.gz 1965053 BLAKE2B 172aed0b149cb1af8c8c7b53022de237c8e07086bad78063374d5e425180e4b70eca5cee4d66a1f5b0bc2d51f6b8d41bf0c564918a85977d83fdbe6ba2f5497b SHA512 d617f5c5b826640b2871dbe3d7973bcc5e66fafd837921a20e009d683806ed50f0f258aa455019d99fc54f5cb65c2fa0380e3a3c92b39ab0684b8799c730b09d
 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
@@ -144,5 +145,6 @@ DIST vie.traineddata-4.00 12209616 BLAKE2B cd1eb9de7a319240b5279f7a7190244fa0c4c
 EBUILD tesseract-3.05.01.ebuild 5835 BLAKE2B 8f81fd6853978106759c00b951ce428992566c68915dfd0ec5e826fd4b68d632f5fc0e76b2414cede74398ccae61258e9e9e30d832e85e9e4996559d9c9aa5a4 SHA512 f216c6b491698dc1edb47e53ebe9e2971e2c7d2acf2a02cf6c05aa6e1436eb225ae85610f1d01e746dc972fcc24d17d293a7bd3645a605ed72891de7a58e4134
 EBUILD tesseract-3.05.02.ebuild 5835 BLAKE2B 8f81fd6853978106759c00b951ce428992566c68915dfd0ec5e826fd4b68d632f5fc0e76b2414cede74398ccae61258e9e9e30d832e85e9e4996559d9c9aa5a4 SHA512 f216c6b491698dc1edb47e53ebe9e2971e2c7d2acf2a02cf6c05aa6e1436eb225ae85610f1d01e746dc972fcc24d17d293a7bd3645a605ed72891de7a58e4134
 EBUILD tesseract-4.0.0.ebuild 3658 BLAKE2B d06d2635968b2b7d68a1dbcacffffbaf941722bbad81d12e1adf37993245964d5022aacb88fb40c9c1a8a35435cd8bf0baefb0ccc482c247a542e6c532c0d16a SHA512 fdb8e1b4a4f3280d3dd808ed630f229d5af276a4e035d1f7150bb2a8d2e8f60d0c2e44839c06f8bf1c0479b1ee20c52dc997a9369493832cd565c7bff4e1484b
+EBUILD tesseract-4.1.0.ebuild 1752 BLAKE2B 3585fbdec92bcc4ee4f8826a851b9c58cf03bbc8624c0af82528ba2f9cb900305d9816f3daf08a5343a3dd1623882ba34402b967843a84d0dc5f3f90055237bc SHA512 da8401d6628b45cf9e89c3d4703f53441b0ef789db81d841d3b657a3bc883b5622dfe651fe1827dd4530715858458d68694d2ef3fcaa241c3390c5469181d6f8
 EBUILD tesseract-9999.ebuild 3544 BLAKE2B 3747649a31c9cc8d4d83aa1c9d2f47e5ebfaea45488373a1712ced42dcefd0beca400aae8b25db9c59fb4ded3b19c5e978adc365f90c162c3361aad8cb8c9cf2 SHA512 6926f550e5d0a68af8d941c4b9d1e0e54ca8d22a1a4e60d9f5ffa3159f399f5a69bdb2180da9b0fddb1416da5ae195eb2926d772233e9c759462876eb1730366
-MISC metadata.xml 1203 BLAKE2B 72b792649c8f504bc809dd7ba99cead07f74704a5743532bacf1e010fd4877b8e5c8c929830e04899362d26fb086fcbadbbddaec7dae0295b9e5f3f9de76bc78 SHA512 b92b597ee4a1597c59646d21e7a293a601b74a06266b61ca5ace001ba0a7cf2e8a6454c81215e4e5534109ca7bb81cf045ffa2584cdb114e810f41c9ae5f7b1c
+MISC metadata.xml 1144 BLAKE2B 1b9ecd743c9a6b016ae04ea28b8bc2f80f6192c8c52d9d7e165cb8a2f222cc08408c97b0e01cebd4840b46cf0f046b2a7511b56c8f14b1a6434fea6e1149a48f SHA512 a86b76ef0f4bdf4339df2d061d1ef4c4fa80b60bc1d748a8c8c06023a9a5bc025bd14ee2d5e06f25706fc8055d8722cef41048e39908fc3771ec5ddd314eea4e
diff --git a/app-text/tesseract/metadata.xml b/app-text/tesseract/metadata.xml
index 90921345d113..c3f203799bf0 100644
--- a/app-text/tesseract/metadata.xml
+++ b/app-text/tesseract/metadata.xml
@@ -13,8 +13,7 @@
   1995. In 1995, this engine was among the top 3 evaluated by UNLV. It was
   open-sourced by HP and UNLV in 2005.</longdescription>
   <upstream>
-    <remote-id type="google-code">tesseract-ocr</remote-id>
-    <remote-id type="github">tesseract-ocr/tessdata</remote-id>
+    <remote-id type="github">tesseract-ocr/tesseract</remote-id>
   </upstream>
   <use>
     <flag name="math"> Enable support for recognition of equations.</flag>
diff --git a/app-text/tesseract/tesseract-4.1.0.ebuild b/app-text/tesseract/tesseract-4.1.0.ebuild
new file mode 100644
index 000000000000..c7877cb2d442
--- /dev/null
+++ b/app-text/tesseract/tesseract-4.1.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
+HOMEPAGE="https://github.com/tesseract-ocr"
+SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc jpeg opencl openmp png static-libs tiff training webp"
+
+COMMON_DEPEND=">=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?]
+	opencl? (
+		virtual/opencl
+		media-libs/tiff:0=
+		media-libs/leptonica:=[tiff]
+	)
+	training? (
+		dev-libs/icu:=
+		x11-libs/pango:=
+		x11-libs/cairo:=
+	)"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		>=app-text/tessdata_fast-4.0.0
+		>=app-text/tessdata_best-4.0.0
+		>=app-text/tessdata_legacy-4.0.0
+	)"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# scrollview disabled for now, see bug #686944
+	local myeconfargs=(
+		--enable-shared
+		--disable-graphics
+		$(use_enable opencl)
+		$(use_enable openmp)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+	use doc && emake doc
+	use training && emake training
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/html/. )
+	default
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	if use training; then
+		emake DESTDIR="${D}" training-install
+	fi
+}