[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/

["Michał Górny" <mgorny@gentoo.org>]

commit:     2df3277cb07eb3cddca3d3280a256394fb069e93
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 31 10:24:21 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 21:48:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2df3277c

sys-boot/grub: 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

 sys-boot/grub/grub-0.97-r16.ebuild | 10 +---------
 sys-boot/grub/grub-0.97-r18.ebuild | 10 +---------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/sys-boot/grub/grub-0.97-r16.ebuild b/sys-boot/grub/grub-0.97-r16.ebuild
index 06d9aa23b12..22793c03ab0 100644
--- a/sys-boot/grub/grub-0.97-r16.ebuild
+++ b/sys-boot/grub/grub-0.97-r16.ebuild
@@ -17,7 +17,7 @@
 
 EAPI="5"
 
-inherit eutils mount-boot toolchain-funcs linux-info flag-o-matic autotools pax-utils multiprocessing
+inherit eutils mount-boot toolchain-funcs linux-info flag-o-matic autotools pax-utils
 
 PATCHVER="1.14" # Should match the revision ideally
 DESCRIPTION="GNU GRUB Legacy boot loader"
@@ -121,12 +121,8 @@ src_configure() {
 		fi
 	fi
 
-	multijob_init
-
 	# build the net-bootable grub first, but only if "netboot" is set
 	if use netboot ; then
-		(
-		multijob_child_init
 		mkdir -p "${WORKDIR}"/netboot
 		pushd "${WORKDIR}"/netboot >/dev/null
 		ECONF_SOURCE=${S} \
@@ -141,8 +137,6 @@ src_configure() {
 			--enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
 			--enable-{tulip,via-rhine,w89c840}
 		popd >/dev/null
-		) &
-		multijob_post_fork
 	fi
 
 	# Now build the regular grub
@@ -156,8 +150,6 @@ src_configure() {
 
 	# sanity check due to common failure
 	use ncurses && ! grep -qs "HAVE_LIBCURSES.*1" config.h && die "USE=ncurses but curses not found"
-
-	multijob_finish
 }
 
 src_compile() {

diff --git a/sys-boot/grub/grub-0.97-r18.ebuild b/sys-boot/grub/grub-0.97-r18.ebuild
index eb820606143..9d5aeede689 100644
--- a/sys-boot/grub/grub-0.97-r18.ebuild
+++ b/sys-boot/grub/grub-0.97-r18.ebuild
@@ -17,7 +17,7 @@
 
 EAPI="6"
 
-inherit eutils mount-boot toolchain-funcs linux-info flag-o-matic autotools pax-utils multiprocessing
+inherit eutils mount-boot toolchain-funcs linux-info flag-o-matic autotools pax-utils
 
 PATCHVER="1.15" # Should match the revision ideally
 DESCRIPTION="GNU GRUB Legacy boot loader"
@@ -121,12 +121,8 @@ src_configure() {
 		fi
 	fi
 
-	multijob_init
-
 	# build the net-bootable grub first, but only if "netboot" is set
 	if use netboot ; then
-		(
-		multijob_child_init
 		mkdir -p "${WORKDIR}"/netboot
 		pushd "${WORKDIR}"/netboot >/dev/null
 		ECONF_SOURCE=${S} \
@@ -141,8 +137,6 @@ src_configure() {
 			--enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
 			--enable-{tulip,via-rhine,w89c840}
 		popd >/dev/null
-		) &
-		multijob_post_fork
 	fi
 
 	# Now build the regular grub
@@ -156,8 +150,6 @@ src_configure() {
 
 	# sanity check due to common failure
 	use ncurses && ! grep -qs "HAVE_LIBCURSES.*1" config.h && die "USE=ncurses but curses not found"
-
-	multijob_finish
 }
 
 src_compile() {