From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EED76139694 for ; Wed, 22 Mar 2017 16:28:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22AD821C091; Wed, 22 Mar 2017 16:28:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DC4DC21C091 for ; Wed, 22 Mar 2017 16:28:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 521EF340DF9 for ; Wed, 22 Mar 2017 16:28:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EB0BC7135 for ; Wed, 22 Mar 2017 16:28:12 +0000 (UTC) From: "Bernard Cafarelli" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Bernard Cafarelli" Message-ID: <1490200087.519a033fa0ca7b95cb495e65f63775ca86a4a780.voyageur@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/tesseract/tesseract-3.04.01-r1.ebuild app-text/tesseract/tesseract-3.04.01.ebuild app-text/tesseract/tesseract-3.05.00.ebuild X-VCS-Directories: app-text/tesseract/ X-VCS-Committer: voyageur X-VCS-Committer-Name: Bernard Cafarelli X-VCS-Revision: 519a033fa0ca7b95cb495e65f63775ca86a4a780 X-VCS-Branch: master Date: Wed, 22 Mar 2017 16:28:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8b5e3e99-00db-4c34-812b-6bceba730ca9 X-Archives-Hash: 9cc047850044473375ed47fefdfd54cb commit: 519a033fa0ca7b95cb495e65f63775ca86a4a780 Author: Bernard Cafarelli gentoo org> AuthorDate: Wed Mar 22 16:27:02 2017 +0000 Commit: Bernard Cafarelli gentoo 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() {