gentoo resync : 08.06.2019

6 files changed, 86 insertions, 85 deletions

diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index f9acca026084..175f6b32779d 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -1,6 +1,6 @@
 AUX tesseract-3.05.00-no_graphics.patch 2199 BLAKE2B 0ed987995a7686dfb6e420c1e79eb1374df5d1c2c69177f858f962c1216f54daeb4b0e10e9c6cbfeda931f44a359b75fa266266c0807321479a4275b8ab7fdb4 SHA512 136b4f298e52517a801a19847ceb85cbb77ee0de42a43dc5a82faa7039f0b9c0bde965453ac5cd6c25f4578351217319a0ceb719fa42f207a38b3efe0c210388
 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
+AUX tesseract-4.0.0-manpages.patch 1132 BLAKE2B b38f4385ff916b40a679a925cfcd4aaf4e64a3e1735dba8a5cb385dc513f9bb8e9acf7a37f90080a1327eac129897eae738faabd8e4b483d1a5f614d824b3abb SHA512 24bda3df99ee059e6957ab34f66537d9743791b968c242cae19eaa13d434210e6b4f9be2c433a0e92756a56752f575dcab37c4c62f2dcbeb063248ddb4397c91
 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
@@ -126,7 +126,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_beta4.tar.gz 1855821 BLAKE2B 8273fefc5c07526c87adcbe1d9d81204f622f42396564d8e5fae5ed5275c47bcefab1bc5df1560dee722a1236fbd2211f622e61b3f279219a877b3bb3bad822e SHA512 37347c461c288cbaf839b65ac1283ab5b60e6723726442a5d067e6a4e2f48d6847d7393206f1ddd4de3c5dbd8a8d9febcc42d68567a46a4665fbf678bab232d4
+DIST tesseract-4.0.0.tar.gz 1961372 BLAKE2B 5d684ec58deddc2cad6d61f5a3e22e9bccc1fa96b57d5bcad5239d5ba6d0805978b94b4b44a871c0796a756173b8072327f8a44a6a84da5604a3b50d9e425d21 SHA512 69e57d4ba1fc43d212fd0fff69a2b5d48a3b37cfee7054fdc083cbb7e04d92317609a32e457229661d70ce8d9b16c9d25e81bfc3861db660dd2c8f292202d447
 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
@@ -142,7 +142,7 @@ DIST uzb_cyrl.traineddata-4.00 10390622 BLAKE2B 055ad7b767d5e919cf386f3a1b2902bd
 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 5835 BLAKE2B 8f81fd6853978106759c00b951ce428992566c68915dfd0ec5e826fd4b68d632f5fc0e76b2414cede74398ccae61258e9e9e30d832e85e9e4996559d9c9aa5a4 SHA512 f216c6b491698dc1edb47e53ebe9e2971e2c7d2acf2a02cf6c05aa6e1436eb225ae85610f1d01e746dc972fcc24d17d293a7bd3645a605ed72891de7a58e4134
-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
+EBUILD tesseract-3.05.02.ebuild 5838 BLAKE2B f627210c35518f399ab06b608fb12d82a4b2a47ea012c9da55d602e6591971fd0da52d2892192725a448458a55e099769f5341910981eabee006cc4e0a9697aa SHA512 931439ef73d10ec5d97b42c718d4232068d2addcef174168f35a43f451262413f1aa611ebcdcf135eba168f0790ab6eb11622f7c9780758c1e2bffb7197b9861
+EBUILD tesseract-4.0.0.ebuild 3658 BLAKE2B d06d2635968b2b7d68a1dbcacffffbaf941722bbad81d12e1adf37993245964d5022aacb88fb40c9c1a8a35435cd8bf0baefb0ccc482c247a542e6c532c0d16a SHA512 fdb8e1b4a4f3280d3dd808ed630f229d5af276a4e035d1f7150bb2a8d2e8f60d0c2e44839c06f8bf1c0479b1ee20c52dc997a9369493832cd565c7bff4e1484b
+EBUILD tesseract-9999.ebuild 3544 BLAKE2B 3747649a31c9cc8d4d83aa1c9d2f47e5ebfaea45488373a1712ced42dcefd0beca400aae8b25db9c59fb4ded3b19c5e978adc365f90c162c3361aad8cb8c9cf2 SHA512 6926f550e5d0a68af8d941c4b9d1e0e54ca8d22a1a4e60d9f5ffa3159f399f5a69bdb2180da9b0fddb1416da5ae195eb2926d772233e9c759462876eb1730366
 MISC metadata.xml 1203 BLAKE2B 72b792649c8f504bc809dd7ba99cead07f74704a5743532bacf1e010fd4877b8e5c8c929830e04899362d26fb086fcbadbbddaec7dae0295b9e5f3f9de76bc78 SHA512 b92b597ee4a1597c59646d21e7a293a601b74a06266b61ca5ace001ba0a7cf2e8a6454c81215e4e5534109ca7bb81cf045ffa2584cdb114e810f41c9ae5f7b1c
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 000000000000..dfa8e9fde340
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-4.0.0-manpages.patch
@@ -0,0 +1,49 @@
+From 39ed30ad834a43cf403f88158c6db7a96f1bed29 Mon Sep 17 00:00:00 2001
+From: Stefan Weil <sw@weilnetz.de>
+Date: Fri, 1 Feb 2019 19:47:46 +0100
+Subject: Fix build rule for manpages
+
+This is similar to commit 2106cba0a98a90451df835f3ab7b2aaf54826442
+which fixed doc/generate_manpages.sh.
+
+Signed-off-by: Stefan Weil <sw@weilnetz.de>
+---
+ doc/Makefile.am | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index a218aca3..c0eeda84 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -2,9 +2,6 @@
+ 
+ if ASCIIDOC
+ 
+-asciidoc=asciidoc -d manpage
+-
+-
+ man_MANS = \
+   combine_lang_model.1 \
+   combine_tessdata.1  \
+@@ -29,6 +26,8 @@ man_MANS += \
+   unicharset.5
+ endif
+ 
++man_xslt = http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
++
+ EXTRA_DIST = $(man_MANS) Doxyfile
+ 
+ .PHONY: html
+@@ -36,7 +35,8 @@ EXTRA_DIST = $(man_MANS) Doxyfile
+ html: $(patsubst %,%.html,$(man_MANS))
+ 
+ %: %.asc
+-	$(asciidoc) -o $@ $<
++	asciidoc -b docbook -d manpage -o - $< | \
++	xsltproc --nonet $(man_xslt) -
+ 
+ %.html: %.asc
+ 	asciidoc -b html5 -o $@ $<
+-- 
+cgit v1.2.1
+
diff --git a/app-text/tesseract/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 dc60579c6671..000000000000
--- a/app-text/tesseract/files/tesseract-4.00.00-use-system-piccolo2d.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur tesseract.orig/java/Makefile.am tesseract/java/Makefile.am
---- tesseract.orig/java/Makefile.am	2017-01-30 17:20:23.135458366 +0100
-+++ tesseract/java/Makefile.am	2017-01-30 17:21:29.834462557 +0100
-@@ -36,10 +36,9 @@
- 	com/google/scrollview/ScrollView.class
- 
- SCROLLVIEW_LIBS = \
--	piccolo2d-core-3.0.jar \
--	piccolo2d-extras-3.0.jar
-+	/usr/share/piccolo2d/lib/piccolo2d.jar
- 
--CLASSPATH = piccolo2d-core-3.0.jar:piccolo2d-extras-3.0.jar
-+CLASSPATH = /usr/share/piccolo2d/lib/piccolo2d.jar
- 
- ScrollView.jar : $(SCROLLVIEW_CLASSES)
- 	$(JAR) cfm $@ $(srcdir)/Manifest.txt com/google/scrollview/*.class \
-diff -Naur tesseract.orig/src/viewer/Makefile.am tesseract/src/viewer/Makefile.am
---- tesseract.orig/src/viewer/Makefile.am	2017-01-30 17:20:23.176458368 +0100
-+++ tesseract/src/viewer/Makefile.am	2017-01-30 17:22:39.281467163 +0100
-@@ -17,3 +17,7 @@
- 
- libtesseract_viewer_la_SOURCES = \
-     scrollview.cpp svmnode.cpp svutil.cpp svpaint.cpp
-+
-+if !GRAPHICS_DISABLED
-+AM_CPPFLAGS += -DSCROLLVIEW_PATH=/usr/share/tessdata/
-+endif
diff --git a/app-text/tesseract/tesseract-3.05.02.ebuild b/app-text/tesseract/tesseract-3.05.02.ebuild
index 9f1cde5cf67a..961971a91daa 100644
--- a/app-text/tesseract/tesseract-3.05.02.ebuild
+++ b/app-text/tesseract/tesseract-3.05.02.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -60,7 +60,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"
+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"
 
diff --git a/app-text/tesseract/tesseract-4.0.0_beta4.ebuild b/app-text/tesseract/tesseract-4.0.0.ebuild
index 84e9db7e0a22..d4ba59d9b351 100644
--- a/app-text/tesseract/tesseract-4.0.0_beta4.ebuild
+++ b/app-text/tesseract/tesseract-4.0.0.ebuild
@@ -1,19 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN="tesseract-ocr"
-MY_PV=${PV/_beta/-beta.}
 LANGPACKV="4.00"
 URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
-JAVA_PKG_OPT_USE="scrollview"
 
-inherit autotools java-pkg-opt-2 toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
 HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 	${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
 	math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
 	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )"
@@ -21,7 +19,7 @@ SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.g
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc jpeg math opencl openmp osd png scrollview static-libs tiff training webp"
+IUSE="doc jpeg math opencl openmp osd png static-libs tiff training webp"
 
 # List of supported Gentoo linguas and their upstream mapping
 # https://github.com/tesseract-ocr/tesseract/wiki/Data-Files
@@ -51,36 +49,30 @@ for lang in ${LANGUAGES}; do
 done
 
 # With opencl USE=tiff is necessary in leptonica
-CDEPEND=">=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?]
+RDEPEND=">=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?]
 	opencl? (
 		virtual/opencl
 		media-libs/tiff:0=
 		media-libs/leptonica:=[tiff]
 	)
-	scrollview? (
-		>=dev-java/piccolo2d-3.0:0
-	)
 	training? (
 		dev-libs/icu:=
 		x11-libs/pango:=
 		x11-libs/cairo:=
 	)"
 
-DEPEND="${CDEPEND}
-	doc? ( app-doc/doxygen )
-	scrollview? ( >=virtual/jdk-1.7 )"
-
-RDEPEND="${CDEPEND}
-	scrollview? ( >=virtual/jre-1.7 )"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	doc? ( app-doc/doxygen )"
 
 DOCS=( AUTHORS ChangeLog README.md )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-4.00.00-use-system-piccolo2d.patch"
+	"${FILESDIR}"/${P}-manpages.patch
 )
 
-S=${WORKDIR}/${PN}-${MY_PV}
-
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
@@ -101,16 +93,15 @@ src_unpack() {
 src_prepare() {
 	default
 	eautoreconf
-
-	java-pkg-opt-2_src_prepare
 }
 
 src_configure() {
+	# scrollview disabled for now, see bug #686944
 	local myeconfargs=(
 		--enable-shared
+		--disable-graphics
 		$(use_enable opencl)
 		$(use_enable openmp)
-		$(use_enable scrollview graphics)
 		$(use_enable static-libs static)
 	)
 
@@ -120,14 +111,14 @@ src_configure() {
 src_compile() {
 	default
 	use doc && emake doc
-	use scrollview && emake ScrollView.jar JAVAC="javac $(java-pkg_javac-args)"
 	use training && emake training
 }
 
 src_install() {
 	use doc && HTML_DOCS=( doc/html/. )
 	default
-	prune_libtool_files
+
+	find "${D}" -name '*.la' -type f -delete || die
 
 	if use training; then
 		emake DESTDIR="${D}" training-install
@@ -135,5 +126,4 @@ src_install() {
 
 	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 efa9df5d7095..6bba4a49da59 100644
--- a/app-text/tesseract/tesseract-9999.ebuild
+++ b/app-text/tesseract/tesseract-9999.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN="tesseract-ocr"
 LANGPACKV="4.00"
 URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
-JAVA_PKG_OPT_USE="scrollview"
 
-inherit autotools git-r3 java-pkg-opt-2 toolchain-funcs
+inherit autotools git-r3 toolchain-funcs
 
 DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
 HOMEPAGE="https://github.com/tesseract-ocr"
@@ -20,7 +19,7 @@ EGIT_REPO_URI="https://github.com/${MY_PN}/${PN}.git"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc jpeg math opencl openmp osd png scrollview static-libs tiff training webp"
+IUSE="doc jpeg math opencl openmp osd png static-libs tiff training webp"
 
 # List of supported Gentoo linguas and their upstream mapping
 # https://github.com/tesseract-ocr/tesseract/wiki/Data-Files
@@ -50,34 +49,26 @@ for lang in ${LANGUAGES}; do
 done
 
 # With opencl USE=tiff is necessary in leptonica
-CDEPEND=">=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?]
+RDEPEND=">=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?]
 	opencl? (
 		virtual/opencl
 		media-libs/tiff:0=
 		media-libs/leptonica:=[tiff]
 	)
-	scrollview? (
-		>=dev-java/piccolo2d-3.0:0
-	)
 	training? (
 		dev-libs/icu:=
 		x11-libs/pango:=
 		x11-libs/cairo:=
 	)"
 
-DEPEND="${CDEPEND}
-	doc? ( app-doc/doxygen )
-	scrollview? ( >=virtual/jdk-1.7 )"
-
-RDEPEND="${CDEPEND}
-	scrollview? ( >=virtual/jre-1.7 )"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	doc? ( app-doc/doxygen )"
 
 DOCS=( AUTHORS ChangeLog README.md )
 
-PATCHES=(
-	"${FILESDIR}/${PN}-4.00.00-use-system-piccolo2d.patch"
-)
-
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
@@ -98,16 +89,15 @@ src_unpack() {
 src_prepare() {
 	default
 	eautoreconf
-
-	java-pkg-opt-2_src_prepare
 }
 
 src_configure() {
+	# scrollview disabled for now, see bug #686944
 	local myeconfargs=(
 		--enable-shared
+		--disable-graphics
 		$(use_enable opencl)
 		$(use_enable openmp)
-		$(use_enable scrollview graphics)
 		$(use_enable static-libs static)
 	)
 
@@ -117,14 +107,14 @@ src_configure() {
 src_compile() {
 	default
 	use doc && emake doc
-	use scrollview && emake ScrollView.jar JAVAC="javac $(java-pkg_javac-args)"
 	use training && emake training
 }
 
 src_install() {
 	use doc && HTML_DOCS=( doc/html/. )
 	default
-	prune_libtool_files
+
+	find "${D}" -name '*.la' -type f -delete || die
 
 	if use training; then
 		emake DESTDIR="${D}" training-install
@@ -132,5 +122,4 @@ src_install() {
 
 	insinto /usr/share/tessdata
 	doins tessdata/*traineddata* # language files
-	use scrollview && doins java/ScrollView.jar # scrollview
 }