gentoo resync : 29.12.2022

4 files changed, 207 insertions, 1 deletions

diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 7bd7421a7744..42b487a852c5 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1,4 +1,5 @@
 AUX 39_memtest86+-r1 1702 BLAKE2B ba73cef5d026a242ab3e5ac54a98cf289ceedfbe174a9d2109cab785e0b0fc9b9e59aa3c80d276255cc8c18bdc3567f02e644652512e194e3c555436d42be8e3 SHA512 ef2d86bd902f44905921880c630a85d3c9763bea3b79211f64346f1f55a5f31ed0b20a80f9f0c3914de1f33b7bd7d3471762f17065183ced185de52d34f2068f
+AUX 39_memtest86+-r2 3529 BLAKE2B 8af086ab34f99b8307571f1ca4820e8dbcdfe0393d0be1c9b4aa6e44690b03ea23d418aba4cb11f1d099c5b0932942d08857eefa998984bc07dd1985dccbf891 SHA512 0e9c485699a8fcd777b40ae6d366878826608d10b2668bbc6b0b28a91f43a44882bc10c95a2103c573a85a95c1bf6f41e2eb65a3bd2d146d621f987eede2c278
 AUX make-memtest86+-boot-floppy 2499 BLAKE2B 1076e5d3e3a139c46c684f7ed29658cd815525e56fae03eb4dd1e36fda0c751a1aa78c891d040aeee979f8b79a8b0db8453e4e26f2efd9963e7bfa10206b5c86 SHA512 28649d630c4624573a5cf4279f6207cf44707978d8a18f2c614997f641038f2da731bb5c3b26066812a5c02d926c40020e74820b1a4eb2b4732a76686c52c260
 AUX make-memtest86+-boot-floppy.1 1165 BLAKE2B 974a5c70009031517bbeaa06155a7da411ce1823ed2b7dc31a1843618058cbcd1c1a51f9c9012dddd843579b588c619c6448e65ae369ba2dc6441a991bf8d9b7 SHA512 8b5b6397e50cf4d48aeda31de4c1f72493e97db52ff45966716df8f9b0fbbd8d4ed71e289c0113ef53fa52a7ea6df4c107c63ca70f90c951dd085c05b64db147
 AUX memtest86+-5.31b-discard-note_gnu_property.patch 723 BLAKE2B 852a5daf852991cde8dec0bd777524744c5303b1966cacd0e15abad9dfea06ea3d6616ea57777bf694da2edb0e4c8b828288c69d655c0e46e27b6a6463ef787b SHA512 923c71e9d037cc0c26006a55045c9362dabf1ed3a6cf20a5b9f61661d6fe9e6dd17f17bcee47d515497a2720485f5d4d34c0f7815c483997aff123ab9d2f5239
@@ -9,5 +10,7 @@ AUX memtest86+-5.31b-no-clean.patch 570 BLAKE2B 99fcdc691c44b4c116878713e48ec505
 AUX memtest86+-5.31b-objcopy.patch 610 BLAKE2B a7a68cefbca249a2db578fa2d1eac2095ebe35f4fba67b6b44b1a85360fdac86a154585b6776ac95ac2963c773ccfcf4e8d828b2c1736bab2741f483626b61a6 SHA512 ad55e5448e70db93a19801cb6dd7cddfd4bf52d9d11582ba00335e59906cb8ee9165b828e59a1ecd1b0ddb2a52aff7165803d69c2ad3984a18ff07f069d36ea1
 AUX memtest86+-5.31b-test-random-cflags.patch 636 BLAKE2B ab14809232dfdb0475fa8d54daca34ad53a6eee0f7ce2592acfc60a60bf0c8f08adacc82ed67ae8e7ae7faa995d9b6efa0d0ea3cf0df33f5cda1a606a7e0d987 SHA512 98965cfe1ec90f5dee115da406609cd85651e09b9914232b717a3b8755b4c10b05f58ed08c8a470b2bd772f1ef4d93faf63516f902a0b48b9c33974eba4733a1
 DIST memtest86+-5.31b.tar.gz 227779 BLAKE2B 14aced912bb84115278a3aff7650a3571918b823335aaf7d09880ef10374c320f64878765d93d2ee5a75e2b33ef6c9c4886a9a168955bd77c668f06f5c86a6ca SHA512 ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541
+DIST memtest86+-6.00_beta2.tar.gz 214840 BLAKE2B 223c3023ba38d584c9ff1923e859ee37f1d943be657c80d4151d0b9ded79b4b363f3e2f7e51d58c7b2b637133ecada0f9a952fcdbbf03d8c34cb00a64762022c SHA512 78b13cc05f470e40e347f6eddb4441c2b377c47ea9aa0252096ef37c884f452bdfce1292452a36aa3ce0cf59c3eb0e53c0e069863b3f165dcd648d9eae9c76ea
 EBUILD memtest86+-5.31b-r3.ebuild 2858 BLAKE2B 47a6e5a68e77f6425b7761d5cc18378a13bc6f6b3febb2624277fa3bf24374e69265ab0c97a3854abbfa5acd96f984b2d1392acb29fb3cda37357370d57067c8 SHA512 8c8846addd0db5093b384c36a74eea8e853e66b174c7f9930d9a61abc71c41cdaf5e1967b01eaad77af68a4f81b7687517e0b23e26f26cd11ae104da0c49e881
-MISC metadata.xml 551 BLAKE2B 8d899e354f3c3e84526674d2eab5fb81f20a2c585d599cafe7a12dec4aa9bf2b004ce6f54010474b0abd2ec0b347b00937aef25cc162794520554dedc89471ba SHA512 519fa8bbbeda2f082ce1eb5874089a61041d2ae0902c73183fd4e619e14b137c1aca2cb4d81557afad5f9620713ba8ee324d7c7674ac0618e9dab8a5d7abdc0e
+EBUILD memtest86+-6.00_beta2.ebuild 1611 BLAKE2B c0de373f6409919e2fcd15c8f2ebe0bdd17692d88016392173b9ab4a80e9f64ebfaaa5ce19bbb431e8f3635d1de838bd114db466653dfeb16a836c8c0ebca4db SHA512 2e07de7fd39f2f66c3cd337ee151e45fbf4f0b32a343290170727980232c75b212e910870f2d614abcea4ba912e4420d526e2ba90e8a3ed13fceb932fcdc37a3
+MISC metadata.xml 944 BLAKE2B fd7d12b3e27ea5dfa0ebf56502faf2bf43222f9a070fc718c7e983a03afb2cde239f71d5a45947548435005dc72faeff4d8b850f38a64f57f7def5f098896ac6 SHA512 e64965365707ad5c830fb07f4ed2a2c54dcf7703b5b898d24c87ea7c082312ac30277abb77af643c9a7c021c56578de0d8b9b2f12cb01017b68ddf61885a13d4
diff --git a/sys-apps/memtest86+/files/39_memtest86+-r2 b/sys-apps/memtest86+/files/39_memtest86+-r2
new file mode 100644
index 000000000000..a213e0325609
--- /dev/null
+++ b/sys-apps/memtest86+/files/39_memtest86+-r2
@@ -0,0 +1,126 @@
+#!/bin/sh
+
+. /usr/share/grub/grub-mkconfig_lib
+
+mtbios32=/boot/memtest86plus/memtest32.bios
+mtbios64=/boot/memtest86plus/memtest64.bios
+mtefi32=/boot/memtest86plus/memtest.efi32
+mtefi64=/boot/memtest86plus/memtest.efi64
+
+if [ $(ls /boot/memtest86plus | wc -l) -gt 1 ]; then
+	multiple_memtest=true
+fi
+
+submenu_indentation=""
+if [ "${multiple_memtest}" = "true" ] && [ "${GRUB_DISABLE_SUBMENU}" != "y" ]; then
+	submenu_indentation="${grub_tab}"
+	cat <<EOF
+submenu 'Memtest86+' {
+EOF
+fi
+
+# Start bios32
+if [ -f "${mtbios32}" ]; then
+	gettext_printf "Found memtest image: %s\n" "${mtbios32}" >&2
+
+	device="$("${grub_probe}" --target=device "${mtbios32}")"
+	path="$(make_system_path_relative_to_its_root "${mtbios32}")"
+	cat <<EOF
+${submenu_indentation}if [ "x\$grub_platform" = xpc ]; then
+${submenu_indentation}menuentry 'Memtest86+ 32bit' {
+EOF
+
+	if [ -n "{submenu_indentation}" ]; then
+		prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab
+	else
+		prepare_grub_to_access_device "${device}" | grub_add_tab
+	fi
+
+	cat <<EOF
+	${submenu_indentation}linux "${path}"
+${submenu_indentation}}
+${submenu_indentation}fi
+EOF
+fi
+# End bios32
+
+# Start bios64
+if [ -f "${mtbios64}" ]; then
+        gettext_printf "Found memtest image: %s\n" "${mtbios64}" >&2
+
+        device="$("${grub_probe}" --target=device "${mtbios64}")"
+        path="$(make_system_path_relative_to_its_root "${mtbios64}")"
+        cat <<EOF
+${submenu_indentation}if [ "x\$grub_platform" = xpc ]; then
+${submenu_indentation}menuentry 'Memtest86+ 64bit' {
+EOF
+
+        if [ -n "{submenu_indentation}" ]; then
+                prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab
+        else
+                prepare_grub_to_access_device "${device}" | grub_add_tab
+        fi
+
+        cat <<EOF
+        ${submenu_indentation}linux "${path}"
+${submenu_indentation}}
+${submenu_indentation}fi
+EOF
+fi
+# End bios64
+
+# Start efi32
+if [ -f "${mtefi32}" ]; then
+        gettext_printf "Found memtest image: %s\n" "${mtefi32}" >&2
+
+        device="$("${grub_probe}" --target=device "${mtefi32}")"
+        path="$(make_system_path_relative_to_its_root "${mtefi32}")"
+        cat <<EOF
+${submenu_indentation}if [ "x\$grub_platform" = xefi ]; then
+${submenu_indentation}menuentry 'Memtest86+ 32bit UEFI' {
+EOF
+
+        if [ -n "{submenu_indentation}" ]; then
+                prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab
+        else
+                prepare_grub_to_access_device "${device}" | grub_add_tab
+        fi
+
+        cat <<EOF
+        ${submenu_indentation}chainloader "${path}"
+${submenu_indentation}}
+${submenu_indentation}fi
+EOF
+fi
+# End efi32
+
+# Start efi64
+if [ -f "${mtefi64}" ]; then
+        gettext_printf "Found memtest image: %s\n" "${mtefi64}" >&2
+
+        device="$("${grub_probe}" --target=device "${mtefi64}")"
+        path="$(make_system_path_relative_to_its_root "${mtefi64}")"
+        cat <<EOF
+${submenu_indentation}if [ "x\$grub_platform" = xefi ]; then
+${submenu_indentation}menuentry 'Memtest86+ 64bit UEFI' {
+EOF
+
+        if [ -n "{submenu_indentation}" ]; then
+                prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab
+        else
+                prepare_grub_to_access_device "${device}" | grub_add_tab
+        fi
+
+        cat <<EOF
+        ${submenu_indentation}chainloader "${path}"
+${submenu_indentation}}
+${submenu_indentation}fi
+EOF
+fi
+#End efi64
+
+if [ "${multiple_memtest}" = "true" ] && [ "${GRUB_DISABLE_SUBMENU}" != "y" ]; then
+	cat <<EOF
+}
+EOF
+fi
diff --git a/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild b/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
new file mode 100644
index 000000000000..2107fd4d4b8f
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit mount-boot
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Memory tester based on PCMemTest"
+HOMEPAGE="https://www.memtest.org/"
+SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
+
+ISODEPS="
+	dev-libs/libisoburn
+	sys-fs/dosfstools
+	sys-fs/mtools
+"
+BDEPEND="
+	iso32? ( ${ISODEPS} )
+	iso64? ( ${ISODEPS} )
+"
+
+S=${WORKDIR}/memtest86plus-${MY_PV}
+
+src_prepare() {
+	sed -i -e "s#/sbin/mkdosfs#mkfs.vfat#" build{32,64}/Makefile || die
+	sed -i -e "s/^AS = as/AS +=/" -e "/^CC/d" build{32,64}/Makefile || die
+	default
+}
+
+src_compile() {
+	pushd build32
+		use bios32 && emake memtest.bin
+		use efi32 && emake memtest.efi
+		use iso32 && emake iso
+	popd
+
+	pushd build64
+		use bios64 && emake memtest.bin
+		use efi64 && emake memtest.efi
+		use iso32 && emake iso
+	popd
+}
+
+install_memtest_images() {
+	use bios32 && newins build32/memtest.bin memtest32.bios
+	use bios64 && newins build64/memtest.bin memtest64.bios
+	use efi32 && newins build32/memtest.efi memtest.efi32
+	use efi64 && newins build64/memtest.efi memtest.efi64
+}
+
+src_install() {
+	default
+	if use boot; then
+		exeinto /etc/grub.d/
+		newexe "${FILESDIR}"/39_memtest86+-r2 39_memtest86+
+		insinto /boot/memtest86plus
+		install_memtest_images
+	fi
+
+	insinto /usr/share/${PN}
+	install_memtest_images
+	use iso32 && newins build32/memtest.iso memtest32.iso
+	use iso64 && newins build64/memtest.iso memtest64.iso
+}
diff --git a/sys-apps/memtest86+/metadata.xml b/sys-apps/memtest86+/metadata.xml
index 359afa21d566..dd0c79050ba4 100644
--- a/sys-apps/memtest86+/metadata.xml
+++ b/sys-apps/memtest86+/metadata.xml
@@ -6,9 +6,15 @@
 	<name>Ben Kohler</name>
 </maintainer>
 <use>
+	<flag name="bios32">Compile a BIOS-bootable 32bit memtest image</flag>
+	<flag name="bios64">Compile a BIOS-bootable 64bit memtest image</flag>
 	<flag name="boot">Also install to /boot instead of just /usr/share/memtest86+/</flag>
+	<flag name="efi32">Compile a EFI32-bootable 32bit memtest image</flag>
+	<flag name="efi64">Compile a UEFI-bootable 64bit memtest image</flag>
 	<flag name="floppy">Install a script to create floppy disks containing memtest86+ binaries.</flag>
 	<flag name="iso">Compile an ISO image</flag>
+	<flag name="iso32">Compile a 32bit ISO image</flag>
+	<flag name="iso64">Compile a 64bit ISO image</flag>
 	<flag name="serial">Compile with serial console support</flag>
 </use>
 </pkgmetadata>