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

[Bernard Cafarelli]

commit:     7032d231288986d9cfa191830e4f79789c589d0b
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 16:43:44 2017 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 16:56:20 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7032d231

app-text/tesseract: add live ebuild

AVX/SSE4.1 are detected at runtime, so no need for CPU USE flags

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../tesseract-4.00.00-use-system-piccolo2d.patch   | 27 ++++++++++++++++++++++
 app-text/tesseract/tesseract-4.00.00_alpha.ebuild  |  1 -
 ...-4.00.00_alpha.ebuild => tesseract-9999.ebuild} | 18 +++++----------
 3 files changed, 33 insertions(+), 13 deletions(-)

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
new file mode 100644
index 00000000..ad1f0f3
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-4.00.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/tesseract-4.00.00_alpha.ebuild b/app-text/tesseract/tesseract-4.00.00_alpha.ebuild
index d5d4de1..029aee6 100644
--- a/app-text/tesseract/tesseract-4.00.00_alpha.ebuild
+++ b/app-text/tesseract/tesseract-4.00.00_alpha.ebuild
@@ -21,7 +21,6 @@ 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 ~mips ~ppc ~ppc64 ~sparc ~x86"
-# Next release will include SSE4.1/AVX
 IUSE="doc examples jpeg math opencl openmp osd png scrollview static-libs tiff training webp"
 
 # List of supported Gentoo linguas and their upstream mapping

diff --git a/app-text/tesseract/tesseract-4.00.00_alpha.ebuild b/app-text/tesseract/tesseract-9999.ebuild
similarity index 88%
copy from app-text/tesseract/tesseract-4.00.00_alpha.ebuild
copy to app-text/tesseract/tesseract-9999.ebuild
index d5d4de1..883c5c3 100644
--- a/app-text/tesseract/tesseract-4.00.00_alpha.ebuild
+++ b/app-text/tesseract/tesseract-9999.ebuild
@@ -9,19 +9,18 @@ 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 git-r3 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}
+SRC_URI="${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
 	math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
 	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )"
+EGIT_REPO_URI="https://github.com/${MY_PN}/${PN}.git"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
-# Next release will include SSE4.1/AVX
+KEYWORDS=""
 IUSE="doc examples jpeg math opencl openmp osd png scrollview static-libs tiff training webp"
 
 # List of supported Gentoo linguas and their upstream mapping
@@ -77,14 +76,9 @@ 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/_}
-
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
@@ -94,7 +88,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack ${P}.tar.gz
+	git-r3_src_unpack
 	for file in ${A}; do
 		if [[ "${file}" == *traineddata* ]]; then
 			cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || die