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

[James Le Cuirot]

commit:     4a8df410b50a41e27f300146cccb29e8a9011a21
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  5 15:33:58 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Sep  5 15:33:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a8df410

sys-boot/grub: Move PATCHES back outside src_prepare

Having them inside makes monkey patching harder.

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 sys-boot/grub/grub-2.12-r4.ebuild | 16 ++++++++--------
 sys-boot/grub/grub-2.12-r5.ebuild | 16 ++++++++--------
 sys-boot/grub/grub-9999.ebuild    | 12 ++++++------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/sys-boot/grub/grub-2.12-r4.ebuild 
b/sys-boot/grub/grub-2.12-r4.ebuild
index 5ce4953d88c4..be8779e57cb7 100644
--- a/sys-boot/grub/grub-2.12-r4.ebuild
+++ b/sys-boot/grub/grub-2.12-r4.ebuild
@@ -57,6 +57,14 @@ else
        EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git";
 fi
 
+PATCHES=(
+       "${FILESDIR}"/gfxpayload.patch
+       "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
+       "${FILESDIR}"/grub-2.06-test-words.patch
+       "${FILESDIR}"/grub-2.12-fwsetup.patch
+       "${WORKDIR}"/grub-2.12-bash-completion.patch
+)
+
 DEJAVU=dejavu-sans-ttf-2.37
 UNIFONT=unifont-15.0.06
 SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
@@ -154,14 +162,6 @@ src_unpack() {
 }
 
 src_prepare() {
-       local PATCHES=(
-               "${FILESDIR}"/gfxpayload.patch
-               "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
-               "${FILESDIR}"/grub-2.06-test-words.patch
-               "${FILESDIR}"/grub-2.12-fwsetup.patch
-               "${WORKDIR}"/grub-2.12-bash-completion.patch
-       )
-
        default
 
        python_setup

diff --git a/sys-boot/grub/grub-2.12-r5.ebuild 
b/sys-boot/grub/grub-2.12-r5.ebuild
index 1e22477b727a..b79c99dc9484 100644
--- a/sys-boot/grub/grub-2.12-r5.ebuild
+++ b/sys-boot/grub/grub-2.12-r5.ebuild
@@ -58,6 +58,14 @@ else
        EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git";
 fi
 
+PATCHES=(
+       "${FILESDIR}"/gfxpayload.patch
+       "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
+       "${FILESDIR}"/grub-2.06-test-words.patch
+       "${FILESDIR}"/grub-2.12-fwsetup.patch
+       "${WORKDIR}"/grub-2.12-bash-completion.patch
+)
+
 DEJAVU=dejavu-sans-ttf-2.37
 UNIFONT=unifont-15.0.06
 SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
@@ -155,14 +163,6 @@ src_unpack() {
 }
 
 src_prepare() {
-       local PATCHES=(
-               "${FILESDIR}"/gfxpayload.patch
-               "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
-               "${FILESDIR}"/grub-2.06-test-words.patch
-               "${FILESDIR}"/grub-2.12-fwsetup.patch
-               "${WORKDIR}"/grub-2.12-bash-completion.patch
-       )
-
        default
 
        python_setup

diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 2b24a0433912..31db1cdb8e2c 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -61,6 +61,12 @@ else
        EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git";
 fi
 
+PATCHES=(
+       "${FILESDIR}"/gfxpayload.patch
+       "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
+       "${FILESDIR}"/grub-2.06-test-words.patch
+)
+
 DEJAVU=dejavu-sans-ttf-2.37
 UNIFONT=unifont-15.0.06
 SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
@@ -158,12 +164,6 @@ src_unpack() {
 }
 
 src_prepare() {
-       local PATCHES=(
-               "${FILESDIR}"/gfxpayload.patch
-               "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
-               "${FILESDIR}"/grub-2.06-test-words.patch
-       )
-
        default
 
        python_setup