Gentoo Archives: gentoo-commits

From: Bernard Cafarelli <voyageur@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/
Date: Wed, 22 Dec 2021 13:09:59
Message-Id: 1640178571.87088ac705cbe3beb1dcf6900a6b79c4b94ece34.voyageur@gentoo
1 commit: 87088ac705cbe3beb1dcf6900a6b79c4b94ece34
2 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 22 12:29:51 2021 +0000
4 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 22 13:09:31 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87088ac7
7
8 app-text/tesseract: 5.0.0 bump
9
10 Drop beta ebuild and sync changes in live ebuild
11
12 Package-Manager: Portage-3.0.30, Repoman-3.0.3
13 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
14
15 app-text/tesseract/Manifest | 2 +-
16 ...{tesseract-5.0.0_beta20210815.ebuild => tesseract-5.0.0.ebuild} | 7 ++-----
17 app-text/tesseract/tesseract-9999.ebuild | 7 ++++---
18 3 files changed, 7 insertions(+), 9 deletions(-)
19
20 diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
21 index 0266650c7a4e..de52ac9093b3 100644
22 --- a/app-text/tesseract/Manifest
23 +++ b/app-text/tesseract/Manifest
24 @@ -1,2 +1,2 @@
25 DIST tesseract-4.1.1.tar.gz 1974988 BLAKE2B f729beb017ec81704b84f5e6539706ff0cd6a51a4d1b7b730c394af58ce2ea2a659203bf239417e8d500cfbde845a73d6e6e181ca946257c2f22525820899602 SHA512 017723a2268be789fe98978eed02fd294968cc8050dde376dee026f56f2b99df42db935049ae5e72c4519a920e263b40af1a6a40d9942e66608145b3131a71a2
26 -DIST tesseract-5.0.0_beta20210815.tar.gz 1914265 BLAKE2B eadefb46a84fcc73d3da7a1780d1e0669840183266176021871e57ca55c79e9b56a78334414732b9024ae911cee522069c3170bf71af877c46c1ffae37c88b3f SHA512 4b78af9119c35d783e47523b41ee8bbf63913f8c122e94b6e6538a4cbab8e751df9f00f3a50d48e8a7beb948c6b23794e2481721696bf3e0f284de8aa6e9e8e7
27 +DIST tesseract-5.0.0.tar.gz 1919742 BLAKE2B 39897f8778017627ce70227c6c162d6b53b504a95c92d9c13e1a27f8b71ec9828bfba8497535cd1684330a110001380433ad6120c0d2a61d86a01bbf1f1db015 SHA512 80e0d6e9076eb8d6b0d99942586acbb43aaec7bee7f7b13a500470aa11bf03f1c128434d764abd67839355e3fb80d41d0bcf10400b33e57fa0ae4659adb42af9
28
29 diff --git a/app-text/tesseract/tesseract-5.0.0_beta20210815.ebuild b/app-text/tesseract/tesseract-5.0.0.ebuild
30 similarity index 92%
31 rename from app-text/tesseract/tesseract-5.0.0_beta20210815.ebuild
32 rename to app-text/tesseract/tesseract-5.0.0.ebuild
33 index 0cd624612031..2f9c1be1d631 100644
34 --- a/app-text/tesseract/tesseract-5.0.0_beta20210815.ebuild
35 +++ b/app-text/tesseract/tesseract-5.0.0.ebuild
36 @@ -1,14 +1,13 @@
37 # Copyright 1999-2021 Gentoo Authors
38 # Distributed under the terms of the GNU General Public License v2
39
40 -EAPI=7
41 +EAPI=8
42
43 inherit autotools multilib-minimal toolchain-funcs
44
45 DESCRIPTION="An OCR Engine, originally developed at HP, now open source."
46 HOMEPAGE="https://github.com/tesseract-ocr"
47 -BETA_PV=$(ver_rs 3-4 "-")
48 -SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${BETA_PV}.tar.gz -> ${P}.tar.gz"
49 +SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
50
51 LICENSE="Apache-2.0"
52 SLOT="0/5"
53 @@ -38,8 +37,6 @@ DEPEND="${COMMON_DEPEND}
54 dev-libs/libxslt
55 doc? ( app-doc/doxygen )"
56
57 -S=${WORKDIR}/${PN}-${BETA_PV}
58 -
59 pkg_pretend() {
60 [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
61 }
62
63 diff --git a/app-text/tesseract/tesseract-9999.ebuild b/app-text/tesseract/tesseract-9999.ebuild
64 index 3e7941c6798e..5523890d242b 100644
65 --- a/app-text/tesseract/tesseract-9999.ebuild
66 +++ b/app-text/tesseract/tesseract-9999.ebuild
67 @@ -1,7 +1,7 @@
68 -# Copyright 1999-2020 Gentoo Authors
69 +# Copyright 1999-2021 Gentoo Authors
70 # Distributed under the terms of the GNU General Public License v2
71
72 -EAPI=7
73 +EAPI=8
74
75 inherit autotools git-r3 multilib-minimal toolchain-funcs
76
77 @@ -12,7 +12,7 @@ EGIT_REPO_URI="https://github.com/tesseract-ocr/${PN}.git"
78 LICENSE="Apache-2.0"
79 SLOT="0"
80 KEYWORDS=""
81 -IUSE="doc jpeg opencl openmp png static-libs tiff training webp"
82 +IUSE="doc float32 jpeg opencl openmp png static-libs tiff training webp"
83
84 COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?]
85 opencl? (
86 @@ -55,6 +55,7 @@ multilib_src_configure() {
87 local myeconfargs=(
88 --enable-shared
89 --disable-graphics
90 + $(use_enable float32)
91 $(use_enable opencl)
92 $(use_enable openmp)
93 $(use_enable static-libs static)