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

[Bernard Cafarelli]

commit:     519a033fa0ca7b95cb495e65f63775ca86a4a780
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 22 16:27:02 2017 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Wed Mar 22 16:28:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=519a033f

app-text/tesseract: do not glob in DISTIDR, bug #612996

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-text/tesseract/tesseract-3.04.01-r1.ebuild |  7 +++++--
 app-text/tesseract/tesseract-3.04.01.ebuild    |  7 +++++--
 app-text/tesseract/tesseract-3.05.00.ebuild    | 10 ++++++----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app-text/tesseract/tesseract-3.04.01-r1.ebuild 
b/app-text/tesseract/tesseract-3.04.01-r1.ebuild
index 776dd2a848a..d7d23a447a0 100644
--- a/app-text/tesseract/tesseract-3.04.01-r1.ebuild
+++ b/app-text/tesseract/tesseract-3.04.01-r1.ebuild
@@ -97,8 +97,11 @@ PATCHES=(
 
 src_unpack() {
        unpack ${P}.tar.gz
-       find "${DISTDIR}/" -name "*traineddata-${LANGPACKV}" \
-                -execdir sh -c 'cp -- "$0" "${S}/tessdata/${0%-*}"' '{}' ';' 
|| die
+       for file in ${A}; do
+               if [[ "${file}" == *traineddata* ]]; then
+                       cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || 
die
+               fi
+       done
 }
 
 src_prepare() {

diff --git a/app-text/tesseract/tesseract-3.04.01.ebuild 
b/app-text/tesseract/tesseract-3.04.01.ebuild
index 6eb8cda4604..6852fc486ef 100644
--- a/app-text/tesseract/tesseract-3.04.01.ebuild
+++ b/app-text/tesseract/tesseract-3.04.01.ebuild
@@ -99,8 +99,11 @@ PATCHES=(
 src_unpack() {
        unpack ${P}.tar.gz
        use doc && unpack tesseract-ocr-3.02.02-doc-html.tar.gz
-       find "${DISTDIR}/" -name "*traineddata-${LANGPACKV}" \
-                -execdir sh -c 'cp -- "$0" "${S}/tessdata/${0%-*}"' '{}' ';' 
|| die
+       for file in ${A}; do
+               if [[ "${file}" == *traineddata* ]]; then
+                       cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || 
die
+               fi
+       done
 }
 
 src_prepare() {

diff --git a/app-text/tesseract/tesseract-3.05.00.ebuild 
b/app-text/tesseract/tesseract-3.05.00.ebuild
index e3d7c887342..7b1c14b4f5b 100644
--- a/app-text/tesseract/tesseract-3.05.00.ebuild
+++ b/app-text/tesseract/tesseract-3.05.00.ebuild
@@ -78,8 +78,7 @@ 
CDEPEND=">=media-libs/leptonica-1.71:=[zlib,tiff?,jpeg?,png?,webp?]
                dev-libs/icu:=
                x11-libs/pango:=
                x11-libs/cairo:=
-       )
-"
+       )"
 
 DEPEND="${CDEPEND}
        doc? ( app-doc/doxygen )
@@ -98,8 +97,11 @@ PATCHES=(
 
 src_unpack() {
        unpack ${P}.tar.gz
-       find "${DISTDIR}/" -name "*traineddata-${LANGPACKV}" \
-                -execdir sh -c 'cp -- "$0" "${S}/tessdata/${0%-*}"' '{}' ';' 
|| die
+       for file in ${A}; do
+               if [[ "${file}" == *traineddata* ]]; then
+                       cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || 
die
+               fi
+       done
 }
 
 src_prepare() {