[gentoo-commits] repo/gentoo:master commit in: app-emulation/xen/

[Florian Schmaus]

commit:     00ae4c52796b402b88f6cc5db45709f01015632c
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 08:09:01 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 08:34:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00ae4c52

app-emulation/xen: shorten ebuild: drop merge_config.sh, use alldefconfig

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 app-emulation/xen/xen-4.16.0-r5.ebuild | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/app-emulation/xen/xen-4.16.0-r5.ebuild 
b/app-emulation/xen/xen-4.16.0-r5.ebuild
index bcfc3bd86b8c..994e9c774ce3 100644
--- a/app-emulation/xen/xen-4.16.0-r5.ebuild
+++ b/app-emulation/xen/xen-4.16.0-r5.ebuild
@@ -116,7 +116,6 @@ src_prepare() {
 
 src_configure() {
        cd xen || die
-       emake defconfig
 
        touch gentoo-config || die
        if use arm; then
@@ -129,13 +128,7 @@ src_configure() {
                echo "CONFIG_XSM=y" > gentoo-config || die
        fi
 
-       local merge_cmd=(
-               ./tools/kconfig/merge_config.sh
-               -m -r
-               .config gentoo-config
-       )
-       einfo "${merge_cmd[*]}"
-       "${merge_cmd[@]}" || die "Merging Gentoo config failed"
+       emake KCONFIG_ALLCONFIG=gentoo-config alldefconfig
 
        # remove flags
        unset CFLAGS