sys-libs/ncurses: Stop using awful multijob_* logic

The multijob logic adds a lot of complex, unmaintained and fragile bash
code with little gain. Moreover, makes build logs unreadable
by interspersing output from multiple configure runs.

Bug: https://bugs.gentoo.org/613322

diff --git a/sys-libs/ncurses/ncurses-5.9-r101.ebuild b/sys-libs/ncurses/ncurses-5.9-r101.ebuild
index 76b8a76d3a728bfbbc84a3d475f3058caddcebf3..c722d68f32083642915d1ff8f4b1e6e57562fd38 100644 (file)
--- a/sys-libs/ncurses/ncurses-5.9-r101.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r101.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # This version is just for the ABI .5 library
 
 EAPI="5"
 
-inherit eutils toolchain-funcs multilib-minimal multiprocessing
+inherit eutils toolchain-funcs multilib-minimal
 
 MY_PV=${PV:0:3}
 MY_P=${PN}-${MY_PV}
@@ -55,8 +55,6 @@ src_configure() {
                $(usex unicode 'ncursesw' '')
        )
 
-       multijob_init
-
        # When installing ncurses, we have to use a compatible version of tic.
        # This comes up when cross-compiling, doing multilib builds, upgrading,
        # or installing for the first time.  Build a local copy of tic whenever
@@ -69,16 +67,15 @@ src_configure() {
                CXXFLAGS=${BUILD_CXXFLAGS} \
                CPPFLAGS=${BUILD_CPPFLAGS} \
                LDFLAGS="${BUILD_LDFLAGS} -static" \
-               multijob_child_init do_configure cross --without-shared --with-normal
+               do_configure cross --without-shared --with-normal
        fi
        multilib-minimal_src_configure
-       multijob_finish
 }
 
 multilib_src_configure() {
        local t
        for t in "${NCURSES_TARGETS[@]}" ; do
-               multijob_child_init do_configure "${t}"
+               do_configure "${t}"
        done
 }
 

diff --git a/sys-libs/ncurses/ncurses-6.0-r1.ebuild b/sys-libs/ncurses/ncurses-6.0-r1.ebuild
index 2ab63de41d4c9f5f5028e41ff768aa4ba1850de5..d98b23afb751732af63e7294fe070303c884d836 100644 (file)
--- a/sys-libs/ncurses/ncurses-6.0-r1.ebuild
+++ b/sys-libs/ncurses/ncurses-6.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-inherit eutils flag-o-matic toolchain-funcs multilib-minimal multiprocessing
+inherit eutils flag-o-matic toolchain-funcs multilib-minimal
 
 MY_PV=${PV:0:3}
 PV_SNAP=${PV:4}
@@ -61,8 +61,6 @@ src_configure() {
                $(use unicode && usex threads 'ncursestw' '')
        )
 
-       multijob_init
-
        # When installing ncurses, we have to use a compatible version of tic.
        # This comes up when cross-compiling, doing multilib builds, upgrading,
        # or installing for the first time.  Build a local copy of tic whenever
@@ -87,16 +85,15 @@ src_configure() {
                CXXFLAGS=${BUILD_CXXFLAGS} \
                CPPFLAGS=${BUILD_CPPFLAGS} \
                LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \
-               multijob_child_init do_configure cross --without-shared --with-normal
+               do_configure cross --without-shared --with-normal
        fi
        multilib-minimal_src_configure
-       multijob_finish
 }
 
 multilib_src_configure() {
        local t
        for t in "${NCURSES_TARGETS[@]}" ; do
-               multijob_child_init do_configure "${t}"
+               do_configure "${t}"
        done
 }