From 0eb2ba9f9d96fad560ae3bbfcaed940c43d7fb4f Mon Sep 17 00:00:00 2001
From: NP-Hardass <NP-Hardass@gentoo.org>
Date: Sat, 14 May 2016 18:40:28 -0400
Subject: sys-apps/memtest86+: Update 39_memtest86+ to support grub submenus

Package-Manager: portage-2.2.28
---
 sys-apps/memtest86+/files/39_memtest86+       | 59 ++++++++++++++++----
 sys-apps/memtest86+/memtest86+-4.20-r2.ebuild | 74 -------------------------
 sys-apps/memtest86+/memtest86+-4.20-r3.ebuild | 74 +++++++++++++++++++++++++
 sys-apps/memtest86+/memtest86+-5.01-r1.ebuild | 79 ---------------------------
 sys-apps/memtest86+/memtest86+-5.01-r2.ebuild | 79 +++++++++++++++++++++++++++
 5 files changed, 201 insertions(+), 164 deletions(-)
 delete mode 100644 sys-apps/memtest86+/memtest86+-4.20-r2.ebuild
 create mode 100644 sys-apps/memtest86+/memtest86+-4.20-r3.ebuild
 delete mode 100644 sys-apps/memtest86+/memtest86+-5.01-r1.ebuild
 create mode 100644 sys-apps/memtest86+/memtest86+-5.01-r2.ebuild

(limited to 'sys-apps/memtest86+')

diff --git a/sys-apps/memtest86+/files/39_memtest86+ b/sys-apps/memtest86+/files/39_memtest86+
index 14f27a276888..10e1964cb8df 100644
--- a/sys-apps/memtest86+/files/39_memtest86+
+++ b/sys-apps/memtest86+/files/39_memtest86+
@@ -4,30 +4,67 @@
 
 memtest=/boot/memtest86plus/memtest
 
+memtestbsd=/boot/memtest86plus/memtest.netbsd
+
+if [ -f "${memtest}" ] && [ -f "${memtestbsd}" ]; then
+	multiple_memtest=true
+fi
+
+submenu_indentation=""
+if [ "x${multiple_memtest}" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
+	submenu_indentation="${grub_tab}"
+	cat <<EOF
+submenu 'Memtest86+' {
+EOF
+fi
+
+
 if [ -f "${memtest}" ]; then
+
+	gettext_printf "Found memtest image: %s\n" "${memtest}" >&2
+
 	device="$("${grub_probe}" --target=device "${memtest}")"
 	path="$(make_system_path_relative_to_its_root "${memtest}")"
 	cat <<EOF
-menuentry "Memtest86+" {
+${submenu_indentation}menuentry 'Memtest86+' {
 EOF
-	prepare_grub_to_access_device "${device}" | grub_add_tab
+
+	if [ "x${submenu_indentation}" != "x" ]; 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
-	linux16 "${path}"
-}
+	${submenu_indentation}linux16 "${path}"
+${submenu_indentation}}
 EOF
 fi
 
-memtest=/boot/memtest86plus/memtest.netbsd
+if [ -f "${memtestbsd}" ]; then
 
-if [ -f "${memtest}" ]; then
-	device="$("${grub_probe}" --target=device "${memtest}")"
-	path="$(make_system_path_relative_to_its_root "${memtest}")"
+	gettext_printf "Found memtest image: %s\n" "${memtestbsd}" >&2
+
+	device="$("${grub_probe}" --target=device "${memtestbsd}")"
+	path="$(make_system_path_relative_to_its_root "${memtestbsd}")"
 	cat <<EOF
-menuentry "Memtest86+ (netbsd)" {
+${submenu_indentation}menuentry 'Memtest86+ (netbsd)' {
 EOF
-	prepare_grub_to_access_device "${device}" | grub_add_tab
+
+	if [ "x${submenu_indentation}" != "x" ]; 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}knetbsd "${path}"
+${submenu_indentation}}
+EOF
+fi
+
+if [ "x${multiple_memtest}" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
 	cat <<EOF
-	knetbsd "${path}"
 }
 EOF
 fi
diff --git a/sys-apps/memtest86+/memtest86+-4.20-r2.ebuild b/sys-apps/memtest86+/memtest86+-4.20-r2.ebuild
deleted file mode 100644
index 06dac9cca1e0..000000000000
--- a/sys-apps/memtest86+/memtest86+-4.20-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit mount-boot eutils toolchain-funcs
-
-DESCRIPTION="Memory tester based on memtest86"
-HOMEPAGE="http://www.memtest.org/"
-SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="floppy serial"
-
-BOOTDIR=/boot/memtest86plus
-QA_PRESTRIPPED="${BOOTDIR}/memtest.netbsd"
-
-RDEPEND="floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )"
-DEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.20-hardcoded_cc.patch
-
-	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
-
-	if use serial ; then
-		sed -i \
-			-e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
-			config.h \
-			|| die "sed failed"
-	fi
-
-	tc-export AS CC LD
-}
-
-src_test() { :; }
-
-src_install() {
-	insinto ${BOOTDIR}
-	newins memtest.bin memtest
-	newins memtest memtest.netbsd
-	dosym memtest ${BOOTDIR}/memtest.bin
-
-	exeinto /etc/grub.d
-	doexe "${FILESDIR}"/39_memtest86+
-
-	dodoc README README.build-process FAQ changelog
-
-	if use floppy ; then
-		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
-		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
-	fi
-}
-
-pkg_postinst() {
-	mount-boot_pkg_postinst
-	elog
-	elog "memtest has been installed in ${BOOTDIR}/"
-	elog "You may wish to update your bootloader configs"
-	elog "by adding these lines:"
-	elog " - For grub2 just run grub-mkconfig, a configuration file is installed"
-	elog "   as /etc/grub.d/39_${PN}"
-	elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)"
-	elog "    > title=${PN}"
-	elog "    > root (hd?,?)"
-	elog "    > kernel ${BOOTDIR}/memtest"
-	elog " - For lilo:"
-	elog "    > image  = ${BOOTDIR}/memtest"
-	elog "    > label  = ${PN}"
-	elog
-}
diff --git a/sys-apps/memtest86+/memtest86+-4.20-r3.ebuild b/sys-apps/memtest86+/memtest86+-4.20-r3.ebuild
new file mode 100644
index 000000000000..07f4158b0801
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-4.20-r3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit mount-boot eutils toolchain-funcs
+
+DESCRIPTION="Memory tester based on memtest86"
+HOMEPAGE="http://www.memtest.org/"
+SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="floppy serial"
+
+BOOTDIR=/boot/memtest86plus
+QA_PRESTRIPPED="${BOOTDIR}/memtest.netbsd"
+
+RDEPEND="floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )"
+DEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.20-hardcoded_cc.patch
+
+	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
+
+	if use serial ; then
+		sed -i \
+			-e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
+			config.h \
+			|| die "sed failed"
+	fi
+
+	tc-export AS CC LD
+}
+
+src_test() { :; }
+
+src_install() {
+	insinto ${BOOTDIR}
+	newins memtest.bin memtest
+	newins memtest memtest.netbsd
+	dosym memtest ${BOOTDIR}/memtest.bin
+
+	exeinto /etc/grub.d
+	doexe "${FILESDIR}"/39_memtest86+
+
+	dodoc README README.build-process FAQ changelog
+
+	if use floppy ; then
+		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
+		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
+	fi
+}
+
+pkg_postinst() {
+	mount-boot_pkg_postinst
+	elog
+	elog "memtest has been installed in ${BOOTDIR}/"
+	elog "You may wish to update your bootloader configs"
+	elog "by adding these lines:"
+	elog " - For grub2 just run grub-mkconfig, a configuration file is installed"
+	elog "   as /etc/grub.d/39_${PN}"
+	elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)"
+	elog "    > title=${PN}"
+	elog "    > root (hd?,?)"
+	elog "    > kernel ${BOOTDIR}/memtest"
+	elog " - For lilo:"
+	elog "    > image  = ${BOOTDIR}/memtest"
+	elog "    > label  = ${PN}"
+	elog
+}
diff --git a/sys-apps/memtest86+/memtest86+-5.01-r1.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r1.ebuild
deleted file mode 100644
index 6186228b89cc..000000000000
--- a/sys-apps/memtest86+/memtest86+-5.01-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit mount-boot eutils toolchain-funcs
-
-DESCRIPTION="Memory tester based on memtest86"
-HOMEPAGE="http://www.memtest.org/"
-SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="floppy serial"
-
-BOOTDIR=/boot/memtest86plus
-QA_PRESTRIPPED="${BOOTDIR}/memtest.netbsd"
-QA_FLAGS_IGNORED="${BOOTDIR}/memtest.netbsd"
-
-RDEPEND="floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )"
-DEPEND=""
-
-src_prepare() {
-	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
-	epatch "${FILESDIR}/${P}-gcc-473.patch" \
-		   "${FILESDIR}/${P}-hardcoded_cc.patch"
-	epatch "${FILESDIR}"/${P}-no-scp.patch
-	epatch "${FILESDIR}"/${P}-io-extern-inline.patch #548312
-	epatch "${FILESDIR}"/${P}-reboot-def.patch #548312
-	epatch "${FILESDIR}"/${P}-no-clean.patch #557890
-
-	if use serial ; then
-		sed -i \
-			-e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
-			config.h \
-			|| die "sed failed"
-	fi
-
-	tc-export AS CC LD
-}
-
-src_test() { :; }
-
-src_install() {
-	insinto ${BOOTDIR}
-	newins memtest.bin memtest
-	newins memtest memtest.netbsd
-	dosym memtest ${BOOTDIR}/memtest.bin
-
-	exeinto /etc/grub.d
-	doexe "${FILESDIR}"/39_memtest86+
-
-	dodoc README README.build-process FAQ changelog
-
-	if use floppy ; then
-		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
-		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
-	fi
-}
-
-pkg_postinst() {
-	mount-boot_pkg_postinst
-	elog
-	elog "memtest has been installed in ${BOOTDIR}/"
-	elog "You may wish to update your bootloader configs"
-	elog "by adding these lines:"
-	elog " - For grub2 just run grub-mkconfig, a configuration file is installed"
-	elog "   as /etc/grub.d/39_${PN}"
-	elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)"
-	elog "    > title=${PN}"
-	elog "    > root (hd?,?)"
-	elog "    > kernel ${BOOTDIR}/memtest"
-	elog " - For lilo:"
-	elog "    > image  = ${BOOTDIR}/memtest"
-	elog "    > label  = ${PN}"
-	elog
-}
diff --git a/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
new file mode 100644
index 000000000000..7d3372c82c5b
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit mount-boot eutils toolchain-funcs
+
+DESCRIPTION="Memory tester based on memtest86"
+HOMEPAGE="http://www.memtest.org/"
+SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="floppy serial"
+
+BOOTDIR=/boot/memtest86plus
+QA_PRESTRIPPED="${BOOTDIR}/memtest.netbsd"
+QA_FLAGS_IGNORED="${BOOTDIR}/memtest.netbsd"
+
+RDEPEND="floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )"
+DEPEND=""
+
+src_prepare() {
+	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
+	epatch "${FILESDIR}/${P}-gcc-473.patch" \
+		   "${FILESDIR}/${P}-hardcoded_cc.patch"
+	epatch "${FILESDIR}"/${P}-no-scp.patch
+	epatch "${FILESDIR}"/${P}-io-extern-inline.patch #548312
+	epatch "${FILESDIR}"/${P}-reboot-def.patch #548312
+	epatch "${FILESDIR}"/${P}-no-clean.patch #557890
+
+	if use serial ; then
+		sed -i \
+			-e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
+			config.h \
+			|| die "sed failed"
+	fi
+
+	tc-export AS CC LD
+}
+
+src_test() { :; }
+
+src_install() {
+	insinto ${BOOTDIR}
+	newins memtest.bin memtest
+	newins memtest memtest.netbsd
+	dosym memtest ${BOOTDIR}/memtest.bin
+
+	exeinto /etc/grub.d
+	doexe "${FILESDIR}"/39_memtest86+
+
+	dodoc README README.build-process FAQ changelog
+
+	if use floppy ; then
+		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
+		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
+	fi
+}
+
+pkg_postinst() {
+	mount-boot_pkg_postinst
+	elog
+	elog "memtest has been installed in ${BOOTDIR}/"
+	elog "You may wish to update your bootloader configs"
+	elog "by adding these lines:"
+	elog " - For grub2 just run grub-mkconfig, a configuration file is installed"
+	elog "   as /etc/grub.d/39_${PN}"
+	elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)"
+	elog "    > title=${PN}"
+	elog "    > root (hd?,?)"
+	elog "    > kernel ${BOOTDIR}/memtest"
+	elog " - For lilo:"
+	elog "    > image  = ${BOOTDIR}/memtest"
+	elog "    > label  = ${PN}"
+	elog
+}
-- 
cgit v1.2.3-65-gdbad