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 70169138350 for ; Fri, 27 Mar 2020 08:37:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C50CE0E10; Fri, 27 Mar 2020 08:37:03 +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 63FEDE0E10 for ; Fri, 27 Mar 2020 08:37:03 +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 ABA5734FA1B for ; Fri, 27 Mar 2020 08:37:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 250C613A for ; Fri, 27 Mar 2020 08:36:59 +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: <1585298020.0e2716a8a51d96c6c05c1c5b721c11d8933dff34.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/, sys-fs/e2fsprogs/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild sys-fs/e2fsprogs/files/e2fsprogs-1.44.6-parallel_install.patch X-VCS-Directories: sys-fs/e2fsprogs/files/ sys-fs/e2fsprogs/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 0e2716a8a51d96c6c05c1c5b721c11d8933dff34 X-VCS-Branch: master Date: Fri, 27 Mar 2020 08:36:59 +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: 85260f3d-b40c-4874-8116-af1bfd058161 X-Archives-Hash: 3df8a32511885bfb8f7531cceb96c0b7 commit: 0e2716a8a51d96c6c05c1c5b721c11d8933dff34 Author: Gwendal Grignou chromium org> AuthorDate: Fri Mar 27 04:01:56 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri Mar 27 08:33:40 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e2716a8 sysdevel/e2fsprogs: install library through install Given e2fsprogs forks a make instance to install libraries, do not specify the rule install-libs when installing e2fsprogs. make install will do it once other dependencies are in place. Closes: https://bugs.gentoo.org/679640 Signed-off-by: Gwendal Grignou chromium.org> Closes: https://github.com/gentoo/gentoo/pull/15132 Signed-off-by: Lars Wendler gentoo.org> sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild | 3 +-- sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild | 3 +-- sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild | 3 +-- sys-fs/e2fsprogs/files/e2fsprogs-1.44.6-parallel_install.patch | 10 ---------- 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild index db28efccf15..48a3c1aae89 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild @@ -29,7 +29,6 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-1.44.6-parallel_install.patch "${FILESDIR}"/${PN}-1.40-fbsd.patch "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 @@ -114,7 +113,7 @@ src_install() { STRIP=: \ root_libdir="${EPREFIX}/usr/$(get_libdir)" \ DESTDIR="${D}" \ - install install-libs + install einstalldocs diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild index 2be6b804acd..3cbd7bb014a 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild @@ -29,7 +29,6 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-1.44.6-parallel_install.patch "${FILESDIR}"/${PN}-1.40-fbsd.patch "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 @@ -114,7 +113,7 @@ src_install() { STRIP=: \ root_libdir="${EPREFIX}/usr/$(get_libdir)" \ DESTDIR="${D}" \ - install install-libs + install einstalldocs diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild index 31effc07757..5db4525cd57 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild @@ -29,7 +29,6 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-1.44.6-parallel_install.patch "${FILESDIR}"/${PN}-1.40-fbsd.patch "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 @@ -114,7 +113,7 @@ src_install() { STRIP=: \ root_libdir="${EPREFIX}/usr/$(get_libdir)" \ DESTDIR="${D}" \ - install install-libs + install einstalldocs diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.44.6-parallel_install.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.44.6-parallel_install.patch deleted file mode 100644 index 57629153192..00000000000 --- a/sys-fs/e2fsprogs/files/e2fsprogs-1.44.6-parallel_install.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- e2fsprogs-1.44.6/Makefile.in -+++ e2fsprogs-1.44.6/Makefile.in -@@ -72,6 +72,7 @@ - uninstall: uninstall-progs-recursive uninstall-shlibs-libs-recursive uninstall-doc-libs - - install-libs: install-libs-recursive -+install-libs-recursive:: | install-shlibs-libs-recursive - - uninstall-libs: uninstall-libs-recursive -