gentoo auto-resync : 11:08:2022 - 14:19:56

3 files changed, 20 insertions, 21 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index bcc5f76839a7..7e467337b3c4 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/milo/Manifest b/sys-boot/milo/Manifest
index e55a247363a9..abf3dc2fab9d 100644
--- a/sys-boot/milo/Manifest
+++ b/sys-boot/milo/Manifest
@@ -9,5 +9,5 @@ DIST linload.exe 7168 BLAKE2B 393696c987b771a75c5c0a04a6f82999189ecb60067464e807
 DIST linux-2.2.20-reiserfs-3.5.35.diff.bz2 154943 BLAKE2B 6226321438bed88bc31fb151a28157dda811a2c7ce6c543564f2ef183489b20f2b7f6df903f63aadaa8196ba10bd54df4c7069e448bb456474bccf64770a666e SHA512 b63d03d605d65cb7a15020ad38b80d77b810963edbdc0b5ccaf1706347de5026e390d8c2a5315f1d2734b793903c1a407b4db4129d11b7d5ff2ad9dc8f2137aa
 DIST linux-2.2.25.tar.bz2 15791211 BLAKE2B 5b4b416c41b2277c4e509e7c0003d1ba0bd26e1bbb03a30bdb9d44f9211f6edb593bbca158379ea565e2f35d01e128590971ea85220baec06c23ae15e3942f1b SHA512 63e83f4f184cdd09f39c24e2023fce3562ea550db7182ae94e36ce30c6b2415bac970306cd60c1d1a89a1a3b54ad957094629557a5782f181939efb219ad41bb
 DIST milo-2.2-18.tar.bz2 1074725 BLAKE2B 7e7cac8ec2ee8246f21f5ea0f1d497dd6234ed67dad0a340e0183abec2f7a4f694b48eb87ba65ef97e967918c55c9fbfdd56e502f21fc47f8d053d0353758f1c SHA512 1ccc86c83d520d07040ba44d14e7e9353cf364bf5b83ba4df14b0560769643ce07f89feeab468144fe17b7bf482beb7480f5dad1a0e9b574e6e6150bb72aae93
-EBUILD milo-2.4.18.ebuild 7780 BLAKE2B da9e084674b09bbfe4b3ebf59fc3ff8acc0f3cbe23da324c32302e1ab81657fa70ba3b1f39ff80a7a8b8493c322877461eea4613dda2aff90fb5e1aa99818f0b SHA512 8818700b01ffe0603f619a5879ca3122a6242c9815dae61a58580961e2237c73a5a58f32977a0ddf841f2632e79e91facb4ef635c198fe720af17aa46339b3a3
+EBUILD milo-2.4.18.ebuild 7825 BLAKE2B 7a39de97939627fca55fb85f5dbe4fe99d5a0823606ec5f1d9996590d98c84e88a96689130ec764c0a5e2a5bb477e7ebd305f562158435292afe3a80efe55612 SHA512 7d9bca4fd50329629cb79c97b29099c55a506b33dd8a05f578318523956f04d29400c76274406c304c9fdf5e7d09d9247d62bbc8a7a8743fa0e069755c1a6b48
 MISC metadata.xml 791 BLAKE2B f5c04318b608981e2d10b88f2fbcf41410c25c20b155d7d13889b417f15fe2892c880bc3fdffe6bf1b2ffaccbfac7285851b1ba224261b3fc3d7f18c9e82a40f SHA512 1b56aef21105b621d47501d1da2a1f181d9ad6a84bc85b92d5c6f928c1c90a0a3c74bb74592129ca7c563cbee88a458db3ef17a3e5563d7638eaa5098d7fecc6
diff --git a/sys-boot/milo/milo-2.4.18.ebuild b/sys-boot/milo/milo-2.4.18.ebuild
index 0501252aa338..a4c3e71f8328 100644
--- a/sys-boot/milo/milo-2.4.18.ebuild
+++ b/sys-boot/milo/milo-2.4.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -93,9 +93,9 @@ src_unpack() {
 src_prepare() {
 	# gcc3 fixes, and some tweaks to get a build, also
 	# reiserfs support for the kernel (and milo).
-	cd ${WORKDIR}/linux; eapply "${FILESDIR}"/linux-${kernel_version}-gcc3-milo.diff || die
-	cd ${WORKDIR}/linux; eapply "${WORKDIR}"/linux-2.2.20-reiserfs-3.5.35.diff || die
-	cd ${S}; eapply "${FILESDIR}"/milo-${milo_version}-gcc3-gentoo.diff || die
+	cd "${WORKDIR}"/linux; eapply "${FILESDIR}"/linux-${kernel_version}-gcc3-milo.diff || die
+	cd "${WORKDIR}"/linux; eapply "${WORKDIR}"/linux-2.2.20-reiserfs-3.5.35.diff || die
+	cd "${S}"; eapply "${FILESDIR}"/milo-${milo_version}-gcc3-gentoo.diff || die
 	eapply_user
 }
 
@@ -138,7 +138,7 @@ src_compile() {
 		die "${MILO_IMAGE} not supported, or not recognised."
 	fi
 
-	sed -i "s!__MILO_ARCHES__!${MILO_ARCH}!g" ${S}/tools/scripts/build
+	sed -i "s!__MILO_ARCHES__!${MILO_ARCH}!g" "${S}"/tools/scripts/build
 
 	ewarn
 	ewarn "seriously, this is going to take a while, go get some coffee..."
@@ -154,9 +154,9 @@ src_compile() {
 	ewarn
 
 	# get kernel configured
-	cp ${custom_milo_kernel_config:-${S}/Documentation/config/linux-2.2.19-SuSE.config} \
-		${WORKDIR}/linux/.config
-	cd ${WORKDIR}/linux; yes n | make oldconfig || die "unable to configure kernel."
+	cp ${custom_milo_kernel_config:-"${S}"/Documentation/config/linux-2.2.19-SuSE.config} \
+		"${WORKDIR}"/linux/.config
+	cd "${WORKDIR}"/linux; yes n | make oldconfig || die "unable to configure kernel."
 
 	# we're building a generic kernel that defaults to ev5, but theres no
 	# reason why we cant tweak the instruction set.
@@ -165,7 +165,7 @@ src_compile() {
 	mcpu_flag="`get-flag mcpu`"
 	if [ ! -z "${mcpu_flag}" ]; then
 		sed -i "s/\(CFLAGS := \$(CFLAGS) \)-mcpu=ev5$/\1-mcpu=${mcpu_flag:-ev5}/g" \
-			${WORKDIR}/linux/arch/alpha/Makefile
+			"${WORKDIR}"/linux/arch/alpha/Makefile
 	fi
 
 	# build the generic linux kernel, of course if you have
@@ -173,11 +173,11 @@ src_compile() {
 	# to hack it (or the .config used here).
 	einfo "building a generic kernel for use with milo..."
 	unset CC DISTCC_HOSTS; make dep vmlinux || die "unable to build generic kernel for milo."
-	cat ${FILESDIR}/objstrip.c > ${WORKDIR}/linux/arch/alpha/boot/tools/objstrip.c
+	cat "${FILESDIR}"/objstrip.c > "${WORKDIR}"/linux/arch/alpha/boot/tools/objstrip.c
 
 	# make the objstrip utility.
-	gcc ${WORKDIR}/linux/arch/alpha/boot/tools/objstrip.c -o \
-		${WORKDIR}/linux/arch/alpha/boot/tools/objstrip || die "couldnt build objstrip."
+	gcc "${WORKDIR}"/linux/arch/alpha/boot/tools/objstrip.c -o \
+		"${WORKDIR}"/linux/arch/alpha/boot/tools/objstrip || die "couldnt build objstrip."
 	einfo "kernel build complete."
 	einfo "building milo images..."
 
@@ -191,20 +191,19 @@ src_compile() {
 	append-flags -DMILO_SERIAL_NUMBER1="${milo_serial_number1:-0x002174616572475f}"
 
 	# the Makefile missed this :-/
-	cd ${S}/tools/common; make || die "couldnt make commonlib."
+	cd "${S}"/tools/common; make || die "couldnt make commonlib."
 
 	# build all the milo images.
-	cd ${S}; tools/scripts/build || die "failed to build milo images."
+	cd "${S}"; tools/scripts/build || die "failed to build milo images."
 
 	# put the ldmilo utility there.
-	cp ${DISTDIR}/ldmilo-patched-${ldmilo_patch} ${S}/binaries/ldmilo.exe
-	cp ${DISTDIR}/linload.exe ${S}/binaries/linload.exe
+	cp "${DISTDIR}"/ldmilo-patched-${ldmilo_patch} "${S}"/binaries/ldmilo.exe
+	cp "${DISTDIR}"/linload.exe "${S}"/binaries/linload.exe
 
 }
 
 src_install() {
-
-	cd ${S}; dodir /opt/milo
+	cd "${S}"; dodir /opt/milo
 	insinto /opt/milo
 
 	einfo "Installing MILO images..."
@@ -214,10 +213,10 @@ src_install() {
 		doins ${i}
 	done
 
-	cd ${S}/Documentation
+	cd "${S}"/Documentation
 
 	dodoc ChangeLog filesystem Nikita.Todo README.milo Todo README.BSD Stuff WhatIsMilo \
-		${FILESDIR}/README-gentoo ${FILESDIR}/mkserial_no.c ${DISTDIR}/MILO-HOWTO
+		"${FILESDIR}"/README-gentoo "${FILESDIR}"/mkserial_no.c "${DISTDIR}"/MILO-HOWTO
 
 }