Cleanup old; revbump to make the ebuild look more almost identical to the new one from memtest86; install a grub2 configuration file; limit to the 0-slot of grub for the floppy USE flag; strip during build as we can't use the splitdebug anyway.

(Portage version: 2.2.0_alpha114/cvs/Linux x86_64)

10 files changed, 105 insertions, 394 deletions

diff --git a/sys-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog
index f65541e866d9..c771e9efdac5 100644
--- a/sys-apps/memtest86+/ChangeLog
+++ b/sys-apps/memtest86+/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for sys-apps/memtest86+
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.64 2011/06/18 20:32:42 hwoarang Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.65 2012/07/02 11:02:00 flameeyes Exp $
+
+*memtest86+-4.20-r1 (02 Jul 2012)
+
+  02 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/memtest86+-4.20-hardcoded_cc.patch, +memtest86+-4.20-r1.ebuild,
+  -files/memtest86+-2.10-hardcoded_cc.patch,
+  -files/memtest86+-2.11-hardcoded_cc.patch,
+  -files/memtest86+-4.10-hardcoded_cc.patch, -memtest86+-2.10.ebuild,
+  -memtest86+-2.11.ebuild, -memtest86+-4.10-r1.ebuild, -memtest86+-4.10.ebuild,
+  -memtest86+-4.20.ebuild:
+  Cleanup old; revbump to make the ebuild look more almost identical to the new
+  one from memtest86; install a grub2 configuration file; limit to the 0-slot of
+  grub for the floppy USE flag; strip during build as we can't use the
+  splitdebug anyway.
 
   18 Jun 2011; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   no maintainer info required since it is already maintained by base-system
@@ -296,4 +310,3 @@
   metadata.xml:
   Initial commit, closes bug #38828, thanks to Frank Dörfler for the original
   ebuild.
-
diff --git a/sys-apps/memtest86+/files/memtest86+-2.10-hardcoded_cc.patch b/sys-apps/memtest86+/files/memtest86+-2.10-hardcoded_cc.patch
deleted file mode 100644
index 43e3fbb3fcc5..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-2.10-hardcoded_cc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naurp memtest86+-2.10-orig/Makefile memtest86+-2.10/Makefile
---- memtest86+-2.10-orig/Makefile	2008-11-27 13:54:49.000000000 +0100
-+++ memtest86+-2.10/Makefile	2008-11-27 13:56:32.000000000 +0100
-@@ -8,10 +8,9 @@
- #
- FDISK=/dev/fd0
- 
--AS=as -32
--CC=gcc
--
--CFLAGS= -fno-stack-protector -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC
-+CPPFLAGS=-m32
-+CFLAGS=-Wall -m32 -march=i486 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
-+ASFLAGS=-32
- 
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
-       config.o linuxbios.o memsize.o pci.o controller.o random.o extra.o \
-@@ -47,10 +46,10 @@ memtest.bin: memtest_shared.bin bootsect
- 	memtest_shared.bin -o memtest.bin
- 
- reloc.o: reloc.c
--	$(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
-+	$(CC) -c $(CFLAGS) -fno-strict-aliasing -fno-stack-protector reloc.c
- 
- test.o: test.c
--	$(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding test.c
-+	$(CC) -c -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector -fno-pie -nopie test.c
- 
- clean:
- 	rm -f *.o *.s *.iso memtest.bin memtest memtest_shared memtest_shared.bin
diff --git a/sys-apps/memtest86+/files/memtest86+-2.11-hardcoded_cc.patch b/sys-apps/memtest86+/files/memtest86+-2.11-hardcoded_cc.patch
deleted file mode 100644
index 2eff9b73d417..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-2.11-hardcoded_cc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naupr memtest86+-2.11-orig/Makefile memtest86+-2.11/Makefile
---- memtest86+-2.11-orig/Makefile	2009-01-03 12:51:46.000000000 +0100
-+++ memtest86+-2.11/Makefile	2009-01-03 12:53:40.000000000 +0100
-@@ -8,10 +8,9 @@
- #
- FDISK=/dev/fd0
- 
--AS=as -32
--CC=gcc
--
--CFLAGS= -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC
-+CPPFLAGS=-m32
-+CFLAGS=-Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
-+ASFLAGS=-32
- 
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
-       config.o linuxbios.o memsize.o pci.o controller.o random.o extra.o \
-@@ -47,10 +46,10 @@ memtest.bin: memtest_shared.bin bootsect
- 	memtest_shared.bin -o memtest.bin
- 
- reloc.o: reloc.c
--	$(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
-+	$(CC) -c $(CFLAGS) -fno-strict-aliasing -fno-stack-protector reloc.c
- 
- test.o: test.c
--	$(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding test.c
-+	$(CC) -c -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector -fno-pie -nopie test.c
- 
- clean:
- 	rm -f *.o *.s *.iso memtest.bin memtest memtest_shared memtest_shared.bin
diff --git a/sys-apps/memtest86+/files/memtest86+-4.10-hardcoded_cc.patch b/sys-apps/memtest86+/files/memtest86+-4.20-hardcoded_cc.patch
index ed0705c615ea..2eb750c8dd93 100644
--- a/sys-apps/memtest86+/files/memtest86+-4.10-hardcoded_cc.patch
+++ b/sys-apps/memtest86+/files/memtest86+-4.20-hardcoded_cc.patch
@@ -24,7 +24,7 @@ diff -Naurp memtest86+-4.10-orig/Makefile memtest86+-4.10/Makefile
  
  test.o: test.c
 -	$(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding test.c
-+	$(CC) -c -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector -fno-pie -nopie test.c
++	$(CC) -c -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector -fno-pie test.c
  
  clean:
  	rm -f *.o *.s *.iso memtest.bin memtest memtest_shared memtest_shared.bin
diff --git a/sys-apps/memtest86+/memtest86+-2.10.ebuild b/sys-apps/memtest86+/memtest86+-2.10.ebuild
deleted file mode 100644
index 7218fc73af37..000000000000
--- a/sys-apps/memtest86+/memtest86+-2.10.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-2.10.ebuild,v 1.3 2009/03/22 08:40:40 spock Exp $
-
-inherit mount-boot eutils
-
-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="serial"
-RESTRICT="test"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-2.10-hardcoded_cc.patch
-	epatch "${FILESDIR}"/${PN}-1.70-gnu_hash.patch
-
-	if use serial ; then
-		sed -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' -i config.h
-	fi
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	insinto /boot/memtest86plus
-	doins memtest.bin || die
-	dodoc README README.build-process
-}
-
-pkg_postinst() {
-	einfo
-	einfo "memtest.bin has been installed in /boot/memtest86plus/"
-	einfo "You may wish to update your bootloader configs"
-	einfo "by adding these lines:"
-
-	einfo " - For grub: (replace '?' with correct numbers for your boot partition)"
-	einfo "    > title=Memtest86Plus"
-	einfo "    > root (hd?,?)"
-	einfo "    > kernel /boot/memtest86plus/memtest.bin"
-
-	einfo " - For lilo:"
-	einfo "    > image  = /boot/memtest86plus/memtest.bin"
-	einfo "    > label  = Memtest86Plus"
-	einfo
-}
diff --git a/sys-apps/memtest86+/memtest86+-2.11.ebuild b/sys-apps/memtest86+/memtest86+-2.11.ebuild
deleted file mode 100644
index 27bc095c3b90..000000000000
--- a/sys-apps/memtest86+/memtest86+-2.11.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-2.11.ebuild,v 1.6 2009/06/12 14:28:51 flameeyes Exp $
-
-QA_PRESTRIPPED=/boot/memtest86plus/memtest
-
-inherit mount-boot eutils
-
-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"
-RESTRICT="test"
-
-RDEPEND="floppy? ( >=sys-boot/grub-0.95 sys-fs/mtools )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-2.11-hardcoded_cc.patch
-	epatch "${FILESDIR}"/${PN}-1.70-gnu_hash.patch
-
-	sed -i -e's,0x10000,0x100000,' memtest.lds
-
-	if use serial ; then
-		sed -i -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' config.h
-	fi
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	insinto /boot/memtest86plus
-	doins memtest || die
-	dodoc README README.build-process
-
-	if use floppy ; then
-		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
-		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	einfo "memtest.bin has been installed in /boot/memtest86plus/"
-	einfo "You may wish to update your bootloader configs"
-	einfo "by adding these lines:"
-
-	einfo " - For grub: (replace '?' with correct numbers for your boot partition)"
-	einfo "    > title=Memtest86Plus"
-	einfo "    > root (hd?,?)"
-	einfo "    > kernel --type=netbsd /boot/memtest86plus/memtest"
-
-	einfo " - For lilo:"
-	einfo "    > image  = /boot/memtest86plus/memtest"
-	einfo "    > label  = Memtest86Plus"
-	einfo
-}
diff --git a/sys-apps/memtest86+/memtest86+-4.10-r1.ebuild b/sys-apps/memtest86+/memtest86+-4.10-r1.ebuild
deleted file mode 100644
index c8e4c0a3a02d..000000000000
--- a/sys-apps/memtest86+/memtest86+-4.10-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-4.10-r1.ebuild,v 1.2 2011/01/09 03:23:16 vapier Exp $
-
-EAPI="3"
-
-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"
-
-RESTRICT="test"
-
-RDEPEND="floppy? ( >=sys-boot/grub-0.95 sys-fs/mtools )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.10-hardcoded_cc.patch
-
-	sed -i -e 's/$(LD) -s /$(LD) /' Makefile || die
-	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
-
-	if use serial ; then
-		sed -i -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' config.h || die
-	fi
-
-	tc-export CC AS LD
-}
-
-src_install() {
-	insinto /boot/memtest86plus
-	newins memtest.bin memtest || die
-	newins memtest memtest.netbsd || die
-	dosym memtest /boot/memtest86plus/memtest.bin
-	dodoc README README.build-process
-
-	if use floppy ; then
-		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
-		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
-	fi
-}
-
-pkg_postinst() {
-	mount-boot_pkg_postinst
-	echo
-	einfo "memtest has been installed in /boot/memtest86plus/"
-	einfo "You may wish to update your bootloader configs"
-	einfo "by adding these lines:"
-	einfo " - For grub: (replace '?' with correct numbers for your boot partition)"
-	einfo "    > title=Memtest86Plus"
-	einfo "    > root (hd?,?)"
-	einfo "    > kernel /boot/memtest86plus/memtest"
-	einfo "   or try this if you get grub error 28:"
-	einfo "    > title=Memtest86Plus"
-	einfo "    > root (hd?,?)"
-	einfo "    > kernel --type=netbsd /boot/memtest86plus/memtest.netbsd"
-	einfo
-	einfo " - For lilo:"
-	einfo "    > image  = /boot/memtest86plus/memtest"
-	einfo "    > label  = Memtest86Plus"
-	echo
-}
diff --git a/sys-apps/memtest86+/memtest86+-4.10.ebuild b/sys-apps/memtest86+/memtest86+-4.10.ebuild
deleted file mode 100644
index 1c35abc3d0a5..000000000000
--- a/sys-apps/memtest86+/memtest86+-4.10.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-4.10.ebuild,v 1.2 2011/01/09 03:23:16 vapier Exp $
-
-QA_PRESTRIPPED=/boot/memtest86plus/memtest
-
-inherit mount-boot eutils
-
-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"
-RESTRICT="test"
-
-RDEPEND="floppy? ( >=sys-boot/grub-0.95 sys-fs/mtools )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-4.10-hardcoded_cc.patch
-
-	sed -i -e's/$(LD) -s /$(LD) /' Makefile
-	sed -i -e's,0x10000,0x100000,' memtest.lds
-
-	if use serial ; then
-		sed -i -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' config.h
-	fi
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	insinto /boot/memtest86plus
-	newins memtest.bin memtest || die
-	newins memtest memtest.netbsd || die
-	dosym memtest /boot/memtest86plus/memtest.bin
-	dodoc README README.build-process
-
-	if use floppy ; then
-		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
-		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
-	fi
-}
-
-pkg_postinst() {
-	mount-boot_pkg_postinst
-	einfo
-	einfo "memtest has been installed in /boot/memtest86plus/"
-	einfo "You may wish to update your bootloader configs"
-	einfo "by adding these lines:"
-	einfo " - For grub: (replace '?' with correct numbers for your boot partition)"
-	einfo "    > title=Memtest86Plus"
-	einfo "    > root (hd?,?)"
-	einfo "    > kernel /boot/memtest86plus/memtest"
-	einfo "   or try this if you get grub error 28:"
-	einfo "    > title=Memtest86Plus"
-	einfo "    > root (hd?,?)"
-	einfo "    > kernel --type=netbsd /boot/memtest86plus/memtest.netbsd"
-	einfo
-	einfo " - For lilo:"
-	einfo "    > image  = /boot/memtest86plus/memtest"
-	einfo "    > label  = Memtest86Plus"
-	einfo
-}
diff --git a/sys-apps/memtest86+/memtest86+-4.20-r1.ebuild b/sys-apps/memtest86+/memtest86+-4.20-r1.ebuild
new file mode 100644
index 000000000000..5d134fd03a5b
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-4.20-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-4.20-r1.ebuild,v 1.1 2012/07/02 11:02:00 flameeyes Exp $
+
+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
+
+	cat - > "${T}"/39_${PN} <<EOF
+#!/bin/sh
+exec tail -n +3 \$0
+
+menuentry "${PN} ${PV}" {
+	linux16 ${BOOTDIR}/memtest
+}
+
+menuentry "${PN} ${PV} (netbsd)" {
+	insmod bsd
+	knetbsd ${BOOTDIR}/memtest.netbsd
+}
+EOF
+
+	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 "${T}"/39_${PN}
+
+	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/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.ebuild b/sys-apps/memtest86+/memtest86+-4.20.ebuild
deleted file mode 100644
index 0b96e172d9a9..000000000000
--- a/sys-apps/memtest86+/memtest86+-4.20.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-4.20.ebuild,v 1.2 2011/06/12 12:59:51 spock Exp $
-
-EAPI="3"
-
-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"
-
-RESTRICT="test"
-
-RDEPEND="floppy? ( >=sys-boot/grub-0.95 sys-fs/mtools )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.10-hardcoded_cc.patch
-
-	sed -i -e 's/$(LD) -s /$(LD) /' -e 's/-nopie//' Makefile || die
-	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
-
-	if use serial ; then
-		sed -i -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' config.h || die
-	fi
-
-	tc-export CC AS LD
-}
-
-src_install() {
-	insinto /boot/memtest86plus
-	newins memtest.bin memtest || die
-	newins memtest memtest.netbsd || die
-	dosym memtest /boot/memtest86plus/memtest.bin
-	dodoc README README.build-process
-
-	if use floppy ; then
-		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
-		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
-	fi
-}
-
-pkg_postinst() {
-	mount-boot_pkg_postinst
-	echo
-	einfo "memtest has been installed in /boot/memtest86plus/"
-	einfo "You may wish to update your bootloader configs"
-	einfo "by adding these lines:"
-	einfo " - For grub: (replace '?' with correct numbers for your boot partition)"
-	einfo "    > title=Memtest86Plus"
-	einfo "    > root (hd?,?)"
-	einfo "    > kernel /boot/memtest86plus/memtest"
-	einfo "   or try this if you get grub error 28:"
-	einfo "    > title=Memtest86Plus"
-	einfo "    > root (hd?,?)"
-	einfo "    > kernel --type=netbsd /boot/memtest86plus/memtest.netbsd"
-	einfo
-	einfo " - For lilo:"
-	einfo "    > image  = /boot/memtest86plus/memtest"
-	einfo "    > label  = Memtest86Plus"
-	echo
-}