sys-apps/busybox: EAPI=6 and drop eutils, multilib

Package-Manager: Portage-2.3.31, Repoman-2.3.9

diff --git a/sys-apps/busybox/busybox-1.28.3.ebuild b/sys-apps/busybox/busybox-1.28.3.ebuild
index 68000bffa17468ba93a5732a53ea13c9dae51c54..f28bf04dfd7281061d2358c0d304e2a0b8bde20b 100644 (file)
--- a/sys-apps/busybox/busybox-1.28.3.ebuild
+++ b/sys-apps/busybox/busybox-1.28.3.ebuild
@@ -3,8 +3,9 @@
 
 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
 
-EAPI="5"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
+EAPI=6
+
+inherit flag-o-matic savedconfig toolchain-funcs
 
 DESCRIPTION="Utilities for rescue and embedded systems"
 HOMEPAGE="https://www.busybox.net/"
@@ -62,14 +63,18 @@ busybox_config_enabled() {
        esac
 }
 
+# patches go here!
+PATCHES=(
+       "${FILESDIR}"/${PN}-1.26.2-bb.patch
+       # "${FILESDIR}"/${P}-*.patch
+)
+
 src_prepare() {
+       default
        unset KBUILD_OUTPUT #88088
        append-flags -fno-strict-aliasing #310413
        use ppc64 && append-flags -mminimal-toc #130943
 
-       # patches go here!
-       epatch "${FILESDIR}"/${PN}-1.26.2-bb.patch
-#      epatch "${FILESDIR}"/${P}-*.patch
        cp "${FILESDIR}"/ginit.c init/ || die
 
        # flag cleanup

diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index 68000bffa17468ba93a5732a53ea13c9dae51c54..f28bf04dfd7281061d2358c0d304e2a0b8bde20b 100644 (file)
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -3,8 +3,9 @@
 
 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
 
-EAPI="5"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
+EAPI=6
+
+inherit flag-o-matic savedconfig toolchain-funcs
 
 DESCRIPTION="Utilities for rescue and embedded systems"
 HOMEPAGE="https://www.busybox.net/"
@@ -62,14 +63,18 @@ busybox_config_enabled() {
        esac
 }
 
+# patches go here!
+PATCHES=(
+       "${FILESDIR}"/${PN}-1.26.2-bb.patch
+       # "${FILESDIR}"/${P}-*.patch
+)
+
 src_prepare() {
+       default
        unset KBUILD_OUTPUT #88088
        append-flags -fno-strict-aliasing #310413
        use ppc64 && append-flags -mminimal-toc #130943
 
-       # patches go here!
-       epatch "${FILESDIR}"/${PN}-1.26.2-bb.patch
-#      epatch "${FILESDIR}"/${P}-*.patch
        cp "${FILESDIR}"/ginit.c init/ || die
 
        # flag cleanup