Cleanup old; bump to version 4.0s (also called 4.0b) and make the ebuild almost identical to memtest86+; install a grub2 configuration file as well.

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

6 files changed, 83 insertions, 179 deletions

diff --git a/sys-apps/memtest86/ChangeLog b/sys-apps/memtest86/ChangeLog
index 2eaa0718a325..26a0e027bb34 100644
--- a/sys-apps/memtest86/ChangeLog
+++ b/sys-apps/memtest86/ChangeLog
@@ -1,6 +1,14 @@
 # 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.40 2011/06/15 05:02:34 jer Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.41 2012/07/02 11:00:47 flameeyes Exp $
+
+*memtest86-4.0s (02 Jul 2012)
+
+  02 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> +memtest86-4.0s.ebuild,
+  -files/memtest86-3.4-build.patch, -files/memtest86-3.5-build.patch,
+  -memtest86-3.4.ebuild, -memtest86-3.5.ebuild:
+  Cleanup old; bump to version 4.0s (also called 4.0b) and make the ebuild
+  almost identical to memtest86+; install a grub2 configuration file as well.
 
   15 Jun 2011; Jeroen Roovers <jer@gentoo.org> files/memtest86-4.0-build.patch:
   Clean up patch.
diff --git a/sys-apps/memtest86/files/memtest86-3.4-build.patch b/sys-apps/memtest86/files/memtest86-3.4-build.patch
deleted file mode 100644
index fc94be085fdd..000000000000
--- a/sys-apps/memtest86/files/memtest86-3.4-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naurp memtest86-3.4-orig/Makefile memtest86-3.4/Makefile
---- memtest86-3.4-orig/Makefile	2008-09-28 12:56:45.000000000 +0200
-+++ memtest86-3.4/Makefile	2008-09-28 12:57:35.000000000 +0200
-@@ -10,8 +10,11 @@ FDISK=/dev/fd0
- 
- CC=gcc
- 
--CFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin \
--	-ffreestanding -fPIC
-+CFLAGS=-Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \
-+	-ffreestanding -fPIC -fno-stack-protector
-+AS=$(CC) -c
-+ASFLAGS=-m32
-+LD=ld -m elf_i386
- 
- 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 \
-@@ -41,8 +44,7 @@ reloc.o: reloc.c
- 	$(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
- 
- test.o: test.c
--	$(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin \
--        -ffreestanding test.c
-+	$(CC) -c $(CFLAGS:-fPIC=) -o $@ $<
- 
- clean:
- 	rm -f *.o memtest.bin memtest memtest_shared memtest_shared.bin
diff --git a/sys-apps/memtest86/files/memtest86-3.5-build.patch b/sys-apps/memtest86/files/memtest86-3.5-build.patch
deleted file mode 100644
index 04f45bffa5eb..000000000000
--- a/sys-apps/memtest86/files/memtest86-3.5-build.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-make sure all the flags in question force i386 and disable SSP
-
---- a/Makefile
-+++ b/Makefile
-@@ -8,10 +8,9 @@
- #
- FDISK=/dev/fd0
- 
--AS=as -32
--CC=gcc
-+ASFLAGS=-32
- 
--CFLAGS= -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC $(SMP_FL)
-+CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector $(SMP_FL)
- 
- 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 \
-@@ -26,7 +25,7 @@
- # symbols and then link it dynamically so I have full
- # relocation information
- memtest_shared: $(OBJS) memtest_shared.lds Makefile
--	$(LD) --warn-constructors --warn-common -static -T memtest_shared.lds \
-+	$(LD) --warn-constructors --warn-common -static -T memtest_shared.lds -m elf_i386 \
- 	-o $@ $(OBJS) && \
- 	$(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS)
- 
-@@ -53,7 +52,7 @@
- 	$(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
- 
- test.o: test.c
--	$(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding test.c
-+	$(CC) -c $(CFLAGS:-fPIC=) -o $@ $<
- 
- clean:
- 	rm -f *.o *.s *.iso memtest.bin memtest memtest_shared memtest_shared.bin
-@@ -72,3 +71,6 @@
- dos: all
- 	cat mt86+_loader memtest.bin > memtest.exe
- 
-+head.o: head.s
-+bootsect.o: bootsect.s
-+setup.o: setup.s
diff --git a/sys-apps/memtest86/memtest86-3.4.ebuild b/sys-apps/memtest86/memtest86-3.4.ebuild
deleted file mode 100644
index d7c7613577de..000000000000
--- a/sys-apps/memtest86/memtest86-3.4.ebuild
+++ /dev/null
@@ -1,55 +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-3.4.ebuild,v 1.3 2011/01/09 03:24:42 vapier Exp $
-
-inherit mount-boot eutils
-
-DESCRIPTION="A stand alone memory test for x86 computers"
-HOMEPAGE="http://www.memtest86.com/"
-SRC_URI="http://www.memtest86.com/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="serial"
-RESTRICT="test"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm head.s || die
-
-	epatch "${FILESDIR}"/${PN}-3.4-build.patch #66630
-	epatch "${FILESDIR}"/${PN}-3.3-gnu-hash.patch
-
-	if use serial ; then
-		sed -i \
-			-e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
-			config.h \
-			|| die "sed failed"
-	fi
-}
-
-src_install() {
-	insinto /boot/memtest86
-	doins memtest.bin || die "doins failed"
-	dodoc README README.build-process
-}
-
-pkg_postinst() {
-	mount-boot_pkg_postinst
-	einfo
-	einfo "memtest.bin has been installed in /boot/memtest86/"
-	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=Memtest86"
-	einfo "    > root (hd?,?)"
-	einfo "    > kernel /boot/memtest86/memtest.bin"
-	einfo " - For lilo:"
-	einfo "    > image  = /boot/memtest86/memtest.bin"
-	einfo "    > label  = Memtest86"
-	einfo
-}
diff --git a/sys-apps/memtest86/memtest86-3.5.ebuild b/sys-apps/memtest86/memtest86-3.5.ebuild
deleted file mode 100644
index 4db630a47fa6..000000000000
--- a/sys-apps/memtest86/memtest86-3.5.ebuild
+++ /dev/null
@@ -1,53 +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-3.5.ebuild,v 1.4 2011/01/09 03:24:42 vapier Exp $
-
-inherit mount-boot eutils toolchain-funcs
-
-DESCRIPTION="A stand alone memory test for x86 computers"
-HOMEPAGE="http://www.memtest86.com/"
-SRC_URI="http://www.memtest86.com/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="serial"
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-3.5-build.patch #66630
-
-	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_install() {
-	insinto /boot/memtest86
-	doins memtest.bin || die "doins failed"
-	dodoc README README.build-process
-}
-
-pkg_postinst() {
-	mount-boot_pkg_postinst
-	einfo
-	einfo "memtest.bin has been installed in /boot/memtest86/"
-	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=Memtest86"
-	einfo "    > root (hd?,?)"
-	einfo "    > kernel /boot/memtest86/memtest.bin"
-	einfo " - For lilo:"
-	einfo "    > image  = /boot/memtest86/memtest.bin"
-	einfo "    > label  = Memtest86"
-	einfo
-}
diff --git a/sys-apps/memtest86/memtest86-4.0s.ebuild b/sys-apps/memtest86/memtest86-4.0s.ebuild
new file mode 100644
index 000000000000..26364ae54620
--- /dev/null
+++ b/sys-apps/memtest86/memtest86-4.0s.ebuild
@@ -0,0 +1,73 @@
+# 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.0s.ebuild,v 1.1 2012/07/02 11:00:47 flameeyes Exp $
+
+EAPI=4
+
+inherit mount-boot eutils toolchain-funcs
+
+DESCRIPTION="A stand alone memory test for x86 computers"
+HOMEPAGE="http://www.memtest86.com/"
+SRC_URI="http://www.memtest86.com/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="serial"
+
+BOOTDIR=/boot/memtest86
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.0-build.patch #66630
+
+	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
+}
+EOF
+
+	tc-export AS CC LD
+}
+
+src_test() { :; }
+
+src_install() {
+	insinto ${BOOTDIR}
+	newins memtest.bin memtest
+	dosym memtest ${BOOTDIR}/memtest.bin
+
+	exeinto /etc/grub.d
+	doexe "${T}"/39_${PN}
+
+	dodoc README README.build-process README.background
+}
+
+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
+}