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 3CF2C138239 for ; Fri, 17 Jan 2020 16:59:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D004E087C; Fri, 17 Jan 2020 16:59:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 D3386E087C for ; Fri, 17 Jan 2020 16:59:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 895C734E1EC for ; Fri, 17 Jan 2020 16:59:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 11276CF for ; Fri, 17 Jan 2020 16:59:16 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1579280351.21101c59127ee96baad9f7ddb4ed45fd4501afb5.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libjpeg-turbo/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4.ebuild X-VCS-Directories: media-libs/libjpeg-turbo/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 21101c59127ee96baad9f7ddb4ed45fd4501afb5 X-VCS-Branch: master Date: Fri, 17 Jan 2020 16:59:16 +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: dad97c2a-d38b-4c1a-ba9e-60ee9fcd23d2 X-Archives-Hash: 21a4ac7c59c7769ccc1f3dec8b3b8eaf commit: 21101c59127ee96baad9f7ddb4ed45fd4501afb5 Author: Lars Wendler gentoo org> AuthorDate: Fri Jan 17 16:58:37 2020 +0000 Commit: Lars Wendler gentoo 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 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 }