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 5FE58138350 for ; Mon, 3 Feb 2020 17:37:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 631A2E0636; Mon, 3 Feb 2020 17:37:10 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 47AE5E0636 for ; Mon, 3 Feb 2020 17:37:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 62D5034E655 for ; Mon, 3 Feb 2020 17:37:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B010910D for ; Mon, 3 Feb 2020 17:37:07 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1580751339.f289e9966587b984f21aaeb095955e23bf52ccdf.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/zbar/zbar-0.23.ebuild X-VCS-Directories: media-gfx/zbar/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f289e9966587b984f21aaeb095955e23bf52ccdf X-VCS-Branch: master Date: Mon, 3 Feb 2020 17:37:07 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1262613a-c0c1-4d83-b2d5-8350556c7298 X-Archives-Hash: f233d81b0076e8172da10e4a99d8b14d commit: f289e9966587b984f21aaeb095955e23bf52ccdf Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Feb 3 14:29:34 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 3 17:35:39 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f289e996 media-gfx/zbar: Minor nitpicks Unify sed style, add minimum jre version, move einstalldocs Package-Manager: Portage-2.3.86, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/zbar/zbar-0.23.ebuild | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/media-gfx/zbar/zbar-0.23.ebuild b/media-gfx/zbar/zbar-0.23.ebuild index 34eb41b923a..495dc423d47 100644 --- a/media-gfx/zbar/zbar-0.23.ebuild +++ b/media-gfx/zbar/zbar-0.23.ebuild @@ -54,7 +54,7 @@ COMMON_DEPEND=" )" RDEPEND="${COMMON_DEPEND} - java? ( virtual/jre )" + java? ( >=virtual/jre-1.8 )" DEPEND="${COMMON_DEPEND} java? ( @@ -99,9 +99,8 @@ src_prepare() { if use test; then # make tests happy # because one of the test requires loadable py module from the current ${BUILD_DIR} - sed -i \ - -e "s|PYTHONPATH=@abs_top_srcdir@|PYTHONPATH=@builddir@|g" \ - test/Makefile.am.inc || die + sed -e "s|PYTHONPATH=@abs_top_srcdir@|PYTHONPATH=@builddir@|g" \ + -i test/Makefile.am.inc || die fi python_fix_shebang \ @@ -111,13 +110,12 @@ src_prepare() { if use java; then java-pkg-opt-2_src_prepare - sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \ + sed -e "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \ -i java/Makefile.am || die fi # do not install {LICENSE,INSTALL,etc}.md doc files with 'make install' (use DOCS=() instead) - sed -i \ - -e "s|^dist_doc_DATA =\(.*\)|dist_doc_DATA =|" Makefile.am || die + sed -e "s|^dist_doc_DATA =\(.*\)|dist_doc_DATA =|" -i Makefile.am || die eautoreconf } @@ -204,10 +202,10 @@ src_install() { ) fi multilib-minimal_src_install - einstalldocs } multilib_src_install_all() { + einstalldocs find "${D}" -name '*.la' -delete || die }