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

[Bernard Cafarelli]

commit:     35ec40276689d665635de45e8fa65f47d52b2aa5
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  4 14:38:25 2019 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Jun  4 14:39:53 2019 +0000
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 <voyageur <AT> 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-9999.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..00000000000
--- 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-4.0.0_beta4.ebuild b/app-text/tesseract/tesseract-4.0.0_beta4.ebuild
deleted file mode 100644
index 84e9db7e0a2..00000000000
--- a/app-text/tesseract/tesseract-4.0.0_beta4.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# 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"
-
-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/${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} )"
-
-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"
-
-# List of supported Gentoo linguas and their upstream mapping
-# https://github.com/tesseract-ocr/tesseract/wiki/Data-Files
-# "old" variants were regrouped in the matching modern locale
-LANGUAGES="af:afr am:amh ar:ara as:asm az:aze,aze_cyrl be:bel bn:ben bo:bod bs:bos bg:bul ca:cat cs:ces zh:chi_sim,chi_tra cy:cym da:dan de:deu,frk dz:dzo el:ell,grc en:enm eo:epo et:est eu:eus fa:fas fi:fin fr:fra,frm ga:gle gl:glg gu:guj he:heb hi:hin hr:hrv hu:hun id:ind is:isl it:ita,ita_old ja:jpn kn:kan ka:kat,kat_old kk:kaz km:khm ky:kir ko:kor ku:kur lo:lao la:lat lv:lav lt:lit ml:mal mr:mar mk:mkd ms:msa my:mya ne:nep nl:nld no:nor or:ori pa:pan pl:pol pt:por ro:ron ru:rus sa:san si:sin sk:slk sl:slv es:spa,spa_old sq:sqi sr:srp,srp_latn sw:swa sv:swe syc:syr ta:tam te:tel tg:tgk tl:tgl th:tha tr:tur ug:uig uk:ukr uz:uzb,uzb_cyrl vi:vie"
-# Missing matches:
-#	ceb 	Cebuano
-#	chr 	Cherokee
-#	hat 	Haitian; Haitian Creole
-#	iku 	Inuktitut
-#	jav 	Javanese
-#	mlt 	Maltese
-#	pus 	Pushto; Pashto
-#	tir 	Tigrinya
-#	urd 	Urdu
-#	yid 	Yiddish
-# l10n_en provides the additional data:
-#	enm 	English, Middle (1100-1500)
-
-for lang in ${LANGUAGES}; do
-	gentoo_lang=${lang%:*}
-	tess_langs=${lang#*:}
-	for tess_lang in ${tess_langs//,/ }; do
-		SRC_URI+=" l10n_${gentoo_lang}? ( ${URI_PREFIX}${tess_lang}.traineddata -> ${tess_lang}.traineddata-${LANGPACKV} )"
-	done
-	IUSE+=" l10n_${gentoo_lang}"
-done
-
-# With opencl USE=tiff is necessary in leptonica
-CDEPEND=">=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 )"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.00.00-use-system-piccolo2d.patch"
-)
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-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 openmp)
-		$(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
-
-	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 efa9df5d709..6bba4a49da5 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
 }