[gentoo-commits] repo/gentoo:master commit in: media-libs/libjpeg-turbo/

[Lars Wendler]

commit:     21101c59127ee96baad9f7ddb4ed45fd4501afb5
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 17 16:58:37 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jan 17 16:59:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21101c59

media-libs/libjpeg-turbo: Fixed QA issues

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild | 12 ++++++------
 media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4.ebuild | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild 
b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
index 57630393fa9..e15a580435f 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -80,7 +80,7 @@ multilib_src_install() {
 
                popd || die
                if use java ; then
-                       rm -rf "${ED%/}"/usr/classes || die
+                       rm -rf "${ED}"/usr/classes || die
                        java-pkg_dojar java/turbojpeg.jar
                fi
        fi
@@ -89,12 +89,12 @@ multilib_src_install() {
 multilib_src_install_all() {
        find "${ED}" -type f -name '*.la' -delete || die
 
-       insinto /usr/share/doc/${PF}/html
-       doins -r "${S}"/doc/html/*
+       docinto html
+       dodoc -r "${S}"/doc/html/*
        newdoc "${WORKDIR}"/debian/changelog changelog.debian
        if use java; then
-               insinto /usr/share/doc/${PF}/html/java
-               doins -r "${S}"/java/doc/*
+               docinto html/java
+               dodoc -r "${S}"/java/doc/*
                newdoc "${S}"/java/README README.java
        fi
 }

diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4.ebuild 
b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4.ebuild
index 89a62f84296..0a16a62f0f5 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4.ebuild
@@ -80,7 +80,7 @@ multilib_src_install() {
 
                popd || die
                if use java ; then
-                       rm -rf "${ED%/}"/usr/classes || die
+                       rm -rf "${ED}"/usr/classes || die
                        java-pkg_dojar java/turbojpeg.jar
                fi
        fi
@@ -89,12 +89,12 @@ multilib_src_install() {
 multilib_src_install_all() {
        find "${ED}" -type f -name '*.la' -delete || die
 
-       insinto /usr/share/doc/${PF}/html
-       doins -r "${S}"/doc/html/*
+       docinto html
+       dodoc -r "${S}"/doc/html/*
        newdoc "${WORKDIR}"/debian/changelog changelog.debian
        if use java; then
-               insinto /usr/share/doc/${PF}/html/java
-               doins -r "${S}"/java/doc/*
+               docinto html/java
+               dodoc -r "${S}"/java/doc/*
                newdoc "${S}"/java/README README.java
        fi
 }