[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/

[Andreas Sturmlechner]

commit:     f289e9966587b984f21aaeb095955e23bf52ccdf
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  3 14:29:34 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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
 }