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 <gwendal@chromium.org>
Closes: https://github.com/gentoo/gentoo/pull/15132
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild
index db28efccf1523e4b99a3b10a29e209f237ae2174..48a3c1aae896d7f28bdaf6d977bf09984680f704 100644 (file)
--- 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 2be6b804acd7071b7563eb515396db047e719be9..3cbd7bb014a69085d4c8c5c95fa1fe2fdeac6ee0 100644 (file)
--- 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 31effc0775710c0a729815bd8ae986b98be7ef7d..5db4525cd57eeda303b860677880ff3eb9605acf 100644 (file)
--- 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 (file)
index 5762915..0000000
--- 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
-