From f5134084d46cd5a4481979b946794dbee49ffd31 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 26 Jan 2023 09:04:49 +0100 Subject: [PATCH] sys-boot/grub: Bump EAPI to 7 The ebuild uses python eclasses, which dropped support for EAPI 6 after the update. Updating EAPI required replacing the use of the versionator eclass as it's banned in EAPI 7 or later. Fortunately, nothing in the ebuild seemed to use anything from the eclass. --- .../grub/{grub-2.02-r8.ebuild => grub-2.02-r9.ebuild} | 0 .../third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-boot/grub/{grub-2.02-r8.ebuild => grub-2.02-r9.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.02-r8.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.02-r9.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.02-r8.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.02-r9.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild index 7703a9f528..3d976f29b5 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 CROS_WORKON_PROJECT="flatcar/grub" CROS_WORKON_REPO="https://github.com" @@ -21,7 +21,7 @@ if [[ -n ${GRUB_AUTOGEN} ]]; then inherit autotools python-any-r1 fi -inherit autotools bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs versionator +inherit autotools bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs DEJAVU=dejavu-sans-ttf-2.37 UNIFONT=unifont-9.0.06 SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )