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.

Package-Manager: portage-2.2.0_alpha114/cvs/Linux x86_64

7 files changed, 94 insertions, 190 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/Manifest b/sys-apps/memtest86/Manifest
index 431db82533ff..f37028e1da96 100644
--- a/sys-apps/memtest86/Manifest
+++ b/sys-apps/memtest86/Manifest
@@ -4,23 +4,23 @@ Hash: SHA1
 AUX memtest86-3.2-solar.patch 821 RMD160 ce955d5b0414e1f58758435e99d40a296893c280 SHA1 e16ef80795e76d28356cf33f10527a96d15d88fc SHA256 8004f3066fd4e332ccc9c217b6f62799fa15ec101fde9448f4aab1a2a2589019
 AUX memtest86-3.3-funky-test.patch 374 RMD160 43c5e8a66fc17ee2d8876d2a712ad113d2fed70a SHA1 c26df3e1c5e2f0ec3f143eb8b05c9555ac18a337 SHA256 9a8ecba4392eb80cf460acd51e51bc9de643730c82ba31a18801d686b3c58ebc
 AUX memtest86-3.3-gnu-hash.patch 297 RMD160 b11789b6e1882da3b29f661843e819f76aee7167 SHA1 abc9a71fc613788662f98d5ad9efaccf831903e2 SHA256 9e7d99895087369b7492ebb03ad7a3e366215444f0d32155fa4dfb02464e1c05
-AUX memtest86-3.4-build.patch 968 RMD160 59653c59b23d946191afb96cd831bc963fa4766b SHA1 918cda50a7433cadd95584ef54619bd0a2cf09eb SHA256 b222dfcbde08451974a95515bdd84762e4ec93e8226cfe42b019cf7d1e9db7eb
-AUX memtest86-3.5-build.patch 1375 RMD160 a3d9f2c185a81e932f7212046b047bf32e5b560b SHA1 5f7df5c4f3631974ee62226b1599c96e3a6a4427 SHA256 afa55ae966263e9c7f3f584679964377db213b26c66af5334d5212679ed394dd
 AUX memtest86-4.0-build.patch 1368 RMD160 93acf8cdce295610e12b3f9b81bbbbb3fc460fec SHA1 9be26d5fed2c5ba4787e85719718b3b245175629 SHA256 c7cf0ef0201fe70733e97abd8ad1f6fe7404726bc86f36fa0c4fe02835f61596
 DIST memtest86-3.3.tar.gz 137922 RMD160 dd390793b9e2601ceccc01671dc9aaf602a8590f SHA1 e4ae8c12e44a7f4bf7567e1601cff6b811819ee7 SHA256 f4580d15636b18885709c8aca06759a512911b2efa76d28de2389165dfb9548c
-DIST memtest86-3.4.tar.gz 201204 RMD160 8a4e2bddfd75e7d07a0448dc8b94dd29e67800d5 SHA1 3af9e20888401e9d0eb3eab4e793a48f0520c436 SHA256 5dd0f964c0edf887ecf462526f2f8dd1c2cccbd723390759b98e142a2394c134
-DIST memtest86-3.5.tar.gz 178560 RMD160 0df53a61316c03a1dbec3d61e268c06d56619387 SHA1 9de8742454b8e699428df986cae600d28c1d7c9a SHA256 c55875766ed2515dbde09e3648676f83cb8a3efbc3c8001f989f937a4d24e3e4
 DIST memtest86-4.0.tar.gz 134766 RMD160 84cc12957741950ff8d26b8847875b77eeceb6ae SHA1 1cf38d24c7a9f9560459534687e26d3c4eeb07cc SHA256 a998d21d61d1d4f38856c1d840523bfcc4835799855c228dcf1d01e174424afc
+DIST memtest86-4.0s.tar.gz 157262 RMD160 e7237db4fea4dac361835912ae33c3cc22e2a031 SHA1 83450062302b528f8cb108a1662fd402d0f84f4c SHA256 05270483eef83683ede190750951387c4a7173568f5c8d7b82bb06824836cb79
 EBUILD memtest86-3.3.ebuild 1412 RMD160 ad9b5e5d7642c5d2c29ec3a7301af50042ca5350 SHA1 9ea1467aec033a52fa79586daea6f39ebc00ac8f SHA256 29588ec71f40297aae8d44daaf3f403334715dcadedc70521f909e4216c4799f
-EBUILD memtest86-3.4.ebuild 1393 RMD160 3efc4098a6e18c17f56da12dcfafd147613b2a2c SHA1 11f20285032d21fed9a04bad8fed3095a16291da SHA256 06b19278dc18237d6ed144bd20c5715ac6d6c3e4c997f2af2f4c5ba472f764b2
-EBUILD memtest86-3.5.ebuild 1354 RMD160 fb8181a9db6d9b964811709bba48724938571e6e SHA1 e935e621c2c7d51d24750efd3f035273f83fa555 SHA256 ffdcd0523800dd6615715a8da5ab0d4cf11efb0f366b68bd0a5fdaf97e08c588
 EBUILD memtest86-4.0.ebuild 1351 RMD160 a79f7cf59330c21c85ac5e48c1b287193dc099fd SHA1 63fdd7aa23ad735f98910f574e17a1ea4fa6ff0e SHA256 10c8f70a31a957e5d2a4f8353b647bddb1d4161b4f86dfb7e4482c384fd6ef7f
-MISC ChangeLog 6059 RMD160 3814df62a9cfb126405c9afd093b1a720abc2fd5 SHA1 cb74f9cfcf74c70978922af3c83c8f02dec63a06 SHA256 932337a6fe49464de5b8233469d7a19d41354064a35701ebd3be5c5b3444f5a2
+EBUILD memtest86-4.0s.ebuild 1702 RMD160 2d273eb1ca009581ddeae1a42d1a4fd8e6ab09ab SHA1 713234fad08a540af2c179c2a99543052ba3d9f3 SHA256 968670c313a57ea5f3f3cbbd2fd1a659ad99aae69028a22427d0412a45e3b689
+MISC ChangeLog 6448 RMD160 88ef8b6fb691fddeff4391f2bf93c9745adc181c SHA1 6c1ee6422ebe67e89a8bae02288e0d662fc4fde8 SHA256 d99a1b519a63de7a513031c2437f2b2577ef5035d032d42e39ab26c940453866
 MISC metadata.xml 241 RMD160 86f0a529b00ddd6915b76083c4f1e2db8598fae1 SHA1 70234d532f1b867dfc34bd936fb34a7015fa90ed SHA256 bd2bd1cf924d8626e469ed4c8780d7a11c8b629ce102d654b3ca0022a7f4254e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk34PO8ACgkQVWmRsqeSphO1xgCfTuf5k0RdQFIBzR1WGwihC0kZ
-mD0AnA+93hVaT0dueCDEEYHuDbTZoaHS
-=N1ZX
+iQEcBAEBAgAGBQJP8X9lAAoJEBzRPIrUMBNCmSAIAIUwHyUcliG5qT+nAO957Hlf
+rDLeuMYKuSwXJbbe9JO16NtBV24yMyDpa731mNWb7G3tB2rRw/Tf0kWYxQcF7wHq
+7F7Np5zPxtWhf3gKUvR6tYS9Rk/JZhhYD1384QfNdAQkPzNp3ibNYAnlB06TVpu2
+ho0vguXwOwxuuB+/rhweJZ3IEOOiYYmbwV6BRKy2RP3m3uKhXWPZuGLrIBT7OI3l
+cnaJdHQLgUZ/S+96HxU3g1sIEwdQtt33gf09STspWsB+kaMsLGNdyYT6olBwo3mE
+aYCUnE+qZVtUzriFASmQYCVWJeGZ/Y+ZCbwHTdhqU7GK1+cmVhBC2q5CaJ1kG24=
+=ply+
 -----END PGP SIGNATURE-----
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
+}